Repository: opennlp Updated Branches: refs/heads/trunk afc6b65b7 -> 4f2790853
OPENNLP-894: Switch from Java 7 to Java 8 and enforce Maven 3.3.9 This closes #10 Project: http://git-wip-us.apache.org/repos/asf/opennlp/repo Commit: http://git-wip-us.apache.org/repos/asf/opennlp/commit/4f279085 Tree: http://git-wip-us.apache.org/repos/asf/opennlp/tree/4f279085 Diff: http://git-wip-us.apache.org/repos/asf/opennlp/diff/4f279085 Branch: refs/heads/trunk Commit: 4f2790853b3bf1c39cd98683fe84859fb35e36b5 Parents: afc6b65 Author: smarthi <[email protected]> Authored: Mon Dec 19 23:25:10 2016 -0500 Committer: Joern Kottmann <[email protected]> Committed: Tue Dec 20 14:45:15 2016 +0100 ---------------------------------------------------------------------- opennlp-brat-annotator/pom.xml | 3 - opennlp-distr/README | 6 +- opennlp-distr/pom.xml | 4 +- opennlp-distr/src/main/assembly/bin.xml | 3 - opennlp-distr/src/main/assembly/src.xml | 1 - opennlp-morfologik-addon/pom.xml | 19 ++--- opennlp-tools/pom.xml | 11 +-- opennlp-uima/pom.xml | 17 +---- .../uima/AnnotatorsInitializationTest.java | 10 +-- .../uima/dictionary/DictionaryResourceTest.java | 2 +- .../test/resources/test-descriptors/Chunker.xml | 1 - .../test-descriptors/DateNameFinder.xml | 1 - .../test-descriptors/DictionaryNameFinder.xml | 3 +- .../test-descriptors/LocationNameFinder.xml | 1 - .../test-descriptors/MoneyNameFinder.xml | 1 - .../test-descriptors/OrganizationNameFinder.xml | 1 - .../test-descriptors/PercentageNameFinder.xml | 1 - .../test-descriptors/PersonNameFinder.xml | 1 - .../resources/test-descriptors/PosTagger.xml | 1 - .../test-descriptors/SentenceDetector.xml | 1 - .../test-descriptors/TimeNameFinder.xml | 1 - .../resources/test-descriptors/Tokenizer.xml | 1 - pom.xml | 73 +++++++++++++++++--- 23 files changed, 83 insertions(+), 80 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/opennlp/blob/4f279085/opennlp-brat-annotator/pom.xml ---------------------------------------------------------------------- diff --git a/opennlp-brat-annotator/pom.xml b/opennlp-brat-annotator/pom.xml index b7e7301..5f77bb7 100644 --- a/opennlp-brat-annotator/pom.xml +++ b/opennlp-brat-annotator/pom.xml @@ -23,7 +23,6 @@ </parent> <artifactId>opennlp-brat-annotator</artifactId> - <version>1.0-SNAPSHOT</version> <packaging>jar</packaging> <name>Apache OpenNLP Brat Annotator</name> @@ -60,13 +59,11 @@ <dependency> <groupId>org.apache.opennlp</groupId> <artifactId>opennlp-tools</artifactId> - <version>1.6.0</version> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>3.8.1</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/opennlp/blob/4f279085/opennlp-distr/README ---------------------------------------------------------------------- diff --git a/opennlp-distr/README b/opennlp-distr/README index a0ad5e4..0ecfaec 100644 --- a/opennlp-distr/README +++ b/opennlp-distr/README @@ -18,7 +18,7 @@ What is new in Apache OpenNLP ${pom.version} This release introduces many new features, improvements and bug fixes. The API has been improved for a better consistency and 1.4 deprecated methods were -removed. Now Java 1.7 is required. +removed. Now Java 1.8 is required. Additionally the release contains the following noteworthy changes: @@ -39,6 +39,6 @@ notes. Requirements ------------ -Java 1.7 is required to run OpenNLP -Maven 3.0.0 is required for building it +Java 1.8 is required to run OpenNLP +Maven 3.3.9 is required for building it http://git-wip-us.apache.org/repos/asf/opennlp/blob/4f279085/opennlp-distr/pom.xml ---------------------------------------------------------------------- diff --git a/opennlp-distr/pom.xml b/opennlp-distr/pom.xml index 01f2006..e5243cf 100644 --- a/opennlp-distr/pom.xml +++ b/opennlp-distr/pom.xml @@ -37,12 +37,10 @@ <dependency> <groupId>org.apache.opennlp</groupId> <artifactId>opennlp-tools</artifactId> - <version>1.6.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.opennlp</groupId> <artifactId>opennlp-uima</artifactId> - <version>1.6.1-SNAPSHOT</version> </dependency> </dependencies> @@ -114,7 +112,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-changes-plugin</artifactId> - <version>2.9</version> + <version>2.12.1</version> <executions> <execution> <id>default-cli</id> http://git-wip-us.apache.org/repos/asf/opennlp/blob/4f279085/opennlp-distr/src/main/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/opennlp-distr/src/main/assembly/bin.xml b/opennlp-distr/src/main/assembly/bin.xml index 2fd5d7f..926a9eb 100644 --- a/opennlp-distr/src/main/assembly/bin.xml +++ b/opennlp-distr/src/main/assembly/bin.xml @@ -46,14 +46,12 @@ <fileSets> <fileSet> <directory>src/main/readme</directory> - <outputDirectory></outputDirectory> <fileMode>644</fileMode> <directoryMode>755</directoryMode> </fileSet> <fileSet> <directory>.</directory> - <outputDirectory></outputDirectory> <filtered>true</filtered> <fileMode>644</fileMode> <directoryMode>755</directoryMode> @@ -65,7 +63,6 @@ <fileSet> <directory>target</directory> - <outputDirectory></outputDirectory> <fileMode>644</fileMode> <directoryMode>755</directoryMode> <includes> http://git-wip-us.apache.org/repos/asf/opennlp/blob/4f279085/opennlp-distr/src/main/assembly/src.xml ---------------------------------------------------------------------- diff --git a/opennlp-distr/src/main/assembly/src.xml b/opennlp-distr/src/main/assembly/src.xml index cdcc9d3..1dea96b 100644 --- a/opennlp-distr/src/main/assembly/src.xml +++ b/opennlp-distr/src/main/assembly/src.xml @@ -27,7 +27,6 @@ <fileSets> <fileSet> <directory>../</directory> - <outputDirectory></outputDirectory> <excludes> <exclude>**/target/**</exclude> <exclude>**/.*/**</exclude> http://git-wip-us.apache.org/repos/asf/opennlp/blob/4f279085/opennlp-morfologik-addon/pom.xml ---------------------------------------------------------------------- diff --git a/opennlp-morfologik-addon/pom.xml b/opennlp-morfologik-addon/pom.xml index 71d2c53..da9b728 100644 --- a/opennlp-morfologik-addon/pom.xml +++ b/opennlp-morfologik-addon/pom.xml @@ -2,9 +2,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.opennlp</groupId> + <parent> + <groupId>org.apache.opennlp</groupId> + <artifactId>opennlp</artifactId> + <version>1.6.1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + <artifactId>opennlp-morfologik-addon</artifactId> - <version>1.0-SNAPSHOT</version> <packaging>jar</packaging> <name>Apache OpenNLP Morfologik Addon</name> @@ -12,15 +17,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> - <plugin> <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> @@ -101,7 +97,6 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.8.1</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/opennlp/blob/4f279085/opennlp-tools/pom.xml ---------------------------------------------------------------------- diff --git a/opennlp-tools/pom.xml b/opennlp-tools/pom.xml index db0d151..9afaff4 100644 --- a/opennlp-tools/pom.xml +++ b/opennlp-tools/pom.xml @@ -55,6 +55,7 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> + <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> @@ -116,7 +117,7 @@ <configuration> <instructions> <Bundle-Activator>opennlp.tools.util.ext.OSGiExtensionLoader</Bundle-Activator> - <Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment> + <Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment> <Export-Package> !opennlp.tools.cmdline.*, opennlp.tools.* @@ -177,14 +178,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/opennlp/blob/4f279085/opennlp-uima/pom.xml ---------------------------------------------------------------------- diff --git a/opennlp-uima/pom.xml b/opennlp-uima/pom.xml index 2347053..11bd95f 100644 --- a/opennlp-uima/pom.xml +++ b/opennlp-uima/pom.xml @@ -83,22 +83,7 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - <argLine>-Xmx512m</argLine> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> + </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/opennlp/blob/4f279085/opennlp-uima/src/test/java/opennlp/uima/AnnotatorsInitializationTest.java ---------------------------------------------------------------------- diff --git a/opennlp-uima/src/test/java/opennlp/uima/AnnotatorsInitializationTest.java b/opennlp-uima/src/test/java/opennlp/uima/AnnotatorsInitializationTest.java index ced03c8..7e77a6d 100644 --- a/opennlp-uima/src/test/java/opennlp/uima/AnnotatorsInitializationTest.java +++ b/opennlp-uima/src/test/java/opennlp/uima/AnnotatorsInitializationTest.java @@ -16,6 +16,8 @@ */ package opennlp.uima; +import java.io.File; +import java.io.IOException; import org.apache.uima.UIMAFramework; import org.apache.uima.analysis_engine.AnalysisEngine; import org.apache.uima.cas.CAS; @@ -24,10 +26,6 @@ import org.apache.uima.resource.ResourceInitializationException; import org.apache.uima.resource.ResourceSpecifier; import org.apache.uima.util.InvalidXMLException; import org.apache.uima.util.XMLInputSource; -import org.junit.Test; - -import java.io.File; -import java.io.IOException; import static org.junit.Assert.fail; @@ -38,7 +36,9 @@ public class AnnotatorsInitializationTest { private static final String PATHNAME = "src/test/resources/test-descriptors/"; - @Test + // TODO: This test requires the SourceForge models, or other models to run, + // but they are missing due to license issues since the project was migrated to Apache + //@Test public void testInitializationExecutionAndReconfigure() { File f = new File(PATHNAME); for (String descName : f.list(new FileUtil.ExtFilenameFilter("xml"))) { http://git-wip-us.apache.org/repos/asf/opennlp/blob/4f279085/opennlp-uima/src/test/java/opennlp/uima/dictionary/DictionaryResourceTest.java ---------------------------------------------------------------------- diff --git a/opennlp-uima/src/test/java/opennlp/uima/dictionary/DictionaryResourceTest.java b/opennlp-uima/src/test/java/opennlp/uima/dictionary/DictionaryResourceTest.java index 40d24c7..2afb97a 100644 --- a/opennlp-uima/src/test/java/opennlp/uima/dictionary/DictionaryResourceTest.java +++ b/opennlp-uima/src/test/java/opennlp/uima/dictionary/DictionaryResourceTest.java @@ -43,7 +43,7 @@ import static org.junit.Assert.*; public class DictionaryResourceTest { - private static final String PATHNAME = "opennlp-uima/src/test/resources/test-descriptors/"; + private static final String PATHNAME = "src/test/resources/test-descriptors/"; private static AnalysisEngine AE; http://git-wip-us.apache.org/repos/asf/opennlp/blob/4f279085/opennlp-uima/src/test/resources/test-descriptors/Chunker.xml ---------------------------------------------------------------------- diff --git a/opennlp-uima/src/test/resources/test-descriptors/Chunker.xml b/opennlp-uima/src/test/resources/test-descriptors/Chunker.xml index dd48498..ecca12e 100644 --- a/opennlp-uima/src/test/resources/test-descriptors/Chunker.xml +++ b/opennlp-uima/src/test/resources/test-descriptors/Chunker.xml @@ -25,7 +25,6 @@ <annotatorImplementationName>opennlp.uima.chunker.Chunker</annotatorImplementationName> <analysisEngineMetaData> <name>Chunker</name> - <description></description> <version>1.5.2-incubating</version> <vendor>Apache Software Foundation</vendor> <configurationParameters> http://git-wip-us.apache.org/repos/asf/opennlp/blob/4f279085/opennlp-uima/src/test/resources/test-descriptors/DateNameFinder.xml ---------------------------------------------------------------------- diff --git a/opennlp-uima/src/test/resources/test-descriptors/DateNameFinder.xml b/opennlp-uima/src/test/resources/test-descriptors/DateNameFinder.xml index 8f58e3b..d619160 100644 --- a/opennlp-uima/src/test/resources/test-descriptors/DateNameFinder.xml +++ b/opennlp-uima/src/test/resources/test-descriptors/DateNameFinder.xml @@ -25,7 +25,6 @@ <annotatorImplementationName>opennlp.uima.namefind.NameFinder</annotatorImplementationName> <analysisEngineMetaData> <name>Date Name Finder</name> - <description></description> <version>1.5.2-incubating</version> <vendor>Apache Software Foundation</vendor> <configurationParameters> http://git-wip-us.apache.org/repos/asf/opennlp/blob/4f279085/opennlp-uima/src/test/resources/test-descriptors/DictionaryNameFinder.xml ---------------------------------------------------------------------- diff --git a/opennlp-uima/src/test/resources/test-descriptors/DictionaryNameFinder.xml b/opennlp-uima/src/test/resources/test-descriptors/DictionaryNameFinder.xml index e063754..97e19b2 100644 --- a/opennlp-uima/src/test/resources/test-descriptors/DictionaryNameFinder.xml +++ b/opennlp-uima/src/test/resources/test-descriptors/DictionaryNameFinder.xml @@ -25,7 +25,6 @@ <annotatorImplementationName>opennlp.uima.namefind.DictionaryNameFinder</annotatorImplementationName> <analysisEngineMetaData> <name>Dictionary Name Finder</name> - <description></description> <version>1.5.2-incubating</version> <vendor>Apache Software Foundation</vendor> <configurationParameters> @@ -109,7 +108,7 @@ <name>NameFinderDictionary</name> <description/> <fileResourceSpecifier> - <fileUrl>file:opennlp-uima/src/test/resources/dictionary.dic</fileUrl> + <fileUrl>file:src/test/resources/dictionary.dic</fileUrl> </fileResourceSpecifier> <implementationName>opennlp.uima.dictionary.DictionaryResourceImpl</implementationName> </externalResource> http://git-wip-us.apache.org/repos/asf/opennlp/blob/4f279085/opennlp-uima/src/test/resources/test-descriptors/LocationNameFinder.xml ---------------------------------------------------------------------- diff --git a/opennlp-uima/src/test/resources/test-descriptors/LocationNameFinder.xml b/opennlp-uima/src/test/resources/test-descriptors/LocationNameFinder.xml index f6fdaeb..51f5079 100644 --- a/opennlp-uima/src/test/resources/test-descriptors/LocationNameFinder.xml +++ b/opennlp-uima/src/test/resources/test-descriptors/LocationNameFinder.xml @@ -25,7 +25,6 @@ <annotatorImplementationName>opennlp.uima.namefind.NameFinder</annotatorImplementationName> <analysisEngineMetaData> <name>Location Name Finder</name> - <description></description> <version>1.5.2-incubating</version> <vendor>Apache Software Foundation</vendor> <configurationParameters> http://git-wip-us.apache.org/repos/asf/opennlp/blob/4f279085/opennlp-uima/src/test/resources/test-descriptors/MoneyNameFinder.xml ---------------------------------------------------------------------- diff --git a/opennlp-uima/src/test/resources/test-descriptors/MoneyNameFinder.xml b/opennlp-uima/src/test/resources/test-descriptors/MoneyNameFinder.xml index c5b9207..8df918d 100644 --- a/opennlp-uima/src/test/resources/test-descriptors/MoneyNameFinder.xml +++ b/opennlp-uima/src/test/resources/test-descriptors/MoneyNameFinder.xml @@ -25,7 +25,6 @@ <annotatorImplementationName>opennlp.uima.namefind.NameFinder</annotatorImplementationName> <analysisEngineMetaData> <name>Money Name Finder</name> - <description></description> <version>1.5.2-incubating</version> <vendor>Apache Software Foundation</vendor> <configurationParameters> http://git-wip-us.apache.org/repos/asf/opennlp/blob/4f279085/opennlp-uima/src/test/resources/test-descriptors/OrganizationNameFinder.xml ---------------------------------------------------------------------- diff --git a/opennlp-uima/src/test/resources/test-descriptors/OrganizationNameFinder.xml b/opennlp-uima/src/test/resources/test-descriptors/OrganizationNameFinder.xml index c72ff0c..0afe1fc 100644 --- a/opennlp-uima/src/test/resources/test-descriptors/OrganizationNameFinder.xml +++ b/opennlp-uima/src/test/resources/test-descriptors/OrganizationNameFinder.xml @@ -25,7 +25,6 @@ <annotatorImplementationName>opennlp.uima.namefind.NameFinder</annotatorImplementationName> <analysisEngineMetaData> <name>Organization Name Finder</name> - <description></description> <version>1.5.2-incubating</version> <vendor>Apache Software Foundation</vendor> <configurationParameters> http://git-wip-us.apache.org/repos/asf/opennlp/blob/4f279085/opennlp-uima/src/test/resources/test-descriptors/PercentageNameFinder.xml ---------------------------------------------------------------------- diff --git a/opennlp-uima/src/test/resources/test-descriptors/PercentageNameFinder.xml b/opennlp-uima/src/test/resources/test-descriptors/PercentageNameFinder.xml index 8235d64..695d58e 100644 --- a/opennlp-uima/src/test/resources/test-descriptors/PercentageNameFinder.xml +++ b/opennlp-uima/src/test/resources/test-descriptors/PercentageNameFinder.xml @@ -25,7 +25,6 @@ <annotatorImplementationName>opennlp.uima.namefind.NameFinder</annotatorImplementationName> <analysisEngineMetaData> <name>Percentage Name Finder</name> - <description></description> <version>1.5.2-incubating</version> <vendor>Apache Software Foundation</vendor> <configurationParameters> http://git-wip-us.apache.org/repos/asf/opennlp/blob/4f279085/opennlp-uima/src/test/resources/test-descriptors/PersonNameFinder.xml ---------------------------------------------------------------------- diff --git a/opennlp-uima/src/test/resources/test-descriptors/PersonNameFinder.xml b/opennlp-uima/src/test/resources/test-descriptors/PersonNameFinder.xml index 19e916d..659a3f4 100644 --- a/opennlp-uima/src/test/resources/test-descriptors/PersonNameFinder.xml +++ b/opennlp-uima/src/test/resources/test-descriptors/PersonNameFinder.xml @@ -25,7 +25,6 @@ <annotatorImplementationName>opennlp.uima.namefind.NameFinder</annotatorImplementationName> <analysisEngineMetaData> <name>Person Name Finder</name> - <description></description> <version>1.5.2-incubating</version> <vendor>Apache Software Foundation</vendor> <configurationParameters> http://git-wip-us.apache.org/repos/asf/opennlp/blob/4f279085/opennlp-uima/src/test/resources/test-descriptors/PosTagger.xml ---------------------------------------------------------------------- diff --git a/opennlp-uima/src/test/resources/test-descriptors/PosTagger.xml b/opennlp-uima/src/test/resources/test-descriptors/PosTagger.xml index 5fe00b6..e3eba91 100644 --- a/opennlp-uima/src/test/resources/test-descriptors/PosTagger.xml +++ b/opennlp-uima/src/test/resources/test-descriptors/PosTagger.xml @@ -25,7 +25,6 @@ <annotatorImplementationName>opennlp.uima.postag.POSTagger</annotatorImplementationName> <analysisEngineMetaData> <name>POS Tagger</name> - <description></description> <version>1.5.2-incubating</version> <vendor>Apache Software Foundation</vendor> <configurationParameters> http://git-wip-us.apache.org/repos/asf/opennlp/blob/4f279085/opennlp-uima/src/test/resources/test-descriptors/SentenceDetector.xml ---------------------------------------------------------------------- diff --git a/opennlp-uima/src/test/resources/test-descriptors/SentenceDetector.xml b/opennlp-uima/src/test/resources/test-descriptors/SentenceDetector.xml index 2025fa4..2a02034 100644 --- a/opennlp-uima/src/test/resources/test-descriptors/SentenceDetector.xml +++ b/opennlp-uima/src/test/resources/test-descriptors/SentenceDetector.xml @@ -26,7 +26,6 @@ <annotatorImplementationName>opennlp.uima.sentdetect.SentenceDetector</annotatorImplementationName> <analysisEngineMetaData> <name>Sentence Detector</name> - <description></description> <version>1.5.2-incubating</version> <vendor>Apache Software Foundation</vendor> <configurationParameters> http://git-wip-us.apache.org/repos/asf/opennlp/blob/4f279085/opennlp-uima/src/test/resources/test-descriptors/TimeNameFinder.xml ---------------------------------------------------------------------- diff --git a/opennlp-uima/src/test/resources/test-descriptors/TimeNameFinder.xml b/opennlp-uima/src/test/resources/test-descriptors/TimeNameFinder.xml index 3f7ed0b..846b5a8 100644 --- a/opennlp-uima/src/test/resources/test-descriptors/TimeNameFinder.xml +++ b/opennlp-uima/src/test/resources/test-descriptors/TimeNameFinder.xml @@ -25,7 +25,6 @@ <annotatorImplementationName>opennlp.uima.namefind.NameFinder</annotatorImplementationName> <analysisEngineMetaData> <name>Time Name Finder</name> - <description></description> <version>1.5.2-incubating</version> <vendor>Apache Software Foundation</vendor> http://git-wip-us.apache.org/repos/asf/opennlp/blob/4f279085/opennlp-uima/src/test/resources/test-descriptors/Tokenizer.xml ---------------------------------------------------------------------- diff --git a/opennlp-uima/src/test/resources/test-descriptors/Tokenizer.xml b/opennlp-uima/src/test/resources/test-descriptors/Tokenizer.xml index cee2a94..27f8480 100644 --- a/opennlp-uima/src/test/resources/test-descriptors/Tokenizer.xml +++ b/opennlp-uima/src/test/resources/test-descriptors/Tokenizer.xml @@ -25,7 +25,6 @@ <annotatorImplementationName>opennlp.uima.tokenize.Tokenizer</annotatorImplementationName> <analysisEngineMetaData> <name>Tokenizer</name> - <description></description> <version>${pom.version}</version> <vendor>Apache Software Foundation</vendor> <configurationParameters> http://git-wip-us.apache.org/repos/asf/opennlp/blob/4f279085/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 91e5043..89d0206 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.apache</groupId> <artifactId>apache</artifactId> - <version>16</version> + <version>18</version> <relativePath /> </parent> @@ -36,10 +36,6 @@ <name>Apache OpenNLP Reactor</name> - <prerequisites> - <maven>3.0</maven> - </prerequisites> - <scm> <connection>scm:git:https://git-wip-us.apache.org/repos/asf/opennlp.git</connection> <url>https://git-wip-us.apache.org/repos/asf?p=opennlp.git</url> @@ -87,12 +83,33 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.8.1</version> + <version>${junit.version}</version> <scope>test</scope> </dependency> + + <dependency> + <artifactId>opennlp-tools</artifactId> + <groupId>${project.groupId}</groupId> + <version>${project.version}</version> + </dependency> + + <dependency> + <artifactId>opennlp-uima</artifactId> + <groupId>${project.groupId}</groupId> + <version>${project.version}</version> + </dependency> + </dependencies> </dependencyManagement> + <properties> + <!-- Build Properties --> + <java.version>1.8</java.version> + <maven.version>3.3.9</maven.version> + <enforcer.plugin.version>1.4.1</enforcer.plugin.version> + <junit.version>4.12</junit.version> + </properties> + <build> <pluginManagement> <plugins> @@ -110,9 +127,7 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <!-- Version 2.3.5 breaks backward compatibility with java 5, - but the build must run on java 5! --> - <version>2.3.4</version> + <version>3.2.0</version> </plugin> </plugins> </pluginManagement> @@ -120,9 +135,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> + <version>3.3</version> <configuration> - <source>1.7</source> - <target>1.7</target> + <source>${java.version}</source> + <target>${java.version}</target> <compilerArgument>-Xlint</compilerArgument> </configuration> </plugin> @@ -189,6 +205,41 @@ </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>${enforcer.plugin.version}</version> + <executions> + <execution> + <id>enforce-java</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireJavaVersion> + <message>Java 8 or higher is required to compile this module</message> + <version>[${java.version},)</version> + </requireJavaVersion> + <requireMavenVersion> + <message>Maven 3.3.9 or higher is required to compile this module</message> + <version>[${maven.version},)</version> + </requireMavenVersion> + </rules> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skipTests>false</skipTests> + <argLine>-Xmx512m</argLine> + </configuration> + </plugin> + </plugins> </build>
