OPENNLP-1263 Fix pom.version

madhawa-gunasekara · kottmann · commit 79d814211592 · 2019-05-24T12:48:55.000+02:00
diff --git a/opennlp-distr/pom.xml b/opennlp-distr/pom.xml
@@ -33,7 +33,7 @@
 	<name>Apache OpenNLP Distribution</name>
 
 	<properties>
-		<opennlp.version>${pom.version}</opennlp.version>
+		<opennlp.version>${project.version}</opennlp.version>
 	</properties>
 
 	<!--  Versions will automatically be updated by the release plugin -->
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/Version.java b/opennlp-tools/src/main/java/opennlp/tools/util/Version.java
@@ -208,7 +208,7 @@ public static Version currentVersion() {
 
     String versionString = manifest.getProperty("OpenNLP-Version", DEV_VERSION_STRING);
 
-    if (versionString.equals("${pom.version}"))
+    if (versionString.equals("${project.version}"))
       versionString = DEV_VERSION_STRING;
 
     return Version.parse(versionString);
diff --git a/opennlp-tools/src/main/resources/opennlp/tools/util/opennlp.version b/opennlp-tools/src/main/resources/opennlp/tools/util/opennlp.version
@@ -14,4 +14,4 @@
 # limitations under the License.
 
 # Version is injected by the maven build, fall back version is 0.0.0-SNAPSHOT
-OpenNLP-Version: ${pom.version}
+OpenNLP-Version: ${project.version}
diff --git a/opennlp-uima/descriptors/Chunker.xml b/opennlp-uima/descriptors/Chunker.xml
@@ -26,7 +26,7 @@
 	<analysisEngineMetaData>
 		<name>Chunker</name>
 		<description></description>
-		<version>${pom.version}</version>
+		<version>${project.version}</version>
 		<vendor>Apache Software Foundation</vendor>
 		<configurationParameters>
 
diff --git a/opennlp-uima/descriptors/DateNameFinder.xml b/opennlp-uima/descriptors/DateNameFinder.xml
@@ -26,7 +26,7 @@
 	<analysisEngineMetaData>
 		<name>Date Name Finder</name>
 		<description></description>
-		<version>${pom.version}</version>
+		<version>${project.version}</version>
 		<vendor>Apache Software Foundation</vendor>
 		<configurationParameters>
 
diff --git a/opennlp-uima/descriptors/LanguageDetector.xml b/opennlp-uima/descriptors/LanguageDetector.xml
@@ -26,7 +26,7 @@
 	<analysisEngineMetaData>
 		<name>LanguageDetector</name>
 		<description></description>
-		<version>${pom.version}</version>
+		<version>${project.version}</version>
 		<vendor>Apache Software Foundation</vendor>
 		<configurationParameters>
 			<configurationParameter>
diff --git a/opennlp-uima/descriptors/LocationNameFinder.xml b/opennlp-uima/descriptors/LocationNameFinder.xml
@@ -26,7 +26,7 @@
 	<analysisEngineMetaData>
 		<name>Location Name Finder</name>
 		<description></description>
-		<version>${pom.version}</version>
+		<version>${project.version}</version>
 		<vendor>Apache Software Foundation</vendor>
 		<configurationParameters>
 
diff --git a/opennlp-uima/descriptors/MoneyNameFinder.xml b/opennlp-uima/descriptors/MoneyNameFinder.xml
@@ -26,7 +26,7 @@
 	<analysisEngineMetaData>
 		<name>Money Name Finder</name>
 		<description></description>
-		<version>${pom.version}</version>
+		<version>${project.version}</version>
 		<vendor>Apache Software Foundation</vendor>
 		<configurationParameters>
 
diff --git a/opennlp-uima/descriptors/OpenNlpTextAnalyzer.xml b/opennlp-uima/descriptors/OpenNlpTextAnalyzer.xml
@@ -75,7 +75,7 @@
 	<analysisEngineMetaData>
 		<name>OpenNlpTextAnalyzer</name>
 		<description />
-		<version>${pom.version}</version>
+		<version>${project.version}</version>
 		<vendor>Apache Software Foundation</vendor>
 		<configurationParameters />
 		<configurationParameterSettings />
diff --git a/opennlp-uima/descriptors/OrganizationNameFinder.xml b/opennlp-uima/descriptors/OrganizationNameFinder.xml
@@ -26,7 +26,7 @@
 	<analysisEngineMetaData>
 		<name>Organization Name Finder</name>
 		<description></description>
-		<version>${pom.version}</version>
+		<version>${project.version}</version>
 		<vendor>Apache Software Foundation</vendor>
 		<configurationParameters>
 
diff --git a/opennlp-uima/descriptors/Parser.xml b/opennlp-uima/descriptors/Parser.xml
@@ -26,7 +26,7 @@
 	<analysisEngineMetaData>
 		<name>Parser</name>
 		<description></description>
-		<version>${pom.version}</version>
+		<version>${project.version}</version>
 		<vendor>Apache Software Foundation</vendor>
 		<configurationParameters>
 			<configurationParameter>
diff --git a/opennlp-uima/descriptors/PercentageNameFinder.xml b/opennlp-uima/descriptors/PercentageNameFinder.xml
@@ -26,7 +26,7 @@
 	<analysisEngineMetaData>
 		<name>Percentage Name Finder</name>
 		<description></description>
-		<version>${pom.version}</version>
+		<version>${project.version}</version>
 		<vendor>Apache Software Foundation</vendor>
 		<configurationParameters>
 
diff --git a/opennlp-uima/descriptors/PersonNameFinder.xml b/opennlp-uima/descriptors/PersonNameFinder.xml
@@ -26,7 +26,7 @@
 	<analysisEngineMetaData>
 		<name>Person Name Finder</name>
 		<description></description>
-		<version>${pom.version}</version>
+		<version>${project.version}</version>
 		<vendor>Apache Software Foundation</vendor>
 		<configurationParameters>
 
diff --git a/opennlp-uima/descriptors/PosTagger.xml b/opennlp-uima/descriptors/PosTagger.xml
@@ -26,7 +26,7 @@
 	<analysisEngineMetaData>
 		<name>POS Tagger</name>
 		<description></description>
-		<version>${pom.version}</version>
+		<version>${project.version}</version>
 		<vendor>Apache Software Foundation</vendor>
 		<configurationParameters>
 
diff --git a/opennlp-uima/descriptors/SentenceDetector.xml b/opennlp-uima/descriptors/SentenceDetector.xml
@@ -27,7 +27,7 @@
 	<analysisEngineMetaData>
 		<name>Sentence Detector</name>
 		<description></description>
-		<version>${pom.version}</version>
+		<version>${project.version}</version>
 		<vendor>Apache Software Foundation</vendor>
 		<configurationParameters>
 			<configurationParameter>
diff --git a/opennlp-uima/descriptors/SimpleTokenizer.xml b/opennlp-uima/descriptors/SimpleTokenizer.xml
@@ -27,7 +27,7 @@
 	<analysisEngineMetaData>
 		<name>SimpleTokenizer</name>
 		<description></description>
-		<version>${pom.version}</version>
+		<version>${project.version}</version>
 		<vendor>Apache Software Foundation</vendor>
 		<configurationParameters>
 			<configurationParameter>
diff --git a/opennlp-uima/descriptors/TimeNameFinder.xml b/opennlp-uima/descriptors/TimeNameFinder.xml
@@ -26,7 +26,7 @@
 	<analysisEngineMetaData>
 		<name>Time Name Finder</name>
 		<description></description>
-		<version>${pom.version}</version>
+		<version>${project.version}</version>
 		<vendor>Apache Software Foundation</vendor>
 
 		<configurationParameters>
diff --git a/opennlp-uima/descriptors/Tokenizer.xml b/opennlp-uima/descriptors/Tokenizer.xml
@@ -26,7 +26,7 @@
 	<analysisEngineMetaData>
 		<name>Tokenizer</name>
 		<description></description>
-		<version>${pom.version}</version>
+		<version>${project.version}</version>
 		<vendor>Apache Software Foundation</vendor>
 		<configurationParameters>
 			<configurationParameter>
diff --git a/opennlp-uima/descriptors/TypeSystem.xml b/opennlp-uima/descriptors/TypeSystem.xml
@@ -27,7 +27,7 @@
 		a custom type system change the mapping in the descriptors to the
 		custom types and reference the custom type system.
 	</description>
-	<version>${pom.version}</version>
+	<version>${project.version}</version>
 	<vendor>Apache Software Foundation</vendor>
 	<types>
 		<typeDescription>
diff --git a/opennlp-uima/src/test/resources/test-descriptors/Tokenizer.xml b/opennlp-uima/src/test/resources/test-descriptors/Tokenizer.xml
@@ -25,7 +25,7 @@
 	<annotatorImplementationName>opennlp.uima.tokenize.Tokenizer</annotatorImplementationName>
 	<analysisEngineMetaData>
 		<name>Tokenizer</name>
-		<version>${pom.version}</version>
+		<version>${project.version}</version>
 		<vendor>Apache Software Foundation</vendor>
 		<configurationParameters>
 			<configurationParameter>
