Repository: opennlp Updated Branches: refs/heads/master 12e2c1353 -> 5f1a259c3
[maven-release-plugin] rollback the release of opennlp-1.8.1 Project: http://git-wip-us.apache.org/repos/asf/opennlp/repo Commit: http://git-wip-us.apache.org/repos/asf/opennlp/commit/5f1a259c Tree: http://git-wip-us.apache.org/repos/asf/opennlp/tree/5f1a259c Diff: http://git-wip-us.apache.org/repos/asf/opennlp/diff/5f1a259c Branch: refs/heads/master Commit: 5f1a259c371ca8ec79af4320ae7c2727dd9f1a41 Parents: 12e2c13 Author: smarthi <[email protected]> Authored: Sat Jul 1 10:14:12 2017 -0400 Committer: smarthi <[email protected]> Committed: Sat Jul 1 10:14:12 2017 -0400 ---------------------------------------------------------------------- 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, 28 insertions(+), 75 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/opennlp/blob/5f1a259c/opennlp-brat-annotator/pom.xml ---------------------------------------------------------------------- diff --git a/opennlp-brat-annotator/pom.xml b/opennlp-brat-annotator/pom.xml index f761669..6c7be0d 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.2-SNAPSHOT</version> + <version>1.8.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/opennlp/blob/5f1a259c/opennlp-distr/pom.xml ---------------------------------------------------------------------- diff --git a/opennlp-distr/pom.xml b/opennlp-distr/pom.xml index e8a603d..1ce102d 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.2-SNAPSHOT</version> + <version>1.8.0-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>posix</tarLongFileMode> + <tarLongFileMode>gnu</tarLongFileMode> <finalName>apache-opennlp-${project.version}</finalName> </configuration> @@ -127,7 +127,7 @@ <phase>generate-resources</phase> <goals><goal>jira-report</goal></goals> <configuration> - <onlyCurrentVersion>true</onlyCurrentVersion> + <fixVersionIds>12339249</fixVersionIds> <outputDirectory>${basedir}/target/issuesFixed/</outputDirectory> <maxEntries>1000</maxEntries> <!-- hopefully, bigger than ever needed --> </configuration> http://git-wip-us.apache.org/repos/asf/opennlp/blob/5f1a259c/opennlp-docs/pom.xml ---------------------------------------------------------------------- diff --git a/opennlp-docs/pom.xml b/opennlp-docs/pom.xml index a63e311..fbf0b5c 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.2-SNAPSHOT</version> + <version>1.8.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/opennlp/blob/5f1a259c/opennlp-morfologik-addon/pom.xml ---------------------------------------------------------------------- diff --git a/opennlp-morfologik-addon/pom.xml b/opennlp-morfologik-addon/pom.xml index 9d1ec39..c46f101 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.2-SNAPSHOT</version> + <version>1.8.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -36,20 +36,19 @@ <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>${morfologik.version}</version> + <version>2.1.0</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.carrot2</groupId> <artifactId>morfologik-tools</artifactId> - <version>${morfologik.version}</version> + <version>2.1.0</version> <scope>compile</scope> </dependency> http://git-wip-us.apache.org/repos/asf/opennlp/blob/5f1a259c/opennlp-tools/pom.xml ---------------------------------------------------------------------- diff --git a/opennlp-tools/pom.xml b/opennlp-tools/pom.xml index 632aafc..d2630c9 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.2-SNAPSHOT</version> + <version>1.8.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -33,6 +33,10 @@ <packaging>bundle</packaging> <name>Apache OpenNLP Tools</name> + <properties> + <argLine>-Xmx4096m</argLine> + </properties> + <dependencies> <dependency> <groupId>org.osgi</groupId> @@ -73,7 +77,17 @@ </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/5f1a259c/opennlp-uima/pom.xml ---------------------------------------------------------------------- diff --git a/opennlp-uima/pom.xml b/opennlp-uima/pom.xml index 33dcf5d..7cfdb72 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.2-SNAPSHOT</version> + <version>1.8.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/opennlp/blob/5f1a259c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b5e62b1..45d3c37 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>org.apache.opennlp</groupId> <artifactId>opennlp</artifactId> - <version>1.8.2-SNAPSHOT</version> + <version>1.8.0-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.9</jacoco.maven.plugin> + <jacoco.maven.plugin>0.7.8</jacoco.maven.plugin> <maven.surefire.plugin>2.19.1</maven.surefire.plugin> </properties> @@ -185,13 +185,7 @@ <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> - <version>${jacoco.maven.plugin}</version> - <configuration> - <excludes> - <exclude>**/stemmer/*</exclude> - <exclude>**/stemmer/snowball/*</exclude> - </excludes> - </configuration> + <version>0.7.8</version> <executions> <execution> <id>jacoco-prepare-agent</id> @@ -227,13 +221,7 @@ <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> @@ -418,54 +406,6 @@ </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>
