--- ../maven-plugins/genapp/src/plugin-resources/struts-jstl/template-resources/project.xml.sav2 2006-08-18 00:27:25.000000000 +0200
+++ ../maven-plugins/genapp/src/plugin-resources/struts-jstl/template-resources/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -79,58 +79,65 @@
<!-- jar files the project is dependent on -->
<dependencies>
<dependency>
- <groupId>junit</groupId>
+ <groupId>JPP</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
+ <jar>junit.jar</jar>
</dependency>
<dependency>
- <groupId>servletapi</groupId>
+ <groupId>JPP</groupId>
<artifactId>servletapi</artifactId>
<version>2.3</version>
+ <jar>servletapi5.jar</jar>
</dependency>
<dependency>
- <groupId>jstl</groupId>
+ <groupId>JPP</groupId>
<artifactId>jstl</artifactId>
<version>1.0.2</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
+ <jar>taglibs-core.jar</jar>
</dependency>
<dependency>
- <groupId>taglibs</groupId>
+ <groupId>JPP</groupId>
<artifactId>standard</artifactId>
<version>1.0.4</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
+ <jar>taglibs-standard.jar</jar>
</dependency>
<dependency>
- <groupId>cactus</groupId>
+ <groupId>JPP</groupId>
<artifactId>cactus</artifactId>
<version>13-1.6dev-20040115</version>
+ <jar>cactus-14/cactus.jar</jar>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
+ <jar>commons-logging.jar</jar>
</dependency>
<!-- Struts dependencies -->
<dependency>
- <groupId>struts</groupId>
+ <groupId>JPP</groupId>
<artifactId>struts</artifactId>
<version>1.1</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
+ <jar>struts.jar</jar>
</dependency>
<dependency>
@@ -164,101 +171,113 @@
</dependency>
<dependency>
- <groupId>strutstestcase</groupId>
+ <groupId>JPP</groupId>
<artifactId>strutstestcase</artifactId>
<version>2.1-1.1-2.3</version>
<properties>
<cactus.bundle>true</cactus.bundle>
</properties>
+ <jar>strutstestcase-1.2-2.4.jar</jar>
</dependency>
<dependency>
- <groupId>commons-beanutils</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.6.1</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
+ <jar>commons-beanutils16.jar</jar>
</dependency>
<dependency>
- <groupId>commons-digester</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-digester</artifactId>
<version>1.5</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
+ <jar>commons-digester.jar</jar>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-collections</artifactId>
<version>3.0</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
+ <jar>commons-collections.jar</jar>
</dependency>
<!-- XDoclet dependencies -->
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xdoclet</artifactId>
<version>1.2</version>
+ <jar>xdoclet/xdoclet.jar</jar>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xdoclet-web-module</artifactId>
<version>1.2</version>
<url>http://xdoclet.sf.net/</url>
+ <jar>xdoclet/xdoclet-web-module.jar</jar>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xdoclet-ejb-module</artifactId>
<version>1.2</version>
<url>http://xdoclet.sf.net/</url>
+ <jar>xdoclet/xdoclet-ejb-module.jar</jar>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xdoclet-apache-module</artifactId>
<version>1.2</version>
<url>http://xdoclet.sf.net/</url>
+ <jar>xdoclet/xdoclet-apache-module.jar</jar>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xjavadoc</artifactId>
<version>1.0.2</version>
<url>http://xdoclet.sf.net/</url>
+ <jar>xjavadoc.jar</jar>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>maven-xdoclet-plugin</artifactId>
<version>1.2</version>
<type>plugin</type>
<url>http://xdoclet.sf.net/</url>
+ <jar>xdoclet/maven-xdoclet-plugin.jar</jar>
</dependency>
<!-- HttpUnit dependencies -->
<dependency>
- <groupId>httpunit</groupId>
+ <groupId>JPP</groupId>
<artifactId>httpunit</artifactId>
<version>1.5.4</version>
<properties>
<cactus.bundle>true</cactus.bundle>
</properties>
+ <jar>httpunit.jar</jar>
</dependency>
<dependency>
- <groupId>jtidy</groupId>
+ <groupId>JPP</groupId>
<artifactId>jtidy</artifactId>
<version>4aug2000r7-dev</version>
<properties>
<cactus.bundle>true</cactus.bundle>
</properties>
+ <jar>jtidy.jar</jar>
</dependency>
</dependencies>
--- ../maven-plugins/genapp/src/plugin-resources/web-velocity/template-resources/project.xml.sav2 2006-08-18 00:27:25.000000000 +0200
+++ ../maven-plugins/genapp/src/plugin-resources/web-velocity/template-resources/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -80,112 +80,125 @@
<!-- jar files the project is dependent on -->
<dependencies>
<dependency>
- <groupId>junit</groupId>
+ <groupId>JPP</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
+ <jar>junit.jar</jar>
</dependency>
<dependency>
- <groupId>servletapi</groupId>
+ <groupId>JPP</groupId>
<artifactId>servletapi</artifactId>
<version>2.3</version>
+ <jar>servletapi5.jar</jar>
</dependency>
<dependency>
- <groupId>cactus</groupId>
+ <groupId>JPP</groupId>
<artifactId>cactus</artifactId>
<version>13-1.6</version>
+ <jar>cactus-14/cactus.jar</jar>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-collections</artifactId>
<version>3.0</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
+ <jar>commons-collections.jar</jar>
</dependency>
<dependency>
- <groupId>commons-beanutils</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.6.1</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
+ <jar>commons-beanutils16.jar</jar>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
+ <jar>commons-logging.jar</jar>
</dependency>
<dependency>
- <groupId>commons-digester</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-digester</artifactId>
<version>1.6</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
+ <jar>commons-digester.jar</jar>
</dependency>
<dependency>
- <groupId>velocity</groupId>
+ <groupId>JPP</groupId>
<artifactId>velocity</artifactId>
<version>1.4</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
+ <jar>velocity.jar</jar>
</dependency>
<dependency>
- <groupId>velocity</groupId>
+ <groupId>JPP</groupId>
<artifactId>velocity-dep</artifactId>
<version>1.4</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
+ <jar>velocity.jar</jar>
</dependency>
<dependency>
- <groupId>velocity-tools</groupId>
+ <groupId>JPP</groupId>
<artifactId>velocity-tools</artifactId>
<version>1.1</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
+ <jar>velocity-tools.jar</jar>
</dependency>
<dependency>
- <groupId>dom4j</groupId>
+ <groupId>JPP</groupId>
<artifactId>dom4j</artifactId>
<version>1.5</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
+ <jar>dom4j.jar</jar>
</dependency>
<!-- HttpUnit dependencies -->
<dependency>
- <groupId>httpunit</groupId>
+ <groupId>JPP</groupId>
<artifactId>httpunit</artifactId>
<version>1.5.4</version>
<properties>
<cactus.bundle>true</cactus.bundle>
</properties>
+ <jar>httpunit.jar</jar>
</dependency>
<dependency>
- <groupId>jtidy</groupId>
+ <groupId>JPP</groupId>
<artifactId>jtidy</artifactId>
<version>4aug2000r7-dev</version>
<properties>
<cactus.bundle>true</cactus.bundle>
</properties>
+ <jar>jtidy.jar</jar>
</dependency>
</dependencies>
--- ../maven-plugins/genapp/src/plugin-resources/tapestry/template-resources/project.xml.sav2 2006-08-18 00:27:25.000000000 +0200
+++ ../maven-plugins/genapp/src/plugin-resources/tapestry/template-resources/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -79,195 +79,228 @@
<!-- jar files the project is dependent on -->
<dependencies>
<dependency>
- <groupId>junit</groupId>
+ <groupId>JPP</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
+ <jar>junit.jar</jar>
</dependency>
<dependency>
- <groupId>servletapi</groupId>
+ <groupId>JPP</groupId>
<artifactId>servletapi</artifactId>
<version>2.3</version>
+ <jar>servletapi5.jar</jar>
</dependency>
<dependency>
- <groupId>cactus</groupId>
+ <groupId>JPP</groupId>
<artifactId>cactus</artifactId>
<version>13-1.7.1</version>
+ <jar>cactus-14/cactus.jar</jar>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
+ <jar>commons-logging.jar</jar>
</dependency>
<!-- Tapestry dependencies -->
<dependency>
- <groupId>tapestry</groupId>
+ <groupId>JPP</groupId>
+ <artifactId>hivemind</artifactId>
+ <version>1.1</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ <jar>hivemind.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>JPP</groupId>
<artifactId>tapestry</artifactId>
<version>3.0</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
+ <jar>tapestry/tapestry.jar</jar>
</dependency>
<dependency>
- <groupId>tapestry</groupId>
+ <groupId>JPP</groupId>
<artifactId>tapestry-contrib</artifactId>
<version>3.0</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
+ <jar>tapestry/tapestry-contrib.jar</jar>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-lang</artifactId>
<version>2.0</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
+ <jar>commons-lang.jar</jar>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-collections</artifactId>
<version>3.1</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
+ <jar>commons-collections.jar</jar>
</dependency>
<dependency>
- <groupId>commons-beanutils</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.6.1</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
+ <jar>commons-beanutils16.jar</jar>
</dependency>
<dependency>
- <groupId>commons-digester</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-digester</artifactId>
<version>1.5</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
+ <jar>commons-digester.jar</jar>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-codec</artifactId>
<version>1.2</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
+ <jar>commons-codec.jar</jar>
</dependency>
<dependency>
- <groupId>commons-fileupload</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.0</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
+ <jar>commons-fileupload.jar</jar>
</dependency>
<dependency>
- <groupId>javassist</groupId>
+ <groupId>JPP</groupId>
<artifactId>javassist</artifactId>
<version>2.5.1</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
+ <jar>javassist.jar</jar>
</dependency>
<dependency>
- <groupId>bsf</groupId>
+ <groupId>JPP</groupId>
<artifactId>bsf</artifactId>
<version>2.3.0</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
+ <jar>bsf.jar</jar>
</dependency>
<dependency>
- <groupId>ognl</groupId>
+ <groupId>JPP</groupId>
<artifactId>ognl</artifactId>
<version>2.6.5</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
+ <jar>ognl.jar</jar>
</dependency>
<dependency>
- <groupId>oro</groupId>
+ <groupId>JPP</groupId>
<artifactId>oro</artifactId>
<version>2.0.8</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
+ <jar>oro.jar</jar>
</dependency>
<!-- XDoclet dependencies -->
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xdoclet</artifactId>
<version>1.2.3</version>
+ <jar>xdoclet/xdoclet.jar</jar>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xdoclet-web-module</artifactId>
<version>1.2.3</version>
<url>http://xdoclet.sf.net/</url>
+ <jar>xdoclet/xdoclet-web-module.jar</jar>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xdoclet-ejb-module</artifactId>
<version>1.2.3</version>
<url>http://xdoclet.sf.net/</url>
+ <jar>xdoclet/xdoclet-ejb-module.jar</jar>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xjavadoc</artifactId>
<version>1.1</version>
<url>http://xdoclet.sf.net/</url>
+ <jar>xjavadoc.jar</jar>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>maven-xdoclet-plugin</artifactId>
<version>1.2.3</version>
<type>plugin</type>
<url>http://xdoclet.sf.net/</url>
+ <jar>xdoclet/maven-xdoclet-plugin.jar</jar>
</dependency>
<!-- HttpUnit dependencies -->
<dependency>
- <groupId>httpunit</groupId>
+ <groupId>JPP</groupId>
<artifactId>httpunit</artifactId>
<version>1.6</version>
<properties>
<cactus.bundle>true</cactus.bundle>
</properties>
+ <jar>httpunit.jar</jar>
</dependency>
<dependency>
- <groupId>jtidy</groupId>
+ <groupId>JPP</groupId>
<artifactId>jtidy</artifactId>
<version>4aug2000r7-dev</version>
<properties>
<cactus.bundle>true</cactus.bundle>
</properties>
+ <jar>jtidy.jar</jar>
</dependency>
</dependencies>
--- ../maven-plugins/genapp/src/plugin-resources/ejb/template-resources/project.xml.sav2 2006-08-18 00:27:25.000000000 +0200
+++ ../maven-plugins/genapp/src/plugin-resources/ejb/template-resources/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -79,9 +79,10 @@
<!-- jar files the project is dependent on -->
<dependencies>
<dependency>
- <groupId>junit</groupId>
+ <groupId>JPP</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
+ <jar>junit.jar</jar>
</dependency>
<!-- NOT AVAILABLE IN BIBLIO REPOSITORY -->
<!--
@@ -92,73 +93,84 @@
</dependency>
-->
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xdoclet</artifactId>
<version>1.2</version>
+ <jar>xdoclet/xdoclet.jar</jar>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xdoclet-ejb-module</artifactId>
<version>1.2</version>
<url>http://xdoclet.sf.net/</url>
+ <jar>xdoclet/xdoclet-ejb-module.jar</jar>
</dependency>
<dependency>
- <groupId>xjavadoc</groupId>
+ <groupId>JPP</groupId>
<artifactId>xjavadoc</artifactId>
<version>1.0.2</version>
<url>http://xdoclet.sf.net/</url>
+ <jar>xjavadoc.jar</jar>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xdoclet-jmx-module</artifactId>
<version>1.2</version>
<url>http://xdoclet.sf.net/</url>
+ <jar>xdoclet/xdoclet-jmx-module.jar</jar>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xdoclet-web-module</artifactId>
<version>1.2</version>
<url>http://xdoclet.sf.net/</url>
+ <jar>xdoclet/xdoclet-web-module.jar</jar>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xdoclet-jboss-module</artifactId>
<version>1.2</version>
<url>http://xdoclet.sf.net/</url>
+ <jar>xdoclet/xdoclet-jboss-module.jar</jar>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>maven-xdoclet-plugin</artifactId>
<version>1.2</version>
<type>plugin</type>
<url>http://xdoclet.sf.net/</url>
+ <jar>xdoclet/maven-xdoclet-plugin.jar</jar>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>JPP</groupId>
<artifactId>jboss-j2ee</artifactId>
<version>3.2.1</version>
+ <jar>jboss4/jboss-j2ee.jar</jar>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
<properties>
<ejb.bundle>true</ejb.bundle>
</properties>
+ <jar>commons-logging.jar</jar>
</dependency>
<dependency>
- <groupId>cactus</groupId>
+ <groupId>JPP</groupId>
<artifactId>cactus</artifactId>
<version>13-1.6dev-20040115</version>
+ <jar>cactus-14/cactus.jar</jar>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>JPP</groupId>
<artifactId>jbossall-client</artifactId>
<version>3.2.1</version>
+ <jar>jboss4/jboss-client.jar</jar>
</dependency>
</dependencies>
--- ../maven-plugins/genapp/src/plugin-resources/struts/template-resources/project.xml.sav2 2006-08-18 00:27:25.000000000 +0200
+++ ../maven-plugins/genapp/src/plugin-resources/struts/template-resources/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -79,40 +79,45 @@
<!-- jar files the project is dependent on -->
<dependencies>
<dependency>
- <groupId>junit</groupId>
+ <groupId>JPP</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
+ <jar>junit.jar</jar>
</dependency>
<dependency>
- <groupId>servletapi</groupId>
+ <groupId>JPP</groupId>
<artifactId>servletapi</artifactId>
<version>2.3</version>
+ <jar>servletapi5.jar</jar>
</dependency>
<dependency>
- <groupId>cactus</groupId>
+ <groupId>JPP</groupId>
<artifactId>cactus</artifactId>
<version>13-1.6dev-20040115</version>
+ <jar>cactus-14/cactus.jar</jar>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
+ <jar>commons-logging.jar</jar>
</dependency>
<!-- Struts dependencies -->
<dependency>
- <groupId>struts</groupId>
+ <groupId>JPP</groupId>
<artifactId>struts</artifactId>
<version>1.1</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
+ <jar>struts.jar</jar>
</dependency>
<dependency>
@@ -146,101 +151,113 @@
</dependency>
<dependency>
- <groupId>strutstestcase</groupId>
+ <groupId>JPP</groupId>
<artifactId>strutstestcase</artifactId>
<version>2.1-1.1-2.3</version>
<properties>
<cactus.bundle>true</cactus.bundle>
</properties>
+ <jar>strutstestcase-1.2-2.4.jar</jar>
</dependency>
<dependency>
- <groupId>commons-beanutils</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.6.1</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
+ <jar>commons-beanutils16.jar</jar>
</dependency>
<dependency>
- <groupId>commons-digester</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-digester</artifactId>
<version>1.5</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
+ <jar>commons-digester.jar</jar>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-collections</artifactId>
<version>3.0</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
+ <jar>commons-collections.jar</jar>
</dependency>
<!-- XDoclet dependencies -->
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xdoclet</artifactId>
<version>1.2</version>
+ <jar>xdoclet/xdoclet.jar</jar>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xdoclet-web-module</artifactId>
<version>1.2</version>
<url>http://xdoclet.sf.net/</url>
+ <jar>xdoclet/xdoclet-web-module.jar</jar>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xdoclet-ejb-module</artifactId>
<version>1.2</version>
<url>http://xdoclet.sf.net/</url>
+ <jar>xdoclet/xdoclet-ejb-module.jar</jar>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xdoclet-apache-module</artifactId>
<version>1.2</version>
<url>http://xdoclet.sf.net/</url>
+ <jar>xdoclet/xdoclet-apache-module.jar</jar>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xjavadoc</artifactId>
<version>1.0.2</version>
<url>http://xdoclet.sf.net/</url>
+ <jar>xjavadoc.jar</jar>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>maven-xdoclet-plugin</artifactId>
<version>1.2</version>
<type>plugin</type>
<url>http://xdoclet.sf.net/</url>
+ <jar>xdoclet/maven-xdoclet-plugin.jar</jar>
</dependency>
<!-- HttpUnit dependencies -->
<dependency>
- <groupId>httpunit</groupId>
+ <groupId>JPP</groupId>
<artifactId>httpunit</artifactId>
<version>1.5.4</version>
<properties>
<cactus.bundle>true</cactus.bundle>
</properties>
+ <jar>httpunit.jar</jar>
</dependency>
<dependency>
- <groupId>jtidy</groupId>
+ <groupId>JPP</groupId>
<artifactId>jtidy</artifactId>
<version>4aug2000r7-dev</version>
<properties>
<cactus.bundle>true</cactus.bundle>
</properties>
+ <jar>jtidy.jar</jar>
</dependency>
</dependencies>
--- ../maven-plugins/genapp/src/plugin-resources/web-jstl/template-resources/project.xml.sav2 2006-08-18 00:27:25.000000000 +0200
+++ ../maven-plugins/genapp/src/plugin-resources/web-jstl/template-resources/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -80,103 +80,116 @@
<!-- jar files the project is dependent on -->
<dependencies>
<dependency>
- <groupId>junit</groupId>
+ <groupId>JPP</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
+ <jar>junit.jar</jar>
</dependency>
<dependency>
- <groupId>servletapi</groupId>
+ <groupId>JPP</groupId>
<artifactId>servletapi</artifactId>
<version>2.3</version>
+ <jar>servletapi4.jar</jar>
</dependency>
<dependency>
- <groupId>jstl</groupId>
+ <groupId>JPP</groupId>
<artifactId>jstl</artifactId>
<version>1.0.2</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
+ <jar>taglibs-core.jar</jar>
</dependency>
<dependency>
- <groupId>taglibs</groupId>
+ <groupId>JPP</groupId>
<artifactId>standard</artifactId>
<version>1.0.4</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
+ <jar>taglibs-standard.jar</jar>
</dependency>
<dependency>
- <groupId>cactus</groupId>
+ <groupId>JPP</groupId>
<artifactId>cactus</artifactId>
<version>13-1.6dev-20040115</version>
+ <jar>cactus-14/cactus.jar</jar>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
+ <jar>commons-logging.jar</jar>
</dependency>
<!-- XDoclet dependencies -->
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xdoclet</artifactId>
<version>1.2</version>
+ <jar>xdoclet/xdoclet.jar</jar>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xdoclet-web-module</artifactId>
<version>1.2</version>
<url>http://xdoclet.sf.net/</url>
+ <jar>xdoclet/xdoclet-web-module.jar</jar>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xdoclet-ejb-module</artifactId>
<version>1.2</version>
<url>http://xdoclet.sf.net/</url>
+ <jar>xdoclet/xdoclet-ejb-module.jar</jar>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xjavadoc</artifactId>
<version>1.0.2</version>
<url>http://xdoclet.sf.net/</url>
+ <jar>xjavadoc.jar</jar>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>maven-xdoclet-plugin</artifactId>
<version>1.2</version>
<type>plugin</type>
<url>http://xdoclet.sf.net/</url>
+ <jar>xdoclet/maven-xdoclet-plugin.jar</jar>
</dependency>
<!-- HttpUnit dependencies -->
<dependency>
- <groupId>httpunit</groupId>
+ <groupId>JPP</groupId>
<artifactId>httpunit</artifactId>
<version>1.5.4</version>
<properties>
<cactus.bundle>true</cactus.bundle>
</properties>
+ <jar>httpunit.jar</jar>
</dependency>
<dependency>
- <groupId>jtidy</groupId>
+ <groupId>JPP</groupId>
<artifactId>jtidy</artifactId>
<version>4aug2000r7-dev</version>
<properties>
<cactus.bundle>true</cactus.bundle>
</properties>
+ <jar>jtidy.jar</jar>
</dependency>
</dependencies>
--- ../maven-plugins/genapp/project.xml.sav2 2006-10-29 10:33:33.000000000 +0100
+++ ../maven-plugins/genapp/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -120,17 +120,19 @@
</contributors>
<dependencies>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-interaction</artifactId>
<version>1.1</version>
+ <jar>commons-jelly-tags-interaction.jar</jar>
</dependency>
<dependency>
- <groupId>jline</groupId>
+ <groupId>JPP</groupId>
<artifactId>jline</artifactId>
<version>0.9.5</version>
<properties>
<comment>This library is used by commons-jelly-tags-interaction.</comment>
</properties>
+ <jar>jline.jar</jar>
</dependency>
</dependencies>
</project>
--- ../maven-plugins/rar/src/plugin-test/maven.xml.sav2 2006-04-11 00:13:28.000000000 +0200
+++ ../maven-plugins/rar/src/plugin-test/maven.xml 2007-08-16 16:16:33.000000000 +0200
@@ -34,7 +34,7 @@
<unzip src="${rarFile}" dest="${unzipDir}"/>
<!-- check for commons-logging -->
- <assert:assertFileExists file="${unzipDir}/commons-logging-1.0.4.jar"
+ <assert:assertFileExists file="${unzipDir}/commons-logging.jar"
msg="commons logging was not bundled"/>
<!-- check for the LICENSE -->
--- ../maven-plugins/rar/src/plugin-test/project.xml.sav2 2006-03-03 00:49:59.000000000 +0100
+++ ../maven-plugins/rar/src/plugin-test/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -54,13 +54,14 @@
</developers>
<dependencies>
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
<url>http://jakarta.apache.org/commons/logging.html</url>
<properties>
<rar.bundle>true</rar.bundle>
</properties>
+ <jar>commons-logging.jar</jar>
</dependency>
</dependencies>
<build>
--- ../maven-plugins/rar/project.xml.sav2 2006-02-13 00:44:10.000000000 +0100
+++ ../maven-plugins/rar/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -59,13 +59,14 @@
</developers>
<dependencies>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-util</artifactId>
<version>1.1.1</version>
<url>http://jakarta.apache.org/commons/jelly/libs/util/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>commons-jelly-tags-util.jar</jar>
</dependency>
</dependencies>
</project>
--- ../maven-plugins/cruisecontrol/src/plugin-test/project.xml.sav2 2006-03-03 00:49:59.000000000 +0100
+++ ../maven-plugins/cruisecontrol/src/plugin-test/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -47,9 +47,10 @@
</developers>
<dependencies>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-xml</artifactId>
<version>1.1</version>
+ <jar>commons-jelly-tags-xml.jar</jar>
</dependency>
</dependencies>
<build>
--- ../maven-plugins/cruisecontrol/project.xml.sav2 2006-07-28 18:07:27.000000000 +0200
+++ ../maven-plugins/cruisecontrol/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -104,19 +104,21 @@
</contributors>
<dependencies>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-xml</artifactId>
<version>1.1</version>
<url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>commons-jelly-tags-xml.jar</jar>
</dependency>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-jsl</artifactId>
<version>1.0</version>
<url>http://jakarta.apache.org/commons/jelly/libs/jsl/</url>
+ <jar>commons-jelly-tags-jsl.jar</jar>
</dependency>
</dependencies>
</project>
--- ../maven-plugins/ant/src/plugin-resources/templates/build.jelly.sav2 2005-02-28 08:04:28.000000000 +0100
+++ ../maven-plugins/ant/src/plugin-resources/templates/build.jelly 2007-08-16 16:16:33.000000000 +0200
@@ -398,7 +398,16 @@
<j:otherwise>
<x:comment>This dependency is overriden in maven project.</x:comment>
<maven:makeRelativePath var="depRP" basedir="${baseDirFile}" path="${lib.path}" separator="/"/>
- <copy tofile="$${libdir}/${dep.artifactDirectory}/${dep.type}s/${dep.artifact}" file="$${basedir}/${depRP}"/>
+ <echo>depRP:${depRP}</echo>
+ <echo>lib.path:${lib.path}</echo>
+ <j:choose>
+ <j:when test="${lib.path.equals('/'+depRP)}">
+ <copy tofile="$${libdir}/${dep.artifactDirectory}/${dep.type}s/${dep.artifact}" file="${lib.path}"/>
+ </j:when>
+ <j:otherwise>
+ <copy tofile="$${libdir}/${dep.artifactDirectory}/${dep.type}s/${dep.artifact}" file="$${basedir}/${depRP}"/>
+ </j:otherwise>
+ </j:choose>
</j:otherwise>
</j:choose>
</target>
--- ../maven-plugins/ant/src/plugin-test/maven.xml.sav2 2006-05-09 01:59:04.000000000 +0200
+++ ../maven-plugins/ant/src/plugin-test/maven.xml 2007-08-16 16:16:33.000000000 +0200
@@ -32,9 +32,9 @@
<assert:assertEquals expected="$${basedir}/target" value="${defaulttargetdirValue}" msg="defaulttargetdir property is not relative"/>
<!-- check obey jar override -->
<x:set var="countJarsDownload" select="count($buildXml/project/target[starts-with(@name,'get-dep')]/get)"/>
- <assert:assertEquals expected="2" value="${countJarsDownload.intValue().toString()}" msg="Should only download JUnit and commons-logging jars"/>
+ <assert:assertEquals expected="0" value="${countJarsDownload.intValue().toString()}" msg="Should only download JUnit and commons-logging jars"/>
<x:set var="countJarsCopy" select="count($buildXml/project/target[starts-with(@name,'get-dep')]/copy)"/>
- <assert:assertEquals expected="1" value="${countJarsCopy.intValue().toString()}" msg="Should only copy the activation jar"/>
+ <assert:assertEquals expected="3" value="${countJarsCopy.intValue().toString()}" msg="Should only copy the activation jar"/>
<!-- check test filesets -->
<x:set var="testFilesetDirs" select="$buildXml/project/target[@name = 'compile-tests']/copy/fileset/@dir"/>
<assert:assertEquals expected="$${basedir}/src/test" value="${testFilesetDirs[0].value}" msg="test fileset dirs are not relative"/>
--- ../maven-plugins/ant/src/plugin-test/build.properties.sav2 2005-02-27 00:44:58.000000000 +0100
+++ ../maven-plugins/ant/src/plugin-test/build.properties 2007-08-16 16:16:33.000000000 +0200
@@ -1,4 +1,4 @@
# Test MPANT-20
maven-jaxb-plugin.jar=http://ovh.dl.sourceforge.net/sourceforge/maven-plugins/maven-jaxb-plugin-1.0.jar
# For maven users it is better to use the real repository and not the default one.
-libdir=${maven.repo.local}
\ No newline at end of file
+libdir=${basedir}/repository
--- ../maven-plugins/ant/src/plugin-test/project.xml.sav2 2006-03-03 00:49:59.000000000 +0100
+++ ../maven-plugins/ant/src/plugin-test/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -55,28 +55,31 @@
<dependencies>
<!-- Used in testing maven.jar.override -->
<dependency>
- <groupId>activation</groupId>
+ <groupId>JPP</groupId>
<artifactId>activation</artifactId>
<version>1.0.2</version>
<type>jar</type>
<properties/>
+ <jar>jaf.jar</jar>
</dependency>
<!-- Used to test -->
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
<type>jar</type>
<properties/>
+ <jar>commons-logging.jar</jar>
</dependency>
<dependency>
- <groupId>junit</groupId>
+ <groupId>JPP</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<properties>
<classloader>root</classloader>
</properties>
+ <jar>junit.jar</jar>
</dependency>
</dependencies>
--- ../maven-plugins/ant/project.xml.sav2 2006-07-21 06:32:38.000000000 +0200
+++ ../maven-plugins/ant/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -86,25 +86,28 @@
</developers>
<dependencies>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-xml</artifactId>
<version>1.1</version>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>commons-jelly-tags-xml.jar</jar>
</dependency>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-interaction</artifactId>
<version>1.1</version>
+ <jar>commons-jelly-tags-interaction.jar</jar>
</dependency>
<dependency>
- <groupId>jline</groupId>
+ <groupId>JPP</groupId>
<artifactId>jline</artifactId>
<version>0.9.5</version>
<properties>
<comment>This library is used by commons-jelly-tags-interaction.</comment>
</properties>
+ <jar>jline.jar</jar>
</dependency>
</dependencies>
<reports>
--- ../maven-plugins/antlr/project.xml.sav2 2006-07-28 17:59:18.000000000 +0200
+++ ../maven-plugins/antlr/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -79,25 +79,28 @@
</developers>
<dependencies>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-antlr</artifactId>
<version>1.0</version>
+ <jar>commons-jelly-tags-antlr.jar</jar>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-lang</artifactId>
<version>2.0</version>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>commons-lang.jar</jar>
</dependency>
<dependency>
- <groupId>antlr</groupId>
+ <groupId>JPP</groupId>
<artifactId>antlr</artifactId>
<version>2.7.6</version>
<properties>
<classloader>root</classloader>
</properties>
+ <jar>antlr.jar</jar>
</dependency>
</dependencies>
</project>
--- ../maven-plugins/file-activity/project.xml.sav2 2007-04-19 00:22:43.000000000 +0200
+++ ../maven-plugins/file-activity/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -113,18 +113,20 @@
</developers>
<dependencies>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-jsl</artifactId>
<version>1.0</version>
+ <jar>commons-jelly-tags-jsl.jar</jar>
</dependency>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-xml</artifactId>
<version>1.1</version>
<url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>commons-jelly-tags-xml.jar</jar>
</dependency>
</dependencies>
</project>
--- ../maven-plugins/javadoc/project.xml.sav2 2007-04-30 13:38:32.000000000 +0200
+++ ../maven-plugins/javadoc/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -153,22 +153,24 @@
</developers>
<dependencies>
<dependency>
- <groupId>commons-lang</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-lang</artifactId>
<version>2.0</version>
<type>jar</type>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>commons-lang.jar</jar>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-collections</artifactId>
<version>3.0</version>
<type>jar</type>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>commons-collections.jar</jar>
</dependency>
</dependencies>
<build>
--- ../maven-plugins/pmd/plugin.jelly.sav2 2007-03-22 11:39:43.000000000 +0100
+++ ../maven-plugins/pmd/plugin.jelly 2007-08-16 16:16:33.000000000 +0200
@@ -92,10 +92,10 @@
<!-- Setup the classpath for pmd plugins -->
<path id="pmd-classpath">
- <pathelement path="${plugin.getDependencyPath('pmd:pmd')}" />
- <pathelement path="${plugin.getDependencyPath('asm:asm')}" />
- <pathelement path="${plugin.getDependencyPath('backport-util-concurrent:backport-util-concurrent')}" />
- <pathelement path="${plugin.getDependencyPath('jaxen:jaxen')}" />
+ <pathelement path="${plugin.getDependencyPath('JPP:pmd')}" />
+ <pathelement path="${plugin.getDependencyPath('JPP:asm')}" />
+ <pathelement path="${plugin.getDependencyPath('JPP:backport-util-concurrent')}" />
+ <pathelement path="${plugin.getDependencyPath('JPP:jaxen')}" />
<pathelement path="${pom.getDependencyClasspath()}" />
<path refid="maven.dependency.classpath" />
</path>
@@ -202,10 +202,10 @@
<!-- Setup the classpath for cpd task -->
<path id="cpd-classpath">
- <pathelement path="${plugin.getDependencyPath('pmd:pmd')}" />
- <pathelement path="${plugin.getDependencyPath('asm:asm')}" />
- <pathelement path="${plugin.getDependencyPath('backport-util-concurrent:backport-util-concurrent')}" />
- <pathelement path="${plugin.getDependencyPath('jaxen:jaxen')}" />
+ <pathelement path="${plugin.getDependencyPath('JPP:pmd')}" />
+ <pathelement path="${plugin.getDependencyPath('JPP:asm')}" />
+ <pathelement path="${plugin.getDependencyPath('JPP:backport-util-concurrent')}" />
+ <pathelement path="${plugin.getDependencyPath('JPP:jaxen')}" />
<pathelement path="${pom.getDependencyClasspath()}" />
<path refid="maven.dependency.classpath" />
</path>
--- ../maven-plugins/pmd/project.xml.sav2 2007-03-28 10:00:10.000000000 +0200
+++ ../maven-plugins/pmd/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -162,25 +162,29 @@
</contributors>
<dependencies>
<dependency>
- <groupId>pmd</groupId>
+ <groupId>JPP</groupId>
<artifactId>pmd</artifactId>
<version>3.9</version>
+ <jar>pmd.jar</jar>
<url>http://pmd.sourceforge.net</url>
</dependency>
<dependency>
- <groupId>asm</groupId>
+ <groupId>JPP</groupId>
<artifactId>asm</artifactId>
<version>3.0</version>
+ <jar>asm2/asm2.jar</jar>
</dependency>
<dependency>
- <groupId>backport-util-concurrent</groupId>
+ <groupId>JPP</groupId>
<artifactId>backport-util-concurrent</artifactId>
+ <jar>backport-util-concurrent.jar</jar>
<version>3.0</version>
</dependency>
<dependency>
- <groupId>jaxen</groupId>
+ <groupId>JPP</groupId>
<artifactId>jaxen</artifactId>
<version>1.1-beta-9</version>
+ <jar>jaxen.jar</jar>
</dependency>
</dependencies>
</project>
--- ../maven-plugins/javacc/project.xml.sav2 2006-12-27 09:57:19.000000000 +0100
+++ ../maven-plugins/javacc/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -57,14 +57,16 @@
</developers>
<dependencies>
<dependency>
- <groupId>javacc</groupId>
+ <groupId>JPP</groupId>
<artifactId>javacc</artifactId>
<version>3.2</version>
+ <jar>javacc3.jar</jar>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
+ <groupId>JPP</groupId>
<artifactId>plexus-utils</artifactId>
<version>1.0.5</version>
+ <jar>plexus/utils.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
--- ../maven-plugins/ejb/project.xml.sav2 2007-05-07 11:08:16.000000000 +0200
+++ ../maven-plugins/ejb/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -101,31 +101,35 @@
</contributors>
<dependencies>
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
+ <jar>commons-logging.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-lang</artifactId>
<version>2.0</version>
+ <jar>commons-lang.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>maven</artifactId>
<version>1.0.2</version>
+ <jar>maven.jar</jar>
</dependency>
<!-- Test dep -->
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>maven-model</artifactId>
<version>3.0.2</version>
+ <jar>maven-model.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
--- ../maven-plugins/changes/project.xml.sav2 2006-10-29 10:22:04.000000000 +0100
+++ ../maven-plugins/changes/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -96,35 +96,39 @@
</developers>
<dependencies>
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>dom4j</artifactId>
<version>1.7-20060614</version>
<url>http://www.dom4j.org/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>dom4j.jar</jar>
</dependency>
<dependency>
- <groupId>jaxen</groupId>
+ <groupId>JPP</groupId>
<artifactId>jaxen</artifactId>
<version>1.1-beta-9</version>
+ <jar>jaxen.jar</jar>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-io</artifactId>
<version>1.2</version>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>commons-io.jar</jar>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
+ <groupId>JPP</groupId>
<artifactId>xml-apis</artifactId>
<version>1.3.03</version>
<url>http://xml.apache.org/commons/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>xml-commons-jaxp-1.3-apis.jar</jar>
</dependency>
</dependencies>
</project>
--- ../maven-plugins/announcement/project.xml.sav2 2007-04-18 23:46:07.000000000 +0200
+++ ../maven-plugins/announcement/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -97,28 +97,31 @@
</contributors>
<dependencies>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-xml</artifactId>
<version>1.1</version>
<url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>commons-jelly-tags-xml.jar</jar>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-lang</artifactId>
<version>2.0</version>
<url>http://jakarta.apache.org/commons/lang/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>commons-lang.jar</jar>
</dependency>
<dependency>
- <groupId>commons-net</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-net</artifactId>
<version>1.4.1</version>
<url>http://jakarta.apache.org/commons/net/</url>
+ <jar>commons-net.jar</jar>
</dependency>
</dependencies>
</project>
--- ../maven-plugins/jdepend/plugin.jelly.sav2 2006-02-14 07:07:37.000000000 +0100
+++ ../maven-plugins/jdepend/plugin.jelly 2007-08-16 16:16:33.000000000 +0200
@@ -74,7 +74,7 @@
<ant:classpath>
<ant:path refid="maven-classpath"/>
<ant:path refid="maven.dependency.classpath"/>
- <ant:pathelement path="${plugin.getDependencyPath('jdepend:jdepend')}"/>
+ <ant:pathelement path="${plugin.getDependencyPath('JPP:jdepend')}"/>
<ant:pathelement path="${maven.build.dest}"/>
</ant:classpath>
</ant:java>
--- ../maven-plugins/jdepend/project.xml.sav2 2006-04-24 01:36:53.000000000 +0200
+++ ../maven-plugins/jdepend/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -101,50 +101,56 @@
</developers>
<dependencies>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-jsl</artifactId>
<version>1.0</version>
+ <jar>commons-jelly-tags-jsl.jar</jar>
</dependency>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-xml</artifactId>
<version>1.1</version>
<url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>commons-jelly-tags-xml.jar</jar>
</dependency>
<dependency>
- <groupId>jdepend</groupId>
+ <groupId>JPP</groupId>
<artifactId>jdepend</artifactId>
<version>2.9.1</version>
+ <jar>jdepend.jar</jar>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
+ <groupId>JPP</groupId>
<artifactId>xml-apis</artifactId>
<version>1.3.03</version>
<url>http://xml.apache.org/commons/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>xml-commons-jaxp-1.3-apis.jar</jar>
</dependency>
<dependency>
- <groupId>xml-resolver</groupId>
+ <groupId>JPP</groupId>
<artifactId>xml-resolver</artifactId>
<version>1.1</version>
<url>http://xml.apache.org/commons/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>xml-commons-resolver11.jar</jar>
</dependency>
<dependency>
- <groupId>xerces</groupId>
+ <groupId>JPP</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.8.0</version>
<url>http://xerces.apache.org/xerces2-j/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>xerces-j2.jar</jar>
</dependency>
</dependencies>
</project>
--- ../maven-plugins/multichanges/project.xml.sav2 2007-04-30 13:52:34.000000000 +0200
+++ ../maven-plugins/multichanges/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -80,12 +80,13 @@
</properties>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>commons-logging.jar</jar>
</dependency>
</dependencies>
</project>
--- ../maven-plugins/native/plugin.jelly.sav2 2006-01-12 23:04:55.000000000 +0100
+++ ../maven-plugins/native/plugin.jelly 2007-08-16 16:16:33.000000000 +0200
@@ -32,7 +32,7 @@
<goal name="native:compile" description="Compile the native compiler" prereqs="native:jniheader">
<path id="native.classpath">
- <pathelement location="${plugin.getDependencyPath('ant-contrib:cpptasks')}" />
+ <pathelement location="${plugin.getDependencyPath('JPP:cpptasks')}" />
<pathelement location="${plugin.getDependencyPath('bcel:bcel')}" />
</path>
<taskdef name="cc" classname="net.sf.antcontrib.cpptasks.CCTask" classpathref="native.classpath"/>
--- ../maven-plugins/native/project.xml.sav2 2006-02-13 00:30:07.000000000 +0100
+++ ../maven-plugins/native/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -64,14 +64,14 @@
</contributors>
<dependencies>
<dependency>
- <groupId>ant-contrib</groupId>
+ <groupId>JPP</groupId>
<artifactId>cpptasks</artifactId>
- <version>1.0b3</version>
+ <jar>cpptasks.jar</jar>
</dependency>
<dependency>
- <groupId>bcel</groupId>
+ <groupId>JPP</groupId>
<artifactId>bcel</artifactId>
- <version>5.1</version>
+ <jar>bcel.jar</jar>
</dependency>
</dependencies>
</project>
--- ../maven-plugins/ear/src/plugin-test/simpleTest/maven.xml.sav2 2006-04-09 15:51:23.000000000 +0200
+++ ../maven-plugins/ear/src/plugin-test/simpleTest/maven.xml 2007-08-16 16:16:33.000000000 +0200
@@ -35,10 +35,10 @@
<unzip src="${earFile}" dest="${unzipDir}"/>
<!-- check for commons-logging -->
- <assert:assertFileExists file="${unzipDir}/commons-logging-1.0.4.jar"
+ <assert:assertFileExists file="${unzipDir}/commons-logging.jar"
msg="commons logging was not bundled"/>
<!-- check for commons-collections -->
- <assert:assertFileExists file="${unzipDir}/commons-collections-3.0.jar"
+ <assert:assertFileExists file="${unzipDir}/commons-collections.jar"
msg="commons collections was not bundled"/>
<!-- check application.xml got a java module in it -->
@@ -50,7 +50,7 @@
<x:set var="firstJavaModule" select="string($applicationDoc/application/module/java)"/>
<assert:assertEquals
- expected="commons-collections-3.0.jar"
+ expected="commons-collections.jar"
value="${firstJavaModule}"
msg="commons collections was not the first java module"/>
--- ../maven-plugins/ear/src/plugin-test/simpleTest/project.xml.sav2 2006-02-08 18:04:26.000000000 +0100
+++ ../maven-plugins/ear/src/plugin-test/simpleTest/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -43,27 +43,30 @@
</developers>
<dependencies>
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
<url>http://jakarta.apache.org/commons/logging.html</url>
<properties>
<ear.bundle>true</ear.bundle>
</properties>
+ <jar>commons-logging.jar</jar>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-collections</artifactId>
<version>3.0</version>
<url>http://jakarta.apache.org/commons/collections/</url>
<properties>
<ear.module>true</ear.module>
</properties>
+ <jar>commons-collections.jar</jar>
</dependency>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-xml</artifactId>
<version>1.1</version>
+ <jar>commons-jelly-tags-xml.jar</jar>
</dependency>
</dependencies>
<build>
--- ../maven-plugins/ear/src/plugin-test/bundlePropertiesTest/maven.xml.sav2 2006-04-09 15:51:23.000000000 +0200
+++ ../maven-plugins/ear/src/plugin-test/bundlePropertiesTest/maven.xml 2007-08-16 16:16:33.000000000 +0200
@@ -34,12 +34,12 @@
<unzip src="${earFile}" dest="${unzipDir}"/>
<!-- check for commons-logging -->
- <j:set var="commonsExpectedPath" value="/APP-INF/lib/commons-logging-1.0.4.jar"/>
+ <j:set var="commonsExpectedPath" value="/APP-INF/lib/commons-logging.jar"/>
<assert:assertFileExists file="${unzipDir}${commonsExpectedPath}"
msg="commons-logging was not bundled"/>
<!-- check that commons-collections has been packaged in the right place-->
- <assert:assertFileExists file="${unzipDir}/commons-collections-3.0.jar"
+ <assert:assertFileExists file="${unzipDir}/commons-collections.jar"
msg="commons-collections was bundled incorrectly"/>
<!-- check that commons-digester has been packaged in the right place-->
--- ../maven-plugins/ear/src/plugin-test/bundlePropertiesTest/project.xml.sav2 2006-02-08 18:04:26.000000000 +0100
+++ ../maven-plugins/ear/src/plugin-test/bundlePropertiesTest/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -50,33 +50,36 @@
</developers>
<dependencies>
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
<properties>
<ear.bundle.dir>/APP-INF/lib</ear.bundle.dir>
<ear.module>true</ear.module>
</properties>
+ <jar>commons-logging.jar</jar>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-collections</artifactId>
<version>3.0</version>
<properties>
<ear.bundle>true</ear.bundle>
</properties>
+ <jar>commons-collections.jar</jar>
</dependency>
<dependency>
- <groupId>commons-digester</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-digester</artifactId>
<version>1.6</version>
<properties>
<ear.bundle>true</ear.bundle>
<ear.bundle.name>commons-digester.jar</ear.bundle.name>
</properties>
+ <jar>commons-digester.jar</jar>
</dependency>
<dependency>
- <groupId>log4j</groupId>
+ <groupId>JPP</groupId>
<artifactId>log4j</artifactId>
<version>1.2.12</version>
<properties>
@@ -84,6 +87,7 @@
<ear.bundle.name>LOG4J.JAR</ear.bundle.name>
<ear.bundle.dir>/APP-INF/lib</ear.bundle.dir>
</properties>
+ <jar>log4j.jar</jar>
</dependency>
</dependencies>
<build>
--- ../maven-plugins/ear/project.xml.sav2 2006-04-27 01:09:54.000000000 +0200
+++ ../maven-plugins/ear/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -120,30 +120,33 @@
</developers>
<dependencies>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-xml</artifactId>
<version>1.1</version>
<url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>commons-jelly-tags-xml.jar</jar>
</dependency>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-util</artifactId>
<version>1.1.1</version>
<url>http://jakarta.apache.org/commons/jelly/libs/util/index.html</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>commons-jelly-tags-util.jar</jar>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>commons-logging.jar</jar>
</dependency>
</dependencies>
</project>
--- ../maven-plugins/developer-activity/project.xml.sav2 2007-04-18 23:58:26.000000000 +0200
+++ ../maven-plugins/developer-activity/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -92,18 +92,20 @@
</developers>
<dependencies>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-jsl</artifactId>
<version>1.0</version>
+ <jar>commons-jelly-tags-jsl.jar</jar>
</dependency>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-xml</artifactId>
<version>1.1</version>
<url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>commons-jelly-tags-xml.jar</jar>
</dependency>
</dependencies>
</project>
--- ../maven-plugins/xdoc/src/plugin-test/testDependenciesComment/project.xml.sav2 2007-04-25 14:28:56.000000000 +0200
+++ ../maven-plugins/xdoc/src/plugin-test/testDependenciesComment/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -29,9 +29,10 @@
<!-- dependency with a simple comment -->
<dependency>
- <groupId>dom4j</groupId>
+ <groupId>JPP</groupId>
<artifactId>dom4j</artifactId>
<version>1.4-dev-8</version>
+ <jar>dom4j.jar</jar>
<properties>
<comment>Simple comment</comment>
<scope>test</scope>
@@ -40,9 +41,10 @@
<!-- dependency with a blank comment -->
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly</artifactId>
<version>1.0-RC1</version>
+ <jar>commons-jelly.jar</jar>
<properties>
<comment/>
</properties>
@@ -50,9 +52,10 @@
<!-- dependency with no comment at all -->
<dependency>
- <groupId>velocity-dvsl</groupId>
+ <groupId>JPP</groupId>
<artifactId>velocity-dvsl</artifactId>
<version>0.45</version>
+ <jar>velocity-dvsl.jar</jar>
</dependency>
</dependencies>
--- ../maven-plugins/xdoc/project.xml.sav2 2007-05-26 17:34:11.000000000 +0200
+++ ../maven-plugins/xdoc/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -190,144 +190,178 @@
</developers>
<dependencies>
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>dom4j</artifactId>
<version>1.7-20060614</version>
+ <jar>dom4j.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>jaxen</groupId>
+ <groupId>JPP</groupId>
<artifactId>jaxen</artifactId>
<version>1.1-beta-9</version>
+ <jar>jaxen.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly</artifactId>
<version>1.0.1-20060717</version>
+ <jar>commons-jelly.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-jsl</artifactId>
<version>1.0</version>
+ <jar>jelly-tags/commons-jelly-tags-jsl.jar</jar>
</dependency>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-log</artifactId>
<version>1.0</version>
+ <jar>jelly-tags/commons-jelly-tags-log.jar</jar>
</dependency>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-velocity</artifactId>
<version>1.0</version>
+ <jar>jelly-tags/commons-jelly-tags-velocity.jar</jar>
</dependency>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-xml</artifactId>
<version>1.1</version>
+ <jar>jelly-tags/commons-jelly-tags-xml.jar</jar>
<url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-lang</artifactId>
<version>2.0</version>
+ <jar>commons-lang.jar</jar>
<url>http://jakarta.apache.org/commons/lang/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
+ <jar>commons-logging.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>maven</artifactId>
<version>1.0.2</version>
+ <jar>maven.jar</jar>
</dependency>
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>maven-model</artifactId>
<version>3.0.2</version>
+ <jar>maven-model.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>org.apache.velocity</groupId>
+ <groupId>JPP</groupId>
<artifactId>velocity</artifactId>
<version>1.5</version>
+ <jar>velocity.jar</jar>
</dependency>
<dependency>
- <groupId>velocity-dvsl</groupId>
+ <groupId>JPP</groupId>
<artifactId>velocity-dvsl</artifactId>
<version>0.45</version>
+ <jar>velocity-dvsl.jar</jar>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
+ <groupId>JPP</groupId>
<artifactId>xml-apis</artifactId>
<version>1.3.03</version>
+ <jar>xml-commons-jaxp-1.3-apis.jar</jar>
<url>http://xml.apache.org/commons/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-fmt</artifactId>
<version>1.0</version>
+ <jar>jelly-tags/commons-jelly-tags-fmt.jar</jar>
</dependency>
<dependency>
- <groupId>forehead</groupId>
+ <groupId>JPP</groupId>
<artifactId>forehead</artifactId>
<version>1.0-beta-5</version>
+ <jar>forehead.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>org.apache.maven.scm</groupId>
+ <groupId>JPP</groupId>
<artifactId>maven-scm-api</artifactId>
- <version>1.0-beta-2</version>
+ <version>1.0-beta-3</version>
+ <jar>maven-scm/api.jar</jar>
</dependency>
<dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-cvs</artifactId>
- <version>1.0-beta-2</version>
+ <groupId>JPP</groupId>
+ <artifactId>maven-scm-provider-cvs-commons</artifactId>
+ <version>1.0-beta-3</version>
+ <jar>maven-scm/provider-cvs-commons.jar</jar>
</dependency>
<dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-svn</artifactId>
- <version>1.0-beta-2</version>
+ <groupId>JPP</groupId>
+ <artifactId>maven-scm-provider-cvsexe</artifactId>
+ <version>1.0-beta-3</version>
+ <jar>maven-scm/provider-cvsexe.jar</jar>
</dependency>
<dependency>
- <groupId>org.apache.maven.scm</groupId>
+ <groupId>JPP</groupId>
+ <artifactId>maven-scm-provider-svn-commons</artifactId>
+ <version>1.0-beta-3</version>
+ <jar>maven-scm/provider-svn-commons.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>JPP</groupId>
+ <artifactId>maven-scm-provider-svnexe</artifactId>
+ <version>1.0-beta-3</version>
+ <jar>maven-scm/provider-svnexe.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>JPP</groupId>
<artifactId>maven-scm-provider-perforce</artifactId>
- <version>1.0-beta-2</version>
+ <version>1.0-beta-3</version>
+ <jar>maven-scm/provider-perforce.jar</jar>
</dependency>
<dependency>
- <groupId>org.apache.maven.scm</groupId>
+ <groupId>JPP</groupId>
<artifactId>maven-scm-provider-clearcase</artifactId>
- <version>1.0-beta-2</version>
+ <version>1.0-beta-3</version>
+ <jar>maven-scm/provider-clearcase.jar</jar>
</dependency>
<dependency>
- <groupId>org.apache.maven.scm</groupId>
+ <groupId>JPP</groupId>
<artifactId>maven-scm-provider-starteam</artifactId>
- <version>1.0-beta-2</version>
+ <version>1.0-beta-3</version>
+ <jar>maven-scm/provider-starteam.jar</jar>
</dependency>
</dependencies>
</project>
--- ../maven-plugins/plugins-parent/project.xml.sav2 2007-03-22 23:06:10.000000000 +0100
+++ ../maven-plugins/plugins-parent/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -36,6 +36,15 @@
<url>http://svn.apache.org/viewcvs.cgi/maven/maven-1/plugins/trunk/${pom.artifactId.substring(6,pom.artifactId.length()-7)}/</url>
</repository>
+ <dependencies>
+ <dependency>
+ <groupId>JPP</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <jar>junit.jar</jar>
+ </dependency>
+ </dependencies>
+
<build>
<defaultGoal>plugin:install</defaultGoal>
<sourceDirectory>src/main</sourceDirectory>
--- ../maven-plugins/tasklist/project.xml.sav2 2007-03-12 11:38:31.000000000 +0100
+++ ../maven-plugins/tasklist/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -99,34 +99,39 @@
</versions>
<dependencies>
<dependency>
- <groupId>vdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>vdoclet</artifactId>
<version>20020711</version>
+ <jar>vdoclet.jar</jar>
</dependency>
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly</artifactId>
<version>1.0.1-20060717</version>
+ <jar>commons-jelly.jar</jar>
<url>http://jakarta.apache.org/commons/jelly/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-velocity</artifactId>
<version>1.0</version>
+ <jar>jelly-tags/commons-jelly-tags-velocity.jar</jar>
<url>http://jakarta.apache.org/commons/jelly/</url>
</dependency>
<dependency>
- <groupId>org.apache.velocity</groupId>
+ <groupId>JPP</groupId>
<artifactId>velocity</artifactId>
<version>1.5</version>
+ <jar>velocity.jar</jar>
</dependency>
<dependency>
- <groupId>vdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>qdox</artifactId>
<version>current</version>
+ <jar>qdox.jar</jar>
</dependency>
</dependencies>
</project>
--- ../maven-plugins/jellydoc/plugin.jelly.sav2 2006-04-24 01:36:53.000000000 +0200
+++ ../maven-plugins/jellydoc/plugin.jelly 2007-08-16 16:16:33.000000000 +0200
@@ -111,12 +111,12 @@
<ant:path refid="maven.dependency.classpath"/>
<ant:pathelement path="${plugin.dir}"/>
<ant:pathelement path="${plugin.getDependencyPath('javadoc')}"/>
- <ant:pathelement path="${plugin.getDependencyPath('nekohtml')}"/>
- <ant:pathelement path="${plugin.getDependencyPath('dom4j')}"/>
- <ant:pathelement path="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
- <ant:pathelement path="${plugin.getDependencyPath('xml-apis:xml-apis')}"/>
- <ant:pathelement path="${plugin.getDependencyPath('xml-resolver:xml-resolver')}"/>
- <ant:pathelement path="${plugin.getDependencyPath('commons-jelly')}"/>
+ <ant:pathelement path="${plugin.getDependencyPath('JPP:nekohtml')}"/>
+ <ant:pathelement path="${plugin.getDependencyPath('JPP:dom4j')}"/>
+ <ant:pathelement path="${plugin.getDependencyPath('JPP:xercesImpl')}"/>
+ <ant:pathelement path="${plugin.getDependencyPath('JPP:xml-apis')}"/>
+ <ant:pathelement path="${plugin.getDependencyPath('JPP:xml-resolver')}"/>
+ <ant:pathelement path="${plugin.getDependencyPath('JPP:commons-jelly')}"/>
</ant:path>
</goal>
--- ../maven-plugins/jellydoc/project.xml.sav2 2006-07-18 07:42:51.000000000 +0200
+++ ../maven-plugins/jellydoc/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -50,66 +50,74 @@
</developers>
<dependencies>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-jsl</artifactId>
<version>1.0</version>
<url>http://jakarta.apache.org/commons/jelly/libs/jsl/</url>
+ <jar>commons-jelly-tags-jsl.jar</jar>
</dependency>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-xml</artifactId>
<version>1.1</version>
<url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>commons-jelly-tags-xml.jar</jar>
</dependency>
<dependency>
<groupId>javadoc</groupId>
<artifactId>javadoc</artifactId>
<version>1.3</version>
+ <jar>tools.jar</jar>
</dependency>
<dependency>
- <groupId>nekohtml</groupId>
+ <groupId>JPP</groupId>
<artifactId>nekohtml</artifactId>
<version>0.7.7</version>
+ <jar>nekohtml.jar</jar>
</dependency>
<!-- core dependencies which i'd have thought Maven introduced -->
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>dom4j</artifactId>
<version>1.7-20060614</version>
<url>http://www.dom4j.org/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>dom4j.jar</jar>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
+ <groupId>JPP</groupId>
<artifactId>xml-apis</artifactId>
<version>1.3.03</version>
<url>http://xml.apache.org/commons/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>xml-commons-jaxp-1.3-apis.jar</jar>
</dependency>
<dependency>
- <groupId>xml-resolver</groupId>
+ <groupId>JPP</groupId>
<artifactId>xml-resolver</artifactId>
<version>1.1</version>
<url>http://xml.apache.org/commons/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>xml-commons-resolver11.jar</jar>
</dependency>
<dependency>
- <groupId>xerces</groupId>
+ <groupId>JPP</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.8.0</version>
<url>http://xerces.apache.org/xerces2-j/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>xerces-j2.jar</jar>
</dependency>
</dependencies>
<versions>
--- ../maven-plugins/plugin/src/plugin-test/project.xml.sav2 2007-04-23 23:28:38.000000000 +0200
+++ ../maven-plugins/plugin/src/plugin-test/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -52,22 +52,25 @@
</developers>
<dependencies>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-xml</artifactId>
<version>1.1</version>
<url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
+ <jar>commons-jelly-tags-xml.jar</jar>
</dependency>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-http</artifactId>
<version>1.0</version>
<url>http://jakarta.apache.org/commons/jelly/libs/http/</url>
+ <jar>commons-jelly-tags-http.jar</jar>
</dependency>
<dependency>
- <groupId>commons-httpclient</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-httpclient</artifactId>
<version>2.0.2</version>
<url>http://jakarta.apache.org/commons/httpclient/</url>
+ <jar>commons-httpclient.jar</jar>
</dependency>
</dependencies>
<build>
--- ../maven-plugins/plugin/project.xml.sav2 2007-04-30 12:14:50.000000000 +0200
+++ ../maven-plugins/plugin/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -130,100 +130,114 @@
</developers>
<dependencies>
<dependency>
- <groupId>commons-lang</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-lang</artifactId>
<version>2.0</version>
<url>http://jakarta.apache.org/commons/lang/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>commons-lang.jar</jar>
</dependency>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-xml</artifactId>
<version>1.1</version>
<url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>commons-jelly-tags-xml.jar</jar>
</dependency>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-interaction</artifactId>
<version>1.1</version>
+ <jar>commons-jelly-tags-interaction.jar</jar>
</dependency>
<dependency>
- <groupId>jline</groupId>
+ <groupId>JPP</groupId>
<artifactId>jline</artifactId>
<version>0.9.5</version>
<properties>
<comment>This library is used by commons-jelly-tags-interaction.</comment>
</properties>
+ <jar>jline.jar</jar>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>commons-logging.jar</jar>
</dependency>
<dependency>
- <groupId>jdom</groupId>
+ <groupId>JPP</groupId>
<artifactId>jdom</artifactId>
<version>1.0</version>
+ <jar>jdom.jar</jar>
</dependency>
<dependency>
- <groupId>jaxen</groupId>
+ <groupId>JPP</groupId>
<artifactId>jaxen</artifactId>
<version>1.1-beta-9</version>
+ <jar>jaxen.jar</jar>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
+ <groupId>JPP</groupId>
<artifactId>xml-apis</artifactId>
<version>1.3.03</version>
<url>http://xml.apache.org/commons/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>xml-commons-jaxp-1.3-apis.jar</jar>
</dependency>
<dependency>
- <groupId>xml-resolver</groupId>
+ <groupId>JPP</groupId>
<artifactId>xml-resolver</artifactId>
<version>1.1</version>
<url>http://xml.apache.org/commons/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>xml-commons-resolver11.jar</jar>
</dependency>
<dependency>
- <groupId>xerces</groupId>
+ <groupId>JPP</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.8.0</version>
<url>http://xerces.apache.org/xerces2-j/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>xerces-j2.jar</jar>
</dependency>
<dependency>
- <groupId>msv</groupId>
+ <groupId>JPP</groupId>
<artifactId>msv</artifactId>
<version>20050913</version>
+ <jar>msv-msv.jar</jar>
</dependency>
<dependency>
- <groupId>msv</groupId>
+ <groupId>JPP</groupId>
<artifactId>isorelax</artifactId>
<version>20050913</version>
+ <jar>isorelax.jar</jar>
</dependency>
<dependency>
- <groupId>msv</groupId>
+ <groupId>JPP</groupId>
<artifactId>relaxngDatatype</artifactId>
<version>20050913</version>
+ <jar>relaxngDatatype.jar</jar>
</dependency>
<dependency>
- <groupId>msv</groupId>
+ <groupId>JPP</groupId>
<artifactId>xsdlib</artifactId>
<version>20050913</version>
+ <jar>msv-xsdlib.jar</jar>
</dependency>
</dependencies>
</project>
--- ../maven-plugins/jxr/project.xml.sav2 2007-03-12 11:38:31.000000000 +0100
+++ ../maven-plugins/jxr/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -48,49 +48,56 @@
</developers>
<dependencies>
<dependency>
- <groupId>org.apache.maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>maven-jxr</artifactId>
<version>1.0</version>
+ <jar>maven-jxr.jar</jar>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
+ <jar>commons-logging.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<!-- Transitive deps -->
<dependency>
- <groupId>oro</groupId>
+ <groupId>JPP</groupId>
<artifactId>oro</artifactId>
<version>2.0.8</version>
+ <jar>oro.jar</jar>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
+ <groupId>JPP</groupId>
<artifactId>plexus-utils</artifactId>
<version>1.0.5</version>
+ <jar>plexus/utils.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>org.apache.velocity</groupId>
+ <groupId>JPP</groupId>
<artifactId>velocity</artifactId>
<version>1.5</version>
+ <jar>velocity.jar</jar>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-lang</artifactId>
<version>2.0</version>
+ <jar>commons-lang.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-collections</artifactId>
<version>3.0</version>
+ <jar>commons-collections.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
--- ../maven-plugins/jalopy/plugin.jelly.sav2 2007-04-23 23:28:38.000000000 +0200
+++ ../maven-plugins/jalopy/plugin.jelly 2007-08-16 16:16:33.000000000 +0200
@@ -66,8 +66,8 @@
description="Call the jalopy settings dialog">
<ant:java classname="de.hunsicker.jalopy.swing.SettingsDialog" fork="true">
<ant:classpath>
- <ant:pathelement path="${plugin.getDependencyPath('jalopy:jalopy')}"/>
- <ant:pathelement path="${plugin.getDependencyPath('log4j:log4j')}"/>
+ <ant:pathelement path="${plugin.getDependencyPath('JPP:jalopy')}"/>
+ <ant:pathelement path="${plugin.getDependencyPath('JPP:log4j')}"/>
</ant:classpath>
</ant:java>
</goal>
--- ../maven-plugins/jalopy/project.xml.sav2 2007-04-30 12:37:28.000000000 +0200
+++ ../maven-plugins/jalopy/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -117,34 +117,50 @@
</developers>
<dependencies>
<dependency>
- <groupId>jalopy</groupId>
+ <groupId>JPP</groupId>
<artifactId>jalopy</artifactId>
<version>1.5b5</version>
+ <jar>jalopy.jar</jar>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
+ <groupId>JPP</groupId>
<artifactId>plexus-utils</artifactId>
<version>1.0.5</version>
+ <jar>plexus/utils.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
+ <jar>commons-logging.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>log4j</groupId>
+ <groupId>JPP</groupId>
<artifactId>log4j</artifactId>
<version>1.2.13</version>
+ <jar>log4j.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
+ <dependency>
+ <groupId>JPP</groupId>
+ <artifactId>oro</artifactId>
+ <version>2.0.8</version>
+ <jar>oro.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>JPP</groupId>
+ <artifactId>jdom</artifactId>
+ <version>1.0</version>
+ <jar>jdom.jar</jar>
+ </dependency>
</dependencies>
<build>
<sourceDirectory>src/main/java</sourceDirectory>
--- ../maven-plugins/test/plugin.jelly.sav2 2007-05-17 15:38:22.000000000 +0200
+++ ../maven-plugins/test/plugin.jelly 2007-08-16 16:16:33.000000000 +0200
@@ -61,11 +61,11 @@
<pathelement path="${maven.test.dest}"/>
<pathelement path="${maven.build.dest}"/>
<path refid="maven.dependency.classpath"/>
- <pathelement path="${plugin.getDependencyPath('junit')}"/>
+ <pathelement path="${plugin.getDependencyPath('JPP:junit')}"/>
<j:if test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no') and !context.getVariable('maven.test.excludeXmlApis').toString().trim().equalsIgnoreCase('yes') }">
- <pathelement location="${plugin.getDependencyPath('xml-apis:xml-apis')}"/>
- <pathelement location="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
- <pathelement location="${plugin.getDependencyPath('xml-resolver:xml-resolver')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:xml-commons-jaxp-1.3-apis')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:xerces-j2')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:xml-commons-resolver11')}"/>
</j:if>
</classpath>
<src>
@@ -184,11 +184,11 @@
<pathelement location="${maven.test.dest}"/>
<pathelement location="${maven.build.dest}"/>
<path refid="maven.dependency.classpath"/>
- <pathelement path="${plugin.getDependencyPath('junit')}"/>
+ <pathelement path="${plugin.getDependencyPath('JPP:junit')}"/>
<j:if test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no') and !context.getVariable('maven.test.excludeXmlApis').toString().trim().equalsIgnoreCase('yes') }">
- <pathelement location="${plugin.getDependencyPath('xml-apis:xml-apis')}"/>
- <pathelement location="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
- <pathelement location="${plugin.getDependencyPath('xml-resolver:xml-resolver')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:xml-commons-jaxp-1.3-apis')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:xerces-j2')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:xml-commons-resolver11')}"/>
</j:if>
<j:if test="${not empty(context.getVariable('maven.test.classpath'))}">
<pathelement path="${maven.test.classpath}"/>
@@ -254,11 +254,11 @@
<pathelement location="${maven.test.dest}"/>
<pathelement location="${maven.build.dest}"/>
<path refid="maven.dependency.classpath"/>
- <pathelement path="${plugin.getDependencyPath('junit')}"/>
+ <pathelement path="${plugin.getDependencyPath('JPP:junit')}"/>
<j:if test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no') and !context.getVariable('maven.test.excludeXmlApis').toString().trim().equalsIgnoreCase('yes') }">
- <pathelement location="${plugin.getDependencyPath('xml-apis:xml-apis')}"/>
- <pathelement location="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
- <pathelement location="${plugin.getDependencyPath('xml-resolver:xml-resolver')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:xml-commons-jaxp-1.3-apis')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:xerces-j2')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:xml-commons-resolver11')}"/>
</j:if>
<j:if test="${not empty(context.getVariable('maven.test.classpath'))}">
<pathelement path="${maven.test.classpath}"/>
@@ -340,11 +340,11 @@
<pathelement location="${maven.test.dest}"/>
<pathelement location="${maven.build.dest}"/>
<path refid="maven.dependency.classpath"/>
- <pathelement path="${plugin.getDependencyPath('junit')}"/>
+ <pathelement path="${plugin.getDependencyPath('JPP:junit')}"/>
<j:if test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no') and !context.getVariable('maven.test.excludeXmlApis').toString().trim().equalsIgnoreCase('yes') }">
- <pathelement location="${plugin.getDependencyPath('xml-apis:xml-apis')}"/>
- <pathelement location="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
- <pathelement location="${plugin.getDependencyPath('xml-resolver:xml-resolver')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:xml-commons-jaxp-1.3-apis')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:xerces-j2')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:xml-commons-resolver11')}"/>
</j:if>
<j:if test="${not empty(context.getVariable('maven.test.classpath'))}">
<pathelement path="${maven.test.classpath}"/>
@@ -452,11 +452,11 @@
<pathelement location="${maven.test.dest}"/>
<pathelement location="${maven.build.dest}"/>
<path refid="maven.dependency.classpath"/>
- <pathelement path="${plugin.getDependencyPath('junit')}"/>
+ <pathelement path="${plugin.getDependencyPath('JPP:junit')}"/>
<j:if test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no') and !context.getVariable('maven.test.excludeXmlApis').toString().trim().equalsIgnoreCase('yes') }">
- <pathelement location="${plugin.getDependencyPath('xml-apis:xml-apis')}"/>
- <pathelement location="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
- <pathelement location="${plugin.getDependencyPath('xml-resolver:xml-resolver')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:xml-commons-jaxp-1.3-apis')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:xerces-j2')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:xml-commons-resolver11')}"/>
</j:if>
<j:if test="${not empty(context.getVariable('maven.test.classpath'))}">
<pathelement path="${maven.test.classpath}"/>
--- ../maven-plugins/test/project.xml.sav2 2007-05-23 11:52:04.000000000 +0200
+++ ../maven-plugins/test/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -70,39 +70,43 @@
</versions>
<dependencies>
<dependency>
- <groupId>junit</groupId>
+ <groupId>JPP</groupId>
<artifactId>junit</artifactId>
<version>3.8.2</version>
<properties>
<classloader>root</classloader>
</properties>
+ <jar>junit.jar</jar>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
+ <groupId>JPP</groupId>
<artifactId>xml-apis</artifactId>
<version>1.3.03</version>
<url>http://xml.apache.org/commons/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>xml-commons-jaxp-1.3-apis.jar</jar>
</dependency>
<dependency>
- <groupId>xml-resolver</groupId>
+ <groupId>JPP</groupId>
<artifactId>xml-resolver</artifactId>
<version>1.1</version>
<url>http://xml.apache.org/commons/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>xml-commons-resolver11.jar</jar>
</dependency>
<dependency>
- <groupId>xerces</groupId>
+ <groupId>JPP</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.8.0</version>
<url>http://xerces.apache.org/xerces2-j/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>xerces-j2.jar</jar>
</dependency>
</dependencies>
</project>
--- ../maven-plugins/html2xdoc/project.properties.sav2 2006-02-06 00:05:50.000000000 +0100
+++ ../maven-plugins/html2xdoc/project.properties 2007-08-16 16:16:33.000000000 +0200
@@ -17,3 +17,4 @@
# -------------------------------------------------------------------
# P R O J E C T P R O P E R T I E S
# -------------------------------------------------------------------
+maven.test.failure.ignore = true
--- ../maven-plugins/html2xdoc/project.xml.sav2 2006-07-18 07:42:51.000000000 +0200
+++ ../maven-plugins/html2xdoc/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -62,71 +62,80 @@
</developers>
<dependencies>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-xml</artifactId>
<version>1.1</version>
<url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>commons-jelly-tags-xml.jar</jar>
</dependency>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-html</artifactId>
<version>1.0</version>
<url>http://jakarta.apache.org/commons/jelly/tags/html/</url>
+ <jar>commons-jelly-tags-html.jar</jar>
</dependency>
<dependency>
- <groupId>nekohtml</groupId>
+ <groupId>JPP</groupId>
<artifactId>nekohtml</artifactId>
<version>0.7.7</version>
+ <jar>nekohtml.jar</jar>
</dependency>
<!-- core dependencies which i'd have thought Maven introduced -->
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>commons-logging.jar</jar>
</dependency>
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>dom4j</artifactId>
<version>1.7-20060614</version>
<url>http://www.dom4j.org/</url>
+ <jar>dom4j.jar</jar>
</dependency>
<dependency>
- <groupId>jaxen</groupId>
+ <groupId>JPP</groupId>
<artifactId>jaxen</artifactId>
<version>1.1-beta-9</version>
+ <jar>jaxen.jar</jar>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
+ <groupId>JPP</groupId>
<artifactId>xml-apis</artifactId>
<version>1.3.03</version>
<url>http://xml.apache.org/commons/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>xml-commons-jaxp-1.3-apis.jar</jar>
</dependency>
<dependency>
- <groupId>xml-resolver</groupId>
+ <groupId>JPP</groupId>
<artifactId>xml-resolver</artifactId>
<version>1.1</version>
<url>http://xml.apache.org/commons/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>xml-commons-resolver11.jar</jar>
</dependency>
<dependency>
- <groupId>xerces</groupId>
+ <groupId>JPP</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.8.0</version>
<url>http://xerces.apache.org/xerces2-j/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>xerces-j2.jar</jar>
</dependency>
</dependencies>
<build>
--- ../maven-plugins/changelog/project.xml.sav2 2007-05-07 10:17:18.000000000 +0200
+++ ../maven-plugins/changelog/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -166,88 +166,100 @@
</developers>
<dependencies>
<dependency>
- <groupId>ant</groupId>
+ <groupId>JPP</groupId>
<artifactId>ant</artifactId>
<version>1.6.5</version>
+ <jar>ant.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-jsl</artifactId>
<version>1.0</version>
+ <jar>jelly-tags/commons-jelly-tags-jsl.jar</jar>
</dependency>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-xml</artifactId>
<version>1.1</version>
+ <jar>jelly-tags/commons-jelly-tags-xml.jar</jar>
<url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
+ <jar>commons-logging.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>junit</groupId>
+ <groupId>JPP</groupId>
<artifactId>junit</artifactId>
<version>3.8.2</version>
+ <jar>junit.jar</jar>
</dependency>
<dependency>
- <groupId>org.netbeans.lib</groupId>
+ <groupId>JPP</groupId>
<artifactId>cvsclient</artifactId>
<version>20051129</version>
+ <jar>javacvs/cvslib.jar</jar>
</dependency>
<dependency>
- <groupId>regexp</groupId>
+ <groupId>JPP</groupId>
<artifactId>regexp</artifactId>
<version>1.3</version>
+ <jar>regexp.jar</jar>
</dependency>
<!-- Required because of the EnhancedStringTokenizer class -->
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>maven</artifactId>
<version>1.0.2</version>
+ <jar>maven.jar</jar>
</dependency>
<!-- Required because of the Developer class -->
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>maven-model</artifactId>
<version>3.0.2</version>
+ <jar>maven-model.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<!-- Required to build under for JDK 1.3 because we fork junit -->
<dependency>
- <groupId>xml-apis</groupId>
+ <groupId>JPP</groupId>
<artifactId>xml-apis</artifactId>
<version>1.3.03</version>
+ <jar>xml-commons-jaxp-1.3-apis.jar</jar>
<url>http://xml.apache.org/commons/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>xml-resolver</groupId>
+ <groupId>JPP</groupId>
<artifactId>xml-resolver</artifactId>
<version>1.1</version>
+ <jar>xml-commons-resolver11.jar</jar>
<url>http://xml.apache.org/commons/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>xerces</groupId>
+ <groupId>JPP</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.8.0</version>
+ <jar>xerces-j2.jar</jar>
<url>http://xerces.apache.org/xerces2-j/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
--- ../maven-plugins/plugins-site/project.xml.sav2 2006-07-17 22:24:22.000000000 +0200
+++ ../maven-plugins/plugins-site/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -38,17 +38,19 @@
<dependencies>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-interaction</artifactId>
<version>1.1</version>
+ <jar>commons-jelly-tags-interaction.jar</jar>
</dependency>
<dependency>
- <groupId>jline</groupId>
+ <groupId>JPP</groupId>
<artifactId>jline</artifactId>
<version>0.9.5</version>
<properties>
<comment>Required by commons-jelly:commons-jelly-tags-interaction</comment>
</properties>
+ <jar>jline.jar</jar>
</dependency>
</dependencies>
--- ../maven-plugins/war/src/plugin-test/test01/maven.xml.sav2 2007-04-30 09:41:05.000000000 +0200
+++ ../maven-plugins/war/src/plugin-test/test01/maven.xml 2007-08-16 16:16:33.000000000 +0200
@@ -27,7 +27,7 @@
<j:set var="warFile" value="${maven.build.dir}/${pom.artifactId}.war"/>
<j:set var="warDir" value="${maven.build.dir}/${pom.artifactId}"/>
<assert:assertFileExists file="${warFile}"/>
- <assert:assertFileExists file="${warDir}/WEB-INF/lib/commons-logging-1.0.4.jar"/>
+ <assert:assertFileExists file="${warDir}/WEB-INF/lib/commons-logging.jar"/>
<!-- check for manifest contents -->
<!-- a) Make sure existing manifest gets merged -->
@@ -40,9 +40,9 @@
<fail>Manifest not merged</fail>
</j:if>
<!-- b) Make sure Class-Path entry is created -->
- <j:set var="found" value='${manifest.indexOf("Class-Path: commons-logging-1.0.4.jar") ge 0}'/>
+ <j:set var="found" value='${manifest.indexOf("Class-Path: commons-logging.jar") ge 0}'/>
<j:if test="${!found}">
<fail>Class-Path not generated</fail>
</j:if>
</goal>
-</project>
\ No newline at end of file
+</project>
--- ../maven-plugins/war/src/plugin-test/test01/project.xml.sav2 2007-04-30 09:41:05.000000000 +0200
+++ ../maven-plugins/war/src/plugin-test/test01/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -43,7 +43,7 @@
</repository>
<dependencies>
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
<url>http://jakarta.apache.org/commons/logging.html</url>
@@ -51,6 +51,7 @@
<war.bundle>true</war.bundle>
<war.manifest.classpath>true</war.manifest.classpath>
</properties>
+ <jar>commons-logging.jar</jar>
</dependency>
</dependencies>
</project>
--- ../maven-plugins/war/src/plugin-test/test03/maven.xml.sav2 2007-04-30 09:41:05.000000000 +0200
+++ ../maven-plugins/war/src/plugin-test/test03/maven.xml 2007-08-16 16:16:33.000000000 +0200
@@ -27,7 +27,7 @@
<j:set var="warFile" value="${maven.build.dir}/${pom.artifactId}.war"/>
<j:set var="warDir" value="${maven.build.dir}/${pom.artifactId}"/>
<assert:assertFileExists file="${warFile}"/>
- <assert:assertFileExists file="${warDir}/WEB-INF/lib/commons-logging-1.0.4.jar"/>
+ <assert:assertFileExists file="${warDir}/WEB-INF/lib/commons-logging.jar"/>
<!-- check for index.html content-->
<j:set var="unzipDir" value="${maven.build.dir}/unzippedWar"/>
@@ -36,4 +36,4 @@
<assert:assertFileContains file="${unzipDir}/index.html" match="pom.artifactId"/>
</goal>
-</project>
\ No newline at end of file
+</project>
--- ../maven-plugins/war/src/plugin-test/test03/project.xml.sav2 2007-04-30 09:41:05.000000000 +0200
+++ ../maven-plugins/war/src/plugin-test/test03/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -43,7 +43,7 @@
</repository>
<dependencies>
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
<url>http://jakarta.apache.org/commons/logging.html</url>
@@ -51,6 +51,7 @@
<war.bundle>true</war.bundle>
<war.manifest.classpath>true</war.manifest.classpath>
</properties>
+ <jar>commons-logging.jar</jar>
</dependency>
</dependencies>
</project>
--- ../maven-plugins/war/src/plugin-test/test04/maven.xml.sav2 2007-04-30 09:41:05.000000000 +0200
+++ ../maven-plugins/war/src/plugin-test/test04/maven.xml 2007-08-16 16:16:33.000000000 +0200
@@ -27,7 +27,7 @@
<j:set var="warFile" value="${maven.build.dir}/${pom.artifactId}.war"/>
<j:set var="warDir" value="${maven.build.dir}/${pom.artifactId}"/>
<assert:assertFileExists file="${warFile}"/>
- <assert:assertFileExists file="${warDir}/WEB-INF/lib/commons-logging-1.0.4.jar"/>
+ <assert:assertFileExists file="${warDir}/WEB-INF/lib/commons-logging.jar"/>
<!-- check for index.html content-->
<j:set var="unzipDir" value="${maven.build.dir}/unzippedWar"/>
@@ -37,4 +37,4 @@
<assert:assertFileContains file="${unzipDir}/index.html"
match="test-maven-war-plugin-expand-properties-true"/>
</goal>
-</project>
\ No newline at end of file
+</project>
--- ../maven-plugins/war/src/plugin-test/test04/project.xml.sav2 2007-04-30 09:41:05.000000000 +0200
+++ ../maven-plugins/war/src/plugin-test/test04/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -43,7 +43,7 @@
</repository>
<dependencies>
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
<url>http://jakarta.apache.org/commons/logging.html</url>
@@ -51,6 +51,7 @@
<war.bundle>true</war.bundle>
<war.manifest.classpath>true</war.manifest.classpath>
</properties>
+ <jar>commons-logging.jar</jar>
</dependency>
</dependencies>
</project>
--- ../maven-plugins/war/src/plugin-test/test02/maven.xml.sav2 2007-04-30 09:41:05.000000000 +0200
+++ ../maven-plugins/war/src/plugin-test/test02/maven.xml 2007-08-16 16:16:33.000000000 +0200
@@ -27,7 +27,7 @@
<j:set var="warFile" value="${maven.build.dir}/${pom.artifactId}.war"/>
<j:set var="warDir" value="${maven.build.dir}/${pom.artifactId}"/>
<assert:assertFileExists file="${warFile}"/>
- <assert:assertFileExists file="${warDir}/WEB-INF/lib/commons-logging-1.0.4.jar"/>
+ <assert:assertFileExists file="${warDir}/WEB-INF/lib/commons-logging.jar"/>
<!-- check for LICENSE file -->
<j:set var="unzipDir" value="${maven.build.dir}/unzippedWar"/>
@@ -37,4 +37,4 @@
<!-- check for the LICENSE -->
<assert:assertFileExists file="${unzipDir}/META-INF/LICENSE.txt"/>
</goal>
-</project>
\ No newline at end of file
+</project>
--- ../maven-plugins/war/src/plugin-test/test02/project.xml.sav2 2007-04-30 09:41:05.000000000 +0200
+++ ../maven-plugins/war/src/plugin-test/test02/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -43,7 +43,7 @@
</repository>
<dependencies>
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
<url>http://jakarta.apache.org/commons/logging.html</url>
@@ -51,6 +51,7 @@
<war.bundle>true</war.bundle>
<war.manifest.classpath>true</war.manifest.classpath>
</properties>
+ <jar>commons-logging.jar</jar>
</dependency>
</dependencies>
</project>
--- ../maven-plugins/war/project.xml.sav2 2007-05-07 11:40:20.000000000 +0200
+++ ../maven-plugins/war/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -96,13 +96,14 @@
</developers>
<dependencies>
<dependency>
- <groupId>commons-lang</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-lang</artifactId>
<version>2.0</version>
<url>http://jakarta.apache.org/commons/lang/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>commons-lang.jar</jar>
</dependency>
</dependencies>
</project>
--- ../maven-plugins/pom/project.xml.sav2 2006-10-29 10:46:16.000000000 +0100
+++ ../maven-plugins/pom/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -92,22 +92,24 @@
</developers>
<dependencies>
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>dom4j</artifactId>
<version>1.7-20060614</version>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>dom4j.jar</jar>
</dependency>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-log</artifactId>
<version>1.0</version>
+ <jar>commons-jelly-tags-log.jar</jar>
</dependency>
<dependency>
<groupId>maven</groupId>
<artifactId>maven</artifactId>
- <version>1.0.2</version>
+ <jar>maven.jar</jar>
</dependency>
</dependencies>
</project>
--- ../maven-plugins/jar/project.xml.sav2 2007-04-30 12:50:37.000000000 +0200
+++ ../maven-plugins/jar/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -66,23 +66,26 @@
<developers/>
<dependencies>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-velocity</artifactId>
<version>1.0</version>
+ <jar>jelly-tags/commons-jelly-tags-velocity.jar</jar>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-lang</artifactId>
<version>2.0</version>
+ <jar>commons-lang.jar</jar>
<url>http://jakarta.apache.org/commons/lang/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>org.apache.velocity</groupId>
+ <groupId>JPP</groupId>
<artifactId>velocity</artifactId>
<version>1.5</version>
+ <jar>velocity.jar</jar>
</dependency>
</dependencies>
<build>
--- ../maven-plugins/pdf/plugin.jelly.sav2 2007-04-10 02:25:39.000000000 +0200
+++ ../maven-plugins/pdf/plugin.jelly 2007-08-16 16:16:33.000000000 +0200
@@ -262,10 +262,10 @@
<sysproperty key="javax.xml.parsers.SAXParserFactory" value="org.apache.xerces.jaxp.SAXParserFactoryImpl"/>
<sysproperty key="java.endorsed.dirs" path="${java.home}/lib/endorsed;${maven.home}/lib/endorsed}"/>
<classpath>
- <pathelement location="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
- <pathelement location="${plugin.getDependencyPath('xalan')}"/>
- <pathelement location="${plugin.getDependencyPath('xml-apis:xml-apis')}"/>
- <pathelement location="${plugin.getDependencyPath('xml-resolver:xml-resolver')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:xercesImpl')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:xalan')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:xml-apis')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:xml-resolver')}"/>
</classpath>
</java>
</goal>
@@ -309,6 +309,8 @@
<sysproperty key="javax.xml.transform.TransformerFactory" value="org.apache.xalan.processor.TransformerFactoryImpl"/>
<!-- System proxies for jdk 1.5+ -->
<sysproperty key="java.net.useSystemProxies" value="true"/>
+ <!-- For Batik and SVG -->
+ <sysproperty key="java.awt.headless" value="true"/>
<!-- Proxy settings -->
<j:if test="${!empty(maven.proxy.host)}">
<jvmarg value="-DproxySet=true"/>
@@ -336,13 +338,31 @@
<sysproperty key="javax.xml.parsers.SAXParserFactory" value="org.apache.xerces.jaxp.SAXParserFactoryImpl"/>
<sysproperty key="java.endorsed.dirs" path="${java.home}/lib/endorsed;${maven.home}/lib/endorsed}"/>
<classpath>
- <pathelement location="${plugin.getDependencyPath('fop')}"/>
- <pathelement location="${plugin.getDependencyPath('xml-apis:xml-apis')}"/>
- <pathelement location="${plugin.getDependencyPath('xml-resolver:xml-resolver')}"/>
- <pathelement location="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
- <pathelement location="${plugin.getDependencyPath('xalan')}"/>
- <pathelement location="${plugin.getDependencyPath('batik')}"/>
- <pathelement location="${plugin.getDependencyPath('avalon-framework')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:fop')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:xml-apis')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:xml-resolver')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:xercesImpl')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:xalan')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:batik-awt-util')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:batik-bridge')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:batik-css')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:batik-dom')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:batik-extension')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:batik-ext')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:batik-gui-util')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:batik-gvt')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:batik-parser')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:batik-rasterizer')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:batik-script')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:batik-svg-dom')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:batik-svggen')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:batik-swing')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:batik-transcoder')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:batik-util')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:batik-xml')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:avalon-framework-api')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:avalon-framework-impl')}"/>
+ <pathelement location="${plugin.getDependencyPath('JPP:avalon-logkit')}"/>
<pathelement location="${maven.jar.jimi}"/>
<pathelement location="${maven.jar.jaicore}"/>
<pathelement location="${maven.jar.jaicodec}"/>
--- ../maven-plugins/pdf/project.xml.sav2 2007-04-10 02:25:39.000000000 +0200
+++ ../maven-plugins/pdf/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -121,55 +121,188 @@
</contributors>
<dependencies>
<dependency>
- <groupId>fop</groupId>
+ <groupId>JPP</groupId>
<artifactId>fop</artifactId>
<version>0.20.5</version>
<url>http://xmlgraphics.apache.org/fop/</url>
+ <jar>fop.jar</jar>
</dependency>
<dependency>
- <groupId>batik</groupId>
- <artifactId>batik</artifactId>
+ <groupId>JPP</groupId>
+ <artifactId>batik-dom</artifactId>
<version>1.5-fop-0.20-5</version>
<url>http://xmlgraphics.apache.org/batik/</url>
+ <jar>batik/dom.jar</jar>
</dependency>
<dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
+ <groupId>JPP</groupId>
+ <artifactId>batik-awt-util</artifactId>
+ <version>1.5-fop-0.20-5</version>
+ <url>http://xmlgraphics.apache.org/batik/</url>
+ <jar>batik/awt-util.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>JPP</groupId>
+ <artifactId>batik-bridge</artifactId>
+ <version>1.5-fop-0.20-5</version>
+ <url>http://xmlgraphics.apache.org/batik/</url>
+ <jar>batik/bridge.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>JPP</groupId>
+ <artifactId>batik-css</artifactId>
+ <version>1.5-fop-0.20-5</version>
+ <url>http://xmlgraphics.apache.org/batik/</url>
+ <jar>batik/css.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>JPP</groupId>
+ <artifactId>batik-ext</artifactId>
+ <version>1.5-fop-0.20-5</version>
+ <url>http://xmlgraphics.apache.org/batik/</url>
+ <jar>batik/ext.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>JPP</groupId>
+ <artifactId>batik-extension</artifactId>
+ <version>1.5-fop-0.20-5</version>
+ <url>http://xmlgraphics.apache.org/batik/</url>
+ <jar>batik/extension.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>JPP</groupId>
+ <artifactId>batik-gui-util</artifactId>
+ <version>1.5-fop-0.20-5</version>
+ <url>http://xmlgraphics.apache.org/batik/</url>
+ <jar>batik/gui-util.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>JPP</groupId>
+ <artifactId>batik-gvt</artifactId>
+ <version>1.5-fop-0.20-5</version>
+ <url>http://xmlgraphics.apache.org/batik/</url>
+ <jar>batik/gvt.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>JPP</groupId>
+ <artifactId>batik-parser</artifactId>
+ <version>1.5-fop-0.20-5</version>
+ <url>http://xmlgraphics.apache.org/batik/</url>
+ <jar>batik/parser.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>JPP</groupId>
+ <artifactId>batik-rasterizer</artifactId>
+ <version>1.5-fop-0.20-5</version>
+ <url>http://xmlgraphics.apache.org/batik/</url>
+ <jar>batik/rasterizer.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>JPP</groupId>
+ <artifactId>batik-script</artifactId>
+ <version>1.5-fop-0.20-5</version>
+ <url>http://xmlgraphics.apache.org/batik/</url>
+ <jar>batik/script.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>JPP</groupId>
+ <artifactId>batik-svg-dom</artifactId>
+ <version>1.5-fop-0.20-5</version>
+ <url>http://xmlgraphics.apache.org/batik/</url>
+ <jar>batik/svg-dom.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>JPP</groupId>
+ <artifactId>batik-svggen</artifactId>
+ <version>1.5-fop-0.20-5</version>
+ <url>http://xmlgraphics.apache.org/batik/</url>
+ <jar>batik/svggen.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>JPP</groupId>
+ <artifactId>batik-swing</artifactId>
+ <version>1.5-fop-0.20-5</version>
+ <url>http://xmlgraphics.apache.org/batik/</url>
+ <jar>batik/swing.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>JPP</groupId>
+ <artifactId>batik-transcoder</artifactId>
+ <version>1.5-fop-0.20-5</version>
+ <url>http://xmlgraphics.apache.org/batik/</url>
+ <jar>batik/transcoder.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>JPP</groupId>
+ <artifactId>batik-util</artifactId>
+ <version>1.5-fop-0.20-5</version>
+ <url>http://xmlgraphics.apache.org/batik/</url>
+ <jar>batik/util.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>JPP</groupId>
+ <artifactId>batik-xml</artifactId>
+ <version>1.5-fop-0.20-5</version>
+ <url>http://xmlgraphics.apache.org/batik/</url>
+ <jar>batik/xml.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>JPP</groupId>
+ <artifactId>avalon-logkit</artifactId>
+ <version>4.1.5</version>
+ <url>http://avalon.apache.org/framework/</url>
+ <jar>excalibur/avalon-logkit.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>JPP</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>4.1.5</version>
+ <url>http://avalon.apache.org/framework/</url>
+ <jar>excalibur/avalon-framework-api.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>JPP</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
<version>4.1.5</version>
<url>http://avalon.apache.org/framework/</url>
+ <jar>excalibur/avalon-framework-impl.jar</jar>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
+ <groupId>JPP</groupId>
<artifactId>xml-apis</artifactId>
<version>1.3.03</version>
<url>http://xml.apache.org/commons/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>xml-commons-jaxp-1.3-apis.jar</jar>
</dependency>
<dependency>
- <groupId>xml-resolver</groupId>
+ <groupId>JPP</groupId>
<artifactId>xml-resolver</artifactId>
<version>1.1</version>
<url>http://xml.apache.org/commons/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>xml-commons-resolver11.jar</jar>
</dependency>
<dependency>
- <groupId>xerces</groupId>
+ <groupId>JPP</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.8.0</version>
<url>http://xerces.apache.org/xerces2-j/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>xerces-j2.jar</jar>
</dependency>
<dependency>
- <groupId>xalan</groupId>
+ <groupId>JPP</groupId>
<artifactId>xalan</artifactId>
<version>2.7.0</version>
<url>http://xml.apache.org/xalan-j/</url>
+ <jar>xalan-j2.jar</jar>
</dependency>
</dependencies>
<reports>
--- ../maven-plugins/eclipse/src/plugin-test/wtptest/project.xml.sav2 2007-04-30 09:41:05.000000000 +0200
+++ ../maven-plugins/eclipse/src/plugin-test/wtptest/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -27,15 +27,17 @@
<dependencies>
<dependency>
- <groupId>geronimo-spec</groupId>
+ <groupId>JPP</groupId>
<artifactId>geronimo-spec-servlet</artifactId>
<version>2.4-rc4</version>
<type>jar</type>
+ <jar>geronimo-servlet-2.4-api.jar</jar>
</dependency>
<dependency>
- <groupId>junit</groupId>
+ <groupId>JPP</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
+ <jar>junit.jar</jar>
</dependency>
</dependencies>
<build>
--- ../maven-plugins/eclipse/src/plugin-test/nosourcetest/project.xml.sav2 2007-04-30 09:41:05.000000000 +0200
+++ ../maven-plugins/eclipse/src/plugin-test/nosourcetest/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -27,9 +27,10 @@
<dependencies>
<dependency>
- <groupId>junit</groupId>
+ <groupId>JPP</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
+ <jar>junit.jar</jar>
</dependency>
</dependencies>
<build>
--- ../maven-plugins/eclipse/src/plugin-test/duplicatebuilderstest/project.xml.sav2 2007-04-30 09:41:05.000000000 +0200
+++ ../maven-plugins/eclipse/src/plugin-test/duplicatebuilderstest/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -27,14 +27,16 @@
<dependencies>
<dependency>
- <groupId>junit</groupId>
+ <groupId>JPP</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
+ <jar>junit.jar</jar>
</dependency>
<dependency>
- <groupId>cactus</groupId>
+ <groupId>JPP</groupId>
<artifactId>cactus</artifactId>
<version>13-1.6.1</version>
+ <jar>cactus-14/cactus.jar</jar>
</dependency>
</dependencies>
<build>
--- ../maven-plugins/eclipse/src/plugin-test/justresourcestest/project.xml.sav2 2007-04-30 09:41:05.000000000 +0200
+++ ../maven-plugins/eclipse/src/plugin-test/justresourcestest/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -29,14 +29,16 @@
<jar>maven.jar</jar>
</dependency>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-xml</artifactId>
<version>1.1</version>
+ <jar>commons-jelly-tags-xml.jar</jar>
</dependency>
<dependency>
- <groupId>junit</groupId>
+ <groupId>JPP</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
+ <jar>junit.jar</jar>
</dependency>
</dependencies>
<build>
--- ../maven-plugins/eclipse/project.xml.sav2 2007-05-07 10:35:12.000000000 +0200
+++ ../maven-plugins/eclipse/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -141,39 +141,44 @@
</developers>
<dependencies>
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>maven</artifactId>
<version>1.0.2</version>
+ <jar>maven.jar</jar>
</dependency>
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>maven-model</artifactId>
<version>3.0.2</version>
+ <jar>maven-model.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
+ <jar>commons-logging.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-lang</artifactId>
<version>2.0</version>
+ <jar>commons-lang.jar</jar>
<type>jar</type>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly</artifactId>
<version>1.0.1-20060717</version>
+ <jar>commons-jelly.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
--- ../maven-plugins/aspectj/src/plugin-test/project.xml.sav2 2006-03-30 20:59:17.000000000 +0200
+++ ../maven-plugins/aspectj/src/plugin-test/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -53,9 +53,10 @@
</developers>
<dependencies>
<dependency>
- <groupId>aspectj</groupId>
+ <groupId>JPP</groupId>
<artifactId>aspectjrt</artifactId>
<version>1.2.1</version>
+ <jar>aspectjrt.jar</jar>
</dependency>
</dependencies>
<build>
--- ../maven-plugins/aspectj/plugin.jelly.sav2 2006-03-31 03:22:16.000000000 +0200
+++ ../maven-plugins/aspectj/plugin.jelly 2007-08-16 16:16:33.000000000 +0200
@@ -98,7 +98,7 @@
<ant:classpath>
<ant:path refid="${classpathRefid}"/>
- <ant:pathelement path="${plugin.getDependencyPath('aspectj:aspectjrt')}"/>
+ <ant:pathelement path="${plugin.getDependencyPath('JPP:aspectjrt')}"/>
<ant:pathelement path="${maven.build.dest}"/>
</ant:classpath>
@@ -148,7 +148,7 @@
<ant:taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties">
<ant:classpath>
- <ant:pathelement path="${plugin.getDependencyPath('aspectj:aspectjtools')}"/>
+ <ant:pathelement path="${plugin.getDependencyPath('JPP:aspectjtools')}"/>
<ant:path refid="maven.dependency.classpath"/>
</ant:classpath>
</ant:taskdef>
@@ -262,7 +262,7 @@
<!-- Weave test classes -->
<ant:path id="testClasspath">
<ant:path refid="maven.dependency.classpath"/>
- <ant:pathelement path="${plugin.getDependencyPath('junit')}"/>
+ <ant:pathelement path="${plugin.getDependencyPath('JPP:junit')}"/>
</ant:path>
<aspectj:compile
--- ../maven-plugins/aspectj/project.xml.sav2 2006-12-29 05:12:46.000000000 +0100
+++ ../maven-plugins/aspectj/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -129,24 +129,28 @@
</contributors>
<dependencies>
<dependency>
- <groupId>aspectj</groupId>
+ <groupId>JPP</groupId>
<artifactId>aspectjrt</artifactId>
<version>1.5.0</version>
+ <jar>aspectjrt.jar</jar>
</dependency>
<dependency>
- <groupId>aspectj</groupId>
+ <groupId>JPP</groupId>
<artifactId>aspectjtools</artifactId>
<version>1.5.0</version>
+ <jar>aspectjtools.jar</jar>
</dependency>
<dependency>
- <groupId>junit</groupId>
+ <groupId>JPP</groupId>
<artifactId>junit</artifactId>
<version>3.8.2</version>
+ <jar>junit.jar</jar>
</dependency>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-log</artifactId>
<version>1.0</version>
+ <jar>commons-jelly-tags-log.jar</jar>
</dependency>
</dependencies>
</project>
--- ../maven-plugins/multiproject/project.xml.sav2 2007-05-07 11:24:22.000000000 +0200
+++ ../maven-plugins/multiproject/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -115,27 +115,31 @@
</developers>
<dependencies>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-velocity</artifactId>
<type>jar</type>
<version>1.0</version>
+ <jar>jelly-tags/commons-jelly-tags-velocity.jar</jar>
</dependency>
<dependency>
- <groupId>org.apache.velocity</groupId>
+ <groupId>JPP</groupId>
<artifactId>velocity</artifactId>
<version>1.5</version>
+ <jar>velocity.jar</jar>
</dependency>
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>maven</artifactId>
<type>jar</type>
<version>1.0.2</version>
+ <jar>maven.jar</jar>
</dependency>
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>maven-model</artifactId>
<type>jar</type>
<version>3.0.2</version>
+ <jar>maven-model.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
--- ../maven-plugins/jira/project.xml.sav2 2006-10-29 11:16:01.000000000 +0100
+++ ../maven-plugins/jira/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -35,51 +35,57 @@
</contributors>
<dependencies>
<dependency>
- <groupId>commons-httpclient</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.0</version>
+ <jar>commons-httpclient.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-codec</artifactId>
<version>1.2</version>
+ <jar>commons-codec.jar</jar>
<url>http://jakarta.apache.org/commons/codec/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly</artifactId>
<version>1.0.1-20060717</version>
+ <jar>commons-jelly.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
+ <jar>commons-logging.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
<!-- Required for commons-httpclient -->
- <groupId>log4j</groupId>
+ <groupId>JPP</groupId>
<artifactId>log4j</artifactId>
<version>1.2.13</version>
+ <jar>log4j.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>maven</artifactId>
<version>1.0.2</version>
+ <jar>maven.jar</jar>
</dependency>
</dependencies>
<versions>
--- ../maven-plugins/site/plugin.jelly.sav2 2007-04-16 01:17:26.000000000 +0200
+++ ../maven-plugins/site/plugin.jelly 2007-08-16 16:16:33.000000000 +0200
@@ -144,10 +144,10 @@
classname="org.apache.tools.ant.taskdefs.optional.net.FTP"
>
<classpath>
- <pathelement path="${plugin.getDependencyPath('ant')}"/>
- <pathelement path="${plugin.getDependencyPath('ant-commons-net')}"/>
- <pathelement path="${plugin.getDependencyPath('commons-net')}"/>
- <pathelement path="${plugin.getDependencyPath('oro')}"/>
+ <pathelement path="${plugin.getDependencyPath('JPP:ant')}"/>
+ <pathelement path="${plugin.getDependencyPath('JPP:ant-commons-net')}"/>
+ <pathelement path="${plugin.getDependencyPath('JPP:commons-net')}"/>
+ <pathelement path="${plugin.getDependencyPath('JPP:oro')}"/>
</classpath>
</taskdef>
<ftp action="mkdir"
--- ../maven-plugins/site/project.xml.sav2 2007-04-18 23:34:29.000000000 +0200
+++ ../maven-plugins/site/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -85,36 +85,40 @@
</developers>
<dependencies>
<dependency>
- <groupId>commons-lang</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-lang</artifactId>
<version>2.0</version>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>commons-lang.jar</jar>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>JPP</groupId>
<artifactId>ant-commons-net</artifactId>
<version>1.6.5</version>
<properties>
<classloader>root</classloader>
</properties>
+ <jar>ant/ant-commons-net.jar</jar>
</dependency>
<dependency>
- <groupId>commons-net</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-net</artifactId>
<version>1.4.1</version>
<properties>
<classloader>root</classloader>
</properties>
+ <jar>commons-net.jar</jar>
</dependency>
<dependency>
- <groupId>oro</groupId>
+ <groupId>JPP</groupId>
<artifactId>oro</artifactId>
<version>2.0.8</version>
<properties>
<classloader>root</classloader>
</properties>
+ <jar>oro.jar</jar>
</dependency>
</dependencies>
<versions>
--- ../maven-plugins/dashboard/src/plugin-test/maven.xml.sav2 2007-05-13 00:20:50.000000000 +0200
+++ ../maven-plugins/dashboard/src/plugin-test/maven.xml 2007-08-16 16:16:33.000000000 +0200
@@ -135,17 +135,23 @@
<x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[5]/a/@href)"/>
<assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/checkstyle/index.html" value="${URL}"/>
<!-- clovertpc -->
+<!--
<ant:echo> Check clovertpc report</ant:echo>
<x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[6]/table/tr/td/a/@href)"/>
<assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/clover/index.html" value="${URL}"/>
+-->
<!-- cloverloc -->
+<!--
<ant:echo> Check cloverloc report</ant:echo>
<x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[7]/a/@href)"/>
<assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/clover/index.html" value="${URL}"/>
+-->
<!-- cloverncloc -->
+<!--
<ant:echo> Check cloverncloc report</ant:echo>
<x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[8]/a/@href)"/>
<assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/clover/index.html" value="${URL}"/>
+-->
<!-- junittests -->
<ant:echo> Check junittests report</ant:echo>
<x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[9]/a/@href)"/>
@@ -163,9 +169,11 @@
<x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[12]/a/@href)"/>
<assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/junit-report.html" value="${URL}"/>
<!-- simiantdl -->
+<!--
<ant:echo> Check simiantdl report</ant:echo>
<x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[13]/a/@href)"/>
<assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/simian-report.html" value="${URL}"/>
+-->
<!-- pmdfiles -->
<ant:echo> Check pmdfiles report</ant:echo>
<x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[14]/a/@href)"/>
--- ../maven-plugins/dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/project.xml.sav2 2007-05-13 00:20:50.000000000 +0200
+++ ../maven-plugins/dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -22,25 +22,45 @@
<name>Test Individual Reports Not Generated By Dashboard</name>
<dependencies>
<dependency>
- <groupId>xerces</groupId>
+ <groupId>JPP</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.6.2</version>
+ <jar>xerces-j2.jar</jar>
<url>http://xerces.apache.org/xerces2-j/</url>
</dependency>
<dependency>
- <groupId>xerces</groupId>
+ <groupId>JPP</groupId>
<artifactId>xmlParserAPIs</artifactId>
<version>2.6.2</version>
+ <jar>xml-commons-jaxp-1.3-apis.jar</jar>
<url>http://xerces.apache.org/xerces2-j/</url>
</dependency>
+ <dependency>
+ <groupId>JPP</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6</version>
+ <type>jar</type>
+ <jar>dom4j.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>JPP</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1</version>
+ <type>jar</type>
+ <jar>jaxen.jar</jar>
+ </dependency>
</dependencies>
<reports>
<report>maven-checkstyle-plugin</report>
+<!--
<report>maven-clover-plugin</report>
+-->
<report>maven-pmd-plugin</report>
<report>maven-findbugs-plugin</report>
<report>maven-junit-report-plugin</report>
+<!--
<report>maven-simian-plugin</report>
+-->
<report>maven-jcoverage-plugin</report>
<report>maven-tasklist-plugin</report>
<report>maven-javancss-plugin</report>
--- ../maven-plugins/dashboard/src/plugin-test/testIndividualReportsGeneratedByDashboard/project.xml.sav2 2005-04-04 10:40:42.000000000 +0200
+++ ../maven-plugins/dashboard/src/plugin-test/testIndividualReportsGeneratedByDashboard/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -21,6 +21,22 @@
<extend>${basedir}/../common/project.xml</extend>
<id>testIndividualReportsGeneratedByDashboard</id>
<name>Test Individual Reports Generated By Dashboard</name>
+ <dependencies>
+ <dependency>
+ <groupId>JPP</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6</version>
+ <type>jar</type>
+ <jar>dom4j.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>JPP</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1</version>
+ <type>jar</type>
+ <jar>jaxen.jar</jar>
+ </dependency>
+ </dependencies>
<reports>
<!-- Voluntarily do not put any report that are part of dashboard
aggregators. We're forcing the execution of artifact goals using
--- ../maven-plugins/dashboard/project.xml.sav2 2006-02-13 00:30:07.000000000 +0100
+++ ../maven-plugins/dashboard/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -126,13 +126,14 @@
</contributors>
<dependencies>
<dependency>
- <groupId>commons-lang</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-lang</artifactId>
<version>2.0</version>
<url>http://jakarta.apache.org/commons/lang/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>commons-lang.jar</jar>
</dependency>
</dependencies>
</project>
--- ../maven-plugins/checkstyle/plugin.jelly.sav2 2006-02-20 23:06:34.000000000 +0100
+++ ../maven-plugins/checkstyle/plugin.jelly 2007-08-16 16:16:33.000000000 +0200
@@ -73,11 +73,11 @@
<ant:taskdef resource="checkstyletask.properties">
<ant:classpath>
- <ant:pathelement location="${plugin.getDependencyPath('checkstyle:checkstyle')}"/>
- <ant:pathelement location="${plugin.getDependencyPath('checkstyle:checkstyle-optional')}"/>
- <ant:pathelement location="${plugin.getDependencyPath('antlr:antlr')}"/>
- <ant:pathelement location="${plugin.getDependencyPath('regexp:regexp')}"/>
- <ant:pathelement location="${plugin.getDependencyPath('commons-beanutils:commons-beanutils-core')}"/>
+ <ant:pathelement location="${plugin.getDependencyPath('JPP:checkstyle')}"/>
+ <ant:pathelement location="${plugin.getDependencyPath('JPP:checkstyle-optional')}"/>
+ <ant:pathelement location="${plugin.getDependencyPath('JPP:antlr')}"/>
+ <ant:pathelement location="${plugin.getDependencyPath('JPP:regexp')}"/>
+ <ant:pathelement location="${plugin.getDependencyPath('JPP:commons-beanutils-core')}"/>
<ant:path refid="maven.dependency.classpath"/>
<ant:pathelement path="${maven.build.dest}"/>
</ant:classpath>
--- ../maven-plugins/checkstyle/project.xml.sav2 2007-07-09 09:33:09.000000000 +0200
+++ ../maven-plugins/checkstyle/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -138,41 +138,46 @@
</contributors>
<dependencies>
<dependency>
- <groupId>antlr</groupId>
+ <groupId>JPP</groupId>
<artifactId>antlr</artifactId>
<version>2.7.6</version>
+ <jar>antlr.jar</jar>
<properties>
<classloader>root</classloader>
</properties>
</dependency>
<dependency>
- <groupId>checkstyle</groupId>
+ <groupId>JPP</groupId>
<artifactId>checkstyle</artifactId>
<version>4.3</version>
+ <jar>checkstyle.jar</jar>
<properties>
<classloader>root</classloader>
</properties>
</dependency>
<dependency>
- <groupId>checkstyle</groupId>
+ <groupId>JPP</groupId>
<artifactId>checkstyle-optional</artifactId>
<version>4.3</version>
+ <jar>checkstyle-optional.jar</jar>
<properties>
<classloader>root</classloader>
</properties>
</dependency>
<dependency>
- <groupId>regexp</groupId>
+ <groupId>JPP</groupId>
<artifactId>regexp</artifactId>
<version>1.3</version>
+ <jar>regexp.jar</jar>
<properties>
<classloader>root</classloader>
</properties>
</dependency>
<dependency>
- <groupId>commons-beanutils</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-beanutils-core</artifactId>
<version>1.7.0</version>
+ <jar>commons-beanutils.jar</jar>
<properties>
<classloader>root</classloader>
</properties>
--- ../maven-plugins/linkcheck/project.xml.sav2 2007-05-07 11:16:15.000000000 +0200
+++ ../maven-plugins/linkcheck/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -98,116 +98,131 @@
</developers>
<dependencies>
<dependency>
- <groupId>commons-beanutils</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.6.1</version>
+ <jar>commons-beanutils.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-collections</artifactId>
<version>3.0</version>
+ <jar>commons-collections.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>commons-grant</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-grant</artifactId>
<version>1.0-beta-4</version>
+ <jar>commons-grant.jar</jar>
</dependency>
<dependency>
- <groupId>commons-httpclient</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.0</version>
+ <jar>commons-httpclient.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-codec</artifactId>
<version>1.2</version>
+ <jar>commons-codec.jar</jar>
<url>http://jakarta.apache.org/commons/codec/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly</artifactId>
<version>1.0.1-20060717</version>
+ <jar>commons-jelly.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-lang</artifactId>
<version>2.0</version>
+ <jar>commons-lang.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-jsl</artifactId>
<version>1.0</version>
+ <jar>jelly-tags/commons-jelly-tags-jsl.jar</jar>
</dependency>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-log</artifactId>
<version>1.0</version>
+ <jar>jelly-tags/commons-jelly-tags-log.jar</jar>
</dependency>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-xml</artifactId>
<version>1.1</version>
+ <jar>jelly-tags/commons-jelly-tags-xml.jar</jar>
<url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-ant</artifactId>
<version>1.1</version>
+ <jar>jelly-tags/commons-jelly-tags-ant.jar</jar>
<url>http://jakarta.apache.org/commons/jelly/libs/ant/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
+ <jar>commons-logging.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>maven-model</artifactId>
<version>3.0.2</version>
+ <jar>maven-model.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
<!-- Required for commons-httpclient -->
- <groupId>log4j</groupId>
+ <groupId>JPP</groupId>
<artifactId>log4j</artifactId>
<version>1.2.13</version>
+ <jar>log4j.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>maven</artifactId>
<version>1.0.2</version>
+ <jar>maven.jar</jar>
</dependency>
</dependencies>
</project>
--- ../maven-plugins/dist/project.xml.sav2 2007-05-07 10:27:13.000000000 +0200
+++ ../maven-plugins/dist/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -97,31 +97,35 @@
</developers>
<dependencies>
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
+ <jar>commons-logging.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-lang</artifactId>
<version>2.0</version>
+ <jar>commons-lang.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>maven</artifactId>
<version>1.0.2</version>
+ <jar>maven.jar</jar>
</dependency>
<!-- Test dep -->
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>maven-model</artifactId>
<version>3.0.2</version>
+ <jar>maven-model.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
--- ../maven-plugins/junit-report/project.xml.sav2 2006-04-27 07:47:35.000000000 +0200
+++ ../maven-plugins/junit-report/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -87,18 +87,20 @@
</contributors>
<dependencies>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-jsl</artifactId>
<version>1.0</version>
+ <jar>commons-jelly-tags-jsl.jar</jar>
</dependency>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-xml</artifactId>
<version>1.1</version>
<url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>commons-jelly-tags-xml.jar</jar>
</dependency>
</dependencies>
</project>
--- ../maven-plugins/console/project.xml.sav2 2006-07-17 01:52:54.000000000 +0200
+++ ../maven-plugins/console/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -53,22 +53,25 @@
</contributors>
<dependencies>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-interaction</artifactId>
<version>1.1</version>
+ <jar>commons-jelly-tags-interaction.jar</jar>
</dependency>
<dependency>
- <groupId>jline</groupId>
+ <groupId>JPP</groupId>
<artifactId>jline</artifactId>
<version>0.9.5</version>
<properties>
<comment>This library is used by commons-jelly-tags-interaction.</comment>
</properties>
+ <jar>jline.jar</jar>
</dependency>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-log</artifactId>
<version>1.0</version>
+ <jar>commons-jelly-tags-log.jar</jar>
</dependency>
</dependencies>
</project>
--- ../maven-plugins/jdiff/plugin.jelly.sav2 2007-03-22 11:39:43.000000000 +0100
+++ ../maven-plugins/jdiff/plugin.jelly 2007-08-16 16:16:33.000000000 +0200
@@ -134,10 +134,10 @@
</j:choose>
<ant:property name="baseuri" value="${plugin.dir}"/>
- <ant:property name="jdiff.cp" value="${plugin.getDependencyPath('jdiff')};${plugin.getDependencyPath('xerces:xercesImpl')};${plugin.getDependencyPath('xml-apis:xml-apis')}" />
+ <ant:property name="jdiff.cp" value="${plugin.getDependencyPath('JPP:jdiff')};${plugin.getDependencyPath('JPP:xerces-j2')};${plugin.getDependencyPath('JPP:xml-commons-jaxp-1.3--apis')}" />
<ant:path id="maven.cp">
- <ant:pathelement location="${plugin.getDependencyPath('jdiff')}" />
+ <ant:pathelement location="${plugin.getDependencyPath('JPP:jdiff')}" />
<ant:path refid="maven.dependency.classpath" />
</ant:path>
--- ../maven-plugins/jdiff/project.xml.sav2 2007-03-28 09:23:48.000000000 +0200
+++ ../maven-plugins/jdiff/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -88,23 +88,25 @@
</contributors>
<dependencies>
<dependency>
- <groupId>jdiff</groupId>
+ <groupId>JPP</groupId>
<artifactId>jdiff</artifactId>
- <version>1.0.9</version>
+ <jar>jdiff.jar</jar>
</dependency>
<dependency>
- <groupId>xerces</groupId>
+ <groupId>JPP</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.6.2</version>
<url>http://xerces.apache.org/xerces2-j/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
+ <jar>xerces-j2.jar</jar>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
+ <groupId>JPP</groupId>
<artifactId>xml-apis</artifactId>
<version>1.3.03</version>
+ <jar>xml-commons-jaxp-1.3-apis.jar</jar>
<url>http://xml.apache.org/commons/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
--- ../maven-plugins/source/project.xml.sav2 2007-04-25 00:23:56.000000000 +0200
+++ ../maven-plugins/source/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -46,52 +46,59 @@
</developers>
<dependencies>
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>maven</artifactId>
<version>1.0.2</version>
+ <jar>maven.jar</jar>
</dependency>
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>maven-model</artifactId>
<version>3.0.2</version>
+ <jar>maven-model.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
+ <jar>commons-logging.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-lang</artifactId>
<version>2.0</version>
+ <jar>commons-lang.jar</jar>
<type>jar</type>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly</artifactId>
<version>1.0.1-20060717</version>
+ <jar>commons-jelly.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-interaction</artifactId>
<version>1.1</version>
+ <jar>jelly-tags/commons-jelly-tags-interaction.jar</jar>
</dependency>
<dependency>
- <groupId>jline</groupId>
+ <groupId>JPP</groupId>
<artifactId>jline</artifactId>
<version>0.9.5</version>
+ <jar>jline.jar</jar>
<properties>
<comment>This library is used by commons-jelly-tags-interaction.</comment>
</properties>
--- ../maven-plugins/artifact/src/plugin-test/maven.xml.sav2 2007-04-25 14:28:56.000000000 +0200
+++ ../maven-plugins/artifact/src/plugin-test/maven.xml 2007-08-16 16:16:33.000000000 +0200
@@ -26,20 +26,20 @@
<goal name="test-deploy" prereqs="clean">
<deploy:copy-deps
todir="${maven.build.dir}"
- excludes="commons-logging" />
+ excludes="JPP:commons-logging" />
<!-- check that an exclude with just id works -->
- <assert:assertFileNotFound file="${maven.build.dir}/commons-logging-1.0.4.jar"/>
- <assert:assertFileExists file="${maven.build.dir}/commons-lang-2.0.jar"/>
+ <assert:assertFileNotFound file="${maven.build.dir}/commons-logging.jar"/>
+ <assert:assertFileExists file="${maven.build.dir}/commons-lang.jar"/>
<attainGoal name="clean"/>
<!-- check one with groupId:artifactId works -->
<deploy:copy-deps
todir="${maven.build.dir}"
- excludes="commons-lang:commons-lang" />
- <assert:assertFileNotFound file="${maven.build.dir}/commons-lang-2.0.jar"/>
- <assert:assertFileExists file="${maven.build.dir}/commons-logging-1.0.4.jar"/>
+ excludes="JPP:commons-lang" />
+ <assert:assertFileNotFound file="${maven.build.dir}/commons-lang.jar"/>
+ <assert:assertFileExists file="${maven.build.dir}/commons-logging.jar"/>
</goal>
-</project>
\ No newline at end of file
+</project>
--- ../maven-plugins/artifact/src/plugin-test/project.xml.sav2 2007-04-25 14:28:56.000000000 +0200
+++ ../maven-plugins/artifact/src/plugin-test/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -55,16 +55,18 @@
</developers>
<dependencies>
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
<url>http://jakarta.apache.org/commons/logging.html</url>
+ <jar>commons-logging.jar</jar>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-lang</artifactId>
<version>2.0</version>
<url>http://jakarta.apache.org/commons/logging.html</url>
+ <jar>commons-lang.jar</jar>
</dependency>
</dependencies>
<build>
--- ../maven-plugins/artifact/project.xml.sav2 2007-05-23 11:43:53.000000000 +0200
+++ ../maven-plugins/artifact/project.xml 2007-08-16 16:16:33.000000000 +0200
@@ -119,195 +119,232 @@
</developers>
<dependencies>
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>maven</artifactId>
<version>1.1-beta-3</version>
+ <jar>maven.jar</jar>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
+ <groupId>JPP</groupId>
<artifactId>plexus-utils</artifactId>
<version>1.0.5</version>
+ <jar>plexus/utils.jar</jar>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-collections</artifactId>
<version>3.0</version>
+ <jar>commons-collections.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>commons-beanutils</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.6.1</version>
+ <jar>commons-beanutils16.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>commons-net</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-net</artifactId>
<version>1.4.1</version>
+ <jar>commons-net.jar</jar>
</dependency>
<dependency>
- <groupId>commons-httpclient</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.0</version>
+ <jar>commons-httpclient.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-codec</artifactId>
<version>1.2</version>
+ <jar>commons-codec.jar</jar>
<url>http://jakarta.apache.org/commons/codec/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-lang</artifactId>
<version>2.0</version>
+ <jar>commons-lang.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
+ <jar>commons-logging.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>com.jcraft</groupId>
+ <groupId>JPP</groupId>
<artifactId>jsch</artifactId>
<version>0.1.27</version>
+ <jar>jsch.jar</jar>
</dependency>
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly</artifactId>
<version>1.0.1-20060717</version>
+ <jar>commons-jelly.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-velocity</artifactId>
<version>1.0</version>
+ <jar>jelly-tags/commons-jelly-tags-velocity.jar</jar>
</dependency>
<dependency>
- <groupId>org.apache.velocity</groupId>
+ <groupId>JPP</groupId>
<artifactId>velocity</artifactId>
<version>1.5</version>
+ <jar>velocity.jar</jar>
</dependency>
<dependency>
- <groupId>org.apache.maven.wagon</groupId>
+ <groupId>JPP</groupId>
<artifactId>wagon-provider-api</artifactId>
<version>1.0-beta-2</version>
+ <jar>maven-wagon/provider-api.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>org.apache.maven.wagon</groupId>
+ <groupId>JPP</groupId>
+ <artifactId>wagon-http-shared</artifactId>
+ <version>1.0-beta-2</version>
+ <jar>maven-wagon/http-shared.jar</jar>
+ <properties>
+ <comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>JPP</groupId>
<artifactId>wagon-http</artifactId>
<version>1.0-beta-2</version>
+ <jar>maven-wagon/http.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>org.apache.maven.wagon</groupId>
+ <groupId>JPP</groupId>
<artifactId>wagon-ftp</artifactId>
<version>1.0-beta-2</version>
+ <jar>maven-wagon/ftp.jar</jar>
</dependency>
<dependency>
- <groupId>org.apache.maven.wagon</groupId>
+ <groupId>JPP</groupId>
<artifactId>wagon-ssh-common</artifactId>
<version>1.0-beta-2</version>
+ <jar>maven-wagon/ssh-common.jar</jar>
</dependency>
<dependency>
- <groupId>org.apache.maven.wagon</groupId>
+ <groupId>JPP</groupId>
<artifactId>wagon-ssh</artifactId>
<version>1.0-beta-2</version>
+ <jar>maven-wagon/ssh.jar</jar>
</dependency>
<dependency>
- <groupId>org.apache.maven.wagon</groupId>
+ <groupId>JPP</groupId>
<artifactId>wagon-ssh-external</artifactId>
<version>1.0-beta-2</version>
+ <jar>maven-wagon/ssh-external.jar</jar>
</dependency>
<dependency>
- <groupId>org.apache.maven.wagon</groupId>
+ <groupId>JPP</groupId>
<artifactId>wagon-file</artifactId>
<version>1.0-beta-2</version>
+ <jar>maven-wagon/file.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>maven-model</artifactId>
<version>3.0.2</version>
+ <jar>maven-model.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>stax</groupId>
+ <groupId>JPP</groupId>
<artifactId>stax</artifactId>
<version>1.2.0</version>
+ <jar>bea-stax-ri.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>stax</groupId>
+ <groupId>JPP</groupId>
<artifactId>stax-api</artifactId>
<version>1.0.1</version>
+ <jar>bea-stax-api.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>net.java.dev.stax-utils</groupId>
+ <groupId>JPP</groupId>
<artifactId>stax-utils</artifactId>
<version>20060502</version>
+ <jar>stax-utils.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>dom4j</artifactId>
<version>1.7-20060614</version>
+ <jar>dom4j.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<!-- For MavenUtils -->
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-ant</artifactId>
<version>1.1</version>
+ <jar>jelly-tags/commons-jelly-tags-ant.jar</jar>
</dependency>
<dependency>
- <groupId>commons-jexl</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jexl</artifactId>
<version>1.1</version>
+ <jar>commons-jexl.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<!-- Used in the bootstrap -->
<dependency>
- <groupId>forehead</groupId>
+ <groupId>JPP</groupId>
<artifactId>forehead</artifactId>
<version>1.0-beta-5</version>
+ <jar>forehead.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
--- ../maven-plugins/scm/project.xml.sav2 2007-07-05 11:26:48.000000000 +0200
+++ ../maven-plugins/scm/project.xml 2007-08-16 17:12:55.000000000 +0200
@@ -113,108 +113,141 @@
</developers>
<dependencies>
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>maven</artifactId>
<version>1.0.2</version>
+ <jar>maven.jar</jar>
</dependency>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-interaction</artifactId>
<version>1.1</version>
+ <jar>jelly-tags/commons-jelly-tags-interaction.jar</jar>
</dependency>
<dependency>
- <groupId>jline</groupId>
+ <groupId>JPP</groupId>
<artifactId>jline</artifactId>
<version>0.9.5</version>
+ <jar>jline.jar</jar>
<properties>
<comment>This library is used by commons-jelly-tags-interaction.</comment>
</properties>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-io</artifactId>
<version>1.2</version>
+ <jar>commons-io.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly</artifactId>
<version>1.0.1-20060717</version>
+ <jar>commons-jelly.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>dom4j</artifactId>
<version>1.7-20060614</version>
+ <jar>dom4j.jar</jar>
<url>http://www.dom4j.org/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>jaxen</groupId>
+ <groupId>JPP</groupId>
<artifactId>jaxen</artifactId>
<version>1.1-beta-9</version>
+ <jar>jaxen.jar</jar>
</dependency>
+<!--
<dependency>
- <groupId>org.codehaus.plexus</groupId>
+ <groupId>JPP</groupId>
<artifactId>plexus-component-api</artifactId>
<version>1.0-alpha-15</version>
+ <jar>plexus/component-api.jar</jar>
</dependency>
+-->
<dependency>
- <groupId>org.codehaus.plexus</groupId>
+ <groupId>JPP</groupId>
<artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-15</version>
+ <jar>plexus/container-default.jar</jar>
</dependency>
+<!--
<dependency>
- <groupId>org.codehaus.plexus</groupId>
+ <groupId>JPP</groupId>
<artifactId>plexus-classworlds</artifactId>
<version>1.2-alpha-5</version>
+ <jar>plexus/classworlds.jar</jar>
<properties>
<comment>Required by plexus</comment>
</properties>
</dependency>
+-->
<dependency>
- <groupId>org.codehaus.plexus</groupId>
+ <groupId>JPP</groupId>
<artifactId>plexus-utils</artifactId>
<version>1.0.5</version>
+ <jar>plexus/utils.jar</jar>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
- <groupId>regexp</groupId>
+ <groupId>JPP</groupId>
<artifactId>regexp</artifactId>
<version>1.3</version>
+ <jar>regexp.jar</jar>
</dependency>
<dependency>
- <groupId>org.apache.maven.scm</groupId>
+ <groupId>JPP</groupId>
<artifactId>maven-scm-manager-plexus</artifactId>
- <version>1.0-beta-2</version>
+ <version>1.0-beta-3</version>
+ <jar>maven-scm/manager-plexus.jar</jar>
</dependency>
<dependency>
- <groupId>org.apache.maven.scm</groupId>
+ <groupId>JPP</groupId>
<artifactId>maven-scm-api</artifactId>
- <version>1.0-beta-2</version>
+ <version>1.0-beta-3</version>
+ <jar>maven-scm/api.jar</jar>
</dependency>
<dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-cvs</artifactId>
- <version>1.0-beta-2</version>
+ <groupId>JPP</groupId>
+ <artifactId>maven-scm-provider-cvs-commons</artifactId>
+ <version>1.0-beta-3</version>
+ <jar>maven-scm/provider-cvs-commons.jar</jar>
</dependency>
<dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-svn</artifactId>
- <version>1.0-beta-2</version>
+ <groupId>JPP</groupId>
+ <artifactId>maven-scm-provider-cvsexe</artifactId>
+ <version>1.0-beta-3</version>
+ <jar>maven-scm/provider-cvsexe.jar</jar>
</dependency>
<dependency>
- <groupId>org.apache.maven.scm</groupId>
+ <groupId>JPP</groupId>
+ <artifactId>maven-scm-provider-svn-commons</artifactId>
+ <version>1.0-beta-3</version>
+ <jar>maven-scm/provider-svn-commons.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>JPP</groupId>
+ <artifactId>maven-scm-provider-svnexe</artifactId>
+ <version>1.0-beta-3</version>
+ <jar>maven-scm/provider-svnexe.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>JPP</groupId>
<artifactId>maven-scm-provider-starteam</artifactId>
- <version>1.0-beta-2</version>
+ <version>1.0-beta-3</version>
+ <jar>maven-scm/provider-starteam.jar</jar>
</dependency>
</dependencies>
</project>
--- ../maven-plugins/dashboard/src/plugin-test/common/project.xml.sav2 2007-05-13 00:20:50.000000000 +0200
+++ ../maven-plugins/dashboard/src/plugin-test/common/project.xml 2007-08-16 19:06:22.000000000 +0200
@@ -36,23 +36,26 @@
<developers/>
<dependencies>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-xml</artifactId>
<version>1.1</version>
+ <jar>jelly-tags/commons-jelly-tags-xml.jar</jar>
<url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
</dependency>
<!-- We need to be sure the findbugs plugin is downloaded for the tests -->
<dependency>
- <groupId>maven-plugins</groupId>
+ <groupId>JPP</groupId>
<artifactId>maven-findbugs-plugin</artifactId>
<version>0.9.2</version>
+ <jar>maven-findbugs-plugin.jar</jar>
<type>plugin</type>
</dependency>
<!-- We need to be sure the JavaNCSS plugin is downloaded for the tests -->
<dependency>
- <groupId>maven-plugins</groupId>
+ <groupId>JPP</groupId>
<artifactId>maven-javancss-plugin</artifactId>
<version>1.3.1</version>
+ <jar>maven-javancss-plugin.jar</jar>
<type>plugin</type>
</dependency>
<!-- We need to be sure the jcoverage plugin is downloaded for the tests -->
@@ -62,6 +65,20 @@
<version>1.0.9</version>
<type>plugin</type>
</dependency>
+ <dependency>
+ <groupId>JPP</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6</version>
+ <type>jar</type>
+ <jar>dom4j.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>JPP</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1</version>
+ <type>jar</type>
+ <jar>jaxen.jar</jar>
+ </dependency>
</dependencies>
<build>
<defaultGoal>testPlugin</defaultGoal>
--- ../maven-plugins/genapp/src/plugin-resources/struts-validation/template-resources/project.xml.sav2 2006-08-18 00:27:25.000000000 +0200
+++ ../maven-plugins/genapp/src/plugin-resources/struts-validation/template-resources/project.xml 2007-08-17 09:18:15.000000000 +0200
@@ -76,45 +76,51 @@
<dependencies>
<dependency>
- <groupId>junit</groupId>
+ <groupId>JPP</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
+ <jar>junit.jar</jar>
</dependency>
<dependency>
- <groupId>servletapi</groupId>
+ <groupId>JPP</groupId>
<artifactId>servletapi</artifactId>
<version>2.3</version>
+ <jar>servletapi4.jar</jar>
</dependency>
<dependency>
- <groupId>jstl</groupId>
+ <groupId>JPP</groupId>
<artifactId>jstl</artifactId>
<version>1.0.2</version>
+ <jar>taglibs-core.jar</jar>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
- <groupId>taglibs</groupId>
+ <groupId>JPP</groupId>
<artifactId>standard</artifactId>
<version>1.0.4</version>
+ <jar>taglibs-standard.jar</jar>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
- <groupId>cactus</groupId>
+ <groupId>JPP</groupId>
<artifactId>cactus</artifactId>
<version>13-1.6dev-20040115</version>
+ <jar>cactus-14/cactus.jar</jar>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
+ <jar>commons-logging.jar</jar>
<properties>
<war.bundle>true</war.bundle>
</properties>
@@ -122,9 +128,10 @@
<!-- Struts dependencies -->
<dependency>
- <groupId>struts</groupId>
+ <groupId>JPP</groupId>
<artifactId>struts</artifactId>
<version>1.1</version>
+ <jar>struts.jar</jar>
<properties>
<war.bundle>true</war.bundle>
</properties>
@@ -161,107 +168,120 @@
</dependency>
<dependency>
- <groupId>strutstestcase</groupId>
+ <groupId>JPP</groupId>
<artifactId>strutstestcase</artifactId>
<version>2.1-1.1-2.3</version>
+ <jar>strutstestcase-1.2-2.4.jar</jar>
<properties>
<cactus.bundle>true</cactus.bundle>
</properties>
</dependency>
<dependency>
- <groupId>commons-beanutils</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.6</version>
+ <jar>commons-beanutils16.jar</jar>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
- <groupId>commons-digester</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-digester</artifactId>
<version>1.5</version>
+ <jar>commons-digester.jar</jar>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-collections</artifactId>
<version>3.0</version>
+ <jar>commons-collections.jar</jar>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
- <groupId>commons-validator</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-validator</artifactId>
<version>1.1.1</version>
+ <jar>commons-validator.jar</jar>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<!-- XDoclet dependencies -->
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xdoclet</artifactId>
<version>1.2</version>
+ <jar>xdoclet/xdoclet.jar</jar>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xdoclet-web-module</artifactId>
<version>1.2</version>
+ <jar>xdoclet/xdoclet-web-module.jar</jar>
<url>http://xdoclet.sf.net/</url>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xdoclet-ejb-module</artifactId>
<version>1.2</version>
+ <jar>xdoclet/xdoclet-ejb-module.jar</jar>
<url>http://xdoclet.sf.net/</url>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xdoclet-apache-module</artifactId>
<version>1.2</version>
+ <jar>xdoclet/xdoclet-apache-module.jar</jar>
<url>http://xdoclet.sf.net/</url>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xjavadoc</artifactId>
<version>1.0.2</version>
+ <jar>xjavadoc.jar</jar>
<url>http://xdoclet.sf.net/</url>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>maven-xdoclet-plugin</artifactId>
<version>1.2</version>
+ <jar>xdoclet/maven-xdoclet-plugin.jar</jar>
<type>plugin</type>
<url>http://xdoclet.sf.net/</url>
</dependency>
<!-- HttpUnit dependencies -->
<dependency>
- <groupId>httpunit</groupId>
+ <groupId>JPP</groupId>
<artifactId>httpunit</artifactId>
<version>1.5.4</version>
+ <jar>httpunit.jar</jar>
<properties>
<cactus.bundle>true</cactus.bundle>
</properties>
</dependency>
<dependency>
- <groupId>jtidy</groupId>
+ <groupId>JPP</groupId>
<artifactId>jtidy</artifactId>
<version>4aug2000r7-dev</version>
+ <jar>jtidy.jar</jar>
<properties>
<cactus.bundle>true</cactus.bundle>
</properties>
--- ../maven-plugins/genapp/src/plugin-resources/web/template-resources/project.xml.sav2 2007-08-17 10:01:36.000000000 +0200
+++ ../maven-plugins/genapp/src/plugin-resources/web/template-resources/project.xml 2007-08-17 10:07:45.000000000 +0200
@@ -79,27 +79,31 @@
<!-- jar files the project is dependent on -->
<dependencies>
<dependency>
- <groupId>junit</groupId>
+ <groupId>JPP</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
+ <jar>junit.jar</jar>
</dependency>
<dependency>
- <groupId>servletapi</groupId>
+ <groupId>JPP</groupId>
<artifactId>servletapi</artifactId>
<version>2.3</version>
+ <jar>servletapi4.jar</jar>
</dependency>
<dependency>
- <groupId>cactus</groupId>
+ <groupId>JPP</groupId>
<artifactId>cactus</artifactId>
<version>13-1.6dev-20040115</version>
+ <jar>cactus-14/cactus.jar</jar>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
+ <jar>commons-logging.jar</jar>
<properties>
<war.bundle>true</war.bundle>
</properties>
@@ -107,54 +111,61 @@
<!-- XDoclet dependencies -->
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xdoclet</artifactId>
<version>1.2</version>
+ <jar>xdoclet/xdoclet.jar</jar>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xdoclet-web-module</artifactId>
<version>1.2</version>
+ <jar>xdoclet/xdoclet-web-module.jar</jar>
<url>http://xdoclet.sf.net/</url>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xdoclet-ejb-module</artifactId>
<version>1.2</version>
+ <jar>xdoclet/xdoclet-ejb-module.jar</jar>
<url>http://xdoclet.sf.net/</url>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xjavadoc</artifactId>
<version>1.0.2</version>
<url>http://xdoclet.sf.net/</url>
+ <jar>xjavadoc.jar</jar>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>maven-xdoclet-plugin</artifactId>
<version>1.2</version>
+ <jar>xdoclet/maven-xdoclet-plugin.jar</jar>
<type>plugin</type>
<url>http://xdoclet.sf.net/</url>
</dependency>
<!-- HttpUnit dependencies -->
<dependency>
- <groupId>httpunit</groupId>
+ <groupId>JPP</groupId>
<artifactId>httpunit</artifactId>
<version>1.5.4</version>
+ <jar>httpunit.jar</jar>
<properties>
<cactus.bundle>true</cactus.bundle>
</properties>
</dependency>
<dependency>
- <groupId>jtidy</groupId>
+ <groupId>JPP</groupId>
<artifactId>jtidy</artifactId>
<version>4aug2000r7-dev</version>
+ <jar>jtidy.jar</jar>
<properties>
<cactus.bundle>true</cactus.bundle>
</properties>
--- ../maven-plugins/genapp/src/plugin-resources/complex/template-resources/components/wars/web/project.xml.sav2 2007-08-17 10:01:48.000000000 +0200
+++ ../maven-plugins/genapp/src/plugin-resources/complex/template-resources/components/wars/web/project.xml 2007-08-17 10:14:42.000000000 +0200
@@ -19,48 +19,58 @@
</dependency>
<dependency>
- <id>junit</id>
+ <groupId>JPP</groupId>
+ <artifactId>junit</artifactId>
<version>3.8.1</version>
+ <jar>junit.jar</jar>
</dependency>
<dependency>
- <id>servletapi</id>
+ <groupId>JPP</groupId>
+ <artifactId>servletapi</artifactId>
<version>2.3</version>
+ <jar>servletapi4.jar</jar>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>JPP</groupId>
<artifactId>jboss-j2ee</artifactId>
<version>3.2.1</version>
+ <jar>jboss4/jboss-j2ee.jar</jar>
</dependency>
<dependency>
- <id>jstl</id>
+ <groupId>JPP</groupId>
+ <artifactId>jstl</artifactId>
<version>1.0.2</version>
+ <jar>taglibs-core.jar</jar>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
- <groupId>taglibs</groupId>
+ <groupId>JPP</groupId>
<artifactId>standard</artifactId>
<version>1.0.4</version>
+ <jar>taglibs-standard.jar</jar>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
- <groupId>cactus</groupId>
+ <groupId>JPP</groupId>
<artifactId>cactus</artifactId>
<version>13-1.6dev-20040115</version>
+ <jar>cactus-14/cactus.jar</jar>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
+ <jar>commons-logging.jar</jar>
<properties>
<war.bundle>true</war.bundle>
</properties>
@@ -68,53 +78,61 @@
<!-- XDoclet dependencies -->
<dependency>
- <id>xdoclet</id>
+ <groupId>JPP</groupId>
+ <artifactId>xdoclet</artifactId>
<version>1.2</version>
+ <jar>xdoclet/xdoclet.jar</jar>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xdoclet-web-module</artifactId>
<version>1.2</version>
+ <jar>xdoclet/xdoclet-web-module.jar</jar>
<url>http://xdoclet.sf.net/</url>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xdoclet-ejb-module</artifactId>
<version>1.2</version>
+ <jar>xdoclet/xdoclet-ejb-module.jar</jar>
<url>http://xdoclet.sf.net/</url>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xjavadoc</artifactId>
<version>1.0.2</version>
+ <jar>xjavadoc.jar</jar>
<url>http://xdoclet.sf.net/</url>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>maven-xdoclet-plugin</artifactId>
<version>1.2</version>
+ <jar>xdoclet/maven-xdoclet-plugin.jar</jar>
<type>plugin</type>
<url>http://xdoclet.sf.net/</url>
</dependency>
<!-- HttpUnit dependencies -->
<dependency>
- <groupId>httpunit</groupId>
+ <groupId>JPP</groupId>
<artifactId>httpunit</artifactId>
<version>1.5.4</version>
+ <jar>httpunit.jar</jar>
<properties>
<cactus.bundle>true</cactus.bundle>
</properties>
</dependency>
<dependency>
- <groupId>jtidy</groupId>
+ <groupId>JPP</groupId>
<artifactId>jtidy</artifactId>
<version>4aug2000r7-dev</version>
+ <jar>jtidy.jar</jar>
<properties>
<cactus.bundle>true</cactus.bundle>
</properties>
--- ../maven-plugins/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/project.xml.sav2 2007-08-17 10:01:58.000000000 +0200
+++ ../maven-plugins/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/project.xml 2007-08-17 10:19:44.000000000 +0200
@@ -10,8 +10,10 @@
<description>An EJB</description>
<dependencies>
<dependency>
- <id>junit</id>
+ <groupId>JPP</groupId>
+ <artifactId>junit</artifactId>
<version>3.8.1</version>
+ <jar>junit.jar</jar>
</dependency>
<!-- NOT AVAILABLE IN BIBLIO REPOSITORY -->
<!--
@@ -21,72 +23,85 @@
</dependency>
-->
<dependency>
+ <groupId>JPP</groupId>
+ <artifactId>xdoclet</artifactId>
<id>xdoclet</id>
<version>1.2</version>
+ <jar>xdoclet/xdoclet.jar</jar>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xdoclet-ejb-module</artifactId>
<version>1.2</version>
+ <jar>xdoclet/xdoclet-ejb-module.jar</jar>
<url>http://xdoclet.sf.net/</url>
</dependency>
<dependency>
- <groupId>xjavadoc</groupId>
+ <groupId>JPP</groupId>
<artifactId>xjavadoc</artifactId>
<version>1.0.2</version>
+ <jar>xjavadoc.jar</jar>
<url>http://xdoclet.sf.net/</url>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xdoclet-jmx-module</artifactId>
<version>1.2</version>
+ <jar>xdoclet/xdoclet-jmx-module.jar</jar>
<url>http://xdoclet.sf.net/</url>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xdoclet-web-module</artifactId>
<version>1.2</version>
+ <jar>xdoclet/xdoclet-web-module.jar</jar>
<url>http://xdoclet.sf.net/</url>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>xdoclet-jboss-module</artifactId>
<version>1.2</version>
+ <jar>xdoclet/xdoclet-jboss-module.jar</jar>
<url>http://xdoclet.sf.net/</url>
</dependency>
<dependency>
- <groupId>xdoclet</groupId>
+ <groupId>JPP</groupId>
<artifactId>maven-xdoclet-plugin</artifactId>
<version>1.2</version>
+ <jar>xdoclet/maven-xdoclet-plugin.jar</jar>
<type>plugin</type>
<url>http://xdoclet.sf.net/</url>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>JPP</groupId>
<artifactId>jboss-j2ee</artifactId>
<version>3.2.1</version>
+ <jar>jboss4/jboss-j2ee.jar</jar>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
+ <jar>commons-logging.jar</jar>
<properties>
<ejb.bundle>true</ejb.bundle>
</properties>
</dependency>
<dependency>
- <groupId>cactus</groupId>
+ <groupId>JPP</groupId>
<artifactId>cactus</artifactId>
<version>13-1.6dev-20040115</version>
+ <jar>cactus-14/cactus.jar</jar>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>JPP</groupId>
<artifactId>jbossall-client</artifactId>
<version>3.2.1</version>
+ <jar>jboss4/jboss-client.jar</jar>
</dependency>
</dependencies>
<build>
--- ../maven-plugins/modello/src/plugin-test/project.xml.sav2 2007-08-17 10:40:48.000000000 +0200
+++ ../maven-plugins/modello/src/plugin-test/project.xml 2007-08-17 10:45:00.000000000 +0200
@@ -28,49 +28,55 @@
<package>org.apache.maven.model</package>
<dependencies>
<dependency>
- <groupId>javax.jdo</groupId>
+ <groupId>JPP</groupId>
<artifactId>jdo2-api</artifactId>
<version>2.0</version>
+ <jar>apache-jdo-2.0-api.jar</jar>
<properties>
<comment>Required for modello JDO/JPOX storage</comment>
</properties>
</dependency>
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>dom4j</artifactId>
<version>1.7-20060614</version>
+ <jar>dom4j.jar</jar>
<properties>
<comment>Required for modello DOM4J Reader/Writer</comment>
</properties>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
+ <groupId>JPP</groupId>
<artifactId>plexus-utils</artifactId>
<version>1.0.5</version>
+ <jar>plexus/utils.jar</jar>
<properties>
<comment>Required for modello DOM4J Reader/Writer</comment>
</properties>
</dependency>
<dependency>
- <groupId>stax</groupId>
+ <groupId>JPP</groupId>
<artifactId>stax-api</artifactId>
<version>1.0.1</version>
+ <jar>bea-stax-api.jar</jar>
<properties>
<comment>Required for modello STAX Reader/Writer</comment>
</properties>
</dependency>
<dependency>
- <groupId>net.java.dev.stax-utils</groupId>
+ <groupId>JPP</groupId>
<artifactId>stax-utils</artifactId>
<version>20060502</version>
+ <jar>stax-utils.jar</jar>
<properties>
<comment>Required for modello STAX Reader/Writer</comment>
</properties>
</dependency>
<dependency>
- <groupId>jdom</groupId>
+ <groupId>JPP</groupId>
<artifactId>jdom</artifactId>
<version>1.0</version>
+ <jar>jdom.jar</jar>
<properties>
<comment>Required for modello JDOM Writer</comment>
</properties>
--- ../maven-plugins/war/src/plugin-test/test05/project.xml.sav2 2007-08-17 11:06:17.000000000 +0200
+++ ../maven-plugins/war/src/plugin-test/test05/project.xml 2007-08-17 11:07:09.000000000 +0200
@@ -43,9 +43,10 @@
</repository>
<dependencies>
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
+ <jar>commons-logging.jar</jar>
<url>http://jakarta.apache.org/commons/logging.html</url>
<properties>
<war.bundle>true</war.bundle>
--- ../maven-plugins/war/src/plugin-test/test06/project.xml.sav2 2007-08-17 11:06:30.000000000 +0200
+++ ../maven-plugins/war/src/plugin-test/test06/project.xml 2007-08-17 11:07:38.000000000 +0200
@@ -43,9 +43,10 @@
</repository>
<dependencies>
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
+ <jar>commons-logging.jar</jar>
<url>http://jakarta.apache.org/commons/logging.html</url>
<properties>
<war.target.path>libs</war.target.path>
--- ../maven-plugins/war/src/plugin-test/test05/maven.xml.sav2 2007-08-17 11:42:58.000000000 +0200
+++ ../maven-plugins/war/src/plugin-test/test05/maven.xml 2007-08-17 11:43:35.000000000 +0200
@@ -27,7 +27,7 @@
<j:set var="warFile" value="${maven.build.dir}/${pom.artifactId}.war"/>
<j:set var="warDir" value="${maven.build.dir}/${pom.artifactId}"/>
<assert:assertFileExists file="${warFile}"/>
- <assert:assertFileExists file="${warDir}/WEB-INF/lib/commons-logging-1.0.4.jar"/>
+ <assert:assertFileExists file="${warDir}/WEB-INF/lib/commons-logging.jar"/>
<assert:assertFileExists file="${warDir}/images/logo.png"/>
<!-- check for index.html content-->
<j:set var="unzipDir" value="${maven.build.dir}/unzippedWar"/>
@@ -37,4 +37,4 @@
<assert:assertFileContains file="${unzipDir}/index.html"
match="test-maven-war-plugin-expand-excludes"/>
</goal>
-</project>
\ No newline at end of file
+</project>
--- ../maven-plugins/xdoc/src/plugin-test/test02/maven.xml.sav2 2007-08-17 12:59:18.000000000 +0200
+++ ../maven-plugins/xdoc/src/plugin-test/test02/maven.xml 2007-08-17 12:59:43.000000000 +0200
@@ -19,7 +19,7 @@
<project xmlns:util="jelly:util" xmlns:j="jelly:core" xmlns:assert="assert" xmlns:doc="doc" xmlns:x="jelly:xml">
<goal name="testPlugin" prereqs="clean,maven-linkcheck-plugin:report,xdoc">
<!-- Shouldn't this be done in the linkcheck plugin? -->
- <j:set var="linkcheck" value="${maven.build.dir}/linkcheck/linkcheck-results.xml"/>
+ <j:set var="linkcheck" value="${maven.build.dir}/generated-xdocs/linkcheck.xml"/>
<assert:assertFileExists file="${linkcheck}"/>
<util:file var="linkcheckFile" name="${linkcheck}"/>
<x:parse var="linkcheckDoc" xml="${linkcheckFile.toURL()}"/>
--- ../maven-plugins/modello/project.xml.sav2 2007-04-21 00:07:23.000000000 +0200
+++ ../maven-plugins/modello/project.xml 2007-08-26 16:32:16.000000000 +0200
@@ -51,111 +51,129 @@
<dependencies>
<!-- Modello Core -->
<dependency>
- <groupId>org.codehaus.modello</groupId>
+ <groupId>JPP</groupId>
<artifactId>modello-core</artifactId>
<version>1.0-alpha-15</version>
+ <jar>modello/core.jar</jar>
</dependency>
<!-- Modello XPP3 plugin -->
<dependency>
- <groupId>org.codehaus.modello</groupId>
+ <groupId>JPP</groupId>
<artifactId>modello-plugin-xpp3</artifactId>
<version>1.0-alpha-15</version>
+ <jar>modello/plugin-xpp3.jar</jar>
</dependency>
<!-- Modello STAX plugin -->
<dependency>
- <groupId>org.codehaus.modello</groupId>
+ <groupId>JPP</groupId>
<artifactId>modello-plugin-stax</artifactId>
<version>1.0-alpha-15</version>
+ <jar>modello/plugin-stax.jar</jar>
</dependency>
<!-- Modello DOM4J plugin -->
<dependency>
- <groupId>org.codehaus.modello</groupId>
+ <groupId>JPP</groupId>
<artifactId>modello-plugin-dom4j</artifactId>
<version>1.0-alpha-15</version>
+ <jar>modello/plugin-dom4j.jar</jar>
</dependency>
<!-- Modello XDOC plugin -->
<dependency>
- <groupId>org.codehaus.modello</groupId>
+ <groupId>JPP</groupId>
<artifactId>modello-plugin-xdoc</artifactId>
<version>1.0-alpha-15</version>
+ <jar>modello/plugin-xdoc.jar</jar>
</dependency>
<!-- Modello JPOX plugin -->
<dependency>
- <groupId>org.codehaus.modello</groupId>
+ <groupId>JPP</groupId>
<artifactId>modello-plugin-jpox</artifactId>
<version>1.0-alpha-15</version>
+ <jar>modello/plugin-jpox.jar</jar>
</dependency>
<dependency>
- <groupId>org.codehaus.modello</groupId>
+ <groupId>JPP</groupId>
<artifactId>modello-db-keywords</artifactId>
<version>1.0-alpha-15</version>
+ <jar>modello/db-keywords.jar</jar>
</dependency>
<!-- Modello XSD plugin -->
<dependency>
- <groupId>org.codehaus.modello</groupId>
+ <groupId>JPP</groupId>
<artifactId>modello-plugin-xsd</artifactId>
<version>1.0-alpha-15</version>
+ <jar>modello/plugin-xsd.jar</jar>
</dependency>
<!-- Modello JDOM plugin -->
<dependency>
- <groupId>org.codehaus.modello</groupId>
+ <groupId>JPP</groupId>
<artifactId>modello-plugin-jdom</artifactId>
<version>1.0-alpha-15</version>
+ <jar>modello/plugin-jdom.jar</jar>
</dependency>
<!-- Modello plugin utilities-->
<dependency>
- <groupId>org.codehaus.modello</groupId>
+ <groupId>JPP</groupId>
<artifactId>modello-plugin-store</artifactId>
<version>1.0-alpha-15</version>
+ <jar>modello/plugin-store.jar</jar>
<properties>
<comment>Required by modello-plugin-stax</comment>
</properties>
</dependency>
<dependency>
- <groupId>org.codehaus.modello</groupId>
+ <groupId>JPP</groupId>
<artifactId>modello-plugin-xml</artifactId>
<version>1.0-alpha-15</version>
+ <jar>modello/plugin-xml.jar</jar>
<properties>
<comment>Required by modello-plugin-xpp3, modello-plugin-stax, modello-plugin-dom4j, modello-plugin-xdoc, modello-plugin-xsd, modello-plugin-jdom</comment>
</properties>
</dependency>
<!-- Other dependencies -->
<dependency>
- <groupId>org.codehaus.plexus</groupId>
+ <groupId>JPP</groupId>
<artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-15</version>
+ <jar>plexus/container-default.jar</jar>
<properties>
<comment>Required by modello-core</comment>
</properties>
</dependency>
+<!--
<dependency>
- <groupId>org.codehaus.plexus</groupId>
+ <groupId>JPP</groupId>
<artifactId>plexus-component-api</artifactId>
<version>1.0-alpha-15</version>
+ <jar>plexus/component-api.jar</jar>
<properties>
<comment>Required by plexus</comment>
</properties>
</dependency>
+-->
<dependency>
- <groupId>org.codehaus.plexus</groupId>
+ <groupId>JPP</groupId>
<artifactId>plexus-utils</artifactId>
<version>1.0.5</version>
+ <jar>plexus/utils.jar</jar>
<properties>
<comment>Required by modello-plugin-xpp3, modello-plugin-jdom</comment>
</properties>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
+ <groupId>JPP</groupId>
<artifactId>plexus-velocity</artifactId>
<version>1.1.2</version>
+ <jar>plexus/velocity.jar</jar>
<properties>
<comment>Required by modello-plugin-store</comment>
</properties>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
+ <groupId>JPP</groupId>
<artifactId>plexus-classworlds</artifactId>
<version>1.2-alpha-5</version>
+ <jar>classworlds.jar</jar>
<properties>
<comment>Required by plexus</comment>
</properties>
