Skip to content

Commit 09e23cb

Browse files
matthiasblaesingmatthiasblaesing
committed
maven-ant-task does not work correctly anymore, drop it and use mvn binary directly
1 parent 078cc66 commit 09e23cb

File tree

3 files changed

+29
-61
lines changed

3 files changed

+29
-61
lines changed

‎build.xml

Lines changed: 29 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -101,16 +101,6 @@
101101
<target name="compile-single" depends="compile"/>
102102

103103
<!-- Prepare additional ant task -->
104-
<path id="maven-ant-tasks.classpath">
105-
<pathelement location="lib/animal-sniffer-ant-tasks-1.17.jar" />
106-
<pathelement location="lib/maven-ant-tasks-2.1.3.jar" />
107-
</path>
108-
<typedef resource="org/apache/maven/artifact/ant/antlib.xml"
109-
uri="antlib:org.apache.maven.artifact.ant"
110-
classpathref="maven-ant-tasks.classpath" />
111-
<typedef resource="org/codehaus/mojo/animal_sniffer/antlib.xml"
112-
uri="antlib:org.codehaus.mojo.animal_sniffer"
113-
classpathref="maven-ant-tasks.classpath" />
114104

115105
<target name="-prepare-anttools">
116106
<subant antfile="build-ant-tools.xml" buildpath="${basedir}"></subant>
@@ -1409,50 +1399,50 @@ cd ..
14091399
</subant>
14101400
</target>
14111401

1412-
<target name="install" depends="dist,-bootstrap-maven" description="Install jna and jna-platform artifacts into local maven repository">
1413-
<artifact:mvn failonerror="true">
1402+
<target name="install" depends="dist" description="Install jna and jna-platform artifacts into local maven repository">
1403+
<exec executable="mvn" searchpath="true" failonerror="true" failifexecutionfails="true" logError="true">
14141404
<arg value="org.apache.maven.plugins:maven-install-plugin:2.5:install-file"/>
14151405
<arg value="-DpomFile=${pom}"/>
14161406
<arg value="-Dfile=${dist-jar}"/>
14171407
<arg value="-Dsources=${maven-sources-jar}"/>
14181408
<arg value="-Djavadoc=${maven-javadoc-jar}"/>
1419-
</artifact:mvn>
1409+
</exec>
14201410

1421-
<artifact:mvn failonerror="true">
1411+
<exec executable="mvn" searchpath="true" failonerror="true" failifexecutionfails="true" logError="true">
14221412
<arg value="org.apache.maven.plugins:maven-install-plugin:2.5:install-file"/>
14231413
<arg value="-DpomFile=${pom}"/>
14241414
<arg value="-Dfile=${dist-aar}"/>
14251415
<arg value="-Dpackaging=aar"/>
1426-
</artifact:mvn>
1416+
</exec>
14271417

1428-
<artifact:mvn failonerror="true">
1418+
<exec executable="mvn" searchpath="true" failonerror="true" failifexecutionfails="true" logError="true">
14291419
<arg value="org.apache.maven.plugins:maven-install-plugin:2.5:install-file"/>
14301420
<arg value="-DpomFile=${pom-jpms}"/>
14311421
<arg value="-Dfile=${dist-jar-jpms}"/>
14321422
<arg value="-Dsources=${maven-sources-jar}"/>
14331423
<arg value="-Djavadoc=${maven-javadoc-jar}"/>
1434-
</artifact:mvn>
1424+
</exec>
14351425

1436-
<artifact:mvn failonerror="true">
1426+
<exec executable="mvn" searchpath="true" failonerror="true" failifexecutionfails="true" logError="true">
14371427
<arg value="org.apache.maven.plugins:maven-install-plugin:2.5:install-file"/>
14381428
<arg value="-DpomFile=${pom-platform}"/>
14391429
<arg value="-Dfile=${platform-jar}"/>
14401430
<arg value="-Dsources=${platform-sources-jar}"/>
14411431
<arg value="-Djavadoc=${platform-javadoc-jar}"/>
1442-
</artifact:mvn>
1432+
</exec>
14431433

1444-
<artifact:mvn failonerror="true">
1434+
<exec executable="mvn" searchpath="true" failonerror="true" failifexecutionfails="true" logError="true">
14451435
<arg value="org.apache.maven.plugins:maven-install-plugin:2.5:install-file"/>
14461436
<arg value="-DpomFile=${pom-platform-jpms}"/>
14471437
<arg value="-Dfile=${platform-jpms-jar}"/>
14481438
<arg value="-Dsources=${platform-sources-jar}"/>
14491439
<arg value="-Djavadoc=${platform-javadoc-jar}"/>
1450-
</artifact:mvn>
1440+
</exec>
14511441
</target>
14521442

