Skip to content

Commit

Permalink
fixing maven release plugin version
Browse files Browse the repository at this point in the history 
regenerated ant files
  • Loading branch information
Vyacheslav Zholudev committed Aug 20, 2015
1 parent 4582d9c commit 90d60b3
Show file tree
Hide file tree
Showing 7 changed files with 526 additions and 181 deletions.
16 changes: 10 additions & 6 deletions grobid-core/maven-build.properties
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,25 @@
#Generated by Maven Ant Plugin - DO NOT EDIT THIS FILE!
#Mon Dec 02 13:32:41 CET 2013
maven.settings.offline=true
#Wed Aug 19 20:10:28 CEST 2015
maven.settings.offline=false
assemblies.name=src/main/assembly/assembly.xml
maven.build.finalName=grobid-core-0.3.4-SNAPSHOT
maven.build.finalName=grobid-core-0.3.6-SNAPSHOT
maven.build.resourceDir.0=src/main/resources
maven.build.testOutputDir=${maven.build.dir}/test-classes
maven.build.testResourceDir.0=src/test/resources
maven.reporting.outputDirectory=${maven.build.dir}/site
package.file=org.grobid.grobid-core_0.3.4-SNAPSHOT.war
maven-javadoc-plugin.version=2.8.1
package.file=org.grobid.grobid-core_0.3.6-SNAPSHOT.war
maven-source-plugin.version=2.1.2
project.build.sourceEncoding=UTF-8
maven.build.srcDir.0=src/main/java
project.build.directory=${maven.build.dir}
checksum-maven-plugin.version=1.0.1
maven.test.reports=${maven.build.dir}/test-reports
maven-gpg-plugin.version=1.4
maven.build.dir=target
project.build.outputDirectory=${maven.build.outputDir}
maven.build.testDir.0=src/test/java
maven.settings.interactiveMode=true
maven.repo.local=../lib
license.file=/Users/lopez/grobid/grobid-core/LICENSE
license.file=/Users/zholudev/Work/workspace/grobid-rg/grobid-core/LICENSE
maven.repo.local=${user.home}/.m2/repository
maven.build.outputDir=${maven.build.dir}/classes
641 changes: 489 additions & 152 deletions grobid-core/maven-build.xml
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion grobid-core/src/test/java/org/grobid/core/test/TestFullTextParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public void testFullTextParser() throws Exception {
getTestResourcePath();

String pdfPath = testPath + "/Wang-paperAVE2008.pdf";

String tei = GrobidFactory.getInstance().createEngine().fullTextToTEI(pdfPath, false, false);
assertNotNull(tei);
//System.out.println(tei);
Expand Down
30 changes: 17 additions & 13 deletions grobid-home/maven-build.properties
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
#Generated by Maven Ant Plugin - DO NOT EDIT THIS FILE!
#Mon Dec 02 13:32:40 CET 2013
project.build.outputDirectory=${maven.build.outputDir}
project.build.directory=${maven.build.dir}
maven.test.reports=${maven.build.dir}/test-reports
maven.build.finalName=grobid-home-0.3.4-SNAPSHOT
maven.reporting.outputDirectory=${maven.build.dir}/site
maven.build.testResourceDir.0=src/test/resources
maven.build.outputDir=${maven.build.dir}/classes
#Wed Aug 19 20:10:28 CEST 2015
maven.settings.offline=false
maven.build.finalName=grobid-home-0.3.6-SNAPSHOT
maven.build.resourceDir.0=src/main/resources
maven.build.testOutputDir=${maven.build.dir}/test-classes
maven.repo.local=../lib
maven.settings.offline=true
maven.build.dir=target
maven.build.testResourceDir.0=src/test/resources
maven.reporting.outputDirectory=${maven.build.dir}/site
maven-javadoc-plugin.version=2.8.1
maven-source-plugin.version=2.1.2
project.build.sourceEncoding=UTF-8
maven.settings.interactiveMode=true
maven.build.testDir.0=src/test/java
maven.build.srcDir.0=src/main/java
project.build.directory=${maven.build.dir}
checksum-maven-plugin.version=1.0.1
maven.test.reports=${maven.build.dir}/test-reports
maven-gpg-plugin.version=1.4
maven.build.dir=target
project.build.outputDirectory=${maven.build.outputDir}
maven.build.testDir.0=src/test/java
maven.settings.interactiveMode=true
maven.repo.local=${user.home}/.m2/repository
maven.build.outputDir=${maven.build.dir}/classes
12 changes: 6 additions & 6 deletions grobid-home/maven-build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<!-- -->
<!-- Any modifications will be overwritten. -->
<!-- -->
<!-- Generated by Maven Ant Plugin on 12/2/13 1:32 PM -->
<!-- Generated by Maven Ant Plugin on 8/19/15 8:10 PM -->
<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
<!-- -->
<!-- ====================================================================== -->
Expand All @@ -24,7 +24,7 @@
<property file="${user.home}/.m2/maven.properties"/>
<property file="maven-build.properties"/>

<property name="maven.build.finalName" value="grobid-home-0.3.4-SNAPSHOT"/>
<property name="maven.build.finalName" value="grobid-home-0.3.6-SNAPSHOT"/>
<property name="maven.build.dir" value="target"/>
<property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
<property name="maven.build.srcDir.0" value="src/main/java"/>
Expand All @@ -35,7 +35,7 @@
<property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
<property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>

<property name="maven.repo.local" value="../lib"/>
<property name="maven.repo.local" value="${user.home}/.m2/repository"/>
<property name="maven.settings.offline" value="false"/>
<property name="maven.settings.interactiveMode" value="true"/>

Expand Down Expand Up @@ -78,12 +78,12 @@
<!-- ====================================================================== -->

<target name="test"
depends="compile-tests"
depends="compile-tests, junit-missing"
unless="junit.skipped"
description="Run the test cases"/>

<target name="test-junit-present">
<available classname="junit.framework.Test" property="junit.present"/>
<available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
</target>

<target name="test-junit-status"
Expand All @@ -106,7 +106,7 @@
depends="test-junit-status"
if="junit.missing">
<echo>=================================== WARNING ===================================</echo>
<echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
<echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
<echo>===============================================================================</echo>
</target>

Expand Down
4 changes: 2 additions & 2 deletions maven-build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<!-- -->
<!-- Any modifications will be overwritten. -->
<!-- -->
<!-- Generated by Maven Ant Plugin on 12/2/13 1:32 PM -->
<!-- Generated by Maven Ant Plugin on 8/19/15 8:10 PM -->
<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
<!-- -->
<!-- ====================================================================== -->
Expand Down Expand Up @@ -77,8 +77,8 @@
<!-- ====================================================================== -->

<target name="package" description="Package the application">
<ant antfile="build.xml" dir="grobid-home" target="package"/>
<ant antfile="build.xml" dir="grobid-core" target="package"/>
<ant antfile="build.xml" dir="grobid-home" target="package"/>
<ant antfile="build.xml" dir="grobid-trainer" target="package"/>
<ant antfile="build.xml" dir="grobid-service" target="package"/>
</target>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>${plugin.version}</version>
<version>2.5.2</version>
<configuration>
<mavenExecutorId>forked-path</mavenExecutorId>
<useReleaseProfile>false</useReleaseProfile>
Expand Down

0 comments on commit 90d60b3

Please sign in to comment.