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:27:58 UTC
[maven-ant-plugin] annotated tag maven-ant-plugin-2.1.1 created
(now ed1e213)
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a change to annotated tag maven-ant-plugin-2.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git.
at ed1e213 (tag)
tagging 193b2e4cf69ceca4855f96608a8ebae5b4a8a43b (commit)
by Benjamin Bentmann
on Mon Apr 13 09:51:50 2009 +0000
- Log -----------------------------------------------------------------
maven-ant-plugin-2.1.1
-----------------------------------------------------------------------
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 193b2e4 [maven-release-plugin] copy for tag maven-ant-plugin-2.1.1
The 138 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] 12/42: o Removed snapshot repos now that the
plugin is using released version of plexus-utils
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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 9cb9aaf6eb30d3df816edb7535e14cc2876a5f70
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Thu Jun 19 15:33:00 2008 +0000
o Removed snapshot repos now that the plugin is using released version of plexus-utils
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@669508 13f79535-47bb-0310-9956-ffa450edef68
---
src/it/settings.xml | 22 ----------------------
1 file changed, 22 deletions(-)
diff --git a/src/it/settings.xml b/src/it/settings.xml
index d80623e..a1c1028 100644
--- a/src/it/settings.xml
+++ b/src/it/settings.xml
@@ -17,17 +17,6 @@
<enabled>true</enabled>
</snapshots>
</repository>
- <!-- Remove this once plexus-utils dependency is bumped out of -SNAPSHOT -->
- <repository>
- <id>plexus.snapshots</id>
- <url>http://snapshots.repository.codehaus.org/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
</repositories>
<pluginRepositories>
<pluginRepository>
@@ -40,17 +29,6 @@
<enabled>true</enabled>
</snapshots>
</pluginRepository>
- <!-- Remove this once plexus-utils dependency is bumped out of -SNAPSHOT -->
- <pluginRepository>
- <id>plexus.snapshots</id>
- <url>http://snapshots.repository.codehaus.org/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
</pluginRepositories>
</profile>
</profiles>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 05/42: [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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 66f40cf3bdbbb4fc3a76b807245eeefffdf33937
Author: Vincent Siveton <vs...@apache.org>
AuthorDate: Tue May 20 02:02:26 2008 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@658087 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index fa832ad..0f000a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@ under the License.
<artifactId>maven-ant-plugin</artifactId>
<packaging>maven-plugin</packaging>
<name>Maven Ant Plugin</name>
- <version>2.1</version>
+ <version>2.2-SNAPSHOT</version>
<prerequisites>
<maven>2.0.6</maven>
@@ -43,9 +43,9 @@ under the License.
</issueManagement>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-ant-plugin-2.1</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-ant-plugin-2.1</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/plugins/tags/maven-ant-plugin-2.1</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>
<dependencies>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 25/42: o Added ASF snapshot repo to user
settings of ITs (e.g. to make sure they can resolve snapshot parents)
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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit ec06fc52260211bf88ddc2c14c996514eddf201d
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Thu Aug 14 22:21:48 2008 +0000
o Added ASF snapshot repo to user settings of ITs (e.g. to make sure they can resolve snapshot parents)
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@686066 13f79535-47bb-0310-9956-ffa450edef68
---
src/it/settings.xml | 35 +++++++++++++++++++++++++++++++++--
1 file changed, 33 insertions(+), 2 deletions(-)
diff --git a/src/it/settings.xml b/src/it/settings.xml
index a1c1028..11e4382 100644
--- a/src/it/settings.xml
+++ b/src/it/settings.xml
@@ -1,4 +1,24 @@
<?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.
+-->
+
<settings>
<profiles>
<profile>
@@ -9,7 +29,7 @@
<repositories>
<repository>
<id>local.central</id>
- <url>file://@localRepository@</url>
+ <url>file:///@localRepository@</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -17,11 +37,22 @@
<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>
<id>local.central</id>
- <url>file://@localRepository@</url>
+ <url>file:///@localRepository@</url>
<releases>
<enabled>true</enabled>
</releases>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 20/42: We don't need to load dependencies for
these tests (moreover in offline mode)
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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 441b8578931b8c12f375eab43f6dbdac61de3763
Author: Arnaud Heritier <ah...@apache.org>
AuthorDate: Wed Aug 6 13:30:51 2008 +0000
We don't need to load dependencies for these tests (moreover in offline mode)
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@683260 13f79535-47bb-0310-9956-ffa450edef68
---
.../org/apache/maven/plugin/ant/AntBuildWriterUtilTest.java | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/test/java/org/apache/maven/plugin/ant/AntBuildWriterUtilTest.java b/src/test/java/org/apache/maven/plugin/ant/AntBuildWriterUtilTest.java
index 30b9063..a5564eb 100644
--- a/src/test/java/org/apache/maven/plugin/ant/AntBuildWriterUtilTest.java
+++ b/src/test/java/org/apache/maven/plugin/ant/AntBuildWriterUtilTest.java
@@ -20,16 +20,12 @@ package org.apache.maven.plugin.ant;
*/
import java.io.File;
-import java.io.StringWriter;
import java.util.Map;
import org.apache.maven.embedder.MavenEmbedder;
import org.apache.maven.embedder.MavenEmbedderConsoleLogger;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
-import org.codehaus.plexus.util.xml.XMLWriter;
-import org.codehaus.plexus.util.xml.XmlWriterUtil;
/**
* Test cases for 'org.apache.maven.plugin.ant.AntBuildWriterUtil'
@@ -57,7 +53,7 @@ public class AntBuildWriterUtilTest
maven.setOffline( true );
maven.start();
- MavenProject project = maven.readProjectWithDependencies( testPom );
+ MavenProject project = maven.readProject( testPom );
assertEquals( AntBuildWriterUtil.getMavenCompilerPluginBasicOption( project, "debug", null ), "true" );
@@ -86,7 +82,7 @@ public class AntBuildWriterUtilTest
maven.setOffline( true );
maven.start();
- MavenProject project = maven.readProjectWithDependencies( testPom );
+ MavenProject project = maven.readProject( testPom );
assertEquals( AntBuildWriterUtil.getMavenWarPluginBasicOption( project, "warName", null ), "mywebapp" );
assertTrue( AntBuildWriterUtil.getMavenWarPluginBasicOption( project, "webXml", null )
@@ -112,7 +108,7 @@ public class AntBuildWriterUtilTest
maven.setOffline( true );
maven.start();
- MavenProject project = maven.readProjectWithDependencies( testPom );
+ MavenProject project = maven.readProject( testPom );
assertEquals( AntBuildWriterUtil.getMavenJavadocPluginBasicOption( project, "doclet", null ), "gr.spinellis.umlgraph.doclet.UmlGraphDoc" );
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 40/42: o Decoupled from assumption that plugin
config is internally stored as Xpp3Dom
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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 22154602d90335f26aec3985c4cf2d2fc69e862e
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Mon Apr 13 09:39:20 2009 +0000
o Decoupled from assumption that plugin config is internally stored as Xpp3Dom
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@764381 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java | 7 +++----
1 file changed, 3 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 d7f42f2..ef27282 100644
--- a/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
+++ b/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
@@ -42,7 +42,6 @@ import org.codehaus.plexus.util.PathTool;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.XMLWriter;
import org.codehaus.plexus.util.xml.XmlWriterUtil;
-import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -952,7 +951,7 @@ public class AntBuildWriterUtil
{
Object next = it.next();
- Xpp3Dom pluginConf = null;
+ Object pluginConf = null;
if ( next instanceof Plugin )
{
@@ -965,7 +964,7 @@ public class AntBuildWriterUtil
continue;
}
- pluginConf = (Xpp3Dom) plugin.getConfiguration();
+ pluginConf = plugin.getConfiguration();
}
if ( next instanceof ReportPlugin )
@@ -979,7 +978,7 @@ public class AntBuildWriterUtil
continue;
}
- pluginConf = (Xpp3Dom) reportPlugin.getConfiguration();
+ pluginConf = reportPlugin.getConfiguration();
}
if ( pluginConf == null )
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 01/42: o fixed license header
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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit c20d3381a66c2a96a7bf99e782f2aa5f0efb42ec
Author: Vincent Siveton <vs...@apache.org>
AuthorDate: Tue May 20 00:58:51 2008 +0000
o fixed license header
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@658063 13f79535-47bb-0310-9956-ffa450edef68
---
src/site/apt/examples/customize.apt | 25 +++++++++++++-----------
src/site/apt/examples/fail-missing-junit.apt | 29 +++++++++++++++-------------
src/site/apt/examples/skip-tests.apt | 25 +++++++++++++-----------
src/site/apt/index.apt | 25 +++++++++++++-----------
src/site/apt/usage.apt | 26 +++++++++++++------------
src/site/fml/faq.fml | 29 +++++++++++++++-------------
6 files changed, 88 insertions(+), 71 deletions(-)
diff --git a/src/site/apt/examples/customize.apt b/src/site/apt/examples/customize.apt
index d0a9347..0e6847a 100644
--- a/src/site/apt/examples/customize.apt
+++ b/src/site/apt/examples/customize.apt
@@ -6,19 +6,22 @@
September 2006
------
- ~~ Copyright 2006 The Apache Software Foundation.
+ ~~ 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
~~
- ~~ Licensed 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
~~
- ~~ 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.
+ ~~ 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.
~~ NOTE: For help with the syntax of this file, see:
~~ http://maven.apache.org/doxia/references/apt-format.html
diff --git a/src/site/apt/examples/fail-missing-junit.apt b/src/site/apt/examples/fail-missing-junit.apt
index 079d86f..da02028 100644
--- a/src/site/apt/examples/fail-missing-junit.apt
+++ b/src/site/apt/examples/fail-missing-junit.apt
@@ -6,19 +6,22 @@
March 2008
------
- ~~ Copyright 2006 The Apache Software Foundation.
+ ~~ 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
~~
- ~~ Licensed 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
~~
- ~~ 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.
+ ~~ 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.
~~ NOTE: For help with the syntax of this file, see:
~~ http://maven.apache.org/doxia/references/apt-format.html
@@ -45,8 +48,8 @@ Failing the Build if JUnit is Missing
<!-- Unit testing, overridden to fail upon missing JUnit -->
<!-- ====================================================================== -->
- <target name="junit-missing"
- depends="test-junit-status"
+ <target name="junit-missing"
+ depends="test-junit-status"
if="junit.missing">
<property name="ant.libdir" location="${ant.home}/lib"/>
<echo level="error">==================================== ERROR ====================================</echo>
diff --git a/src/site/apt/examples/skip-tests.apt b/src/site/apt/examples/skip-tests.apt
index 7af0975..e866759 100644
--- a/src/site/apt/examples/skip-tests.apt
+++ b/src/site/apt/examples/skip-tests.apt
@@ -6,19 +6,22 @@
March 2008
------
- ~~ Copyright 2006 The Apache Software Foundation.
+ ~~ 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
~~
- ~~ Licensed 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
~~
- ~~ 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.
+ ~~ 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.
~~ NOTE: For help with the syntax of this file, see:
~~ http://maven.apache.org/doxia/references/apt-format.html
diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index 683fe7a..858974a 100644
--- a/src/site/apt/index.apt
+++ b/src/site/apt/index.apt
@@ -6,19 +6,22 @@
September 2006
------
- ~~ Copyright 2006 The Apache Software Foundation.
+ ~~ 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
~~
- ~~ Licensed 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
~~
- ~~ 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.
+ ~~ 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.
~~ NOTE: For help with the syntax of this file, see:
~~ http://maven.apache.org/doxia/references/apt-format.html
diff --git a/src/site/apt/usage.apt b/src/site/apt/usage.apt
index 7197ff3..294411c 100644
--- a/src/site/apt/usage.apt
+++ b/src/site/apt/usage.apt
@@ -6,24 +6,26 @@
September 2006
------
- ~~ Copyright 2006 The Apache Software Foundation.
+ ~~ 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
~~
- ~~ Licensed 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
~~
- ~~ 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.
+ ~~ 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.
~~ NOTE: For help with the syntax of this file, see:
~~ http://maven.apache.org/doxia/references/apt-format.html
-
Usage
The Ant Plugin generates Ant build files from POMs. The following example describe the basic
diff --git a/src/site/fml/faq.fml b/src/site/fml/faq.fml
index de6d2e0..ac3b3cc 100644
--- a/src/site/fml/faq.fml
+++ b/src/site/fml/faq.fml
@@ -1,19 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2006 The Apache Software Foundation.
- ~
- ~ Licensed 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.
+ 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.
-->
<faqs id="FAQ" title="Frequently Asked Questions">
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 17/42: Use the same activation rule for all
integration-tests in plugins builds (-Dintegration-tests=true)
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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 15e94729c3e4885a8f28bc2609152941bbc8776c
Author: Arnaud Heritier <ah...@apache.org>
AuthorDate: Tue Aug 5 12:32:26 2008 +0000
Use the same activation rule for all integration-tests in plugins builds (-Dintegration-tests=true)
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@682692 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 98f22ba..bf30558 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
@@ -144,12 +144,6 @@ under the License.
<profiles>
<profile>
<id>integration-tests</id>
- <activation>
- <property>
- <name>maven.test.skip</name>
- <value>!true</value>
- </property>
- </activation>
<build>
<plugins>
<plugin>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 32/42: [MANT-45] basedir attribute of task
of package target in generated Ant build causes files to be archived twice
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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit bff95319f7b9e628dcab1297b578223b9364f94a
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Wed Sep 3 13:52:16 2008 +0000
[MANT-45] basedir attribute of <war> task of package target in generated Ant build causes files to be archived twice
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@691615 13f79535-47bb-0310-9956-ffa450edef68
---
src/it/webapp-it/pom.xml | 4 +
src/it/webapp-it/src/main/java/org/MyClass.java | 5 +
.../webapp-it/src/main/resources/test.properties | 1 +
src/it/webapp-it/src/main/webapp/WEB-INF/test.txt | 1 +
src/it/webapp-it/verify.bsh | 105 +++++++++++++++++----
.../maven/plugin/ant/AntBuildWriterUtil.java | 25 ++---
6 files changed, 107 insertions(+), 34 deletions(-)
diff --git a/src/it/webapp-it/pom.xml b/src/it/webapp-it/pom.xml
index 1fd5fb5..2d432c0 100644
--- a/src/it/webapp-it/pom.xml
+++ b/src/it/webapp-it/pom.xml
@@ -38,6 +38,10 @@ under the License.
</dependency>
</dependencies>
+ <properties>
+ <build.compiler>extJavac</build.compiler>
+ </properties>
+
<build>
<finalName>ant-webapp-test</finalName>
<plugins>
diff --git a/src/it/webapp-it/src/main/java/org/MyClass.java b/src/it/webapp-it/src/main/java/org/MyClass.java
new file mode 100644
index 0000000..47c7d4b
--- /dev/null
+++ b/src/it/webapp-it/src/main/java/org/MyClass.java
@@ -0,0 +1,5 @@
+package org;
+
+public class MyClass
+{
+}
diff --git a/src/it/webapp-it/src/main/resources/test.properties b/src/it/webapp-it/src/main/resources/test.properties
new file mode 100644
index 0000000..4b10332
--- /dev/null
+++ b/src/it/webapp-it/src/main/resources/test.properties
@@ -0,0 +1 @@
+key=value
\ No newline at end of file
diff --git a/src/it/webapp-it/src/main/webapp/WEB-INF/test.txt b/src/it/webapp-it/src/main/webapp/WEB-INF/test.txt
new file mode 100644
index 0000000..8318c86
--- /dev/null
+++ b/src/it/webapp-it/src/main/webapp/WEB-INF/test.txt
@@ -0,0 +1 @@
+Test
\ No newline at end of file
diff --git a/src/it/webapp-it/verify.bsh b/src/it/webapp-it/verify.bsh
index f002a32..8f2ba8b 100644
--- a/src/it/webapp-it/verify.bsh
+++ b/src/it/webapp-it/verify.bsh
@@ -1,32 +1,99 @@
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
+import java.util.jar.*;
import org.codehaus.plexus.util.IOUtil;
-File build;
-File mavenBuild;
-File mavenBuildProperties;
+try
+{
+ File build;
+ File mavenBuild;
+ File mavenBuildProperties;
+
+ // Webapp project
+
+ build = new File( basedir, "build.xml" );
+ if ( build.isDirectory() || !build.exists() )
+ {
+ System.err.println( "The file '" + build.getAbsolutePath() + "' is a directory or doesn't exist." );
+ return false;
+ }
+ mavenBuild = new File( basedir, "maven-build.xml" );
+ if ( mavenBuild.isDirectory() || !mavenBuild.exists() )
+ {
+ System.err.println( "The file '" + mavenBuild.getAbsolutePath() + "' is a directory or doesn't exist." );
+ return false;
+ }
+ mavenBuildProperties = new File( basedir, "maven-build.properties" );
+ if ( mavenBuildProperties.isDirectory() || !mavenBuildProperties.exists() )
+ {
+ System.err.println( "The file '" + mavenBuildProperties.getAbsolutePath() + "' is a directory or doesn't exist." );
+ return false;
+ }
+
+ warFile = new File( basedir, "target/ant-webapp-test.war" );
+ System.out.println( "Checking for existence of WAR file: " + warFile );
+ if ( !warFile.isFile() )
+ {
+ System.err.println( "FAILED!" );
+ return false;
+ }
+
+ JarFile war = new JarFile( warFile );
-// Webapp project
+ String[] expected = {
+ "index.jsp",
+ "WEB-INF/web.xml",
+ "WEB-INF/test.txt",
+ "WEB-INF/classes/test.properties",
+ "WEB-INF/classes/org/MyClass.class",
+ };
+ for ( String entry : expected )
+ {
+ System.out.println( "Checking for existence of WAR file entry: " + entry );
+ if ( war.getEntry( entry ) == null )
+ {
+ System.err.println( "FAILED!" );
+ return false;
+ }
-build = new File( basedir, "build.xml" );
-if ( build.isDirectory() || !build.exists() )
-{
- System.err.println( "The file '" + build.getAbsolutePath() + "' is a directory or doesn't exist." );
- return false;
-}
-mavenBuild = new File( basedir, "maven-build.xml" );
-if ( mavenBuild.isDirectory() || !mavenBuild.exists() )
-{
- System.err.println( "The file '" + mavenBuild.getAbsolutePath() + "' is a directory or doesn't exist." );
- return false;
+ System.out.println( "Checking for uniqueness of WAR file entry: " + entry );
+ int count = 0;
+ for ( Enumeration en = war.entries(); en.hasMoreElements(); )
+ {
+ JarEntry je = (JarEntry) en.nextElement();
+ if ( entry.equals( je.getName() ) )
+ {
+ count++;
+ }
+ }
+ if ( count != 1 )
+ {
+ System.err.println( "FAILED! " + count );
+ return false;
+ }
+ }
+
+ String[] unexpected = {
+ "org/MyClass.class",
+ };
+ for ( String entry : unexpected )
+ {
+ System.out.println( "Checking for absence of WAR file entry: " + entry );
+ if ( war.getEntry( entry ) != null )
+ {
+ System.err.println( "FAILED!" );
+ return false;
+ }
+ }
+
+ war.close();
}
-mavenBuildProperties = new File( basedir, "maven-build.properties" );
-if ( mavenBuildProperties.isDirectory() || !mavenBuildProperties.exists() )
+catch( Throwable t )
{
- System.err.println( "The file '" + mavenBuildProperties.getAbsolutePath() + "' is a directory or doesn't exist." );
- return false;
+ t.printStackTrace();
+ return false;
}
return true;
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 333f306..c5b052f 100644
--- a/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
+++ b/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
@@ -495,22 +495,20 @@ public class AntBuildWriterUtil
public static void writeWarTask( XMLWriter writer, MavenProject project, File localRepository )
throws IOException
{
+ String webXml =
+ getMavenWarPluginBasicOption( project, "webXml", "${basedir}/src/main/webapp/WEB-INF/web.xml" );
+ if ( webXml.startsWith( "${basedir}/" ) )
+ {
+ webXml = webXml.substring( "${basedir}/".length() );
+ }
+
writeCopyLib( writer, project, "${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib" );
writer.startElement( "war" );
writer.addAttribute( "destfile", "${maven.build.dir}/${maven.build.finalName}.war" );
- addWrapAttribute( writer, "war", "basedir", "${maven.build.outputDir}", 3 );
addWrapAttribute( writer, "war", "compress",
getMavenWarPluginBasicOption( project, "archive//compress", "true" ), 3 );
- if ( getMavenWarPluginBasicOption( project, "webXml", null ) != null )
- {
- addWrapAttribute( writer, "war", "webxml", getMavenWarPluginBasicOption( project, "webXml", null ), 3 );
- }
- else
- {
- // Default
- addWrapAttribute( writer, "war", "webxml", "${basedir}/src/main/webapp/WEB-INF/web.xml", 3 );
- }
+ addWrapAttribute( writer, "war", "webxml", webXml, 3 );
if ( getMavenWarPluginBasicOption( project, "manifestFile", null ) != null )
{
addWrapAttribute( writer, "war", "manifest", getMavenWarPluginBasicOption( project, "manifestFile", null ),
@@ -522,12 +520,9 @@ public class AntBuildWriterUtil
writer.startElement( "classes" );
writer.addAttribute( "dir", "${maven.build.outputDir}" );
writer.endElement(); // classes
- writer.startElement( "webinf" );
- writer.addAttribute( "dir", "${basedir}/src/main/webapp/WEB-INF" );
- addWrapAttribute( writer, "webinf", "excludes", "web.xml", 4 );
- writer.endElement(); // webinf
writer.startElement( "fileset" );
- writer.addAttribute( "dir", "${basedir}/src/main/webapp" );
+ writer.addAttribute( "dir", "src/main/webapp" );
+ addWrapAttribute( writer, "fileset", "excludes", "WEB-INF/web.xml", 4 );
writer.endElement(); // fileset
writer.endElement(); // war
}
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 38/42: o Inherited from maven-plugins:13
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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 38441c5138bc3352c069b70c2069d82b586da32b
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Sat Feb 21 10:24:49 2009 +0000
o Inherited from maven-plugins:13
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@746480 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 2f519b0..018ca99 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>13-SNAPSHOT</version>
+ <version>13</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] 29/42: o Explicitly stated UTF-8 as file
encoding o Updated license header
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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 6c4fd9e9020b859d245d01012745765f18e8e838
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Thu Aug 28 16:56:51 2008 +0000
o Explicitly stated UTF-8 as file encoding
o Updated license header
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@689890 13f79535-47bb-0310-9956-ffa450edef68
---
src/site/fml/faq.fml | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/site/fml/faq.fml b/src/site/fml/faq.fml
index ac3b3cc..5d0b406 100644
--- a/src/site/fml/faq.fml
+++ b/src/site/fml/faq.fml
@@ -1,23 +1,23 @@
<?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
+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.
- -->
+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.
+-->
<faqs id="FAQ" title="Frequently Asked Questions">
<part id="General">
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 37/42: new parent
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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit fd2378216953273bf2a97a9038a18b6528531705
Author: Brian E Fox <br...@apache.org>
AuthorDate: Sat Feb 14 02:12:28 2009 +0000
new parent
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@744366 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index a12288e..2f519b0 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>12</version>
+ <version>13-SNAPSHOT</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] 07/42: [MANT-41] mvn ant:ant fails with NPE when
maven-javadoc-plugin custom tag is specified in pom.xml
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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit c988957708bf48e0737b9d0e20cef180db7f8c68
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Thu Jun 5 22:34:34 2008 +0000
[MANT-41] mvn ant:ant fails with NPE when maven-javadoc-plugin custom tag is specified in pom.xml
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@663768 13f79535-47bb-0310-9956-ffa450edef68
---
src/it/javadoc-it/pom.xml | 61 +++++++
src/it/javadoc-it/src/main/java/Main.java | 3 +
.../maven/plugin/ant/AntBuildWriterUtil.java | 195 +++++++++++++--------
.../maven/plugin/ant/AntBuildWriterUtilTest.java | 11 ++
src/test/resources/unit/ant-javadoc-test/pom.xml | 8 +-
5 files changed, 206 insertions(+), 72 deletions(-)
diff --git a/src/it/javadoc-it/pom.xml b/src/it/javadoc-it/pom.xml
new file mode 100644
index 0000000..7996857
--- /dev/null
+++ b/src/it/javadoc-it/pom.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.maven-ant-plugin.it</groupId>
+ <artifactId>javadoc-it</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <build>
+ <finalName>${project.artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ant-plugin</artifactId>
+ <version>@pom.version@</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>build.xml</include>
+ <include>maven-build.*</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <tags>
+ <tag>
+ <name>requirement</name>
+ <placement>a</placement>
+ <head>Software Requirement:</head>
+ </tag>
+ </tags>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <properties>
+ <build.compiler>extJavac</build.compiler>
+ </properties>
+
+</project>
diff --git a/src/it/javadoc-it/src/main/java/Main.java b/src/it/javadoc-it/src/main/java/Main.java
new file mode 100644
index 0000000..27ccb83
--- /dev/null
+++ b/src/it/javadoc-it/src/main/java/Main.java
@@ -0,0 +1,3 @@
+public class Main
+{
+}
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 8e25c4b..b0aa3c7 100644
--- a/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
+++ b/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
@@ -39,7 +39,6 @@ import org.apache.maven.model.ReportPlugin;
import org.apache.maven.project.MavenProject;
import org.apache.maven.wagon.PathUtils;
import org.apache.xpath.XPathAPI;
-import org.apache.xpath.objects.XObject;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.XMLWriter;
import org.codehaus.plexus.util.xml.Xpp3Dom;
@@ -535,10 +534,11 @@ public class AntBuildWriterUtil
{
for ( int i = 0; i < tags.length; i++ )
{
+ Map props = (Map) tags[i].get( "tag" );
writer.startElement( "tag" );
- writer.addAttribute( "name", (String) tags[i].get( "name" ) );
- addWrapAttribute( writer, "javadoc", "scope", (String) tags[i].get( "placement" ), 4 );
- addWrapAttribute( writer, "javadoc", "description", (String) tags[i].get( "head" ), 4 );
+ writer.addAttribute( "name", (String) props.get( "name" ) );
+ addWrapAttribute( writer, "javadoc", "scope", (String) props.get( "placement" ), 4 );
+ addWrapAttribute( writer, "javadoc", "description", (String) props.get( "head" ), 4 );
writer.endElement(); // tag
}
}
@@ -1131,98 +1131,103 @@ public class AntBuildWriterUtil
Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder()
.parse( new ByteArrayInputStream( pluginConf.toString().getBytes( "UTF-8" ) ) );
- XObject obj = XPathAPI.eval( doc, "//configuration/" + optionName );
-
- NodeList nodeList = obj.nodelist();
- if ( nodeList.getLength() > 0 && isList( nodeList.item( 0 ) ) )
+ NodeList nodeList = XPathAPI.eval( doc, "//configuration/" + optionName ).nodelist();
+ if ( nodeList.getLength() > 0 )
{
- /*
- * <optionNames>
- * <optionName>
- * <param1>value1</param1>
- * <param2>value2</param2>
- * </optionName>
- * </optionNames>
- */
- Map options = new HashMap();
-
- List optionNames = new ArrayList();
- NodeList childs = nodeList.item( 0 ).getChildNodes();
- for ( int i = 0; i < childs.getLength(); i++ )
- {
- if ( childs.item( i ).getNodeType() == Node.ELEMENT_NODE )
- {
- Map option = new HashMap();
+ Node optionNode = nodeList.item( 0 );
- obj = XPathAPI.eval( doc, "//configuration/" + childs.item( i ).getNodeName() );
+ if ( isList( optionNode ) )
+ {
+ /*
+ * <optionNames>
+ * <optionName>
+ * <param1>value1</param1>
+ * <param2>value2</param2>
+ * </optionName>
+ * </optionNames>
+ */
+ Map options = new HashMap();
- if ( StringUtils.isNotEmpty( obj.toString() ) )
+ List optionNames = new ArrayList();
+ NodeList childs = optionNode.getChildNodes();
+ for ( int i = 0; i < childs.getLength(); i++ )
+ {
+ Node child = childs.item( i );
+ if ( child.getNodeType() == Node.ELEMENT_NODE )
{
- Map properties = new HashMap();
- NodeList childs2 = childs.item( i ).getChildNodes();
- if ( childs2.getLength() > 0 )
+ Map option = new HashMap();
+
+ if ( isElementContent( child ) )
{
- for ( int j = 0; j < childs2.getLength(); j++ )
+ Map properties = new HashMap();
+ NodeList childs2 = child.getChildNodes();
+ if ( childs2.getLength() > 0 )
{
- if ( childs2.item( j ).getNodeType() == Node.ELEMENT_NODE )
+ for ( int j = 0; j < childs2.getLength(); j++ )
{
- properties.put( childs2.item( j ).getNodeName(), childs2.item( j )
- .getFirstChild().getNodeValue() );
+ Node child2 = childs2.item( j );
+ if ( child2.getNodeType() == Node.ELEMENT_NODE )
+ {
+ properties.put( child2.getNodeName(), getTextContent( child2 ) );
+ }
}
+ option.put( child.getNodeName(), properties );
}
- option.put( childs.item( i ).getNodeName(), properties );
}
- }
- else
- {
- option.put( childs.item( i ).getNodeName(), childs.item( i ).getFirstChild()
- .getNodeValue() );
- }
+ else
+ {
+ option.put( child.getNodeName(), getTextContent( child ) );
+ }
- optionNames.add( option );
+ optionNames.add( option );
+ }
}
- }
-
- options.put( optionName, optionNames.toArray( new Map[0] ) );
- return options;
- }
+ options.put( optionName, optionNames.toArray( new Map[0] ) );
- /*
- * <optionName>
- * <param1>value1</param1>
- * <param2>value2</param2>
- * </optionName>
- */
- if ( StringUtils.isNotEmpty( obj.toString() ) )
- {
- Map option = new HashMap();
+ return options;
+ }
- NodeList childs = nodeList.item( 0 ).getChildNodes();
- if ( childs.getLength() > 1 )
+ if ( isElementContent( optionNode ) )
{
- Map parameters = new HashMap();
+ /*
+ * <optionName>
+ * <param1>value1</param1>
+ * <param2>value2</param2>
+ * </optionName>
+ */
+ Map option = new HashMap();
- for ( int i = 0; i < childs.getLength(); i++ )
+ NodeList childs = optionNode.getChildNodes();
+ if ( childs.getLength() > 1 )
{
- if ( childs.item( i ).getNodeType() == Node.ELEMENT_NODE )
+ Map parameters = new HashMap();
+
+ for ( int i = 0; i < childs.getLength(); i++ )
{
- parameters.put( childs.item( i ).getNodeName(), childs.item( i ).getFirstChild()
- .getNodeValue() );
+ Node child = childs.item( i );
+ if ( child.getNodeType() == Node.ELEMENT_NODE )
+ {
+ parameters.put( child.getNodeName(), getTextContent( child ) );
+ }
}
+
+ option.put( optionName, parameters );
}
- option.put( optionName, parameters );
+ return option;
}
else
{
/*
* <optionName>value1</optionName>
*/
- option.put( optionName, obj.toString() );
- }
+ Map option = new HashMap();
+
+ option.put( optionName, getTextContent( optionNode ) );
- return option;
+ return option;
+ }
}
}
catch ( Exception e )
@@ -1286,7 +1291,7 @@ public class AntBuildWriterUtil
* </options>
* </pre>
*
- * @param node a given node
+ * @param node a given node, may be <code>null</code>.
* @return true if the node is a list, false otherwise.
*/
private static boolean isList( Node node )
@@ -1296,13 +1301,13 @@ public class AntBuildWriterUtil
return false;
}
- NodeList childs = node.getChildNodes();
+ NodeList children = node.getChildNodes();
boolean isList = false;
String lastNodeName = null;
- for ( int i = 0; i < childs.getLength(); i++ )
+ for ( int i = 0; i < children.getLength(); i++ )
{
- Node child = childs.item( i );
+ Node child = children.item( i );
if ( child.getNodeType() == Node.ELEMENT_NODE )
{
isList = isList || ( child.getNodeName().equals( lastNodeName ) );
@@ -1318,6 +1323,54 @@ public class AntBuildWriterUtil
}
/**
+ * Checks whether the specified node has element content or consists only of character data.
+ *
+ * @param node The node to test, may be <code>null</code>.
+ * @return <code>true</code> if any child node is an element, <code>false</code> otherwise.
+ */
+ private static boolean isElementContent( Node node )
+ {
+ if ( node == null )
+ {
+ return false;
+ }
+ NodeList children = node.getChildNodes();
+ for ( int i = 0; i < children.getLength(); i++ )
+ {
+ Node child = children.item( i );
+ if ( child.getNodeType() == Node.ELEMENT_NODE )
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Gets the text content of the specified node.
+ *
+ * @param node The node whose text contents should be retrieved, may be <code>null</code>.
+ * @return The text content of the node, can be empty but never <code>null</code>.
+ */
+ private static String getTextContent( Node node )
+ {
+ StringBuffer buffer = new StringBuffer();
+ if ( node != null )
+ {
+ NodeList children = node.getChildNodes();
+ for ( int i = 0; i < children.getLength(); i++ )
+ {
+ Node child = children.item( i );
+ if ( child.getNodeType() == Node.TEXT_NODE || child.getNodeType() == Node.CDATA_SECTION_NODE )
+ {
+ buffer.append( child.getNodeValue() );
+ }
+ }
+ }
+ return buffer.toString();
+ }
+
+ /**
* Gets the singular form of the specified (English) plural form. For example:
*
* <pre>
diff --git a/src/test/java/org/apache/maven/plugin/ant/AntBuildWriterUtilTest.java b/src/test/java/org/apache/maven/plugin/ant/AntBuildWriterUtilTest.java
index 8f5663f..e1b7cb7 100644
--- a/src/test/java/org/apache/maven/plugin/ant/AntBuildWriterUtilTest.java
+++ b/src/test/java/org/apache/maven/plugin/ant/AntBuildWriterUtilTest.java
@@ -21,6 +21,7 @@ package org.apache.maven.plugin.ant;
import java.io.File;
import java.io.StringWriter;
+import java.util.Map;
import org.apache.maven.embedder.MavenEmbedder;
import org.apache.maven.embedder.MavenEmbedderConsoleLogger;
@@ -164,6 +165,16 @@ public class AntBuildWriterUtilTest
assertNotNull( AntBuildWriterUtil.getMavenJavadocPluginOptions( project, "docletArtifacts", null ) );
assertEquals( AntBuildWriterUtil.getMavenJavadocPluginOptions( project, "docletArtifacts", null ).length, 2 );
+ Map[] options = AntBuildWriterUtil.getMavenJavadocPluginOptions( project, "tags", null );
+ assertNotNull( options );
+ assertEquals( options.length, 1 );
+ assertEquals( 1, options[0].size() );
+ Map properties = (Map) options[0].get( "tag" );
+ assertNotNull( properties );
+ assertEquals( "requirement", properties.get( "name" ) );
+ assertEquals( "a", properties.get( "placement" ) );
+ assertEquals( "Software Requirement:", properties.get( "head" ) );
+
maven.stop();
}
diff --git a/src/test/resources/unit/ant-javadoc-test/pom.xml b/src/test/resources/unit/ant-javadoc-test/pom.xml
index c37f71f..17199d7 100644
--- a/src/test/resources/unit/ant-javadoc-test/pom.xml
+++ b/src/test/resources/unit/ant-javadoc-test/pom.xml
@@ -111,7 +111,13 @@ under the License.
<version>4.5</version>
</docletArtifact>
</docletArtifacts>
-
+ <tags>
+ <tag>
+ <name>requirement</name>
+ <placement>a</placement>
+ <head>Software Requirement:</head>
+ </tag>
+ </tags>
</configuration>
</plugin>
</plugins>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 15/42: [MANT-46] mvn ant:ant throws a
StringIndexOutOfBoundsException
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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 1118cde3d9fe5e0bf18df5c9230035081bab5cd0
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Tue Jul 29 10:49:16 2008 +0000
[MANT-46] mvn ant:ant throws a StringIndexOutOfBoundsException
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@680669 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 7 +--
src/it/relative-path-it/goals.txt | 3 +
src/it/relative-path-it/pom.xml | 60 +++++++++++++++++++
src/it/relative-path-it/verify.bsh | 61 ++++++++++++++++++++
.../apache/maven/plugin/ant/AntBuildWriter.java | 39 ++++++-------
.../maven/plugin/ant/AntBuildWriterUtil.java | 67 +++++++++++++++++++++-
.../maven/plugin/ant/AntBuildWriterUtilTest.java | 24 +++++++-
7 files changed, 232 insertions(+), 29 deletions(-)
diff --git a/pom.xml b/pom.xml
index 368bd9e..298140a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,11 +72,6 @@ under the License.
<version>2.0.6</version>
</dependency>
<dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-provider-api</artifactId>
- <version>1.0-beta-2</version>
- </dependency>
- <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0.2</version>
@@ -84,7 +79,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.5.4</version>
+ <version>1.5.5</version>
</dependency>
<dependency>
<groupId>ant</groupId>
diff --git a/src/it/relative-path-it/goals.txt b/src/it/relative-path-it/goals.txt
new file mode 100644
index 0000000..4524f24
--- /dev/null
+++ b/src/it/relative-path-it/goals.txt
@@ -0,0 +1,3 @@
+clean
+ant:ant
+antrun:run
diff --git a/src/it/relative-path-it/pom.xml b/src/it/relative-path-it/pom.xml
new file mode 100644
index 0000000..957f0e0
--- /dev/null
+++ b/src/it/relative-path-it/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.maven-ant-plugin.it</groupId>
+ <artifactId>relative-path-it</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ant-plugin</artifactId>
+ <version>@pom.version@</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>build.xml</include>
+ <include>maven-build.*</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <configuration>
+ <tasks>
+ <ant dir="${basedir}" antfile="${basedir}/build.xml" target="package" />
+ </tasks>
+ </configuration>
+ </plugin>
+ </plugins>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>.</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
+</project>
diff --git a/src/it/relative-path-it/verify.bsh b/src/it/relative-path-it/verify.bsh
new file mode 100644
index 0000000..4a32ec9
--- /dev/null
+++ b/src/it/relative-path-it/verify.bsh
@@ -0,0 +1,61 @@
+import java.io.*;
+import java.util.*;
+import java.util.regex.*;
+
+import org.codehaus.plexus.util.*;
+
+boolean checkValue( String expected, String key, Properties props )
+{
+ String actual = props.getProperty( key );
+ if ( !expected.equals( actual ) )
+ {
+ System.err.println( "Generated build properties contain bad value for key " + key + ": expected \"" + expected
+ + "\" but was \"" + actual + "\"" );
+ return false;
+ }
+ return true;
+}
+
+try
+{
+ File propsFile = new File( basedir, "maven-build.properties" );
+ Properties props = new Properties();
+ InputStream in = null;
+ try
+ {
+ in = new FileInputStream( propsFile );
+ props.load( in );
+ }
+ finally
+ {
+ IOUtil.close( in );
+ }
+
+ if ( !checkValue( "target", "maven.build.dir", props ) )
+ {
+ return false;
+ }
+ if ( !checkValue( "src/main/java", "maven.build.srcDir.0", props ) )
+ {
+ return false;
+ }
+ if ( !checkValue( "src/test/java", "maven.build.testDir.0", props ) )
+ {
+ return false;
+ }
+ if ( !checkValue( "src/main/resources", "maven.build.resourceDir.0", props ) )
+ {
+ return false;
+ }
+ if ( !checkValue( ".", "maven.build.resourceDir.1", props ) )
+ {
+ return false;
+ }
+}
+catch( Throwable t )
+{
+ t.printStackTrace();
+ return false;
+}
+
+return true;
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 8cada3a..61f22dd 100644
--- a/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
+++ b/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
@@ -36,7 +36,6 @@ import org.apache.maven.model.Repository;
import org.apache.maven.model.Resource;
import org.apache.maven.project.MavenProject;
import org.apache.maven.settings.Settings;
-import org.apache.maven.wagon.PathUtils;
import org.apache.tools.ant.Main;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
@@ -138,17 +137,17 @@ public class AntBuildWriter
// Build properties
// ----------------------------------------------------------------------
- addProperty( properties, "maven.build.finalName", PathUtils.toRelative( project.getBasedir(), project
+ addProperty( properties, "maven.build.finalName", AntBuildWriterUtil.toRelative( project.getBasedir(), project
.getBuild().getFinalName() ) );
// target
- addProperty( properties, "maven.build.dir", PathUtils.toRelative( project.getBasedir(), project.getBuild()
+ addProperty( properties, "maven.build.dir", AntBuildWriterUtil.toRelative( project.getBasedir(), project.getBuild()
.getDirectory() ) );
addProperty( properties, "project.build.directory", "${maven.build.dir}" );
// ${maven.build.dir}/classes
addProperty( properties, "maven.build.outputDir", "${maven.build.dir}/"
- + PathUtils.toRelative( new File( project.getBasedir(), properties.getProperty( "maven.build.dir" ) ),
+ + AntBuildWriterUtil.toRelative( new File( project.getBasedir(), properties.getProperty( "maven.build.dir" ) ),
project.getBuild().getOutputDirectory() ) );
addProperty( properties, "project.build.outputDirectory", "${maven.build.outputDir}" );
@@ -158,7 +157,7 @@ public class AntBuildWriter
String[] compileSourceRoots = (String[]) project.getCompileSourceRoots().toArray( new String[0] );
for ( int i = 0; i < compileSourceRoots.length; i++ )
{
- addProperty( properties, "maven.build.srcDir." + i, PathUtils.toRelative( project.getBasedir(),
+ addProperty( properties, "maven.build.srcDir." + i, AntBuildWriterUtil.toRelative( project.getBasedir(),
compileSourceRoots[i] ) );
}
}
@@ -168,14 +167,14 @@ public class AntBuildWriter
Resource[] array = (Resource[]) project.getBuild().getResources().toArray( new Resource[0] );
for ( int i = 0; i < array.length; i++ )
{
- addProperty( properties, "maven.build.resourceDir." + i, PathUtils.toRelative( project.getBasedir(),
+ addProperty( properties, "maven.build.resourceDir." + i, AntBuildWriterUtil.toRelative( project.getBasedir(),
array[i].getDirectory() ) );
}
}
// ${maven.build.dir}/test-classes
addProperty( properties, "maven.build.testOutputDir", "${maven.build.dir}/"
- + PathUtils.toRelative( new File( project.getBasedir(), properties.getProperty( "maven.build.dir" ) ),
+ + AntBuildWriterUtil.toRelative( new File( project.getBasedir(), properties.getProperty( "maven.build.dir" ) ),
project.getBuild().getTestOutputDirectory() ) );
// src/test/java
if ( !project.getTestCompileSourceRoots().isEmpty() )
@@ -183,7 +182,7 @@ public class AntBuildWriter
String[] compileSourceRoots = (String[]) project.getTestCompileSourceRoots().toArray( new String[0] );
for ( int i = 0; i < compileSourceRoots.length; i++ )
{
- addProperty( properties, "maven.build.testDir." + i, PathUtils.toRelative( project.getBasedir(),
+ addProperty( properties, "maven.build.testDir." + i, AntBuildWriterUtil.toRelative( project.getBasedir(),
compileSourceRoots[i] ) );
}
}
@@ -193,7 +192,7 @@ public class AntBuildWriter
Resource[] array = (Resource[]) project.getBuild().getTestResources().toArray( new Resource[0] );
for ( int i = 0; i < array.length; i++ )
{
- addProperty( properties, "maven.build.testResourceDir." + i, PathUtils
+ addProperty( properties, "maven.build.testResourceDir." + i, AntBuildWriterUtil
.toRelative( project.getBasedir(), array[i].getDirectory() ) );
}
}
@@ -435,13 +434,13 @@ public class AntBuildWriter
writer.startElement( "property" );
writer.addAttribute( "name", "maven.build.dir" );
- writer.addAttribute( "value", PathUtils.toRelative( project.getBasedir(), project.getBuild().getDirectory() ) );
+ writer.addAttribute( "value", AntBuildWriterUtil.toRelative( project.getBasedir(), project.getBuild().getDirectory() ) );
writer.endElement(); // property
writer.startElement( "property" );
writer.addAttribute( "name", "maven.build.outputDir" );
writer.addAttribute( "value", "${maven.build.dir}/"
- + PathUtils.toRelative( new File( project.getBuild().getDirectory() ), project.getBuild()
+ + AntBuildWriterUtil.toRelative( new File( project.getBuild().getDirectory() ), project.getBuild()
.getOutputDirectory() ) );
writer.endElement(); // property
@@ -452,7 +451,7 @@ public class AntBuildWriter
{
writer.startElement( "property" );
writer.addAttribute( "name", "maven.build.srcDir." + i );
- writer.addAttribute( "value", PathUtils.toRelative( project.getBasedir(), compileSourceRoots[i] ) );
+ writer.addAttribute( "value", AntBuildWriterUtil.toRelative( project.getBasedir(), compileSourceRoots[i] ) );
writer.endElement(); // property
}
}
@@ -464,7 +463,7 @@ public class AntBuildWriter
{
writer.startElement( "property" );
writer.addAttribute( "name", "maven.build.resourceDir." + i );
- writer.addAttribute( "value", PathUtils.toRelative( project.getBasedir(), array[i].getDirectory() ) );
+ writer.addAttribute( "value", AntBuildWriterUtil.toRelative( project.getBasedir(), array[i].getDirectory() ) );
writer.endElement(); // property
}
}
@@ -472,7 +471,7 @@ public class AntBuildWriter
writer.startElement( "property" );
writer.addAttribute( "name", "maven.build.testOutputDir" );
writer.addAttribute( "value", "${maven.build.dir}/"
- + PathUtils.toRelative( new File( project.getBuild().getDirectory() ), project.getBuild()
+ + AntBuildWriterUtil.toRelative( new File( project.getBuild().getDirectory() ), project.getBuild()
.getTestOutputDirectory() ) );
writer.endElement(); // property
@@ -483,7 +482,7 @@ public class AntBuildWriter
{
writer.startElement( "property" );
writer.addAttribute( "name", "maven.build.testDir." + i );
- writer.addAttribute( "value", PathUtils.toRelative( project.getBasedir(), compileSourceRoots[i] ) );
+ writer.addAttribute( "value", AntBuildWriterUtil.toRelative( project.getBasedir(), compileSourceRoots[i] ) );
writer.endElement(); // property
}
}
@@ -495,7 +494,7 @@ public class AntBuildWriter
{
writer.startElement( "property" );
writer.addAttribute( "name", "maven.build.testResourceDir." + i );
- writer.addAttribute( "value", PathUtils.toRelative( project.getBasedir(), array[i].getDirectory() ) );
+ writer.addAttribute( "value", AntBuildWriterUtil.toRelative( project.getBasedir(), array[i].getDirectory() ) );
writer.endElement(); // property
}
}
@@ -514,7 +513,7 @@ public class AntBuildWriter
writer.startElement( "property" );
writer.addAttribute( "name", "maven.reporting.outputDirectory" );
writer.addAttribute( "value", "${maven.build.dir}/"
- + PathUtils.toRelative( new File( project.getBuild().getDirectory() ), reportingOutputDir ) );
+ + AntBuildWriterUtil.toRelative( new File( project.getBuild().getDirectory() ), reportingOutputDir ) );
writer.endElement(); // property
// ----------------------------------------------------------------------
@@ -585,7 +584,7 @@ public class AntBuildWriter
{
Artifact artifact = (Artifact) i.next();
writer.startElement( "include" );
- writer.addAttribute( "name", PathUtils.toRelative( localRepository, artifact.getFile().getPath() ) );
+ writer.addAttribute( "name", AntBuildWriterUtil.toRelative( localRepository, artifact.getFile().getPath() ) );
writer.endElement(); // include
}
}
@@ -608,7 +607,7 @@ public class AntBuildWriter
{
Artifact artifact = (Artifact) i.next();
writer.startElement( "include" );
- writer.addAttribute( "name", PathUtils.toRelative( localRepository, artifact.getFile().getPath() ) );
+ writer.addAttribute( "name", AntBuildWriterUtil.toRelative( localRepository, artifact.getFile().getPath() ) );
writer.endElement(); // include
}
}
@@ -1253,7 +1252,7 @@ public class AntBuildWriter
Artifact artifact = (Artifact) i.next();
// TODO: should the artifacthandler be used instead?
- String path = PathUtils.toRelative( localRepository, artifact.getFile().getPath() );
+ String path = AntBuildWriterUtil.toRelative( localRepository, artifact.getFile().getPath() );
if ( !new File( path ).exists() )
{
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 0da93f8..333f306 100644
--- a/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
+++ b/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
@@ -37,8 +37,8 @@ import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.ReportPlugin;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.wagon.PathUtils;
import org.apache.xpath.XPathAPI;
+import org.codehaus.plexus.util.PathTool;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.XMLWriter;
import org.codehaus.plexus.util.xml.XmlWriterUtil;
@@ -157,7 +157,7 @@ public class AntBuildWriterUtil
{
writer.startElement( "ant" );
writer.addAttribute( "antfile", "build.xml" );
- writer.addAttribute( "dir", PathUtils.toRelative( project.getBasedir(), moduleSubPath ) );
+ writer.addAttribute( "dir", toRelative( project.getBasedir(), moduleSubPath ) );
writer.addAttribute( "target", tasks );
writer.endElement(); // ant
}
@@ -1269,4 +1269,67 @@ public class AntBuildWriterUtil
return singularForm;
}
+ /**
+ * Relativizes the specified path against the given base directory (if possible). If the specified path is a
+ * subdirectory of the base directory, the base directory prefix will be chopped off. If the specified path is equal
+ * to the base directory, the path "." is returned. Otherwise, the path is returned as is. Examples:
+ * <table border="1">
+ * <tr>
+ * <td>basedir</td>
+ * <td>path</td>
+ * <td>result</td>
+ * </tr>
+ * <tr>
+ * <td>/home</td>
+ * <td>/home/dir</td>
+ * <td>dir</td>
+ * </tr>
+ * <tr>
+ * <td>/home</td>
+ * <td>/home/dir/</td>
+ * <td>dir/</td>
+ * </tr>
+ * <tr>
+ * <td>/home</td>
+ * <td>/home</td>
+ * <td>.</td>
+ * </tr>
+ * <tr>
+ * <td>/home</td>
+ * <td>/home/</td>
+ * <td>./</td>
+ * </tr>
+ * <tr>
+ * <td>/home</td>
+ * <td>dir</td>
+ * <td>dir</td>
+ * </tr>
+ * </table>
+ * The returned path will always use the forward slash ('/') as the file separator regardless of the current
+ * platform. Also, the result path will have a trailing slash if the input path has a trailing file separator.
+ *
+ * @param basedir The base directory to relativize the path against, must not be <code>null</code>.
+ * @param path The path to relativize, must not be <code>null</code>.
+ * @return The relativized path, never <code>null</code>.
+ */
+ static String toRelative( File basedir, String path )
+ {
+ String result = null;
+ if ( new File( path ).isAbsolute() )
+ {
+ String pathNormalized = path.replace( '/', File.separatorChar ).replace( '\\', File.separatorChar );
+ result = PathTool.getRelativeFilePath( basedir.getAbsolutePath(), pathNormalized );
+ }
+ if ( result == null )
+ {
+ result = path;
+ }
+ result = result.replace( '\\', '/' );
+ if ( result.length() <= 0 || "/".equals( result ) )
+ {
+ result = '.' + result;
+ }
+ return result;
+ }
+
}
diff --git a/src/test/java/org/apache/maven/plugin/ant/AntBuildWriterUtilTest.java b/src/test/java/org/apache/maven/plugin/ant/AntBuildWriterUtilTest.java
index bfd8e12..30b9063 100644
--- a/src/test/java/org/apache/maven/plugin/ant/AntBuildWriterUtilTest.java
+++ b/src/test/java/org/apache/maven/plugin/ant/AntBuildWriterUtilTest.java
@@ -136,7 +136,7 @@ public class AntBuildWriterUtilTest
}
/**
- * Test method for {@link AntBuildWriterUtil#getSingularForm(String)}.
+ * Test method for <code>AntBuildWriterUtil.getSingularForm(String)}</code>.
*
* @throws Exception
*/
@@ -150,4 +150,26 @@ public class AntBuildWriterUtilTest
assertEquals( "", AntBuildWriterUtil.getSingularForm( null ) );
}
+ /**
+ * Test method for <code>AntBuildWriterUtil.toRelative(File, String)</code>.
+ *
+ * @throws Exception
+ */
+ public static void testToRelative()
+ throws Exception
+ {
+ assertEquals( "relative", AntBuildWriterUtil.toRelative( new File( "/home" ), "relative" ) );
+ assertEquals( "dir", AntBuildWriterUtil.toRelative( new File( "home" ),
+ new File( "home/dir" ).getAbsolutePath() ) );
+ assertEquals( "dir", AntBuildWriterUtil.toRelative( new File( "/home" ),
+ new File( "/home/dir" ).getAbsolutePath() ) );
+ assertEquals( "dir/", AntBuildWriterUtil.toRelative( new File( "/home" ),
+ new File( "/home/dir" ).getAbsolutePath() + "/" ) );
+ assertEquals( "dir/sub", AntBuildWriterUtil.toRelative( new File( "/home" ),
+ new File( "/home/dir/sub" ).getAbsolutePath() ) );
+ assertEquals( ".", AntBuildWriterUtil.toRelative( new File( "/home" ), new File( "/home" ).getAbsolutePath() ) );
+ assertEquals( "./", AntBuildWriterUtil.toRelative( new File( "/home" ), new File( "/home" ).getAbsolutePath()
+ + "/" ) );
+ }
+
}
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 19/42: Remove plugins versions already defined
in parent
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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 10f1611c083744d58735aaf0913c0a742c94d8bf
Author: Arnaud Heritier <ah...@apache.org>
AuthorDate: Wed Aug 6 00:23:12 2008 +0000
Remove plugins versions already defined in parent
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@683059 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 28 ----------------------------
1 file changed, 28 deletions(-)
diff --git a/pom.xml b/pom.xml
index b5c5144..cee492d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -155,7 +155,6 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
- <version>1.2</version>
<configuration>
<debug>true</debug>
<projectsDirectory>src/it</projectsDirectory>
@@ -194,33 +193,6 @@ under the License.
</execution>
</executions>
</plugin>
- <!-- TODO: Remove this plugin execution once MINVOKER-43 is released -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <version>2.2</version>
- <executions>
- <execution>
- <id>it-preparation</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>install-file</goal>
- </goals>
- <configuration>
- <file>${project.build.directory}/${project.build.finalName}.jar</file>
- <groupId>${project.groupId}</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- <packaging>${project.packaging}</packaging>
- <pomFile>${basedir}/pom.xml</pomFile>
- <createChecksum>true</createChecksum>
- <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
- <!-- NOTE: must match identifier of real local repository or metadata lookup during ITs will misbehave -->
- <localRepositoryId>local</localRepositoryId>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</profile>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 23/42: o Reordered POM
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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit a3831dce3b6809c4403ab9e328a494e93114ca59
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Mon Aug 11 18:12:56 2008 +0000
o Reordered POM
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@684858 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8358dfe..afdf772 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,16 +39,19 @@ under the License.
<maven>2.0.6</maven>
</prerequisites>
- <issueManagement>
- <system>jira</system>
- <url>http://jira.codehaus.org/browse/MANT</url>
- </issueManagement>
-
<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>
</scm>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://jira.codehaus.org/browse/MANT</url>
+ </issueManagement>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
<dependencies>
<dependency>
@@ -191,8 +194,4 @@ under the License.
</build>
</profile>
</profiles>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
</project>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 13/42: MANT-42: Update to p-u 1.5.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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit dc9b984004ffeaedf09172bde31457e3e3cfcd59
Author: Vincent Siveton <vs...@apache.org>
AuthorDate: Wed Jun 25 12:23:19 2008 +0000
MANT-42: Update to p-u 1.5.4
o removed test codes
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@671527 13f79535-47bb-0310-9956-ffa450edef68
---
.../maven/plugin/ant/AntBuildWriterUtilTest.java | 44 ----------------------
1 file changed, 44 deletions(-)
diff --git a/src/test/java/org/apache/maven/plugin/ant/AntBuildWriterUtilTest.java b/src/test/java/org/apache/maven/plugin/ant/AntBuildWriterUtilTest.java
index 56f22af..bfd8e12 100644
--- a/src/test/java/org/apache/maven/plugin/ant/AntBuildWriterUtilTest.java
+++ b/src/test/java/org/apache/maven/plugin/ant/AntBuildWriterUtilTest.java
@@ -41,50 +41,6 @@ public class AntBuildWriterUtilTest
extends PlexusTestCase
{
/**
- * Test method for 'org.apache.maven.plugin.ant.AntBuildWriterUtil.writeComment(XMLWriter, String)'
- */
- public void testWriteCommentNull()
- {
- StringWriter s = new StringWriter();
- XMLWriter writer = new PrettyPrintXMLWriter( s );
- XmlWriterUtil.writeComment( writer, null );
- StringBuffer sb = new StringBuffer();
- sb.append( "<!-- null -->" ).append( '\n' );
- assertTrue( s.toString().equals( sb.toString() ) );
- }
-
- /**
- * Test method for 'org.apache.maven.plugin.ant.AntBuildWriterUtil.writeComment(XMLWriter, String)'
- */
- public void testWriteCommentShort()
- {
- StringWriter s = new StringWriter();
- XMLWriter writer = new PrettyPrintXMLWriter( s );
- XmlWriterUtil.writeComment( writer, "This is a short text" );
- StringBuffer sb = new StringBuffer();
- sb.append( "<!-- This is a short text -->" ).append( '\n' );
- assertTrue( s.toString().equals( sb.toString() ) );
- }
-
- /**
- * Test method for 'org.apache.maven.plugin.ant.AntBuildWriterUtil.writeComment(XMLWriter, String)'
- */
- public void testWriteCommentLong()
- {
- StringWriter s = new StringWriter();
- XMLWriter writer = new PrettyPrintXMLWriter( s );
- XmlWriterUtil.writeComment( writer, "Maven is a software project management and comprehension tool. "
- + "Based on the concept of a project object model (POM), Maven can manage a project's build, reporting "
- + "and documentation from a central piece of information." );
- StringBuffer sb = new StringBuffer();
- sb.append( "<!-- Maven is a software project management and comprehension tool. Based -->" ).append( '\n' );
- sb.append( "<!-- on the concept of a project object model (POM), Maven can manage a -->" ).append( '\n' );
- sb.append( "<!-- project's build, reporting and documentation from a central piece of -->" ).append( '\n' );
- sb.append( "<!-- information. -->" ).append( '\n' );
- assertTrue( s.toString().equals( sb.toString() ) );
- }
-
- /**
* Test method for 'org.apache.maven.plugin.ant.AntBuildWriterUtil.getMavenCompilerPluginConfiguration(MavenProject, String, String)'
*
* @throws Exception
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 03/42: o bumped some artifacts to 2.0.6
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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 94b8c5423e8b4b869943d08432a071e605726d67
Author: Vincent Siveton <vs...@apache.org>
AuthorDate: Tue May 20 01:11:30 2008 +0000
o bumped some artifacts to 2.0.6
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@658072 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index a5fffa7..08ae3ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,22 +52,22 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>2.0.4</version>
+ <version>2.0.6</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
- <version>2.0.4</version>
+ <version>2.0.6</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>2.0.4</version>
+ <version>2.0.6</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
- <version>2.0.4</version>
+ <version>2.0.6</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
@@ -121,7 +121,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>2.0.4</version>
+ <version>2.0.6</version>
<scope>test</scope>
</dependency>
<dependency>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 22/42: o Synced id and activation of
integration-tests with core ITs
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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit c55d09e71f2541d3da6cbbbf6da784349a469980
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Thu Aug 7 17:45:02 2008 +0000
o Synced id and activation of integration-tests with core ITs
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@683662 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index cee492d..8358dfe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,13 +143,7 @@ under the License.
<profiles>
<profile>
- <id>integration-tests</id>
- <activation>
- <property>
- <name>skipTests</name>
- <value>!true</value>
- </property>
- </activation>
+ <id>run-its</id>
<build>
<plugins>
<plugin>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 34/42: o Inherited from maven-plugins:12
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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 0a10332d30ae1ba9f453d6d63bdf1cfdafb0b0cb
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Sun Sep 21 20:41:41 2008 +0000
o Inherited from maven-plugins:12
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@697604 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index d87795f..2cc13fd 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>12-SNAPSHOT</version>
+ <version>12</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] 36/42: o Updated all plugins to use
maven-invoker-plugin:1.3 to workaround MNG-3284 and bogus CI failures
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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit d376a0268717a7cbd3f49091ce17047f434c67e1
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Sat Dec 20 18:48:54 2008 +0000
o Updated all plugins to use maven-invoker-plugin:1.3 to workaround MNG-3284 and bogus CI failures
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@728331 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index f10fd12..a12288e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -156,7 +156,7 @@ under the License.
<pomIncludes>
<pomInclude>*/pom.xml</pomInclude>
</pomIncludes>
- <postBuildHookScript>verify.bsh</postBuildHookScript>
+ <postBuildHookScript>verify</postBuildHookScript>
<settingsFile>src/it/settings.xml</settingsFile>
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
<goals>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 06/42: o Updated to maven-invoker-plugin:1.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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 25f6f700c04a1d865a46e4bc5df550083e482d13
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Thu Jun 5 22:30:42 2008 +0000
o Updated to maven-invoker-plugin:1.2
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@663767 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 74 +++++++++--------------------------------------------
src/it/settings.xml | 35 +++++++++++++++++++++++++
2 files changed, 47 insertions(+), 62 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0f000a3..b5eb7ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,9 +29,11 @@ under the License.
</parent>
<artifactId>maven-ant-plugin</artifactId>
+ <version>2.1.1-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
+
<name>Maven Ant Plugin</name>
- <version>2.2-SNAPSHOT</version>
+ <description>Generates an Ant build file from a POM.</description>
<prerequisites>
<maven>2.0.6</maven>
@@ -144,16 +146,6 @@ under the License.
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
- </plugin>
- </plugins>
- </build>
-
<profiles>
<profile>
<id>integration-tests</id>
@@ -167,75 +159,34 @@ under the License.
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>src/it</directory>
- <includes>
- <include>**/target</include>
- <include>**/build.xml</include>
- <include>**/maven-build.xml</include>
- <include>**/maven-build.properties</include>
- </includes>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <version>2.2</version>
- <executions>
- <execution>
- <id>it-test</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>install-file</goal>
- </goals>
- <configuration>
- <file>${project.build.directory}/${project.build.finalName}.jar</file>
- <groupId>${project.groupId}</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- <packaging>${project.packaging}</packaging>
- <pomFile>${basedir}/pom.xml</pomFile>
- <createChecksum>true</createChecksum>
- <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
- <localRepositoryId>it-local-repo</localRepositoryId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
- <version>1.1</version>
+ <version>1.2</version>
<configuration>
<debug>true</debug>
<projectsDirectory>src/it</projectsDirectory>
+ <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
<pomIncludes>
<pomInclude>*/pom.xml</pomInclude>
</pomIncludes>
<postBuildHookScript>verify.bsh</postBuildHookScript>
+ <settingsFile>src/it/settings.xml</settingsFile>
+ <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
<goals>
<goal>clean</goal>
<goal>ant:ant</goal>
<goal>antrun:run</goal>
</goals>
- <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
</configuration>
<executions>
<execution>
<id>integration-test</id>
- <phase>integration-test</phase>
<goals>
+ <goal>install</goal>
<goal>run</goal>
</goals>
</execution>
<execution>
<id>integration-test-phase-2</id>
- <phase>integration-test</phase>
<goals>
<goal>run</goal>
</goals>
@@ -248,13 +199,12 @@ under the License.
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
- </plugin>
</plugins>
</build>
</profile>
</profiles>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
</project>
diff --git a/src/it/settings.xml b/src/it/settings.xml
new file mode 100644
index 0000000..a1c1028
--- /dev/null
+++ b/src/it/settings.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings>
+ <profiles>
+ <profile>
+ <id>it-repo</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>local.central</id>
+ <url>file://@localRepository@</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>local.central</id>
+ <url>file://@localRepository@</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ </profiles>
+</settings>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 16/42: Try to use the 12-SNAPSHOT parent
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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 710319241077a3c98ef17d839d3e9ca81a2a32bb
Author: Arnaud Heritier <ah...@apache.org>
AuthorDate: Mon Aug 4 12:47:41 2008 +0000
Try to use the 12-SNAPSHOT parent
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@682367 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 298140a..98f22ba 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>11</version>
+ <version>12-SNAPSHOT</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] 39/42: used http://maven.apache.org/xsd/* for
schema location
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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 8a31eea3bf45af681eb59616df5f579ec8c03783
Author: Herve Boutemy <hb...@apache.org>
AuthorDate: Fri Mar 6 21:36:09 2009 +0000
used http://maven.apache.org/xsd/* for schema location
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@751080 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 018ca99..751bfe3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@ 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/maven-v4_0_0.xsd">
+<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>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 31/42: o Tweaked invoker configuration to ease
single test execution via -Dinvoker.test
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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 568673cf8326e1d11bd330e99077f8320eaa78c1
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Tue Sep 2 21:32:46 2008 +0000
o Tweaked invoker configuration to ease single test execution via -Dinvoker.test
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@691386 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pom.xml b/pom.xml
index 4b1f194..d87795f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -172,8 +172,10 @@ under the License.
<goal>run</goal>
</goals>
</execution>
+ <!-- TODO: Remove execution once MINVOKER-46 is released -->
<execution>
<id>integration-test-phase-2</id>
+ <phase>post-integration-test</phase>
<goals>
<goal>run</goal>
</goals>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 08/42: MANT-42: Update to p-u 1.5.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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit b72ec8c392b52894b11916c12176ef85c0d58cfb
Author: Vincent Siveton <vs...@apache.org>
AuthorDate: Tue Jun 17 18:55:39 2008 +0000
MANT-42: Update to p-u 1.5.4
o uses the snapshot of 1.5.4
o removed moved codes
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@668794 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
.../apache/maven/plugin/ant/AntBuildWriter.java | 89 +++++------
.../maven/plugin/ant/AntBuildWriterUtil.java | 171 +++------------------
.../maven/plugin/ant/AntBuildWriterUtilTest.java | 9 +-
4 files changed, 69 insertions(+), 202 deletions(-)
diff --git a/pom.xml b/pom.xml
index b5eb7ad..472c9e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,7 +84,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.5.1</version>
+ <version>1.5.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>ant</groupId>
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 d7d6636..33d5283 100644
--- a/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
+++ b/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
@@ -41,6 +41,7 @@ import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
import org.codehaus.plexus.util.xml.XMLWriter;
+import org.codehaus.plexus.util.xml.XmlWriterUtil;
/**
* Write Ant build files from <code>Maven Project</code> for <a href="http://ant.apache.org">Ant</a> 1.6.2 or above:
@@ -59,7 +60,7 @@ public class AntBuildWriter
/**
* The default line indenter
*/
- protected static final int DEFAULT_INDENTATION_SIZE = 2;
+ protected static final int DEFAULT_INDENTATION_SIZE = XmlWriterUtil.DEFAULT_INDENTATION_SIZE;
/**
* The default build file name (build.xml)
@@ -257,7 +258,7 @@ public class AntBuildWriter
writer.addAttribute( "default", "package" );
writer.addAttribute( "basedir", "." );
- AntBuildWriterUtil.writeLineBreak( writer );
+ XmlWriterUtil.writeLineBreak( writer );
// ----------------------------------------------------------------------
// <property/>
@@ -313,11 +314,11 @@ public class AntBuildWriter
// ----------------------------------------------------------------------
writeGetDepsTarget( writer );
- AntBuildWriterUtil.writeLineBreak( writer );
+ XmlWriterUtil.writeLineBreak( writer );
writer.endElement(); // project
- AntBuildWriterUtil.writeLineBreak( writer );
+ XmlWriterUtil.writeLineBreak( writer );
IOUtil.close( w );
}
@@ -360,18 +361,18 @@ public class AntBuildWriter
writer.addAttribute( "default", "package" );
writer.addAttribute( "basedir", "." );
- AntBuildWriterUtil.writeLineBreak( writer );
+ XmlWriterUtil.writeLineBreak( writer );
- AntBuildWriterUtil.writeCommentText( writer, "Import " + DEFAULT_MAVEN_BUILD_FILENAME
+ XmlWriterUtil.writeCommentText( writer, "Import " + DEFAULT_MAVEN_BUILD_FILENAME
+ " into the current project", 1 );
writer.startElement( "import" );
writer.addAttribute( "file", DEFAULT_MAVEN_BUILD_FILENAME );
writer.endElement(); // import
- AntBuildWriterUtil.writeLineBreak( writer, 1, 1 );
+ XmlWriterUtil.writeLineBreak( writer, 1, 1 );
- AntBuildWriterUtil.writeCommentText( writer, "Help target", 1 );
+ XmlWriterUtil.writeCommentText( writer, "Help target", 1 );
writer.startElement( "target" );
writer.addAttribute( "name", "help" );
@@ -382,11 +383,11 @@ public class AntBuildWriter
writer.endElement(); // target
- AntBuildWriterUtil.writeLineBreak( writer, 2 );
+ XmlWriterUtil.writeLineBreak( writer, 2 );
writer.endElement(); // project
- AntBuildWriterUtil.writeLineBreak( writer );
+ XmlWriterUtil.writeLineBreak( writer );
IOUtil.close( w );
}
@@ -405,7 +406,7 @@ public class AntBuildWriter
// TODO: optional in m1
// TODO: USD properties
- AntBuildWriterUtil.writeCommentText( writer, "Build environment properties", 1 );
+ XmlWriterUtil.writeCommentText( writer, "Build environment properties", 1 );
// ----------------------------------------------------------------------
// File properties to override local properties
@@ -423,7 +424,7 @@ public class AntBuildWriter
// Build properties
// ----------------------------------------------------------------------
- AntBuildWriterUtil.writeLineBreak( writer, 2, 1 );
+ XmlWriterUtil.writeLineBreak( writer, 2, 1 );
writer.startElement( "property" );
writer.addAttribute( "name", "maven.build.finalName" );
@@ -518,7 +519,7 @@ public class AntBuildWriter
// Setting properties
// ----------------------------------------------------------------------
- AntBuildWriterUtil.writeLineBreak( writer, 2, 1 );
+ XmlWriterUtil.writeLineBreak( writer, 2, 1 );
writer.startElement( "property" );
writer.addAttribute( "name", "maven.repo.local" );
@@ -535,7 +536,7 @@ public class AntBuildWriter
writer.addAttribute( "value", String.valueOf( settings.isInteractiveMode() ) );
writer.endElement(); // property
- AntBuildWriterUtil.writeLineBreak( writer );
+ XmlWriterUtil.writeLineBreak( writer );
}
/**
@@ -570,7 +571,7 @@ public class AntBuildWriter
return;
}
- AntBuildWriterUtil.writeCommentText( writer, "Defining classpaths", 1 );
+ XmlWriterUtil.writeCommentText( writer, "Defining classpaths", 1 );
writer.startElement( "path" );
writer.addAttribute( "id", "build.classpath" );
@@ -618,7 +619,7 @@ public class AntBuildWriter
writer.endElement(); // fileset
writer.endElement(); // path
- AntBuildWriterUtil.writeLineBreak( writer );
+ XmlWriterUtil.writeLineBreak( writer );
}
/**
@@ -628,7 +629,7 @@ public class AntBuildWriter
*/
private void writeCleanTarget( XMLWriter writer )
{
- AntBuildWriterUtil.writeCommentText( writer, "Cleaning up target", 1 );
+ XmlWriterUtil.writeCommentText( writer, "Cleaning up target", 1 );
writer.startElement( "target" );
writer.addAttribute( "name", "clean" );
@@ -654,7 +655,7 @@ public class AntBuildWriter
writer.endElement(); // target
- AntBuildWriterUtil.writeLineBreak( writer );
+ XmlWriterUtil.writeLineBreak( writer );
}
/**
@@ -667,7 +668,7 @@ public class AntBuildWriter
private void writeCompileTarget( XMLWriter writer, List compileSourceRoots )
throws IOException
{
- AntBuildWriterUtil.writeCommentText( writer, "Compilation target", 1 );
+ XmlWriterUtil.writeCommentText( writer, "Compilation target", 1 );
if ( AntBuildWriterUtil.isPomPackaging( project ) )
{
@@ -697,7 +698,7 @@ public class AntBuildWriter
writer.endElement(); // target
}
- AntBuildWriterUtil.writeLineBreak( writer );
+ XmlWriterUtil.writeLineBreak( writer );
}
/**
@@ -710,7 +711,7 @@ public class AntBuildWriter
private void writeCompileTestsTarget( XMLWriter writer, List testCompileSourceRoots )
throws IOException
{
- AntBuildWriterUtil.writeCommentText( writer, "Test-compilation target", 1 );
+ XmlWriterUtil.writeCommentText( writer, "Test-compilation target", 1 );
if ( AntBuildWriterUtil.isPomPackaging( project ) )
{
@@ -741,7 +742,7 @@ public class AntBuildWriter
writer.endElement(); // target
}
- AntBuildWriterUtil.writeLineBreak( writer );
+ XmlWriterUtil.writeLineBreak( writer );
}
/**
@@ -753,7 +754,7 @@ public class AntBuildWriter
private void writeTestTargets( XMLWriter writer, List testCompileSourceRoots )
throws IOException
{
- AntBuildWriterUtil.writeCommentText( writer, "Run all tests", 1 );
+ XmlWriterUtil.writeCommentText( writer, "Run all tests", 1 );
if ( AntBuildWriterUtil.isPomPackaging( project ) )
{
@@ -842,7 +843,7 @@ public class AntBuildWriter
}
writer.endElement(); // target
- AntBuildWriterUtil.writeLineBreak( writer, 2, 1 );
+ XmlWriterUtil.writeLineBreak( writer, 2, 1 );
writer.startElement( "target" );
writer.addAttribute( "name", "test-junit-present" );
@@ -854,7 +855,7 @@ public class AntBuildWriter
writer.endElement(); // target
- AntBuildWriterUtil.writeLineBreak( writer, 2, 1 );
+ XmlWriterUtil.writeLineBreak( writer, 2, 1 );
writer.startElement( "target" );
writer.addAttribute( "name", "test-junit-status" );
@@ -883,7 +884,7 @@ public class AntBuildWriter
writer.endElement(); // condition
writer.endElement(); // target
- AntBuildWriterUtil.writeLineBreak( writer, 2, 1 );
+ XmlWriterUtil.writeLineBreak( writer, 2, 1 );
writer.startElement( "target" );
writer.addAttribute( "name", "junit-missing" );
@@ -905,12 +906,12 @@ public class AntBuildWriter
writer.endElement(); // target
}
- AntBuildWriterUtil.writeLineBreak( writer );
+ XmlWriterUtil.writeLineBreak( writer );
}
/**
* Gets the include patterns for the unit tests.
- *
+ *
* @return A list of strings with include patterns, might be empty but never <code>null</code>.
*/
private List getTestIncludes()
@@ -926,7 +927,7 @@ public class AntBuildWriter
/**
* Gets the exclude patterns for the unit tests.
- *
+ *
* @return A list of strings with exclude patterns, might be empty but never <code>null</code>.
*/
private List getTestExcludes()
@@ -942,7 +943,7 @@ public class AntBuildWriter
/**
* Write the <code><fileset></code> elements for the test compile source roots.
- *
+ *
* @param writer
* @param testCompileSourceRoots
* @param includes
@@ -969,7 +970,7 @@ public class AntBuildWriter
private void writeJavadocTarget( XMLWriter writer )
throws IOException
{
- AntBuildWriterUtil.writeCommentText( writer, "Javadoc target", 1 );
+ XmlWriterUtil.writeCommentText( writer, "Javadoc target", 1 );
writer.startElement( "target" );
writer.addAttribute( "name", "javadoc" );
@@ -993,7 +994,7 @@ public class AntBuildWriter
writer.endElement(); // target
- AntBuildWriterUtil.writeLineBreak( writer );
+ XmlWriterUtil.writeLineBreak( writer );
}
/**
@@ -1006,7 +1007,7 @@ public class AntBuildWriter
throws IOException
{
String synonym = null; // type of the package we are creating (for example jar)
- AntBuildWriterUtil.writeCommentText( writer, "Package target", 1 );
+ XmlWriterUtil.writeCommentText( writer, "Package target", 1 );
writer.startElement( "target" );
writer.addAttribute( "name", "package" );
@@ -1056,11 +1057,11 @@ public class AntBuildWriter
writer.endElement(); // target
- AntBuildWriterUtil.writeLineBreak( writer );
+ XmlWriterUtil.writeLineBreak( writer );
if ( synonym != null )
{
- AntBuildWriterUtil.writeCommentText( writer,
+ XmlWriterUtil.writeCommentText( writer,
"A dummy target for the package named after the type it creates", 1 );
writer.startElement( "target" );
writer.addAttribute( "name", synonym );
@@ -1068,7 +1069,7 @@ public class AntBuildWriter
writer.addAttribute( "description", "Builds the " + synonym + " for the application" );
writer.endElement(); //target
- AntBuildWriterUtil.writeLineBreak( writer );
+ XmlWriterUtil.writeLineBreak( writer );
}
}
@@ -1216,7 +1217,7 @@ public class AntBuildWriter
return;
}
- AntBuildWriterUtil.writeCommentText( writer, "Download dependencies target", 1 );
+ XmlWriterUtil.writeCommentText( writer, "Download dependencies target", 1 );
writer.startElement( "target" );
writer.addAttribute( "name", "test-offline" );
@@ -1230,7 +1231,7 @@ public class AntBuildWriter
writer.endElement(); // condition
writer.endElement(); // target
- AntBuildWriterUtil.writeLineBreak( writer, 2, 1 );
+ XmlWriterUtil.writeLineBreak( writer, 2, 1 );
writer.startElement( "target" );
writer.addAttribute( "name", "get-deps" );
@@ -1301,7 +1302,7 @@ public class AntBuildWriter
writer.endElement(); // target
- AntBuildWriterUtil.writeLineBreak( writer );
+ XmlWriterUtil.writeLineBreak( writer );
}
// ----------------------------------------------------------------------
@@ -1356,20 +1357,20 @@ public class AntBuildWriter
return sb.toString();
}
-
+
/**
* Flattens the specified file selector options into a simple string list. For instance, the input
- *
+ *
* <pre>
* [ {include="*Test.java"}, {include="*TestCase.java"} ]
* </pre>
- *
+ *
* is converted to
- *
+ *
* <pre>
* [ "*Test.java", "*TestCase.java" ]
* </pre>
- *
+ *
* @param options The file selector options to flatten, may be <code>null</code>.
* @return The string list, might be empty but never <code>null</code>.
*/
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 b0aa3c7..0da93f8 100644
--- a/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
+++ b/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
@@ -41,6 +41,7 @@ import org.apache.maven.wagon.PathUtils;
import org.apache.xpath.XPathAPI;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.XMLWriter;
+import org.codehaus.plexus.util.xml.XmlWriterUtil;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
@@ -117,21 +118,21 @@ public class AntBuildWriterUtil
{
writeAntVersionHeader( writer );
- writeCommentLineBreak( writer );
- writeComment( writer, StringUtils.repeat( "=", 21 ) + " - DO NOT EDIT THIS FILE! - "
+ XmlWriterUtil.writeCommentLineBreak( writer );
+ XmlWriterUtil.writeComment( writer, StringUtils.repeat( "=", 21 ) + " - DO NOT EDIT THIS FILE! - "
+ StringUtils.repeat( "=", 21 ) );
- writeCommentLineBreak( writer );
- writeComment( writer, " " );
- writeComment( writer, "Any modifications will be overwritten." );
- writeComment( writer, " " );
+ XmlWriterUtil.writeCommentLineBreak( writer );
+ XmlWriterUtil.writeComment( writer, " " );
+ XmlWriterUtil.writeComment( writer, "Any modifications will be overwritten." );
+ XmlWriterUtil.writeComment( writer, " " );
DateFormat dateFormat = DateFormat.getDateTimeInstance( DateFormat.SHORT, DateFormat.SHORT, Locale.US );
- writeComment( writer, "Generated by Maven Ant Plugin on "
+ XmlWriterUtil.writeComment( writer, "Generated by Maven Ant Plugin on "
+ dateFormat.format( new Date( System.currentTimeMillis() ) ) );
- writeComment( writer, "See: http://maven.apache.org/plugins/maven-ant-plugin/" );
- writeComment( writer, " " );
- writeCommentLineBreak( writer );
+ XmlWriterUtil.writeComment( writer, "See: http://maven.apache.org/plugins/maven-ant-plugin/" );
+ XmlWriterUtil.writeComment( writer, " " );
+ XmlWriterUtil.writeCommentLineBreak( writer );
- writeLineBreak( writer );
+ XmlWriterUtil.writeLineBreak( writer );
}
/**
@@ -141,143 +142,7 @@ public class AntBuildWriterUtil
*/
public static void writeAntVersionHeader( XMLWriter writer )
{
- writeCommentText( writer, "Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.", 0 );
- }
-
- /**
- * Convenience method to write one <code>CRLF</code>
- *
- * @param writer not null writer
- */
- public static void writeLineBreak( XMLWriter writer )
- {
- writeLineBreak( writer, 1 );
- }
-
- /**
- * Convenience method to repeat <code>CRLF</code>
- *
- * @param writer not null
- * @param repeat
- */
- public static void writeLineBreak( XMLWriter writer, int repeat )
- {
- for ( int i = 0; i < repeat; i++ )
- {
- writer.writeMarkup( "\n" );
- }
- }
-
- /**
- * Convenience method to repeat <code>CRLF</code> and to indent the writer
- *
- * @param writer not null
- * @param repeat
- * @param indent postive number
- */
- public static void writeLineBreak( XMLWriter writer, int repeat, int indent )
- {
- writeLineBreak( writer, repeat );
-
- if ( indent < 0 )
- {
- indent = 0;
- }
-
- writer.writeText( StringUtils.repeat( " ", indent * AntBuildWriter.DEFAULT_INDENTATION_SIZE ) );
- }
-
- /**
- * Convenience method to write XML comment line break. Its size is 80.
- *
- * @param writer not null
- */
- public static void writeCommentLineBreak( XMLWriter writer )
- {
- writer.writeMarkup( "<!-- " + StringUtils.repeat( "=", 70 ) + " -->\n" );
- }
-
- /**
- * Convenience method to write XML comment line. The <code>comment</code> is splitted to have a size of 80.
- *
- * @param writer not null
- * @param comment
- */
- public static void writeComment( XMLWriter writer, String comment )
- {
- if ( comment == null )
- {
- comment = "null";
- }
-
- String[] words = StringUtils.split( comment, " " );
-
- StringBuffer line = new StringBuffer( "<!-- " );
- for ( int i = 0; i < words.length; i++ )
- {
- String[] sentences = StringUtils.split( words[i], "\n" );
- if ( sentences.length > 1 )
- {
- for ( int j = 0; j < sentences.length - 1; j++ )
- {
- line.append( sentences[j] ).append( ' ' );
- line.append( StringUtils.repeat( " ", 76 - line.length() ) ).append( "-->" ).append( '\n' );
- writer.writeMarkup( line.toString() );
- line = new StringBuffer( "<!-- " );
- }
- line.append( sentences[sentences.length - 1] ).append( ' ' );
- }
- else
- {
- StringBuffer sentenceTmp = new StringBuffer( line.toString() );
- sentenceTmp.append( words[i] ).append( ' ' );
- if ( sentenceTmp.length() > 76 )
- {
- line.append( StringUtils.repeat( " ", 76 - line.length() ) ).append( "-->" ).append( '\n' );
- writer.writeMarkup( line.toString() );
- line = new StringBuffer( "<!-- " );
- line.append( words[i] ).append( ' ' );
- }
- else
- {
- line.append( words[i] ).append( ' ' );
- }
- }
- }
- if ( line.length() <= 76 )
- {
- line.append( StringUtils.repeat( " ", 76 - line.length() ) ).append( "-->" ).append( '\n' );
- }
- writer.writeMarkup( line.toString() );
- }
-
- /**
- * Convenience method to write XML comment between two comment line break.
- * The XML comment block is also indented.
- *
- * @param writer not null
- * @param comment
- * @param indent
- */
- public static void writeCommentText( XMLWriter writer, String comment, int indent )
- {
- if ( indent < 0 )
- {
- indent = 0;
- }
-
- writeLineBreak( writer, 1 );
-
- writer.writeMarkup( StringUtils.repeat( " ", indent * AntBuildWriter.DEFAULT_INDENTATION_SIZE ) );
- writeCommentLineBreak( writer );
-
- writer.writeMarkup( StringUtils.repeat( " ", indent * AntBuildWriter.DEFAULT_INDENTATION_SIZE ) );
- writeComment( writer, comment );
-
- writer.writeMarkup( StringUtils.repeat( " ", indent * AntBuildWriter.DEFAULT_INDENTATION_SIZE ) );
- writeCommentLineBreak( writer );
-
- writeLineBreak( writer, 1, indent );
+ XmlWriterUtil.writeCommentText( writer, "Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.", 0 );
}
/**
@@ -691,7 +556,7 @@ public class AntBuildWriterUtil
{
writer.addAttribute( "\n"
+ StringUtils.repeat( " ", ( StringUtils.isEmpty( tag ) ? 0 : tag.length() ) + indent
- * AntBuildWriter.DEFAULT_INDENTATION_SIZE ) + name, value );
+ * XmlWriterUtil.DEFAULT_INDENTATION_SIZE ) + name, value );
}
}
@@ -1324,7 +1189,7 @@ public class AntBuildWriterUtil
/**
* Checks whether the specified node has element content or consists only of character data.
- *
+ *
* @param node The node to test, may be <code>null</code>.
* @return <code>true</code> if any child node is an element, <code>false</code> otherwise.
*/
@@ -1348,7 +1213,7 @@ public class AntBuildWriterUtil
/**
* Gets the text content of the specified node.
- *
+ *
* @param node The node whose text contents should be retrieved, may be <code>null</code>.
* @return The text content of the node, can be empty but never <code>null</code>.
*/
@@ -1372,13 +1237,13 @@ public class AntBuildWriterUtil
/**
* Gets the singular form of the specified (English) plural form. For example:
- *
+ *
* <pre>
* properties -> property
* branches -> branch
* reports -> report
* </pre>
- *
+ *
* @param pluralForm The plural form for which to derive the singular form, may be <code>null</code>.
* @return The corresponding singular form or an empty string if the input string was not recognized as a plural
* form.
diff --git a/src/test/java/org/apache/maven/plugin/ant/AntBuildWriterUtilTest.java b/src/test/java/org/apache/maven/plugin/ant/AntBuildWriterUtilTest.java
index e1b7cb7..56f22af 100644
--- a/src/test/java/org/apache/maven/plugin/ant/AntBuildWriterUtilTest.java
+++ b/src/test/java/org/apache/maven/plugin/ant/AntBuildWriterUtilTest.java
@@ -29,6 +29,7 @@ import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
import org.codehaus.plexus.util.xml.XMLWriter;
+import org.codehaus.plexus.util.xml.XmlWriterUtil;
/**
* Test cases for 'org.apache.maven.plugin.ant.AntBuildWriterUtil'
@@ -46,7 +47,7 @@ public class AntBuildWriterUtilTest
{
StringWriter s = new StringWriter();
XMLWriter writer = new PrettyPrintXMLWriter( s );
- AntBuildWriterUtil.writeComment( writer, null );
+ XmlWriterUtil.writeComment( writer, null );
StringBuffer sb = new StringBuffer();
sb.append( "<!-- null -->" ).append( '\n' );
assertTrue( s.toString().equals( sb.toString() ) );
@@ -59,7 +60,7 @@ public class AntBuildWriterUtilTest
{
StringWriter s = new StringWriter();
XMLWriter writer = new PrettyPrintXMLWriter( s );
- AntBuildWriterUtil.writeComment( writer, "This is a short text" );
+ XmlWriterUtil.writeComment( writer, "This is a short text" );
StringBuffer sb = new StringBuffer();
sb.append( "<!-- This is a short text -->" ).append( '\n' );
assertTrue( s.toString().equals( sb.toString() ) );
@@ -72,7 +73,7 @@ public class AntBuildWriterUtilTest
{
StringWriter s = new StringWriter();
XMLWriter writer = new PrettyPrintXMLWriter( s );
- AntBuildWriterUtil.writeComment( writer, "Maven is a software project management and comprehension tool. "
+ XmlWriterUtil.writeComment( writer, "Maven is a software project management and comprehension tool. "
+ "Based on the concept of a project object model (POM), Maven can manage a project's build, reporting "
+ "and documentation from a central piece of information." );
StringBuffer sb = new StringBuffer();
@@ -180,7 +181,7 @@ public class AntBuildWriterUtilTest
/**
* Test method for {@link AntBuildWriterUtil#getSingularForm(String)}.
- *
+ *
* @throws Exception
*/
public static void testGetSingularForm()
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 02/42: o add SCM
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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 09dd11764e289b89721d03aaf8e5ad17741a453e
Author: Vincent Siveton <vs...@apache.org>
AuthorDate: Tue May 20 01:05:21 2008 +0000
o add SCM
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@658065 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/pom.xml b/pom.xml
index 3c3b296..a5fffa7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,6 +42,12 @@ under the License.
<url>http://jira.codehaus.org/browse/MANT</url>
</issueManagement>
+ <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>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 35/42: o Updated to maven-invoker-plugin:1.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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 45dd97b3b8e99d200c76626147dab24acb8edc04
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Fri Nov 14 08:57:19 2008 +0000
o Updated to maven-invoker-plugin:1.3
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@713954 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 15 +--------------
src/it/ear-it/goals-2.txt | 1 -
src/it/ear-it/goals.txt | 3 ---
src/it/ear-it/invoker.properties | 3 +++
src/it/encoding-it/goals.txt | 3 ---
src/it/file-repo-it/goals.txt | 3 ---
src/it/plugin-it/goals.txt | 3 ---
src/it/relative-path-it/goals.txt | 3 ---
src/it/settings.xml | 4 ++--
src/it/single-test-it/goals.txt | 3 ---
src/it/skip-missing-junit-it/goals.txt | 3 ---
src/it/skip-test-compilation-it/goals.txt | 3 ---
src/it/skip-test-execution-it/goals.txt | 3 ---
src/it/test-custom-selector-it/goals.txt | 3 ---
src/it/test-default-selector-it/goals.txt | 3 ---
src/it/webapp-it/goals.txt | 3 ---
16 files changed, 6 insertions(+), 53 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2cc13fd..f10fd12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -148,6 +148,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
+ <version>1.3</version>
<configuration>
<debug>true</debug>
<projectsDirectory>src/it</projectsDirectory>
@@ -172,20 +173,6 @@ under the License.
<goal>run</goal>
</goals>
</execution>
- <!-- TODO: Remove execution once MINVOKER-46 is released -->
- <execution>
- <id>integration-test-phase-2</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <pomIncludes>
- <pomInclude>ear-it/pom.xml</pomInclude>
- </pomIncludes>
- <goalsFile>goals-2.txt</goalsFile>
- </configuration>
- </execution>
</executions>
</plugin>
</plugins>
diff --git a/src/it/ear-it/goals-2.txt b/src/it/ear-it/goals-2.txt
deleted file mode 100644
index 7179f2c..0000000
--- a/src/it/ear-it/goals-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-antrun:run
diff --git a/src/it/ear-it/goals.txt b/src/it/ear-it/goals.txt
deleted file mode 100644
index 96f7752..0000000
--- a/src/it/ear-it/goals.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-clean
-install
-ant:ant
diff --git a/src/it/ear-it/invoker.properties b/src/it/ear-it/invoker.properties
new file mode 100644
index 0000000..d64c783
--- /dev/null
+++ b/src/it/ear-it/invoker.properties
@@ -0,0 +1,3 @@
+invoker.goals.1 = clean install ant:ant
+invoker.goals.2 = antrun:run
+invoker.nonRecursive.2 = true
diff --git a/src/it/encoding-it/goals.txt b/src/it/encoding-it/goals.txt
deleted file mode 100644
index 4524f24..0000000
--- a/src/it/encoding-it/goals.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-clean
-ant:ant
-antrun:run
diff --git a/src/it/file-repo-it/goals.txt b/src/it/file-repo-it/goals.txt
deleted file mode 100644
index 4524f24..0000000
--- a/src/it/file-repo-it/goals.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-clean
-ant:ant
-antrun:run
diff --git a/src/it/plugin-it/goals.txt b/src/it/plugin-it/goals.txt
deleted file mode 100644
index 4524f24..0000000
--- a/src/it/plugin-it/goals.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-clean
-ant:ant
-antrun:run
diff --git a/src/it/relative-path-it/goals.txt b/src/it/relative-path-it/goals.txt
deleted file mode 100644
index 4524f24..0000000
--- a/src/it/relative-path-it/goals.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-clean
-ant:ant
-antrun:run
diff --git a/src/it/settings.xml b/src/it/settings.xml
index 11e4382..68f23d0 100644
--- a/src/it/settings.xml
+++ b/src/it/settings.xml
@@ -29,7 +29,7 @@ under the License.
<repositories>
<repository>
<id>local.central</id>
- <url>file:///@localRepository@</url>
+ <url>@localRepositoryUrl@</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -52,7 +52,7 @@ under the License.
<pluginRepositories>
<pluginRepository>
<id>local.central</id>
- <url>file:///@localRepository@</url>
+ <url>@localRepositoryUrl@</url>
<releases>
<enabled>true</enabled>
</releases>
diff --git a/src/it/single-test-it/goals.txt b/src/it/single-test-it/goals.txt
deleted file mode 100644
index 4524f24..0000000
--- a/src/it/single-test-it/goals.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-clean
-ant:ant
-antrun:run
diff --git a/src/it/skip-missing-junit-it/goals.txt b/src/it/skip-missing-junit-it/goals.txt
deleted file mode 100644
index 4524f24..0000000
--- a/src/it/skip-missing-junit-it/goals.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-clean
-ant:ant
-antrun:run
diff --git a/src/it/skip-test-compilation-it/goals.txt b/src/it/skip-test-compilation-it/goals.txt
deleted file mode 100644
index 4524f24..0000000
--- a/src/it/skip-test-compilation-it/goals.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-clean
-ant:ant
-antrun:run
diff --git a/src/it/skip-test-execution-it/goals.txt b/src/it/skip-test-execution-it/goals.txt
deleted file mode 100644
index 4524f24..0000000
--- a/src/it/skip-test-execution-it/goals.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-clean
-ant:ant
-antrun:run
diff --git a/src/it/test-custom-selector-it/goals.txt b/src/it/test-custom-selector-it/goals.txt
deleted file mode 100644
index 4524f24..0000000
--- a/src/it/test-custom-selector-it/goals.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-clean
-ant:ant
-antrun:run
diff --git a/src/it/test-default-selector-it/goals.txt b/src/it/test-default-selector-it/goals.txt
deleted file mode 100644
index 4524f24..0000000
--- a/src/it/test-default-selector-it/goals.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-clean
-ant:ant
-antrun:run
diff --git a/src/it/webapp-it/goals.txt b/src/it/webapp-it/goals.txt
deleted file mode 100644
index 4524f24..0000000
--- a/src/it/webapp-it/goals.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-clean
-ant:ant
-antrun:run
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 14/42: o Used Install Plugin for IT staging to
workaround MINVOKER-43 o Removed unnecessary repos from IT POMs
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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 970439001e8b0a39d20cdf172609eb4c011d7da0
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Mon Jul 28 16:07:07 2008 +0000
o Used Install Plugin for IT staging to workaround MINVOKER-43
o Removed unnecessary repos from IT POMs
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@680385 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 27 +++++++++++++++++++++++
src/it/ear-it/pom.xml | 35 -----------------------------
src/it/plugin-it/pom.xml | 57 ------------------------------------------------
src/it/webapp-it/pom.xml | 35 -----------------------------
4 files changed, 27 insertions(+), 127 deletions(-)
diff --git a/pom.xml b/pom.xml
index d0b284c..368bd9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -199,6 +199,33 @@ under the License.
</execution>
</executions>
</plugin>
+ <!-- TODO: Remove this plugin execution once MINVOKER-43 is released -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <id>it-preparation</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>install-file</goal>
+ </goals>
+ <configuration>
+ <file>${project.build.directory}/${project.build.finalName}.jar</file>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>${project.version}</version>
+ <packaging>${project.packaging}</packaging>
+ <pomFile>${basedir}/pom.xml</pomFile>
+ <createChecksum>true</createChecksum>
+ <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+ <!-- NOTE: must match identifier of real local repository or metadata lookup during ITs will misbehave -->
+ <localRepositoryId>local</localRepositoryId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
diff --git a/src/it/ear-it/pom.xml b/src/it/ear-it/pom.xml
index 929cc0d..86b2fca 100644
--- a/src/it/ear-it/pom.xml
+++ b/src/it/ear-it/pom.xml
@@ -36,41 +36,6 @@ under the License.
<module>ear</module>
</modules>
- <repositories>
- <!-- Local repo defined by the maven-install-plugin in maven-ant-plugin pom -->
- <repository>
- <id>it-local-repo</id>
- <url>file://${basedir}/../../../target/local-repo</url>
- </repository>
- <!-- Need Apache Snapshot -->
- <repository>
- <id>apache.snapshots</id>
- <name>Maven Snapshots</name>
- <url>http://people.apache.org/maven-snapshot-repository</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <!-- No Plugin Snapshot -->
- <pluginRepositories>
- <pluginRepository>
- <id>apache.snapshots</id>
- <name>Maven Plugin Snapshots</name>
- <url>http://people.apache.org/maven-snapshot-repository</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
-
<build>
<plugins>
<plugin>
diff --git a/src/it/plugin-it/pom.xml b/src/it/plugin-it/pom.xml
index f492f3c..d57b71c 100644
--- a/src/it/plugin-it/pom.xml
+++ b/src/it/plugin-it/pom.xml
@@ -28,63 +28,6 @@ under the License.
<version>1.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
- <repositories>
- <!-- Local repo defined by the maven-install-plugin in maven-ant-plugin pom -->
- <repository>
- <id>it-local-repo</id>
- <url>file://${basedir}/../../../target/local-repo</url>
- </repository>
- <!-- Need Apache Snapshot -->
- <repository>
- <id>apache.snapshots</id>
- <name>Maven Snapshots</name>
- <url>http://people.apache.org/maven-snapshot-repository</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>repo1</id>
- <name>Maven2</name>
- <url>http://repo1.maven.org/maven2</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <!-- No Plugin Snapshot -->
- <pluginRepositories>
- <pluginRepository>
- <id>apache.snapshots</id>
- <name>Maven Plugin Snapshots</name>
- <url>http://people.apache.org/maven-snapshot-repository</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- <pluginRepository>
- <id>repo1</id>
- <name>Maven2</name>
- <url>http://repo1.maven.org/maven2</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
-
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
diff --git a/src/it/webapp-it/pom.xml b/src/it/webapp-it/pom.xml
index 72f8589..1fd5fb5 100644
--- a/src/it/webapp-it/pom.xml
+++ b/src/it/webapp-it/pom.xml
@@ -38,41 +38,6 @@ under the License.
</dependency>
</dependencies>
- <repositories>
- <!-- Local repo defined by the maven-install-plugin in maven-ant-plugin pom -->
- <repository>
- <id>it-local-repo</id>
- <url>file://${basedir}/../../../target/local-repo</url>
- </repository>
- <!-- Need Apache Snapshot -->
- <repository>
- <id>apache.snapshots</id>
- <name>Maven Snapshots</name>
- <url>http://people.apache.org/maven-snapshot-repository</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <!-- No Plugin Snapshot -->
- <pluginRepositories>
- <pluginRepository>
- <id>apache.snapshots</id>
- <name>Maven Plugin Snapshots</name>
- <url>http://people.apache.org/maven-snapshot-repository</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
-
<build>
<finalName>ant-webapp-test</finalName>
<plugins>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 09/42: Adding plexus snapshots repo to
settings.xml for integration testing until plexus-utils dependency version
is bumped off of -SNAPSHOT version.
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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 1474acce033b14d0ab13b67a813f8a8821881f0a
Author: John Dennis Casey <jd...@apache.org>
AuthorDate: Tue Jun 17 21:30:39 2008 +0000
Adding plexus snapshots repo to settings.xml for integration testing until plexus-utils dependency version is bumped off of -SNAPSHOT version.
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@668836 13f79535-47bb-0310-9956-ffa450edef68
---
src/it/settings.xml | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/src/it/settings.xml b/src/it/settings.xml
index a1c1028..d80623e 100644
--- a/src/it/settings.xml
+++ b/src/it/settings.xml
@@ -17,6 +17,17 @@
<enabled>true</enabled>
</snapshots>
</repository>
+ <!-- Remove this once plexus-utils dependency is bumped out of -SNAPSHOT -->
+ <repository>
+ <id>plexus.snapshots</id>
+ <url>http://snapshots.repository.codehaus.org/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
</repositories>
<pluginRepositories>
<pluginRepository>
@@ -29,6 +40,17 @@
<enabled>true</enabled>
</snapshots>
</pluginRepository>
+ <!-- Remove this once plexus-utils dependency is bumped out of -SNAPSHOT -->
+ <pluginRepository>
+ <id>plexus.snapshots</id>
+ <url>http://snapshots.repository.codehaus.org/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
</pluginRepositories>
</profile>
</profiles>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 26/42: o Updated index page of plugin site
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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 982af634bf37c9b30c9e4042cda4378ca804ca62
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Tue Aug 26 09:57:03 2008 +0000
o Updated index page of plugin site
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@689012 13f79535-47bb-0310-9956-ffa450edef68
---
src/site/apt/index.apt | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index 858974a..8788e73 100644
--- a/src/site/apt/index.apt
+++ b/src/site/apt/index.apt
@@ -41,7 +41,21 @@ Maven 2 Ant Plugin
* Usage
- Instructions on how to use the Ant Plugin can be found on the {{{usage.html}usage page}}.
+ 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.
+
+ 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 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
+ 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
+ {{{http://maven.apache.org/guides/development/guide-helping.html}guide to helping with Maven}}.
* Examples
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 28/42: o Changed encoding of site descriptor to
UTF-8 just like used for POMs o Updated/added license headers
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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 3aa6c64e5d4683289eae52c866e1a0a6994e6ca3
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Tue Aug 26 13:36:10 2008 +0000
o Changed encoding of site descriptor to UTF-8 just like used for POMs
o Updated/added license headers
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@689071 13f79535-47bb-0310-9956-ffa450edef68
---
src/site/site.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/site/site.xml b/src/site/site.xml
index 10b1e56..bf15514 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 33/42: [MANT-44] Generated ant copy commands in
package target point to hard-coded local repository instead of
${maven.repo.local}
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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 2cd5a082a43e79cf3767ab6864b51b31c24090df
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Wed Sep 3 14:43:28 2008 +0000
[MANT-44] Generated ant copy commands in package target point to hard-coded local repository instead of ${maven.repo.local}
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@691629 13f79535-47bb-0310-9956-ffa450edef68
---
src/it/webapp-it/pom.xml | 6 ++++++
src/it/webapp-it/verify.bsh | 16 +++++++++++++++-
.../org/apache/maven/plugin/ant/AntBuildWriter.java | 2 +-
.../apache/maven/plugin/ant/AntBuildWriterUtil.java | 19 ++++++++++++++-----
4 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/src/it/webapp-it/pom.xml b/src/it/webapp-it/pom.xml
index 2d432c0..954b253 100644
--- a/src/it/webapp-it/pom.xml
+++ b/src/it/webapp-it/pom.xml
@@ -29,8 +29,14 @@ under the License.
<version>1.0-SNAPSHOT</version>
<name>Webapp project</name>
<url>http://maven.apache.org</url>
+
<dependencies>
<dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.2</version>
diff --git a/src/it/webapp-it/verify.bsh b/src/it/webapp-it/verify.bsh
index 8f2ba8b..b9dc041 100644
--- a/src/it/webapp-it/verify.bsh
+++ b/src/it/webapp-it/verify.bsh
@@ -2,8 +2,9 @@ import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.util.jar.*;
+import java.util.regex.*;
-import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.*;
try
{
@@ -19,12 +20,24 @@ try
System.err.println( "The file '" + build.getAbsolutePath() + "' is a directory or doesn't exist." );
return false;
}
+
mavenBuild = new File( basedir, "maven-build.xml" );
if ( mavenBuild.isDirectory() || !mavenBuild.exists() )
{
System.err.println( "The file '" + mavenBuild.getAbsolutePath() + "' is a directory or doesn't exist." );
return false;
}
+
+ String xml = FileUtils.fileRead( mavenBuild, "UTF-8" );
+ Matcher m0 = Pattern.compile( "<copy\\s+file\\s*=\\s*\\Q\"${maven.repo.local}/log4j/log4j/1.2.14/log4j-1.2.14.jar\"\\E"
+ + "\\s*todir\\s*=\\s*\\Q\"${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib\"\\E" ).matcher( xml );
+ System.out.println( "Checking for existence of <copy> from ${maven.repo.local} for WAR libs" );
+ if ( !m0.find() )
+ {
+ System.err.println( "FAILED!\n" + xml );
+ return false;
+ }
+
mavenBuildProperties = new File( basedir, "maven-build.properties" );
if ( mavenBuildProperties.isDirectory() || !mavenBuildProperties.exists() )
{
@@ -48,6 +61,7 @@ try
"WEB-INF/test.txt",
"WEB-INF/classes/test.properties",
"WEB-INF/classes/org/MyClass.class",
+ "WEB-INF/lib/log4j-1.2.14.jar",
};
for ( String entry : expected )
{
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 61f22dd..915761a 100644
--- a/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
+++ b/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
@@ -1039,7 +1039,7 @@ public class AntBuildWriter
}
else if ( AntBuildWriterUtil.isEarPackaging( project ) )
{
- AntBuildWriterUtil.writeEarTask( writer, project );
+ AntBuildWriterUtil.writeEarTask( writer, project, localRepository );
synonym = "ear";
}
else if ( AntBuildWriterUtil.isWarPackaging( project ) )
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 c5b052f..d7f42f2 100644
--- a/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
+++ b/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
@@ -452,12 +452,13 @@ public class AntBuildWriterUtil
*
* @param writer not null
* @param project not null
+ * @param localRepository not null
* @throws IOException if any
*/
- public static void writeEarTask( XMLWriter writer, MavenProject project )
+ public static void writeEarTask( XMLWriter writer, MavenProject project, File localRepository )
throws IOException
{
- writeCopyLib( writer, project, "${maven.build.dir}/${maven.build.finalName}" );
+ writeCopyLib( writer, project, localRepository, "${maven.build.dir}/${maven.build.finalName}" );
writer.startElement( "ear" );
writer.addAttribute( "destfile", "${maven.build.dir}/${maven.build.finalName}.ear" );
@@ -502,7 +503,7 @@ public class AntBuildWriterUtil
webXml = webXml.substring( "${basedir}/".length() );
}
- writeCopyLib( writer, project, "${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib" );
+ writeCopyLib( writer, project, localRepository, "${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib" );
writer.startElement( "war" );
writer.addAttribute( "destfile", "${maven.build.dir}/${maven.build.finalName}.war" );
@@ -1108,9 +1109,10 @@ public class AntBuildWriterUtil
*
* @param writer not null
* @param project not null
+ * @param localRepository not null
* @param outputDir not null
*/
- private static void writeCopyLib( XMLWriter writer, MavenProject project, String outputDir )
+ private static void writeCopyLib( XMLWriter writer, MavenProject project, File localRepository, String outputDir )
{
writer.startElement( "mkdir" );
writer.addAttribute( "dir", outputDir );
@@ -1125,8 +1127,15 @@ public class AntBuildWriterUtil
if ( !artifact.getScope().equals( Artifact.SCOPE_PROVIDED )
&& !artifact.getScope().equals( Artifact.SCOPE_TEST ) )
{
+ String path = artifact.getFile().getPath();
+ path = toRelative( localRepository, path );
+ if ( !new File( path ).isAbsolute() )
+ {
+ path = "${maven.repo.local}/" + path;
+ }
+
writer.startElement( "copy" );
- writer.addAttribute( "file", artifact.getFile().getPath() );
+ writer.addAttribute( "file", path );
addWrapAttribute( writer, "copy", "todir", outputDir, 3 );
writer.endElement(); // copy
}
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 21/42: o Synced stub dependency with POM
dependency
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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit abe088c72062d221ddf6aaa6f085de5d94bb7a3e
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Wed Aug 6 20:43:27 2008 +0000
o Synced stub dependency with POM dependency
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@683400 13f79535-47bb-0310-9956-ffa450edef68
---
.../maven/plugin/ant/stubs/AbstractAntTestMavenProjectStub.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/test/java/org/apache/maven/plugin/ant/stubs/AbstractAntTestMavenProjectStub.java b/src/test/java/org/apache/maven/plugin/ant/stubs/AbstractAntTestMavenProjectStub.java
index dd25542..fcc135a 100644
--- a/src/test/java/org/apache/maven/plugin/ant/stubs/AbstractAntTestMavenProjectStub.java
+++ b/src/test/java/org/apache/maven/plugin/ant/stubs/AbstractAntTestMavenProjectStub.java
@@ -149,10 +149,10 @@ public abstract class AbstractAntTestMavenProjectStub
*/
public List getCompileArtifacts()
{
- Artifact junit = new DefaultArtifact( "junit", "junit", VersionRange.createFromVersion( "3.8.1" ),
+ Artifact junit = new DefaultArtifact( "junit", "junit", VersionRange.createFromVersion( "3.8.2" ),
Artifact.SCOPE_TEST, "jar", null, new DefaultArtifactHandler( "jar" ),
false );
- junit.setFile( new File( "junit/junit/3.8.1/junit-3.8.1.jar" ) );
+ junit.setFile( new File( "junit/junit/3.8.2/junit-3.8.2.jar" ) );
return Collections.singletonList( junit );
}
@@ -162,10 +162,10 @@ public abstract class AbstractAntTestMavenProjectStub
*/
public List getTestArtifacts()
{
- Artifact junit = new DefaultArtifact( "junit", "junit", VersionRange.createFromVersion( "3.8.1" ),
+ Artifact junit = new DefaultArtifact( "junit", "junit", VersionRange.createFromVersion( "3.8.2" ),
Artifact.SCOPE_TEST, "jar", null, new DefaultArtifactHandler( "jar" ),
false );
- junit.setFile( new File( "junit/junit/3.8.1/junit-3.8.1.jar" ) );
+ junit.setFile( new File( "junit/junit/3.8.2/junit-3.8.2.jar" ) );
return Collections.singletonList( junit );
}
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 30/42: o Updated index page of plugin site
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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 5d64155b09113a83400fc921a1c8ee068fcfdfb7
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Fri Aug 29 13:27:05 2008 +0000
o Updated index page of plugin site
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@690250 13f79535-47bb-0310-9956-ffa450edef68
---
src/site/apt/index.apt | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index bcf2777..dcdf193 100644
--- a/src/site/apt/index.apt
+++ b/src/site/apt/index.apt
@@ -42,12 +42,14 @@ Maven Ant Plugin
* Usage
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.
+ 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
already contain the answer to your question as part of an older thread. Hence, it is also worth browsing/searching
- the 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
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 04/42: [maven-release-plugin] prepare release
maven-ant-plugin-2.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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 4a1f5c5f9fe74aadfb5753879f6b87a244a51738
Author: Vincent Siveton <vs...@apache.org>
AuthorDate: Tue May 20 02:02:13 2008 +0000
[maven-release-plugin] prepare release maven-ant-plugin-2.1
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@658085 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 08ae3ac..fa832ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@ under the License.
<artifactId>maven-ant-plugin</artifactId>
<packaging>maven-plugin</packaging>
<name>Maven Ant Plugin</name>
- <version>2.1-SNAPSHOT</version>
+ <version>2.1</version>
<prerequisites>
<maven>2.0.6</maven>
@@ -43,9 +43,9 @@ under the License.
</issueManagement>
<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.1</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-ant-plugin-2.1</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/plugins/tags/maven-ant-plugin-2.1</url>
</scm>
<dependencies>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 18/42: Align activation properties for
integration-tests profile because we cannot setup it in the parent (see
MNG-3228)
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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 47cc92f8b530966b5f2ca61b3e5515b9a4e1c637
Author: Arnaud Heritier <ah...@apache.org>
AuthorDate: Tue Aug 5 13:22:01 2008 +0000
Align activation properties for integration-tests profile because we cannot setup it in the parent (see MNG-3228)
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@682707 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index bf30558..b5c5144 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
@@ -144,6 +144,12 @@ under the License.
<profiles>
<profile>
<id>integration-tests</id>
+ <activation>
+ <property>
+ <name>skipTests</name>
+ <value>!true</value>
+ </property>
+ </activation>
<build>
<plugins>
<plugin>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 42/42: [maven-release-plugin] copy for tag
maven-ant-plugin-2.1.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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 193b2e4cf69ceca4855f96608a8ebae5b4a8a43b
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Mon Apr 13 09:51:50 2009 +0000
[maven-release-plugin] copy for tag maven-ant-plugin-2.1.1
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/tags/maven-ant-plugin-2.1.1@764386 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 87121a5..4d706da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@ under the License.
</parent>
<artifactId>maven-ant-plugin</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.1</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.1.1</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-ant-plugin-2.1.1</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/plugins/tags/maven-ant-plugin-2.1.1</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] 27/42: o Unified plugin name
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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 8d123aca5924af9947c2e78db52361bf19aa1f39
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Tue Aug 26 13:01:43 2008 +0000
o Unified plugin name
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@689057 13f79535-47bb-0310-9956-ffa450edef68
---
src/site/apt/index.apt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index 8788e73..bcf2777 100644
--- a/src/site/apt/index.apt
+++ b/src/site/apt/index.apt
@@ -27,7 +27,7 @@
~~ http://maven.apache.org/doxia/references/apt-format.html
-Maven 2 Ant Plugin
+Maven Ant Plugin
The Ant Plugin generates build files for {{{http://ant.apache.org/}Ant}} 1.6.2 or above from the POM.
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 10/42: o Handled URL decoding to prepare for the
day when the Maven core will use RFC-compliant URLs
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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 7d9e0ac5549137a3d064b0b1883345a0bf8f8b49
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Wed Jun 18 19:43:43 2008 +0000
o Handled URL decoding to prepare for the day when the Maven core will use RFC-compliant URLs
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@669269 13f79535-47bb-0310-9956-ffa450edef68
---
.../apache/maven/plugin/ant/AntBuildWriter.java | 66 +++++++++++++++++++---
.../maven/plugin/ant/AntBuildWriterTest.java | 64 +++++++++++++++++++++
2 files changed, 121 insertions(+), 9 deletions(-)
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 33d5283..8cada3a 100644
--- a/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
+++ b/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
@@ -23,6 +23,7 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
+import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
@@ -37,6 +38,7 @@ import org.apache.maven.project.MavenProject;
import org.apache.maven.settings.Settings;
import org.apache.maven.wagon.PathUtils;
import org.apache.tools.ant.Main;
+import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
@@ -1269,20 +1271,16 @@ public class AntBuildWriter
Repository repository = (Repository) j.next();
String url = repository.getUrl();
- if ( url.regionMatches( true, 0, "file:", 0, 5 ) && url.indexOf( basedir ) > 0 )
+ String localDir = getProjectRepoDirectory( url, basedir );
+ if ( localDir != null )
{
- url = url.substring( url.indexOf( basedir ) + basedir.length() );
- if ( url.startsWith( "/" ) )
+ if ( localDir.length() > 0 && !localDir.endsWith( "/" ) )
{
- url = url.substring( 1 );
- }
- if ( !url.endsWith( "/" ) && url.length() > 0 )
- {
- url += '/';
+ localDir += '/';
}
writer.startElement( "copy" );
- writer.addAttribute( "file", url + path );
+ writer.addAttribute( "file", localDir + path );
AntBuildWriterUtil.addWrapAttribute( writer, "copy", "tofile", "${maven.repo.local}/" + path, 3 );
AntBuildWriterUtil.addWrapAttribute( writer, "copy", "failonerror", "false", 3 );
writer.endElement(); // copy
@@ -1305,6 +1303,56 @@ public class AntBuildWriter
XmlWriterUtil.writeLineBreak( writer );
}
+ /**
+ * Gets the relative path to a repository that is rooted in the project. The returned path (if any) will always use
+ * the forward slash ('/') as the directory separator. For example, the path "target/it-repo" will be returned for a
+ * repository constructed from the URL "file://${basedir}/target/it-repo".
+ *
+ * @param repoUrl The URL to the repository, must not be <code>null</code>.
+ * @param projectDir The absolute path to the base directory of the project, must not be <code>null</code>
+ * @return The path to the repository (relative to the project base directory) or <code>null</code> if the
+ * repository is not rooted in the project.
+ */
+ static String getProjectRepoDirectory( String repoUrl, String projectDir )
+ {
+ try
+ {
+ /*
+ * NOTE: The usual way of constructing repo URLs rooted in the project is "file://${basedir}" or
+ * "file:/${basedir}". None of these forms delivers a valid URL on both Unix and Windows (even ignoring URL
+ * encoding), one platform will end up with the first directory of the path being interpreted as the host
+ * name...
+ */
+ if ( repoUrl.regionMatches( true, 0, "file://", 0, 7 ) )
+ {
+ String temp = repoUrl.substring( 7 );
+ if ( !temp.startsWith( "/" ) && !temp.regionMatches( true, 0, "localhost/", 0, 10 ) )
+ {
+ repoUrl = "file:///" + temp;
+ }
+ }
+ String path = FileUtils.toFile( new URL( repoUrl ) ).getPath();
+ if ( path.startsWith( projectDir ) )
+ {
+ path = path.substring( projectDir.length() ).replace( '\\', '/' );
+ if ( path.startsWith( "/" ) )
+ {
+ path = path.substring( 1 );
+ }
+ if ( path.endsWith( "/" ) )
+ {
+ path = path.substring( 0, path.length() - 1 );
+ }
+ return path;
+ }
+ }
+ catch ( Exception e )
+ {
+ // not a "file:" URL or simply malformed
+ }
+ return null;
+ }
+
// ----------------------------------------------------------------------
// Convenience methods
// ----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/maven/plugin/ant/AntBuildWriterTest.java b/src/test/java/org/apache/maven/plugin/ant/AntBuildWriterTest.java
new file mode 100644
index 0000000..7ad62f7
--- /dev/null
+++ b/src/test/java/org/apache/maven/plugin/ant/AntBuildWriterTest.java
@@ -0,0 +1,64 @@
+package org.apache.maven.plugin.ant;
+
+/*
+ * 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.
+ */
+
+import java.io.File;
+
+import junit.framework.TestCase;
+
+/**
+ * Tests <code>AntBuildWriter</code>.
+ *
+ * @author Benjamin Bentmann
+ * @version $Id$
+ */
+public class AntBuildWriterTest
+ extends TestCase
+{
+
+ public void testGetProjectRepoDirectory()
+ {
+ String basedir = new File( System.getProperty( "java.io.tmpdir" ) ).getPath();
+
+ // non-project rooted repo URLs
+ assertEquals( null, AntBuildWriter.getProjectRepoDirectory( "http://maven.apache.org/", basedir ) );
+ assertEquals( null, AntBuildWriter.getProjectRepoDirectory( "file:///just-some-test-directory", basedir ) );
+
+ // RFC-compliant URLs
+ assertEquals( "", AntBuildWriter.getProjectRepoDirectory( new File( basedir ).toURI().toString(), basedir ) );
+ assertEquals( "dir", AntBuildWriter.getProjectRepoDirectory( new File( basedir, "dir" ).toURI().toString(),
+ basedir ) );
+ assertEquals( "dir/subdir",
+ AntBuildWriter.getProjectRepoDirectory( new File( basedir, "dir/subdir" ).toURI().toString(),
+ basedir ) );
+
+ // not so strict URLs
+ assertEquals( "", AntBuildWriter.getProjectRepoDirectory( "file://" + basedir, basedir ) );
+ assertEquals( "dir", AntBuildWriter.getProjectRepoDirectory( "file://" + basedir + "/dir", basedir ) );
+ assertEquals( "dir/subdir", AntBuildWriter.getProjectRepoDirectory( "file://" + basedir + "/dir/subdir",
+ basedir ) );
+
+ // URLs with encoded characters
+ assertEquals( "some dir",
+ AntBuildWriter.getProjectRepoDirectory( new File( basedir, "some dir" ).toURI().toString(),
+ basedir ) );
+ }
+
+}
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 24/42: o Removed inherited property
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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 1425f4ac753b26c84d812e847f95f2ba5ef4581d
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Mon Aug 11 18:13:40 2008 +0000
o Removed inherited property
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@684859 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index afdf772..4b1f194 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,10 +49,6 @@ under the License.
<url>http://jira.codehaus.org/browse/MANT</url>
</issueManagement>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 41/42: o Tidied up 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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit d3c6f7e62e0726bdda8b4934bdc8c27fd4739b18
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Mon Apr 13 09:42:03 2009 +0000
o Tidied up dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@764383 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 38 ++++++++++++++++----------------------
1 file changed, 16 insertions(+), 22 deletions(-)
diff --git a/pom.xml b/pom.xml
index 751bfe3..87121a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@ under the License.
<description>Generates an Ant build file from a POM.</description>
<prerequisites>
- <maven>2.0.6</maven>
+ <maven>${mavenVersion}</maven>
</prerequisites>
<scm>
@@ -49,31 +49,36 @@ under the License.
<url>http://jira.codehaus.org/browse/MANT</url>
</issueManagement>
+ <properties>
+ <mavenVersion>2.0.6</mavenVersion>
+ <antVersion>1.6.5</antVersion>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>2.0.6</version>
+ <version>${mavenVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
- <version>2.0.6</version>
+ <version>${mavenVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>2.0.6</version>
+ <version>${mavenVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
- <version>2.0.6</version>
+ <version>${mavenVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>2.0.2</version>
+ <version>${mavenVersion}</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -83,7 +88,7 @@ under the License.
<dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
- <version>1.6.5</version>
+ <version>${antVersion}</version>
</dependency>
<dependency>
<groupId>xalan</groupId>
@@ -95,13 +100,14 @@ under the License.
<artifactId>xml-apis</artifactId>
<version>1.0.b2</version>
</dependency>
+
+ <!-- test -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-9</version>
+ <scope>test</scope>
</dependency>
-
- <!-- test -->
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
@@ -115,21 +121,9 @@ under the License.
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
- <version>2.0.6</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-junit</artifactId>
- <version>1.6.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>ant</groupId>
<artifactId>ant-nodeps</artifactId>
- <version>1.6.5</version>
+ <version>${antVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-ant-plugin] 11/42: MANT-42: Update to p-u 1.5.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.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit c51e17c464304e2639fed59f673532e2d4d0925c
Author: Vincent Siveton <vs...@apache.org>
AuthorDate: Wed Jun 18 22:01:09 2008 +0000
MANT-42: Update to p-u 1.5.4
o uses p-u 1.5.4
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@669309 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 472c9e1..d0b284c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,7 +84,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.4</version>
</dependency>
<dependency>
<groupId>ant</groupId>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.