This is an automated email from the ASF dual-hosted git repository.

joern pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/opennlp.git


The following commit(s) were added to refs/heads/master by this push:
     new 79d8142  OPENNLP-1263 Fix pom.version
79d8142 is described below

commit 79d81421159233d79c1fb7a8729c1d44ec048395
Author: madhawa-gunasekara <[email protected]>
AuthorDate: Fri May 24 12:10:26 2019 +0530

    OPENNLP-1263 Fix pom.version
---
 opennlp-distr/pom.xml                                               | 2 +-
 opennlp-tools/src/main/java/opennlp/tools/util/Version.java         | 2 +-
 opennlp-tools/src/main/resources/opennlp/tools/util/opennlp.version | 2 +-
 opennlp-uima/descriptors/Chunker.xml                                | 2 +-
 opennlp-uima/descriptors/DateNameFinder.xml                         | 2 +-
 opennlp-uima/descriptors/LanguageDetector.xml                       | 2 +-
 opennlp-uima/descriptors/LocationNameFinder.xml                     | 2 +-
 opennlp-uima/descriptors/MoneyNameFinder.xml                        | 2 +-
 opennlp-uima/descriptors/OpenNlpTextAnalyzer.xml                    | 2 +-
 opennlp-uima/descriptors/OrganizationNameFinder.xml                 | 2 +-
 opennlp-uima/descriptors/Parser.xml                                 | 2 +-
 opennlp-uima/descriptors/PercentageNameFinder.xml                   | 2 +-
 opennlp-uima/descriptors/PersonNameFinder.xml                       | 2 +-
 opennlp-uima/descriptors/PosTagger.xml                              | 2 +-
 opennlp-uima/descriptors/SentenceDetector.xml                       | 2 +-
 opennlp-uima/descriptors/SimpleTokenizer.xml                        | 2 +-
 opennlp-uima/descriptors/TimeNameFinder.xml                         | 2 +-
 opennlp-uima/descriptors/Tokenizer.xml                              | 2 +-
 opennlp-uima/descriptors/TypeSystem.xml                             | 2 +-
 opennlp-uima/src/test/resources/test-descriptors/Tokenizer.xml      | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/opennlp-distr/pom.xml b/opennlp-distr/pom.xml
index 19ae9a6..434117c 100644
--- 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
index 07fb86d..c94ea92 100644
--- 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 class Version {
 
     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
index 0bb9493..70bfa10 100644
--- 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}
\ No newline at end of file
+OpenNLP-Version: ${project.version}
\ No newline at end of file
diff --git a/opennlp-uima/descriptors/Chunker.xml 
b/opennlp-uima/descriptors/Chunker.xml
index 17f093a..7b62a79 100644
--- 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
index 8ad3f87..98eff16 100644
--- 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
index 5d15b9e..73c825e 100644
--- 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
index 70a4c12..b28bc59 100644
--- 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
index f74a7c6..12a00d6 100644
--- 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
index 965824c..b680242 100644
--- 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
index 8a80d6d..4c9279e 100644
--- 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
index 6782bb7..1e17078 100644
--- 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
index ec8ca78..6565357 100644
--- 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
index 84ecbe4..69d3b91 100644
--- 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
index f576f9b..9e4498b 100644
--- 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
index 6d809ae..afd51ea 100644
--- 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
index 68daa28..b4f7104 100644
--- 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
index ca60b51..aed0cbf 100644
--- 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
index ca39707..8bf1f94 100644
--- 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
index c944052..228d919 100644
--- 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
index 27f8480..c10dad0 100644
--- 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>

Reply via email to