14531443
<!-- NOTE: The 'deploy' target works only if the version (jna.version in build.xml) ends in '-SNAPSHOT'. -->
1454-
<target name="deploy" depends="dist,-bootstrap-maven" description="deploy snapshot version to Maven snapshot repository">
1455-
<artifact:mvn failonerror="true">
1444+
<target name="deploy" depends="dist" description="deploy snapshot version to Maven snapshot repository">
1445+
<exec executable="mvn" searchpath="true" failonerror="true" failifexecutionfails="true" logError="true">
14561446
<arg value="org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy-file"/>
14571447
<arg value="-Durl=${maven-snapshots-repository-url}"/>
14581448
<arg value="-DrepositoryId=${maven-snapshots-repository-id}"/>
@@ -1461,9 +1451,9 @@ cd ..
14611451
<arg value="-Dfiles=${maven-sources-jar},${maven-javadoc-jar},${dist-aar}"/>
14621452
<arg value="-Dtypes=jar,jar,aar"/>
14631453
<arg value="-Dclassifiers=sources,javadoc,"/>
1464-
</artifact:mvn>
1454+
</exec>
14651455

1466-
<artifact:mvn failonerror="true">
1456+
<exec executable="mvn" searchpath="true" failonerror="true" failifexecutionfails="true" logError="true">
14671457
<arg value="org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy-file"/>
14681458
<arg value="-Durl=${maven-snapshots-repository-url}"/>
14691459
<arg value="-DrepositoryId=${maven-snapshots-repository-id}"/>
@@ -1472,9 +1462,9 @@ cd ..
14721462
<arg value="-Dfiles=${platform-sources-jar},${platform-javadoc-jar}"/>
14731463
<arg value="-Dtypes=jar,jar"/>
14741464
<arg value="-Dclassifiers=sources,javadoc"/>
1475-
</artifact:mvn>
1465+
</exec>
14761466

1477-
<artifact:mvn failonerror="true">
1467+
<exec executable="mvn" searchpath="true" failonerror="true" failifexecutionfails="true" logError="true">
14781468
<arg value="org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy-file"/>
14791469
<arg value="-Durl=${maven-snapshots-repository-url}"/>
14801470
<arg value="-DrepositoryId=${maven-snapshots-repository-id}"/>
@@ -1483,9 +1473,9 @@ cd ..
14831473
<arg value="-Dfiles=${maven-sources-jar},${maven-javadoc-jar}"/>
14841474
<arg value="-Dtypes=jar,jar"/>
14851475
<arg value="-Dclassifiers=sources,javadoc"/>
1486-
</artifact:mvn>
1476+
</exec>
14871477

1488-
<artifact:mvn failonerror="true">
1478+
<exec executable="mvn" searchpath="true" failonerror="true" failifexecutionfails="true" logError="true">
14891479
<arg value="org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy-file"/>
14901480
<arg value="-Durl=${maven-snapshots-repository-url}"/>
14911481
<arg value="-DrepositoryId=${maven-snapshots-repository-id}"/>
@@ -1494,15 +1484,15 @@ cd ..
14941484
<arg value="-Dfiles=${platform-sources-jar},${platform-javadoc-jar}"/>
14951485
<arg value="-Dtypes=jar,jar"/>
14961486
<arg value="-Dclassifiers=sources,javadoc"/>
1497-
</artifact:mvn>
1487+
</exec>
14981488
</target>
14991489

15001490

15011491
<property name="version-maven-gpg-plugin" value="1.4"/>
15021492

1503-
<target name="stage" depends="dist,-bootstrap-maven" description="deploy release version to Maven staging repository">
1493+
<target name="stage" depends="dist" description="deploy release version to Maven staging repository">
15041494
<!-- sign and deploy the jna, artifact -->
1505-
<artifact:mvn failonerror="true">
1495+
<exec executable="mvn" searchpath="true" failonerror="true" failifexecutionfails="true" logError="true">
15061496
<arg value="org.apache.maven.plugins:maven-gpg-plugin:${version-maven-gpg-plugin}:sign-and-deploy-file"/>
15071497
<arg value="-Durl=${maven-staging-repository-url}"/>
15081498
<arg value="-DrepositoryId=${maven-staging-repository-id}"/>
@@ -1512,10 +1502,10 @@ cd ..
15121502
<arg value="-Dclassifiers=sources,javadoc,"/>
15131503
<arg value="-Dtypes=jar,jar,aar"/>
15141504
<arg value="-Dgpg.useagent=true"/>
1515-
</artifact:mvn>
1505+
</exec>
15161506

