You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2017/12/20 09:29:00 UTC
[maven-ant-plugin] annotated tag maven-ant-plugin-2.3 created (now
662c213)
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a change to annotated tag maven-ant-plugin-2.3
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git.
at 662c213 (tag)
tagging 43b3d52d69cb8a1b57b26a3cf5f2c85d96821d48 (commit)
by Benjamin Bentmann
on Sat Nov 7 14:30:10 2009 +0000
- Log -----------------------------------------------------------------
maven-ant-plugin-2.3
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new de74b97 ant plugin imported
new cbc0e73 use released versions
new 5ff024a bump versions
new 6f8c86a update parent references to get access to the ci settings
new d30b5ac Resolving: MNG-495
new b4f3299 Update all versions to beta-1-SNAPSHOT
new 5df8fc1 Fix svn properties
new 6b833b9 PR: MNG-596 add XSD definition to m2 poms and archetypes
new a8f21e6 add todir on batchtest to save reports
new 0854e01 update dependency and parent versions
new 1daea99 [maven-release-plugin] prepare release maven-ant-2.0-beta-1
new c094bb5 [maven-release-plugin] prepare for next development iteration
new dbf6570 ignore release.properties and more
new 75e9ec9 PR: MNG-749 Submitted by: Edwin Punzalan Reviewed by: Brett Porter make directories in ant plugin for repository files
new 6b8f42b remove unneeded exception in ant plugin
new ca08739 clean up ant plugin exception handling
new cde45f5 update versions in plugins
new 6c584c8 ignore
new 72947a5 move plugins
new c0bafd6 adjust parent POMs
new ac317f9 remove release.properties from ignores
new e93a903 MNG-2460: Incorrect POM inheritance for plugins
new 411da8e MANT-5: Add line breaks between <target> elements in build.xml
new b2e67ec MANT-2: error "maven.repo.local" property in the ant file
new 112f204 MANT-10: error with build.classpath in build.xml
new 3e8b91f MANT-14: Generate a build-user.xml à la Eclipse
new cf39c52 MANT-15: Review plugin documentation
new 9bb06a8 MANT-16: Create an clean goal
new 8c04ed3 MANT-13: Generated build.xml for pom packaged super projects doesn't invoke subprojects
new 5417ffe MANT-17: Using Maven Compiler Plugin settings to define javac task
new 68adbe6 MANT-18: added Maven Project properties in the maven-build.properties
new eac24a7 o Updated prerequisite to 2.0.2 and updated dependencies o Tested install with Maven 2.0.2, 2.0.3 and 2.0.4
new a2d1cba MANT-19: Handle more packaging projects (jar, ear, war...)
new c3f7111 use inheritence and make all the site appearances consistent
new f8c0ff1 put back the Overview menu - when you inherit menu items they are meant to be resolved against the parent, by design - so these always belonged in the child POM.
new 86ebffe o updating to latest release parent
new 1e05a11 o updating to latest released parent
new 5a29642 - move plugin-plugin out of 'reporting' for plugins. It's a required part of the site, and does not cause any issues with the reactor or site generation - update to snapshots
new 6441830 o applied new license headers o no code changes
new 9bd2a8b MANT-24:Generate synonum targets named after the archive type for the package target Submitted by: Petteri Räty Reviewed by: Vincent Siveton
new 117b5ae MANT-23: Make the ant plugin able to generate javadoc targets into build.xml files
new c35ef83 o ignored files
new 223cbc4 Update parent version to 8, as 8-SNAPSHOT is never deployed and 8 is released
new 7eec345 MANT-27: updated pom to declare used dependencies
new 602c93f git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@522032 13f79535-47bb-0310-9956-ffa450edef68
new 6cf6feb Add two common variables, project.build.outputDirectory and project.build.directory
new 8ad5bda Set version to 2.0
new 6f741f7 o remove tab o improved doc
new c51b816 Use released version of install plugin
new f63e260 [maven-release-plugin] prepare release maven-ant-plugin-2.0
new 916183c [maven-release-plugin] prepare for next development iteration
new abe9e70 Readd license header lost in release
new 8c2b795 o fixed IT builds with snapshot version
new 46ed54c o forced IT o added repo1 for IT test
new 8cdef31 o set surefire version to try to avoid CI build failures
new 6f5c36d o forced download to try to avoid CI build failures
new 486e215 add more info to find out why it is failing on Solaris
new 16d35b3 forgot IOException doesn't take this arg even in JDK 1.4+. Going with a temporary solution.
new daf94c9 work around bug in old versions of xalan bundled in JDK 1.4.2
new 7898ccb o Improve documentation.
new 8884f29 [MANT-35] The generated maven-build.xml has paths that contain \ characters on Windows
new 207d70f [MANT-34] The generated maven-build.xml and maven-build.properties contains absolute path to local repository
new 719d598 [MANT-30] classcast exception when running ant:ant on tagtraum.com's gcviewer project Submitted by: Patrick Huber Reviewed by: Dennis Lundberg
new c74a8ef o Ignore IDEA files.
new 7a39f78 o Added svn:eol-style=native
new df06a09 o Fixed svn:keywords
new 228327b [MANT-37] Wrong path to test resources in maven-build.xml
new 43be787 [MANT-36] Use correct file encoding when writing build files
new 6ce6835 o Enabled filtering of plugin version for IT POM
new e6419cd o Decoupled unit tests from default encoding of executing JVM for build reproducibility
new 455efd9 o Added bin to svn:ignore
new 9699143 [MANT-32] java.lang.ClassCastException when packaging jeuclid-3.0.1
new d1d0ed4 [MANT-34] The generated maven-build.xml and maven-build.properties contains absolute path to local repository
new a7787a4 o Adjusted IT due to r639886
new d60798d [MANT-4] Generated ANT contains hardcoded "get" tasks that look at the "C:\" drive etc... when using a local repository
new e2c0191 [MANT-38] Use reporting output directory configured in POM
new dd26960 [MANT-39] Always specify source/target options for javac
new ef4a011 [MANT-40] Use includes/excludes configured for Surefire when running tests
new 732a9f9 [MANT-7] "test" target should support running a single test - just like mvn test does
new 3d291cd [MANT-6] "test" targets should fail if junit.jar not present
new f556e04 o Added some line breaks to the build scripts
new 92154ac o Stabilized ITs
new 5ad0930 [MANT-22] Make it possible to run the package target without tests
new 6e85328 o Fixed docs
new 44e3e06 o Bumped to latest parent
new 31cbe99 encoding-it should not fail if platform encoding does not support tested characters
new 2fde0f5 o updated prerequisite to Maven 2.0.6 since plexus-utils version is > 1.1 o upgraded plexus-utils to 1.5.1 to support spaces in dir name
new 6fe01f4 o Decoupled IT from file system for more robustness
new a5dedc8 o Moved the IT verification into the invoker controlled builds for better failure analysis
new 61573d3 o Updated to maven-plugins:11
new 6e58094 o Avoided usage of StringInputStream/StringOutputStream with regard to PLXUTILS-70
new f95a550 o Updated to wagon-provider-api:1.0-beta-2
new a2d362c o Update links to Doxia APT reference.
new b6ed9e0 o lock down plugins for it
new 268ee76 o readingness pom o bumped to maven-surefire-plugin:2.4.3
new 9fd9fda o ignored Eclipse settings
new c20d338 o fixed license header
new 09dd117 o add SCM
new 94b8c54 o bumped some artifacts to 2.0.6
new 4a1f5c5 [maven-release-plugin] prepare release maven-ant-plugin-2.1
new 66f40cf [maven-release-plugin] prepare for next development iteration
new 25f6f70 o Updated to maven-invoker-plugin:1.2
new c988957 [MANT-41] mvn ant:ant fails with NPE when maven-javadoc-plugin custom tag is specified in pom.xml
new b72ec8c MANT-42: Update to p-u 1.5.4
new 1474acc Adding plexus snapshots repo to settings.xml for integration testing until plexus-utils dependency version is bumped off of -SNAPSHOT version.
new 7d9e0ac o Handled URL decoding to prepare for the day when the Maven core will use RFC-compliant URLs
new c51e17c MANT-42: Update to p-u 1.5.4
new 9cb9aaf o Removed snapshot repos now that the plugin is using released version of plexus-utils
new dc9b984 MANT-42: Update to p-u 1.5.4
new 9704390 o Used Install Plugin for IT staging to workaround MINVOKER-43 o Removed unnecessary repos from IT POMs
new 1118cde [MANT-46] mvn ant:ant throws a StringIndexOutOfBoundsException
new 7103192 Try to use the 12-SNAPSHOT parent
new 15e9472 Use the same activation rule for all integration-tests in plugins builds (-Dintegration-tests=true)
new 47cc92f Align activation properties for integration-tests profile because we cannot setup it in the parent (see MNG-3228)
new 10f1611 Remove plugins versions already defined in parent
new 441b857 We don't need to load dependencies for these tests (moreover in offline mode)
new abe088c o Synced stub dependency with POM dependency
new c55d09e o Synced id and activation of integration-tests with core ITs
new a3831dc o Reordered POM
new 1425f4a o Removed inherited property
new ec06fc5 o Added ASF snapshot repo to user settings of ITs (e.g. to make sure they can resolve snapshot parents)
new 982af63 o Updated index page of plugin site
new 8d123ac o Unified plugin name
new 3aa6c64 o Changed encoding of site descriptor to UTF-8 just like used for POMs o Updated/added license headers
new 6c4fd9e o Explicitly stated UTF-8 as file encoding o Updated license header
new 5d64155 o Updated index page of plugin site
new 568673c o Tweaked invoker configuration to ease single test execution via -Dinvoker.test
new bff9531 [MANT-45] basedir attribute of <war> task of package target in generated Ant build causes files to be archived twice
new 2cd5a08 [MANT-44] Generated ant copy commands in package target point to hard-coded local repository instead of ${maven.repo.local}
new 0a10332 o Inherited from maven-plugins:12
new 45dd97b o Updated to maven-invoker-plugin:1.3
new d376a02 o Updated all plugins to use maven-invoker-plugin:1.3 to workaround MNG-3284 and bogus CI failures
new fd23782 new parent
new 38441c5 o Inherited from maven-plugins:13
new 8a31eea used http://maven.apache.org/xsd/* for schema location
new 2215460 o Decoupled from assumption that plugin config is internally stored as Xpp3Dom
new d3c6f7e o Tidied up dependencies
new cfb717d [maven-release-plugin] prepare release maven-ant-plugin-2.1.1
new cadbf6e [maven-release-plugin] prepare for next development iteration
new 070c859 o Reverted release of 2.1.1
new 7c4ca91 o Tidied up mojo annotations
new c51d570 MANT-47: ant:clean should not delete build.xml
new 85e7982 o javadoc
new 16103c7 o added missing plexus-interactivity-jline o bumped p-u to latest version
new 0529b92 o added the api dep
new 44a0118 o Decoupled from settings
new d7be49c o Fixed file leak
new 699f253 [MANT-47] ant:clean should not delete build.xml
new c98a16d o Bumped plugin version to 2.2 to account for the extended configuration and changed default behavior
new b2f5d88 [MANT-51] Configuration from plugin management is not considered
new 787acbc [MANT-50] Wrong build.classpath with reactor mode
new bcd519a [MANT-52] NullPointerException when maven-javadoc-plugin configuration defines multiple group elements within a groups list element.
new c806fb0 o Polished code & site
new 0418188 o Added assembly descriptor for ASF-compliant source distribution
new 39b70a1 [maven-release-plugin] prepare release maven-ant-plugin-2.2
new cd43116 [maven-release-plugin] prepare for next development iteration
new 2c50ab2 o Updated dependencies to use ant:1.7.1
new e8a5bad o fixed ambiguous links o added Doxia xsd
new 12af19e [MANT-59] Add support for the bundle packaging.
new 8f0dfb1 [MANT-60] Generated "package" task for EAR/WAR is missing transitive dependencies
new 0a79bd5 upgrade parent version to ensure source-release is automatic.
new 36fae97 o Updated to maven-invoker-plugin:1.4
new 8fc5ec8 [MANT-61] Classpath generation should honour system-scope
new 6c01302 [MANT-61] Classpath generation should honour system-scope.
new b457c90 o Fixed packaging detection (packaging is case-sensitive)
new b19534c o Inherited from maven-plugins:16 o Removed custom source-release assembly descriptor
new a20928a [maven-release-plugin] prepare release maven-ant-plugin-2.3
new 43b3d52 [maven-scm] copy for tag maven-ant-plugin-2.3
The 168 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" <co...@maven.apache.org>'].
[maven-ant-plugin] 03/14: o Updated dependencies to use ant:1.7.1
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to annotated tag maven-ant-plugin-2.3
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 2c50ab26caa6440dd72b702af17d0885a1a0b8a9
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Sun Jul 19 14:42:34 2009 +0000
o Updated dependencies to use ant:1.7.1
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@795548 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 39e8c7d..1e141a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@ under the License.
<properties>
<mavenVersion>2.0.6</mavenVersion>
- <antVersion>1.6.5</antVersion>
+ <antVersion>1.7.1</antVersion>
</properties>
<dependencies>
@@ -86,7 +86,7 @@ under the License.
<version>1.5.8</version>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>${antVersion}</version>
</dependency>
@@ -121,7 +121,7 @@ under the License.
<scope>test</scope>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant-nodeps</artifactId>
<version>${antVersion}</version>
<scope>test</scope>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 13/14: [maven-release-plugin] prepare release
maven-ant-plugin-2.3
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to annotated tag maven-ant-plugin-2.3
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit a20928a26464bf60188ff423dc96d41d76007759
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Sat Nov 7 14:29:37 2009 +0000
[maven-release-plugin] prepare release maven-ant-plugin-2.3
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@833682 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index c1b39c2..7210692 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd' xmlns='http://maven.apache.org/POM/4.0.0'>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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>
<parent>
@@ -29,7 +29,7 @@ under the License.
</parent>
<artifactId>maven-ant-plugin</artifactId>
- <version>2.3-SNAPSHOT</version>
+ <version>2.3</version>
<packaging>maven-plugin</packaging>
<name>Maven Ant Plugin</name>
@@ -40,9 +40,9 @@ under the License.
</prerequisites>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin/</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-ant-plugin-2.3</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-ant-plugin-2.3</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/plugins/tags/maven-ant-plugin-2.3</url>
</scm>
<issueManagement>
<system>jira</system>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 08/14: o Updated to maven-invoker-plugin:1.4
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to annotated tag maven-ant-plugin-2.3
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 36fae9794d7a50557c2f2496beaf6f46b68484c4
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Sat Sep 26 14:51:47 2009 +0000
o Updated to maven-invoker-plugin:1.4
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@819145 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
src/it/settings.xml | 11 -----------
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index a90978d..a0a15f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,7 +142,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
<configuration>
<debug>true</debug>
<projectsDirectory>src/it</projectsDirectory>
diff --git a/src/it/settings.xml b/src/it/settings.xml
index 68f23d0..c8f77f0 100644
--- a/src/it/settings.xml
+++ b/src/it/settings.xml
@@ -37,17 +37,6 @@ under the License.
<enabled>true</enabled>
</snapshots>
</repository>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
</repositories>
<pluginRepositories>
<pluginRepository>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 04/14: o fixed ambiguous links o added Doxia xsd
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to annotated tag maven-ant-plugin-2.3
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit e8a5bad8e54d40c9385cd85bb6c554660f23ff99
Author: Vincent Siveton <vs...@apache.org>
AuthorDate: Wed Aug 5 12:31:27 2009 +0000
o fixed ambiguous links
o added Doxia xsd
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@801176 13f79535-47bb-0310-9956-ffa450edef68
---
src/site/apt/index.apt | 26 ++++++++++++++------------
src/site/fml/faq.fml | 6 +++++-
src/site/site.xml | 5 ++++-
3 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index dcdf193..93ab1ae 100644
--- a/src/site/apt/index.apt
+++ b/src/site/apt/index.apt
@@ -35,38 +35,40 @@ Maven Ant Plugin
The Ant Plugin has two goals:
- * {{{ant-mojo.html}ant:ant}} Generate Ant build files.
+ * {{{./ant-mojo.html}ant:ant}} Generate Ant build files.
- * {{{clean-mojo.html}ant:clean}} Clean all Ant build files.
+ * {{{./clean-mojo.html}ant:clean}} Clean all Ant build files.
* Usage
- General instructions on how to use the Ant Plugin can be found on the {{{usage.html}usage page}}. Some more
+ General instructions on how to use the Ant Plugin can be found on the {{{./usage.html}usage page}}. Some more
specific use cases are described in the examples given below. Last but not least, users occasionally contribute
additional examples, tips or errata to the
{{{http://docs.codehaus.org/display/MAVENUSER/Ant+Plugin}plugin's wiki page}}.
- In case you still have questions regarding the plugin's usage, please have a look at the {{{faq.html}FAQ}} and feel
- free to contact the {{{mail-lists.html}user mailing list}}. The posts to the mailing list are archived and could
+ In case you still have questions regarding the plugin's usage, please have a look at the {{{./faq.html}FAQ}} and feel
+ free to contact the {{{./mail-lists.html}user mailing list}}. The posts to the mailing list are archived and could
already contain the answer to your question as part of an older thread. Hence, it is also worth browsing/searching
- the {{{mail-lists.html}mail archive}}.
+ the {{{./mail-lists.html}mail archive}}.
If you feel like the plugin is missing a feature or has a defect, you can fill a feature request or bug report in our
- {{{issue-tracking.html}issue tracker}}. When creating a new issue, please provide a comprehensive description of your
+ {{{./issue-tracking.html}issue tracker}}. When creating a new issue, please provide a comprehensive description of your
concern. Especially for fixing bugs it is crucial that the developers can reproduce your problem. For this reason,
entire debug logs, POMs or most preferably little demo projects attached to the issue are very much appreciated.
Of course, patches are welcome, too. Contributors can check out the project from our
- {{{source-repository.html}source repository}} and will find supplementary information in the
+ {{{./source-repository.html}source repository}} and will find supplementary information in the
{{{http://maven.apache.org/guides/development/guide-helping.html}guide to helping with Maven}}.
* Examples
The following examples show how to use the Ant Plugin in more advanced usecases:
- * {{{examples/customize.html}Customizing Generated Ant Build Files}}
+ * {{{./examples/customize.html}Customizing Generated Ant Build Files}}
- * {{{examples/run-single-test.html}Running Individual Unit Tests}}
+ * {{{./examples/run-single-test.html}Running Individual Unit Tests}}
- * {{{examples/fail-missing-junit.html}Failing the Build if JUnit is Missing}}
+ * {{{./examples/fail-missing-junit.html}Failing the Build if JUnit is Missing}}
- * {{{examples/skip-tests.html}Skipping Unit Tests}}
+ * {{{./examples/skip-tests.html}Skipping Unit Tests}}
+
+ []
diff --git a/src/site/fml/faq.fml b/src/site/fml/faq.fml
index 5d0b406..1cbbb1b 100644
--- a/src/site/fml/faq.fml
+++ b/src/site/fml/faq.fml
@@ -19,7 +19,11 @@ specific language governing permissions and limitations
under the License.
-->
-<faqs id="FAQ" title="Frequently Asked Questions">
+
+<faqs xmlns="http://maven.apache.org/FML/1.0.1"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/FML/1.0.1 http://maven.apache.org/xsd/fml-1.0.1.xsd"
+ id="FAQ" title="Frequently Asked Questions">
<part id="General">
<faq id="Where are the generated Ant build files">
<question>Where are the generated Ant build files?</question>
diff --git a/src/site/site.xml b/src/site/site.xml
index bf15514..a0d191b 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -19,7 +19,10 @@ specific language governing permissions and limitations
under the License.
-->
-<project>
+<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd"
+ name="Maven Ant plugin">
<body>
<links>
<item name="Ant" href="http://ant.apache.org/"/>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 10/14: [MANT-61] Classpath generation should
honour system-scope.
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to annotated tag maven-ant-plugin-2.3
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 6c013023a682e062a9eb0fa4535e10c4b33a820a
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Sat Oct 31 17:14:41 2009 +0000
[MANT-61] Classpath generation should honour system-scope.
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@831567 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 5 +++
src/it/system-scope-dep/pom.xml | 30 ++++++++-----
src/it/system-scope-dep/test.properties | 1 -
.../apache/maven/plugin/ant/AntBuildWriter.java | 49 +++++++++++++++++++---
.../java/org/apache/maven/plugin/ant/AntMojo.java | 15 ++++++-
5 files changed, 83 insertions(+), 17 deletions(-)
diff --git a/pom.xml b/pom.xml
index a0a15f4..7eaf8b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,6 +81,11 @@ under the License.
<version>${mavenVersion}</version>
</dependency>
<dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>1.5.8</version>
diff --git a/src/it/system-scope-dep/pom.xml b/src/it/system-scope-dep/pom.xml
index 56d2eb8..6c68bcb 100644
--- a/src/it/system-scope-dep/pom.xml
+++ b/src/it/system-scope-dep/pom.xml
@@ -8,18 +8,9 @@
<properties>
<build.compiler>extJavac</build.compiler>
+ <lib.dir>${basedir}/lib</lib.dir>
</properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.its.ant</groupId>
- <artifactId>dep</artifactId>
- <version>0.1</version>
- <scope>system</scope>
- <systemPath>${lib.dir}/system-scope-dep-0.1.jar</systemPath>
- </dependency>
- </dependencies>
-
<build>
<plugins>
<plugin>
@@ -41,4 +32,23 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>test</id>
+ <activation>
+ <property>
+ <name>!skip-it</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.ant</groupId>
+ <artifactId>dep</artifactId>
+ <version>0.1</version>
+ <scope>system</scope>
+ <systemPath>${lib.dir}/system-scope-dep-0.1.jar</systemPath>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
diff --git a/src/it/system-scope-dep/test.properties b/src/it/system-scope-dep/test.properties
deleted file mode 100644
index cf15e82..0000000
--- a/src/it/system-scope-dep/test.properties
+++ /dev/null
@@ -1 +0,0 @@
-lib.dir = ${basedir}/lib
diff --git a/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java b/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
index 97b5d92..5e79c96 100644
--- a/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
+++ b/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
@@ -30,9 +30,12 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
+import java.util.SortedMap;
+import java.util.TreeMap;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Dependency;
+import org.apache.maven.model.Profile;
import org.apache.maven.model.Repository;
import org.apache.maven.model.Resource;
import org.apache.maven.project.MavenProject;
@@ -89,6 +92,8 @@ public class AntBuildWriter
private boolean overwrite;
+ private Properties executionProperties;
+
/**
* @param project
* @param artifactResolverWrapper
@@ -96,13 +101,14 @@ public class AntBuildWriter
* @param overwrite
*/
public AntBuildWriter( MavenProject project, ArtifactResolverWrapper artifactResolverWrapper, Settings settings,
- boolean overwrite )
+ boolean overwrite, Properties executionProperties )
{
this.project = project;
this.artifactResolverWrapper = artifactResolverWrapper;
this.localRepository = new File( artifactResolverWrapper.getLocalRepository().getBasedir() );
this.settings = settings;
this.overwrite = overwrite;
+ this.executionProperties = ( executionProperties != null ) ? executionProperties : new Properties();
}
/**
@@ -621,22 +627,55 @@ public class AntBuildWriter
private String getUninterpolatedSystemPath( Artifact artifact )
{
+ String managementKey = artifact.getDependencyConflictId();
+
for ( Iterator it = project.getOriginalModel().getDependencies().iterator(); it.hasNext(); )
{
Dependency dependency = (Dependency) it.next();
- if ( artifact.getDependencyConflictId().equals( dependency.getManagementKey() ) )
+ if ( managementKey.equals( dependency.getManagementKey() ) )
{
return dependency.getSystemPath();
}
}
+ for ( Iterator itp = project.getOriginalModel().getProfiles().iterator(); itp.hasNext(); )
+ {
+ Profile profile = (Profile) itp.next();
+ for ( Iterator it = profile.getDependencies().iterator(); it.hasNext(); )
+ {
+ Dependency dependency = (Dependency) it.next();
+ if ( managementKey.equals( dependency.getManagementKey() ) )
+ {
+ return dependency.getSystemPath();
+ }
+ }
+ }
+
String path = artifact.getFile().getAbsolutePath();
- if ( path.startsWith( project.getBasedir().getAbsolutePath() + File.separator ) )
+ Properties props = new Properties();
+ props.putAll( project.getProperties() );
+ props.putAll( executionProperties );
+ props.remove( "user.dir" );
+ props.put( "basedir", project.getBasedir().getAbsolutePath() );
+
+ SortedMap candidateProperties = new TreeMap();
+ for ( Iterator it = props.keySet().iterator(); it.hasNext(); )
+ {
+ String key = (String) it.next();
+ String value = new File( props.getProperty( key ) ).getPath();
+ if ( path.startsWith( value ) && value.length() > 0 )
+ {
+ candidateProperties.put( value, key );
+ }
+ }
+ if ( !candidateProperties.isEmpty() )
{
- path = path.substring( project.getBasedir().getAbsolutePath().length() + 1 );
+ String value = candidateProperties.lastKey().toString();
+ String key = candidateProperties.get( value ).toString();
+ path = path.substring( value.length() );
path = path.replace( '\\', '/' );
- path = "${basedir}/" + path;
+ return "${" + key + "}" + path;
}
return path;
diff --git a/src/main/java/org/apache/maven/plugin/ant/AntMojo.java b/src/main/java/org/apache/maven/plugin/ant/AntMojo.java
index c87ede7..0190d23 100644
--- a/src/main/java/org/apache/maven/plugin/ant/AntMojo.java
+++ b/src/main/java/org/apache/maven/plugin/ant/AntMojo.java
@@ -22,6 +22,7 @@ package org.apache.maven.plugin.ant;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
@@ -29,6 +30,7 @@ import org.apache.maven.settings.Settings;
import java.io.IOException;
import java.util.List;
+import java.util.Properties;
/**
* Generate Ant build files.
@@ -106,6 +108,14 @@ public class AntMojo
*/
private boolean overwrite;
+ /**
+ * The current Maven session.
+ *
+ * @parameter default-value="${session}"
+ * @readonly
+ */
+ private MavenSession session;
+
/** {@inheritDoc} */
public void execute()
throws MojoExecutionException
@@ -114,7 +124,10 @@ public class AntMojo
localRepository,
remoteRepositories );
- AntBuildWriter antBuildWriter = new AntBuildWriter( project, artifactResolverWrapper, settings, overwrite );
+ Properties executionProperties = ( session != null ) ? session.getExecutionProperties() : null;
+
+ AntBuildWriter antBuildWriter =
+ new AntBuildWriter( project, artifactResolverWrapper, settings, overwrite, executionProperties );
try
{
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 01/14: [maven-release-plugin] prepare release
maven-ant-plugin-2.2
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to annotated tag maven-ant-plugin-2.3
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 39b70a18f169c8fdd2803c86c1c5df63ba048527
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Wed Jul 15 11:02:29 2009 +0000
[maven-release-plugin] prepare release maven-ant-plugin-2.2
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@794229 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index e497123..0598d70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@ under the License.
</parent>
<artifactId>maven-ant-plugin</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.2</version>
<packaging>maven-plugin</packaging>
<name>Maven Ant Plugin</name>
@@ -40,9 +40,9 @@ under the License.
</prerequisites>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin/</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-ant-plugin-2.2</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-ant-plugin-2.2</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/plugins/tags/maven-ant-plugin-2.2</url>
</scm>
<issueManagement>
<system>jira</system>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 02/14: [maven-release-plugin] prepare for next
development iteration
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to annotated tag maven-ant-plugin-2.3
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit cd4311680dc0070dd7398488e4289c056def6681
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Wed Jul 15 11:03:27 2009 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@794231 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0598d70..39e8c7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@ under the License.
</parent>
<artifactId>maven-ant-plugin</artifactId>
- <version>2.2</version>
+ <version>2.3-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Maven Ant Plugin</name>
@@ -40,9 +40,9 @@ under the License.
</prerequisites>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-ant-plugin-2.2</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-ant-plugin-2.2</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/plugins/tags/maven-ant-plugin-2.2</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin/</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/</url>
</scm>
<issueManagement>
<system>jira</system>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 12/14: o Inherited from maven-plugins:16 o
Removed custom source-release assembly descriptor
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to annotated tag maven-ant-plugin-2.3
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit b19534c16bd1826427d05a4980a923cf02d015e1
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Sat Nov 7 14:13:51 2009 +0000
o Inherited from maven-plugins:16
o Removed custom source-release assembly descriptor
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@833679 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 27 +--------------------------
src/main/assembly/src.xml | 43 -------------------------------------------
2 files changed, 1 insertion(+), 69 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7eaf8b5..c1b39c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>14</version>
+ <version>16</version>
</parent>
<artifactId>maven-ant-plugin</artifactId>
@@ -177,30 +177,5 @@ under the License.
</plugins>
</build>
</profile>
- <profile>
- <id>release</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>make-project-src-distro</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
diff --git a/src/main/assembly/src.xml b/src/main/assembly/src.xml
deleted file mode 100644
index 753680a..0000000
--- a/src/main/assembly/src.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<assembly>
- <id>src</id>
- <formats>
- <format>tar.gz</format>
- <format>tar.bz2</format>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>${project.basedir}</directory>
- <outputDirectory>/</outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <includes>
- <include>src/**</include>
- <include>pom.xml</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- </fileSets>
-</assembly>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 09/14: [MANT-61] Classpath generation should
honour system-scope
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to annotated tag maven-ant-plugin-2.3
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 8fc5ec8a777bc8ff5f0c22b67eca9962b6c6c87d
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Sun Oct 25 22:38:35 2009 +0000
[MANT-61] Classpath generation should honour system-scope
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@829673 13f79535-47bb-0310-9956-ffa450edef68
---
.../system-scope-dep/lib/system-scope-dep-0.1.jar | Bin 0 -> 4294 bytes
src/it/system-scope-dep/pom.xml | 44 +++++++++++
.../src/main/java/DefaultComponent.java | 24 ++++++
src/it/system-scope-dep/test.properties | 1 +
.../apache/maven/plugin/ant/AntBuildWriter.java | 84 ++++++++++++---------
5 files changed, 117 insertions(+), 36 deletions(-)
diff --git a/src/it/system-scope-dep/lib/system-scope-dep-0.1.jar b/src/it/system-scope-dep/lib/system-scope-dep-0.1.jar
new file mode 100644
index 0000000..4aa61e0
Binary files /dev/null and b/src/it/system-scope-dep/lib/system-scope-dep-0.1.jar differ
diff --git a/src/it/system-scope-dep/pom.xml b/src/it/system-scope-dep/pom.xml
new file mode 100644
index 0000000..56d2eb8
--- /dev/null
+++ b/src/it/system-scope-dep/pom.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.ant</groupId>
+ <artifactId>system-scope-dep</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <properties>
+ <build.compiler>extJavac</build.compiler>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.ant</groupId>
+ <artifactId>dep</artifactId>
+ <version>0.1</version>
+ <scope>system</scope>
+ <systemPath>${lib.dir}/system-scope-dep-0.1.jar</systemPath>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ant-plugin</artifactId>
+ <version>@project.version@</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <configuration>
+ <tasks>
+ <property name="lib.dir" location="${lib.dir}" />
+ <ant dir="${basedir}" antfile="${basedir}/build.xml" target="compile" />
+ </tasks>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/src/it/system-scope-dep/src/main/java/DefaultComponent.java b/src/it/system-scope-dep/src/main/java/DefaultComponent.java
new file mode 100644
index 0000000..84ac87e
--- /dev/null
+++ b/src/it/system-scope-dep/src/main/java/DefaultComponent.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+// requires the system-scope dependency for compilation
+public class DefaultComponent
+ implements Component
+{
+}
diff --git a/src/it/system-scope-dep/test.properties b/src/it/system-scope-dep/test.properties
new file mode 100644
index 0000000..cf15e82
--- /dev/null
+++ b/src/it/system-scope-dep/test.properties
@@ -0,0 +1 @@
+lib.dir = ${basedir}/lib
diff --git a/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java b/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
index 9bf35da..97b5d92 100644
--- a/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
+++ b/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
@@ -32,6 +32,7 @@ import java.util.Map;
import java.util.Properties;
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.model.Dependency;
import org.apache.maven.model.Repository;
import org.apache.maven.model.Resource;
import org.apache.maven.project.MavenProject;
@@ -583,55 +584,62 @@ public class AntBuildWriter
XmlWriterUtil.writeCommentText( writer, "Defining classpaths", 1 );
+ writeBuildPathDefinition( writer, "build.classpath", project.getCompileArtifacts() );
+
+ writeBuildPathDefinition( writer, "build.test.classpath", project.getTestArtifacts() );
+
+ XmlWriterUtil.writeLineBreak( writer );
+ }
+
+ private void writeBuildPathDefinition( XMLWriter writer, String id, List artifacts )
+ {
writer.startElement( "path" );
- writer.addAttribute( "id", "build.classpath" );
- writer.startElement( "fileset" );
- writer.addAttribute( "dir", "${maven.repo.local}" );
- if ( !project.getCompileArtifacts().isEmpty() )
+ writer.addAttribute( "id", id );
+
+ for ( Iterator i = artifacts.iterator(); i.hasNext(); )
{
- for ( Iterator i = project.getCompileArtifacts().iterator(); i.hasNext(); )
+ Artifact artifact = (Artifact) i.next();
+
+ writer.startElement( "pathelement" );
+
+ String path;
+ if ( Artifact.SCOPE_SYSTEM.equals( artifact.getScope() ) )
{
- Artifact artifact = (Artifact) i.next();
- String path = artifactResolverWrapper.getLocalArtifactPath( artifact );
- writer.startElement( "include" );
- writer.addAttribute( "name", path );
- writer.endElement(); // include
+ path = getUninterpolatedSystemPath( artifact );
}
+ else
+ {
+ path = "${maven.repo.local}/" + artifactResolverWrapper.getLocalArtifactPath( artifact );
+ }
+ writer.addAttribute( "location", path );
+
+ writer.endElement(); // pathelement
}
- else
- {
- writer.startElement( "include" );
- writer.addAttribute( "name", "*.jar" );
- writer.endElement(); // include
- }
- writer.endElement(); // fileset
+
writer.endElement(); // path
+ }
- writer.startElement( "path" );
- writer.addAttribute( "id", "build.test.classpath" );
- writer.startElement( "fileset" );
- writer.addAttribute( "dir", "${maven.repo.local}" );
- if ( !project.getTestArtifacts().isEmpty() )
+ private String getUninterpolatedSystemPath( Artifact artifact )
+ {
+ for ( Iterator it = project.getOriginalModel().getDependencies().iterator(); it.hasNext(); )
{
- for ( Iterator i = project.getTestArtifacts().iterator(); i.hasNext(); )
+ Dependency dependency = (Dependency) it.next();
+ if ( artifact.getDependencyConflictId().equals( dependency.getManagementKey() ) )
{
- Artifact artifact = (Artifact) i.next();
- String path = artifactResolverWrapper.getLocalArtifactPath( artifact );
- writer.startElement( "include" );
- writer.addAttribute( "name", path );
- writer.endElement(); // include
+ return dependency.getSystemPath();
}
}
- else
+
+ String path = artifact.getFile().getAbsolutePath();
+
+ if ( path.startsWith( project.getBasedir().getAbsolutePath() + File.separator ) )
{
- writer.startElement( "include" );
- writer.addAttribute( "name", "*.jar" );
- writer.endElement(); // include
+ path = path.substring( project.getBasedir().getAbsolutePath().length() + 1 );
+ path = path.replace( '\\', '/' );
+ path = "${basedir}/" + path;
}
- writer.endElement(); // fileset
- writer.endElement(); // path
- XmlWriterUtil.writeLineBreak( writer );
+ return path;
}
/**
@@ -1262,7 +1270,11 @@ public class AntBuildWriter
{
Artifact artifact = (Artifact) i.next();
- // TODO: should the artifacthandler be used instead?
+ if ( Artifact.SCOPE_SYSTEM.equals( artifact.getScope() ) )
+ {
+ continue;
+ }
+
String path = artifactResolverWrapper.getLocalArtifactPath( artifact );
if ( !new File( path ).exists() )
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 05/14: [MANT-59] Add support for the bundle
packaging.
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to annotated tag maven-ant-plugin-2.3
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 12af19e10c60e36896b5078ce02d6f996bda9a3b
Author: Paul Gier <pg...@apache.org>
AuthorDate: Fri Sep 4 16:12:24 2009 +0000
[MANT-59] Add support for the bundle packaging.
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@811464 13f79535-47bb-0310-9956-ffa450edef68
---
.../maven/plugin/ant/AntBuildWriterUtil.java | 39 +++++++++++++++++++---
1 file changed, 35 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java b/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
index 59a6caf..db0d72b 100644
--- a/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
+++ b/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
@@ -568,14 +568,45 @@ public class AntBuildWriterUtil
}
/**
- * @param mavenProject not null
- * @return true if project packaging equals <code>jar</code> or <code>maven-plugin</code>
+ * @param mavenProject
+ * @return true if project packaging equals one of several packaging types
+ * including <code>jar</code>, <code>maven-plugin</code>, <code>ejb</code>, or
+ * <code>bundle</code>
*/
public static boolean isJarPackaging( MavenProject mavenProject )
{
return mavenProject.getPackaging().toLowerCase().equals( "jar" )
- || mavenProject.getPackaging().toLowerCase().equals( "ejb" )
- || mavenProject.getPackaging().toLowerCase().equals( "maven-plugin" );
+ || isEjbPackaging( mavenProject )
+ || isMavenPluginPackaging( mavenProject )
+ || isBundlePackaging( mavenProject )
+ ;
+ }
+
+ /**
+ * @param mavenProject
+ * @return true if project packaging equals <code>bundle</code>
+ */
+ public static boolean isBundlePackaging( MavenProject mavenProject )
+ {
+ return mavenProject.getPackaging().toLowerCase().equals( "bundle" );
+ }
+
+ /**
+ * @param mavenProject
+ * @return true if project packaging equals <code>ejb</code>
+ */
+ public static boolean isEjbPackaging( MavenProject mavenProject )
+ {
+ return mavenProject.getPackaging().toLowerCase().equals( "ejb" );
+ }
+
+ /**
+ * @param mavenProject
+ * @return true if project packaging equals <code>maven-plugin</code>
+ */
+ public static boolean isMavenPluginPackaging( MavenProject mavenProject )
+ {
+ return mavenProject.getPackaging().toLowerCase().equals( "maven-plugin" );
}
/**
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 07/14: upgrade parent version to ensure
source-release is automatic.
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to annotated tag maven-ant-plugin-2.3
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 0a79bd54ad8fe11607fcda3db947b07716fa7a92
Author: John Dennis Casey <jd...@apache.org>
AuthorDate: Wed Sep 16 17:17:44 2009 +0000
upgrade parent version to ensure source-release is automatic.
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@815894 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1e141a7..a90978d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
@@ -19,13 +19,13 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd' xmlns='http://maven.apache.org/POM/4.0.0'>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>13</version>
+ <version>14</version>
</parent>
<artifactId>maven-ant-plugin</artifactId>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 06/14: [MANT-60] Generated "package" task for
EAR/WAR is missing transitive dependencies
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to annotated tag maven-ant-plugin-2.3
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 8f0dfb1bd07eb0eb6eb9f3b3224d9fc0b8884d55
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Sun Sep 6 16:02:28 2009 +0000
[MANT-60] Generated "package" task for EAR/WAR is missing transitive dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@811830 13f79535-47bb-0310-9956-ffa450edef68
---
src/it/webapp-it/pom.xml | 6 ++++++
src/it/webapp-it/verify.bsh | 2 ++
src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java | 8 ++++----
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/it/webapp-it/pom.xml b/src/it/webapp-it/pom.xml
index 954b253..78c1ec3 100644
--- a/src/it/webapp-it/pom.xml
+++ b/src/it/webapp-it/pom.xml
@@ -42,6 +42,12 @@ under the License.
<version>3.8.2</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <!-- This one has a transitive dependency on plexus-utils:1.4.1 -->
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <version>2.0.6</version>
+ </dependency>
</dependencies>
<properties>
diff --git a/src/it/webapp-it/verify.bsh b/src/it/webapp-it/verify.bsh
index b9dc041..3c65829 100644
--- a/src/it/webapp-it/verify.bsh
+++ b/src/it/webapp-it/verify.bsh
@@ -62,6 +62,8 @@ try
"WEB-INF/classes/test.properties",
"WEB-INF/classes/org/MyClass.class",
"WEB-INF/lib/log4j-1.2.14.jar",
+ "WEB-INF/lib/maven-model-2.0.6.jar",
+ "WEB-INF/lib/plexus-utils-1.4.1.jar",
};
for ( String entry : expected )
{
diff --git a/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java b/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
index db0d72b..31c0942 100644
--- a/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
+++ b/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
@@ -1159,14 +1159,14 @@ public class AntBuildWriterUtil
writer.addAttribute( "dir", outputDir );
writer.endElement(); // mkdir
- if ( !project.getDependencyArtifacts().isEmpty() )
+ if ( project.getArtifacts() != null )
{
- for ( Iterator i = project.getDependencyArtifacts().iterator(); i.hasNext(); )
+ for ( Iterator i = project.getArtifacts().iterator(); i.hasNext(); )
{
Artifact artifact = (Artifact) i.next();
- if ( !artifact.getScope().equals( Artifact.SCOPE_PROVIDED )
- && !artifact.getScope().equals( Artifact.SCOPE_TEST ) )
+ if ( Artifact.SCOPE_COMPILE.equals( artifact.getScope() )
+ || Artifact.SCOPE_RUNTIME.equals( artifact.getScope() ) )
{
String path = artifactResolverWrapper.getLocalArtifactPath( artifact );
if ( !new File( path ).isAbsolute() )
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 11/14: o Fixed packaging detection (packaging is
case-sensitive)
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to annotated tag maven-ant-plugin-2.3
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit b457c9010a529979ad4eaa90e95df3ae85dbf554
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Sat Nov 7 14:02:13 2009 +0000
o Fixed packaging detection (packaging is case-sensitive)
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@833678 13f79535-47bb-0310-9956-ffa450edef68
---
.../org/apache/maven/plugin/ant/AntBuildWriterUtil.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java b/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
index 31c0942..de8ba81 100644
--- a/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
+++ b/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
@@ -564,7 +564,7 @@ public class AntBuildWriterUtil
*/
public static boolean isPomPackaging( MavenProject mavenProject )
{
- return mavenProject.getPackaging().toLowerCase().equals( "pom" );
+ return "pom".equals( mavenProject.getPackaging() );
}
/**
@@ -575,7 +575,7 @@ public class AntBuildWriterUtil
*/
public static boolean isJarPackaging( MavenProject mavenProject )
{
- return mavenProject.getPackaging().toLowerCase().equals( "jar" )
+ return "jar".equals( mavenProject.getPackaging() )
|| isEjbPackaging( mavenProject )
|| isMavenPluginPackaging( mavenProject )
|| isBundlePackaging( mavenProject )
@@ -588,7 +588,7 @@ public class AntBuildWriterUtil
*/
public static boolean isBundlePackaging( MavenProject mavenProject )
{
- return mavenProject.getPackaging().toLowerCase().equals( "bundle" );
+ return "bundle".equals( mavenProject.getPackaging() );
}
/**
@@ -597,7 +597,7 @@ public class AntBuildWriterUtil
*/
public static boolean isEjbPackaging( MavenProject mavenProject )
{
- return mavenProject.getPackaging().toLowerCase().equals( "ejb" );
+ return "ejb".equals( mavenProject.getPackaging() );
}
/**
@@ -606,7 +606,7 @@ public class AntBuildWriterUtil
*/
public static boolean isMavenPluginPackaging( MavenProject mavenProject )
{
- return mavenProject.getPackaging().toLowerCase().equals( "maven-plugin" );
+ return "maven-plugin".equals( mavenProject.getPackaging() );
}
/**
@@ -615,7 +615,7 @@ public class AntBuildWriterUtil
*/
public static boolean isEarPackaging( MavenProject mavenProject )
{
- return mavenProject.getPackaging().toLowerCase().equals( "ear" );
+ return "ear".equals( mavenProject.getPackaging() );
}
/**
@@ -624,7 +624,7 @@ public class AntBuildWriterUtil
*/
public static boolean isWarPackaging( MavenProject mavenProject )
{
- return mavenProject.getPackaging().toLowerCase().equals( "war" );
+ return "war".equals( mavenProject.getPackaging() );
}
/**
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 14/14: [maven-scm] copy for tag
maven-ant-plugin-2.3
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to annotated tag maven-ant-plugin-2.3
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 43b3d52d69cb8a1b57b26a3cf5f2c85d96821d48
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Sat Nov 7 14:30:10 2009 +0000
[maven-scm] copy for tag maven-ant-plugin-2.3
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/tags/maven-ant-plugin-2.3@833683 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.