Repository: opennlp Updated Branches: refs/heads/master 5f1a259c3 -> 6590efb50
Revert "[maven-release-plugin] rollback the release of opennlp-1.8.1" This reverts commit 5f1a259c371ca8ec79af4320ae7c2727dd9f1a41. Project: http://git-wip-us.apache.org/repos/asf/opennlp/repo Commit: http://git-wip-us.apache.org/repos/asf/opennlp/commit/6590efb5 Tree: http://git-wip-us.apache.org/repos/asf/opennlp/tree/6590efb5 Diff: http://git-wip-us.apache.org/repos/asf/opennlp/diff/6590efb5 Branch: refs/heads/master Commit: 6590efb50292ccf1267efce868607bbeb69201d9 Parents: 5f1a259 Author: Jörn Kottmann <[email protected]> Authored: Sat Jul 1 16:24:32 2017 +0200 Committer: Jörn Kottmann <[email protected]> Committed: Sat Jul 1 16:24:32 2017 +0200 ---------------------------------------------------------------------- opennlp-brat-annotator/pom.xml | 2 +- opennlp-distr/pom.xml | 6 ++-- opennlp-docs/pom.xml | 2 +- opennlp-morfologik-addon/pom.xml | 7 ++-- opennlp-tools/pom.xml | 18 ++-------- opennlp-uima/pom.xml | 2 +- pom.xml | 66 +++++++++++++++++++++++++++++++++-- 7 files changed, 75 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/opennlp/blob/6590efb5/opennlp-brat-annotator/pom.xml ---------------------------------------------------------------------- diff --git a/opennlp-brat-annotator/pom.xml b/opennlp-brat-annotator/pom.xml index 6c7be0d..f761669 100644 --- a/opennlp-brat-annotator/pom.xml +++ b/opennlp-brat-annotator/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.apache.opennlp</groupId> <artifactId>opennlp</artifactId> - <version>1.8.0-SNAPSHOT</version> + <version>1.8.2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/opennlp/blob/6590efb5/opennlp-distr/pom.xml ---------------------------------------------------------------------- diff --git a/opennlp-distr/pom.xml b/opennlp-distr/pom.xml index 1ce102d..e8a603d 100644 --- a/opennlp-distr/pom.xml +++ b/opennlp-distr/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.opennlp</groupId> <artifactId>opennlp</artifactId> - <version>1.8.0-SNAPSHOT</version> + <version>1.8.2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -72,7 +72,7 @@ many file have more than 100 chars. Right now only javadoc files are too long. --> - <tarLongFileMode>gnu</tarLongFileMode> + <tarLongFileMode>posix</tarLongFileMode> <finalName>apache-opennlp-${project.version}</finalName> </configuration> @@ -127,7 +127,7 @@ <phase>generate-resources</phase> <goals><goal>jira-report</goal></goals> <configuration> - <fixVersionIds>12339249</fixVersionIds> + <onlyCurrentVersion>true</onlyCurrentVersion> <outputDirectory>${basedir}/target/issuesFixed/</outputDirectory> <maxEntries>1000</maxEntries> <!-- hopefully, bigger than ever needed --> </configuration> http://git-wip-us.apache.org/repos/asf/opennlp/blob/6590efb5/opennlp-docs/pom.xml ---------------------------------------------------------------------- diff --git a/opennlp-docs/pom.xml b/opennlp-docs/pom.xml index fbf0b5c..a63e311 100644 --- a/opennlp-docs/pom.xml +++ b/opennlp-docs/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.opennlp</groupId> <artifactId>opennlp</artifactId> - <version>1.8.0-SNAPSHOT</version> + <version>1.8.2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/opennlp/blob/6590efb5/opennlp-morfologik-addon/pom.xml ---------------------------------------------------------------------- diff --git a/opennlp-morfologik-addon/pom.xml b/opennlp-morfologik-addon/pom.xml index c46f101..9d1ec39 100644 --- a/opennlp-morfologik-addon/pom.xml +++ b/opennlp-morfologik-addon/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.opennlp</groupId> <artifactId>opennlp</artifactId> - <version>1.8.0-SNAPSHOT</version> + <version>1.8.2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -36,19 +36,20 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <morfologik.version>2.1.3</morfologik.version> </properties> <dependencies> <dependency> <groupId>org.carrot2</groupId> <artifactId>morfologik-stemming</artifactId> - <version>2.1.0</version> + <version>${morfologik.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.carrot2</groupId> <artifactId>morfologik-tools</artifactId> - <version>2.1.0</version> + <version>${morfologik.version}</version> <scope>compile</scope> </dependency> http://git-wip-us.apache.org/repos/asf/opennlp/blob/6590efb5/opennlp-tools/pom.xml ---------------------------------------------------------------------- diff --git a/opennlp-tools/pom.xml b/opennlp-tools/pom.xml index d2630c9..632aafc 100644 --- a/opennlp-tools/pom.xml +++ b/opennlp-tools/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.apache.opennlp</groupId> <artifactId>opennlp</artifactId> - <version>1.8.0-SNAPSHOT</version> + <version>1.8.2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -33,10 +33,6 @@ <packaging>bundle</packaging> <name>Apache OpenNLP Tools</name> - <properties> - <argLine>-Xmx4096m</argLine> - </properties> - <dependencies> <dependency> <groupId>org.osgi</groupId> @@ -77,17 +73,7 @@ </resource> </resources> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>@{argLine}</argLine> - <excludes> - <exclude>/opennlp/tools/eval/**/*</exclude> - </excludes> - </configuration> - </plugin> - + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> http://git-wip-us.apache.org/repos/asf/opennlp/blob/6590efb5/opennlp-uima/pom.xml ---------------------------------------------------------------------- diff --git a/opennlp-uima/pom.xml b/opennlp-uima/pom.xml index 7cfdb72..33dcf5d 100644 --- a/opennlp-uima/pom.xml +++ b/opennlp-uima/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.apache.opennlp</groupId> <artifactId>opennlp</artifactId> - <version>1.8.0-SNAPSHOT</version> + <version>1.8.2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/opennlp/blob/6590efb5/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 45d3c37..b5e62b1 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>org.apache.opennlp</groupId> <artifactId>opennlp</artifactId> - <version>1.8.0-SNAPSHOT</version> + <version>1.8.2-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache OpenNLP Reactor</name> @@ -126,7 +126,7 @@ <checkstyle.plugin.version>2.17</checkstyle.plugin.version> <opennlp.forkCount>1.0C</opennlp.forkCount> <coveralls.maven.plugin>4.3.0</coveralls.maven.plugin> - <jacoco.maven.plugin>0.7.8</jacoco.maven.plugin> + <jacoco.maven.plugin>0.7.9</jacoco.maven.plugin> <maven.surefire.plugin>2.19.1</maven.surefire.plugin> </properties> @@ -185,7 +185,13 @@ <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> - <version>0.7.8</version> + <version>${jacoco.maven.plugin}</version> + <configuration> + <excludes> + <exclude>**/stemmer/*</exclude> + <exclude>**/stemmer/snowball/*</exclude> + </excludes> + </configuration> <executions> <execution> <id>jacoco-prepare-agent</id> @@ -221,7 +227,13 @@ <artifactId>maven-surefire-plugin</artifactId> <version>${maven.surefire.plugin}</version> <configuration> + <argLine>-Xmx2048m</argLine> <forkCount>${opennlp.forkCount}</forkCount> + <failIfNoSpecifiedTests>false</failIfNoSpecifiedTests> + <excludes> + <exclude>**/stemmer/*</exclude> + <exclude>**/stemmer/snowball/*</exclude> + </excludes> </configuration> </plugin> @@ -406,6 +418,54 @@ </plugins> </build> </profile> + + <profile> + <id>eval-tests</id> + <properties> + <opennlp.forkCount>0.5C</opennlp.forkCount> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>${maven.surefire.plugin}</version> + <configuration> + <argLine>-Xmx4g</argLine> + <includes> + <include>**/*Test.java</include> + <include>**/*Eval.java</include> + </includes> + <excludedGroups>opennlp.tools.HighMemoryUsage</excludedGroups> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>high-memory-tests</id> + <properties> + <opennlp.forkCount>1</opennlp.forkCount> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>${maven.surefire.plugin}</version> + <configuration> + <argLine>-Xmx20g</argLine> + <includes> + <include>**/*Test.java</include> + <include>**/*Eval.java</include> + </includes> + <groups>opennlp.tools.HighMemoryUsage</groups> + </configuration> + </plugin> + </plugins> + </build> + </profile> </profiles> <modules>