15171507
<!-- sign and deploy the platform artifact -->
1518-
<artifact:mvn failonerror="true">
1508+
<exec executable="mvn" searchpath="true" failonerror="true" failifexecutionfails="true" logError="true">
15191509
<arg value="org.apache.maven.plugins:maven-gpg-plugin:${version-maven-gpg-plugin}:sign-and-deploy-file"/>
15201510
<arg value="-Durl=${maven-staging-repository-url}"/>
15211511
<arg value="-DrepositoryId=${maven-staging-repository-id}"/>
@@ -1525,10 +1515,10 @@ cd ..
15251515
<arg value="-Dclassifiers=sources,javadoc"/>
15261516
<arg value="-Dtypes=jar,jar"/>
15271517
<arg value="-Dgpg.useagent=true"/>
1528-
</artifact:mvn>
1518+
</exec>
15291519

15301520
<!-- sign and deploy the jna, artifact -->
1531-
<artifact:mvn failonerror="true">
1521+
<exec executable="mvn" searchpath="true" failonerror="true" failifexecutionfails="true" logError="true">
15321522
<arg value="org.apache.maven.plugins:maven-gpg-plugin:${version-maven-gpg-plugin}:sign-and-deploy-file"/>
15331523
<arg value="-Durl=${maven-staging-repository-url}"/>
15341524
<arg value="-DrepositoryId=${maven-staging-repository-id}"/>
@@ -1538,10 +1528,10 @@ cd ..
15381528
<arg value="-Dtypes=jar,jar"/>
15391529
<arg value="-Dclassifiers=sources,javadoc"/>
15401530
<arg value="-Dgpg.useagent=true"/>
1541-
</artifact:mvn>
1531+
</exec>
15421532

15431533
<!-- sign and deploy the platform artifact -->
1544-
<artifact:mvn failonerror="true">
1534+
<exec executable="mvn" searchpath="true" failonerror="true" failifexecutionfails="true" logError="true">
15451535
<arg value="org.apache.maven.plugins:maven-gpg-plugin:${version-maven-gpg-plugin}:sign-and-deploy-file"/>
15461536
<arg value="-Durl=${maven-staging-repository-url}"/>
15471537
<arg value="-DrepositoryId=${maven-staging-repository-id}"/>
@@ -1551,29 +1541,7 @@ cd ..
15511541
<arg value="-Dtypes=jar,jar"/>
15521542
<arg value="-Dclassifiers=sources,javadoc"/>
15531543
<arg value="-Dgpg.useagent=true"/>
1554-
</artifact:mvn>
1555-
</target>
1556-
1557-
<target name="-bootstrap-maven">
1558-
<artifact:remoteRepository id="remote.mavenCentral" url="https://repo1.maven.org/maven2/" />
1559-
<artifact:dependencies pathId="dependency.dummy">
1560-
<remoteRepository refid="remote.mavenCentral" />
1561-
<dependency groupId="org.apache.maven.plugins" artifactId="maven-gpg-plugin" version="1.4" type="maven-plugin"/>
1562-
<dependency groupId="org.apache.maven.plugins" artifactId="maven-deploy-plugin" version="2.7" type="maven-plugin"/>
1563-
<dependency groupId="org.apache.maven.plugins" artifactId="maven-install-plugin" version="2.5" type="maven-plugin"/>
1564-
<dependency groupId="org.apache.maven" artifactId="apache-maven" version="2.0.10" />
1565-
<dependency groupId="org.apache.maven" artifactId="maven-model" version="2.0.10" />
1566-
<dependency groupId="org.apache.maven" artifactId="maven-artifact" version="2.0.10" />
1567-
<dependency groupId="org.apache.maven" artifactId="maven-project" version="2.0.10" />
1568-
<dependency groupId="org.apache.maven" artifactId="maven-artifact-manager" version="2.0.10" />
1569-
<dependency groupId="org.apache.maven" artifactId="maven-plugin-registry" version="2.0.10" />
1570-
<dependency groupId="org.apache.maven" artifactId="maven-plugin-api" version="2.0.10" />
1571-
<dependency groupId="org.codehaus.plexus" artifactId="plexus-utils" version="3.0.15" />
1572-
</artifact:dependencies>
1573-
<artifact:dependencies pathId="dependency.dummy2">
1574-
<remoteRepository refid="remote.mavenCentral" />
1575-
<dependency groupId="org.codehaus.plexus" artifactId="plexus-utils" version="1.5.5" />
1576-
</artifact:dependencies>
1544+
</exec>
15771545
</target>
15781546

15791547
<target name="checkstyle">

‎lib/animal-sniffer-ant-tasks-1.17.jar

-159 KB
Binary file not shown.

‎lib/maven-ant-tasks-2.1.3.jar

-1.26 MB
Binary file not shown.

0 commit comments

Comments
 (0)