[Jpackage-commits] dist/maven2/devel .cvsignore, 1.6, 1.7 maven-doxia-modules.pom, 1.3, NONE maven2-2.0.8-excludeexternaljars.patch, 1.1, NONE maven2-2.2.1-default-resolver-pool-size.patch, NONE, 1.1 maven2-2.2.1-depmap.xml, NONE, 1.1 maven2-2.2.1-enable-bootstrap-repo.patch, NONE, 1.1 maven2-2.2.1-jpp.patch, NONE, 1.1 maven2-2.2.1-settings.xml, NONE, 1.1 maven2-2.2.1-unshade.patch, NONE, 1.1 maven2-2.2.1-update-tests.patch, NONE, 1.1 maven2-JPackageRepositoryLayout.java, 1.3, 1.4 maven2-MNG-3139.patch, 1.1, NONE maven2-MavenJPackageDepmap.java, 1.2, 1.3 maven2-RELEASE.patch, NONE, 1.1 maven2-addjdom-depmap.xml, 1.1, NONE maven2-addjdomtobootstrappath.patch, 1.2, NONE maven2-antbuild.patch, NONE, 1.1 maven2-commons-cli-1.1.patch, 1.1, NONE maven2-component-info.xml, 1.1, NONE maven2-enable-bootstrap-repository.patch, 1.1, NONE maven2-fastjar-manifest-fix.patch, 1.1, NONE maven2-javadoc-plugin-pom.patch, 1.3, NONE maven2-jpp-readme.html, 1.1, NONE maven2-jpp-script, 1.1, 1.2 maven2-jpprepolayout.patch, 1.3, NONE maven2-plugins-MJAVADOC -137-AbstractJavadocMojo.patch, 1.1, NONE maven2-plugins-catch-uncaught-exceptions.patch, 1.1, NONE maven2-plugins-dependency-plugin-import-fix.patch, 1.1, NONE maven2-plugins-disablecobertura.patch, 1.2, NONE maven2-plugins-disableenforcer.patch, 1.1, NONE maven2-plugins-doxiaupdatefix.patch, 1.2, NONE maven2-plugins-javadoc-newdoxia.patch, 1.1, NONE maven2-plugins-jpprepolayout.patch, 1.2, NONE maven2-plugins-project-info-reports-jdkversion.patch, 1.1, NONE maven2-run-it-tests.sh, 1.2, NONE maven2-settings.xml, 1.1, NONE maven2-shade-plugin-replacement.patch, 1.1, NONE maven2-site-plugin-addservletdep.patch, 1.2, NONE maven2-sourcetarget.patch, 1.1, NONE maven2-use-unversioned-classworlds.patch, 1.1, NONE maven2-versionless-depmap.xml, 1.18, NONE maven2.spec, 1.57, 1.58 sources, 1.11, 1.12

David Walluck david at ryu.zarb.org
Mon Oct 10 23:17:34 CEST 2011


Update of /home/projects/jpackage/cvs/dist/maven2/devel
In directory ryu.zarb.org:/tmp/cvs-serv26874/devel

Modified Files:
	.cvsignore maven2-JPackageRepositoryLayout.java 
	maven2-MavenJPackageDepmap.java maven2-jpp-script maven2.spec 
	sources 
Added Files:
	maven2-2.2.1-default-resolver-pool-size.patch 
	maven2-2.2.1-depmap.xml 
	maven2-2.2.1-enable-bootstrap-repo.patch 
	maven2-2.2.1-jpp.patch maven2-2.2.1-settings.xml 
	maven2-2.2.1-unshade.patch maven2-2.2.1-update-tests.patch 
	maven2-RELEASE.patch maven2-antbuild.patch 
Removed Files:
	maven-doxia-modules.pom maven2-2.0.8-excludeexternaljars.patch 
	maven2-MNG-3139.patch maven2-addjdom-depmap.xml 
	maven2-addjdomtobootstrappath.patch 
	maven2-commons-cli-1.1.patch maven2-component-info.xml 
	maven2-enable-bootstrap-repository.patch 
	maven2-fastjar-manifest-fix.patch 
	maven2-javadoc-plugin-pom.patch maven2-jpp-readme.html 
	maven2-jpprepolayout.patch 
	maven2-plugins-MJAVADOC-137-AbstractJavadocMojo.patch 
	maven2-plugins-catch-uncaught-exceptions.patch 
	maven2-plugins-dependency-plugin-import-fix.patch 
	maven2-plugins-disablecobertura.patch 
	maven2-plugins-disableenforcer.patch 
	maven2-plugins-doxiaupdatefix.patch 
	maven2-plugins-javadoc-newdoxia.patch 
	maven2-plugins-jpprepolayout.patch 
	maven2-plugins-project-info-reports-jdkversion.patch 
	maven2-run-it-tests.sh maven2-settings.xml 
	maven2-shade-plugin-replacement.patch 
	maven2-site-plugin-addservletdep.patch 
	maven2-sourcetarget.patch 
	maven2-use-unversioned-classworlds.patch 
	maven2-versionless-depmap.xml 
Log Message:
- initial import

--- maven2-addjdom-depmap.xml DELETED ---

--- NEW FILE: maven2-2.2.1-unshade.patch ---
diff -up ./apache-maven/pom.xml.sav ./apache-maven/pom.xml
--- ./apache-maven/pom.xml.sav	2009-08-06 15:11:25.000000000 -0400
+++ ./apache-maven/pom.xml	2010-06-15 16:21:15.000000000 -0400
@@ -71,53 +71,40 @@
                   <exclude>xml-apis:xml-apis</exclude>
                   <exclude>junit:junit</exclude>
                   <exclude>jmock:jmock</exclude>
+                  <exclude>backport-util-concurrent:backport-util-concurrent</exclude>
+                  <exclude>com.jcraft:jsch</exclude>
+                  <exclude>commons-cli:commons-cli</exclude>
+                  <exclude>commons-codec:commons-codec:jar</exclude>
+                  <exclude>commons-httpclient:commons-httpclient:jar</exclude>
+                  <exclude>jdom:jdom</exclude>
+                  <exclude>nekohtml:nekohtml</exclude>
+                  <exclude>nekohtml:xercesMinimal</exclude>
+                  <exclude>org.apache.maven.doxia:doxia-logging-api</exclude>
+                  <exclude>org.apache.maven.doxia:doxia-sink-api</exclude>
+                  <exclude>org.apache.maven.wagon:wagon-file</exclude>
+                  <exclude>org.apache.maven.wagon:wagon-http</exclude>
+                  <exclude>org.apache.maven.wagon:wagon-http-lightweight</exclude>
+                  <exclude>org.apache.maven.wagon:wagon-http-shared</exclude>
+                  <exclude>org.apache.maven.wagon:wagon-provider-api</exclude>
+                  <exclude>org.apache.maven.wagon:wagon-ssh</exclude>
+                  <exclude>org.apache.maven.wagon:wagon-ssh-common</exclude>
+                  <exclude>org.apache.maven.wagon:wagon-ssh-external</exclude>
+                  <exclude>org.apache.maven.wagon:wagon-webdav-jackrabbit</exclude>
+                  <exclude>org.apache.jackrabbit:jackrabbit-webdav</exclude>
+                  <exclude>org.apache.jackrabbit:jackrabbit-jcr-commons</exclude>
+                  <exclude>org.codehaus.plexus:plexus-container-default</exclude>
+                  <exclude>org.codehaus.plexus:plexus-interactivity-api</exclude>
+                  <exclude>org.codehaus.plexus:plexus-interpolation</exclude>
+                  <exclude>org.codehaus.plexus:plexus-sec-dispatcher</exclude>
+                  <exclude>org.codehaus.plexus:plexus-utils</exclude>
+                  <exclude>org.slf4j:jcl-over-slf4j</exclude>
+                  <exclude>org.slf4j:slf4j-api</exclude>
+                  <exclude>org.slf4j:slf4j-nop</exclude>
+                  <exclude>org.slf4j:slf4j-jdk14</exclude>
+                  <exclude>org.sonatype.plexus:plexus-cipher</exclude>
+                  <exclude>xerces:xerces</exclude>
                 </excludes>
               </artifactSet>
-              <relocations>
-                <!-- for jackrabbit webdav wagon -->
-                <relocation>
-                  <pattern>org.apache.jackrabbit</pattern>
-                </relocation>
-
-                <!-- For http/webdav wagons -->
-                <relocation>
-                  <pattern>org.apache.commons.httpclient</pattern>
-                </relocation>
-                <relocation>
-                  <pattern>org.apache.commons.logging</pattern>
-                </relocation>
-                <relocation>
-                  <pattern>org.slf4j</pattern>
-                </relocation>
-
-                <!-- For maven-artifact-manager -->
-                <relocation>
-                  <pattern>edu.emory.mathcs.backport</pattern>
-                </relocation>
-
-                <!-- For jsch wagon -->
-                <relocation>
-                  <pattern>org.apache.commons.codec</pattern>
-                </relocation>
-
-                <!-- For wagon API -->
-                <relocation>
-                  <pattern>org.cyberneko</pattern>
-                </relocation>
-                <relocation>
-                  <pattern>org.apache.xerces</pattern>
-                </relocation>
-
-                <relocation>
-                  <pattern>org.codehaus.plexus.util</pattern>
-                  <excludes>
-                    <exclude>org.codehaus.plexus.util.xml.Xpp3Dom</exclude>
-                    <exclude>org.codehaus.plexus.util.xml.pull.XmlPullParser</exclude>
-                    <exclude>org.codehaus.plexus.util.xml.pull.XmlPullParserException</exclude>
-                    <exclude>org.codehaus.plexus.util.xml.pull.XmlSerializer</exclude>
-                  </excludes>
-                </relocation>
-              </relocations>
             </configuration>
           </execution>
         </executions>

--- maven2-settings.xml DELETED ---

--- maven2-plugins-javadoc-newdoxia.patch DELETED ---

--- maven2-jpp-readme.html DELETED ---

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven2/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -C 2 -d -r1.11 -r1.12
*** sources	29 Mar 2010 18:42:11 -0000	1.11
--- sources	10 Oct 2011 21:17:32 -0000	1.12
***************
*** 1,8 ****
- ffd6fcb439b5b7e143a31a4fd5af9902  maven2-src.tar.gz
- a9b9ce42ffbba60eb1833f0a773f7aa7  maven2-plugins-070705-src.tar.gz
- c3c1014b8548f94f91f3b679a5500e4b  maven-javadoc-plugin-2.4-src.tar.gz
- 13c1088b7b9535b9e4fb31317f79491a  maven2-model-v3.jar
- de45a278b88554bb545f092e2f82c56d  maven2-maven-site-plugin.tar.gz
- a4b18868658fe3e3c58d0f4e9bf66bee  m2_pom_repo.tar.gz
- 00976d79948c93be23cdda62300dc8c2  m2_jar_repo.tar.gz
  dc36ce1fbefedbdd27fa93c8584ba91a  maven2-empty-dep.jar
--- 1,3 ----
  dc36ce1fbefedbdd27fa93c8584ba91a  maven2-empty-dep.jar
+ 6f46b0e42921df6a9b1a8280d59ab80b  maven2-2.2.1-bootstrapdeps.tar.gz
+ 1197900ced670d0a62211f67aa8a3b68  maven2-2.2.1.tar.gz

--- maven-doxia-modules.pom DELETED ---

--- maven2-plugins-dependency-plugin-import-fix.patch DELETED ---

--- maven2-MNG-3139.patch DELETED ---

Index: maven2.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven2/devel/maven2.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -C 2 -d -r1.57 -r1.58
*** maven2.spec	10 Jan 2011 15:13:23 -0000	1.57
--- maven2.spec	10 Oct 2011 21:17:32 -0000	1.58
***************
*** 1,3081 ****
! # Copyright (c) 2000-2005, JPackage Project
! # All rights reserved.
! #
! # Redistribution and use in source and binary forms, with or without
! # modification, are permitted provided that the following conditions
! # are met:
! #
! # 1. Redistributions of source code must retain the above copyright
! #    notice, this list of conditions and the following disclaimer.
! # 2. Redistributions in binary form must reproduce the above copyright
[...3747 lines suppressed...]
  
! * Fri Jun 18 2010 Deepak Bhole <dbhole at redhat.com> 2.2.1-3
! - Added buildnumber plugin requirements
! - Rebuild in non-bootstrap
  
! * Thu Jun 17 2010 Deepak Bhole <dbhole at redhat.com> - 0:2.2.1-2
! - Added support for dumping mapping info (in debug mode)
! - Add a custom depmap
! - Added empty-dep
! - Added proper requirements
! - Fixed classworlds jar name used at runtime
! - Install individual components
! - Install poms and mappings
! - Remove non maven items from shaded uber jar
! - Create dependency links in $M2_HOME/lib at install time
  
! * Thu Nov 26 2009 Deepak Bhole <dbhole at redhat.com> - 0:2.2.1-1
! - Initial bootstrap build
  
  

--- maven2-jpprepolayout.patch DELETED ---

Index: maven2-JPackageRepositoryLayout.java
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven2/devel/maven2-JPackageRepositoryLayout.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** maven2-JPackageRepositoryLayout.java	12 Mar 2010 20:26:30 -0000	1.3
--- maven2-JPackageRepositoryLayout.java	10 Oct 2011 21:17:32 -0000	1.4
***************
*** 103,107 ****
  		// a serious problem anyways..
  		f = new java.io.File(System.getProperty("maven2.jpp.default.repo", "/usr/share/maven2/repository") + "/" + path.toString());
! 		System.err.println("Checking path " + f.getAbsolutePath() + " for the pom");
  		if (!f.exists()) {
              System.err.println(f.getAbsolutePath() + " not found");
--- 103,107 ----
  		// a serious problem anyways..
  		f = new java.io.File(System.getProperty("maven2.jpp.default.repo", "/usr/share/maven2/repository") + "/" + path.toString());
! 		//System.err.println("Checking path " + f.getAbsolutePath() + " for the pom");
  		if (!f.exists()) {
              System.err.println(f.getAbsolutePath() + " not found");

--- maven2-versionless-depmap.xml DELETED ---

--- maven2-plugins-catch-uncaught-exceptions.patch DELETED ---

--- NEW FILE: maven2-antbuild.patch ---
diff -up ./build.xml.sav ./build.xml
--- ./build.xml.sav	2009-08-06 15:11:38.000000000 -0400
+++ ./build.xml	2009-11-19 13:44:40.000000000 -0500
@@ -108,6 +108,9 @@ TODO:
        <localRepository path="${maven.repo.local}"/>
        <dependency groupId="org.codehaus.modello" artifactId="modello-maven-plugin" version="1.0"/>
        <dependency groupId="org.codehaus.modello" artifactId="modello-core" version="1.0"/>
+       <dependency groupId="org.codehaus.modello" artifactId="modello-plugin-java" version="1.0"/>
+       <dependency groupId="org.codehaus.modello" artifactId="modello-plugin-xpp3" version="1.0"/>
+       <dependency groupId="org.codehaus.plexus" artifactId="plexus-classworlds" version="1.2-alpha-9"/>
     </artifact:dependencies>
   </target>
 
@@ -195,10 +198,13 @@ TODO:
       <classpath refid="maven.classpath"/>
       <arg value="-e"/>
       <arg value="-B"/>
+      <arg value="-s"/>
+      <arg value="__M2_SETTINGS_FILE__"/>
       <arg value="clean"/>
       <arg value="install"/>
       <arg value="-Dmaven.repo.local=${maven.repo.local}"/>
       <arg value="-Dsurefire.useFile=${surefire.useFile}"/>
+      <arg value="-Dmaven2.jpp.mode=1"/>
     </java>
   </target>
 

--- maven2-2.0.8-excludeexternaljars.patch DELETED ---

--- maven2-javadoc-plugin-pom.patch DELETED ---

--- maven2-site-plugin-addservletdep.patch DELETED ---

--- maven2-plugins-MJAVADOC-137-AbstractJavadocMojo.patch DELETED ---

--- maven2-plugins-jpprepolayout.patch DELETED ---

--- maven2-use-unversioned-classworlds.patch DELETED ---

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven2/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -C 2 -d -r1.6 -r1.7
*** .cvsignore	16 Mar 2010 18:07:59 -0000	1.6
--- .cvsignore	10 Oct 2011 21:17:32 -0000	1.7
***************
*** 1,8 ****
- maven2-src.tar.gz
- maven2-plugins-070705-src.tar.gz
- maven-javadoc-plugin-2.4-src.tar.gz
- maven2-model-v3.jar
- maven2-maven-site-plugin.tar.gz
- m2_pom_repo.tar.gz
- m2_jar_repo.tar.gz
  maven2-empty-dep.jar
--- 1,3 ----
  maven2-empty-dep.jar
+ maven2-2.2.1-bootstrapdeps.tar.gz
+ maven2-2.2.1.tar.gz

--- NEW FILE: maven2-2.2.1-depmap.xml ---
<dependencies>
    <dependency>
        <maven>
            <groupId>asm</groupId>
            <artifactId>asm</artifactId>
        </maven>
        <jpp>
            <groupId>JPP/objectweb-asm</groupId>
            <artifactId>asm</artifactId>
        </jpp>
    </dependency>
    <dependency>
        <maven>
            <groupId>asm</groupId>
            <artifactId>asm-commons</artifactId>
        </maven>
        <jpp>
            <groupId>JPP/objectweb-asm</groupId>
            <artifactId>asm-commons</artifactId>
        </jpp>
    </dependency>
    <dependency>
        <maven>
            <groupId>asm</groupId>
            <artifactId>asm-tree</artifactId>
        </maven>
        <jpp>
            <groupId>JPP/objectweb-asm</groupId>
            <artifactId>asm-tree</artifactId>
        </jpp>
    </dependency>
    <dependency>
        <maven>
            <groupId>asm</groupId>
            <artifactId>asm-util</artifactId>
        </maven>
        <jpp>
            <groupId>JPP/objectweb-asm</groupId>
            <artifactId>asm-util</artifactId>
        </jpp>
    </dependency>
    <dependency>
        <maven>
            <groupId>nekohtml</groupId>
            <artifactId>xercesMinimal</artifactId>
        </maven>
        <jpp>
            <groupId>JPP</groupId>
            <artifactId>xerces-j2</artifactId>
        </jpp>
    </dependency>
    <dependency>
        <maven>
            <groupId>org.tmatesoft.svnkit</groupId>
            <artifactId>svnkit</artifactId>
        </maven>
        <jpp>
            <groupId>JPP</groupId>
            <artifactId>svnkit</artifactId>
        </jpp>
    </dependency>

    <dependency>
        <maven>
            <groupId>net.java.dev.jna</groupId>
            <artifactId>jna</artifactId>
        </maven>
        <jpp>
            <groupId>JPP</groupId>
            <artifactId>jna</artifactId>
        </jpp>
    </dependency>
    
    <dependency>
        <maven>
            <groupId>org.jdom</groupId>
            <artifactId>jdom</artifactId>
        </maven>
        <jpp>
            <groupId>JPP</groupId>
            <artifactId>jdom</artifactId>
        </jpp>
    </dependency>

	<dependency>
        <maven>
            <groupId>org.codehaus.plexus</groupId>
            <artifactId>plexus-container-default</artifactId>
        </maven>
        <jpp>
            <groupId>JPP/plexus</groupId>
            <artifactId>container-default</artifactId>
        </jpp>
    </dependency>
</dependencies>

--- NEW FILE: maven2-2.2.1-default-resolver-pool-size.patch ---
>From 9c7b1812cbca35f8bd9997e6b5e3ce93f3191840 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Mon, 28 Jun 2010 15:39:30 +0200
Subject: [PATCH] change default resolver pool size in jpp mode

---
 .../artifact/resolver/DefaultArtifactResolver.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java b/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
index d8c3629..0c40881 100644
--- a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
+++ b/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
@@ -61,7 +61,14 @@ public class DefaultArtifactResolver
     // Components
     // ----------------------------------------------------------------------
 
-    private static final int DEFAULT_POOL_SIZE = 5;
+    private static final int DEFAULT_POOL_SIZE;
+    static {
+        if (System.getProperty("maven2.jpp.mode") == null) {
+            DEFAULT_POOL_SIZE = 5;
+        } else {
+            DEFAULT_POOL_SIZE = 1;
+        }
+    }
 
     private WagonManager wagonManager;
 
-- 
1.7.0.1


--- maven2-plugins-disableenforcer.patch DELETED ---

--- maven2-plugins-disablecobertura.patch DELETED ---

--- maven2-addjdomtobootstrappath.patch DELETED ---

Index: maven2-jpp-script
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven2/devel/maven2-jpp-script,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** maven2-jpp-script	24 Jun 2008 16:06:16 -0000	1.1
--- maven2-jpp-script	10 Oct 2011 21:17:32 -0000	1.2
***************
*** 8,10 ****
  export M2_HOME=/usr/share/maven2
  echo $JAVA_HOME
! export JAVA_HOME; $M2_HOME/bin/mvn -Dmaven2.offline.mode -Dmaven2.ignore.versions -Dmaven2.usejppjars $@
--- 8,10 ----
  export M2_HOME=/usr/share/maven2
  echo $JAVA_HOME
! export JAVA_HOME; $M2_HOME/bin/mvn -Dmaven2.jpp.mode $@

--- NEW FILE: maven2-2.2.1-settings.xml ---
<settings>
    <localRepository>__M2_LOCALREPO_PLACEHOLDER__</localRepository>
    <mirrors>
        <mirror>
            <id>RPMCentralRepoMirror</id>
            <name>RPM Central Repo Mirror</name>
            <url>__M2_REMOTEREPO_PLACEHOLDER__</url>
            <mirrorOf>central</mirrorOf>
        </mirror>
    </mirrors>

    <profiles>
        <profile>
            <id>build</id>
            <activation>
                <activeByDefault>true</activeByDefault>
            </activation>
            <repositories>
                <repository>
                    <id>RPMBuildRepo</id>
                    <name>Repo used during rpmbuild</name>
                    <releases>
                        <enabled>true</enabled>
                        <updatePolicy>never</updatePolicy>
                        <checksumPolicy>warn</checksumPolicy>
                    </releases>
                    <snapshots>
                        <enabled>true</enabled>
                        <updatePolicy>never</updatePolicy>
                        <checksumPolicy>warn</checksumPolicy>
                    </snapshots>
                    <url>__M2_REMOTEREPO_PLACEHOLDER__</url>
                    <layout>default</layout>
                </repository>
            </repositories>
            <pluginRepositories>
                <pluginRepository>
                    <id>RPMPluginBuildRepo</id>
                    <name>Plugin repo used during rpmbuild</name>
                    <releases>
                        <enabled>true</enabled>
                        <updatePolicy>never</updatePolicy>
                        <checksumPolicy>warn</checksumPolicy>
                    </releases>
                    <snapshots>
                        <enabled>true</enabled>
                        <updatePolicy>never</updatePolicy>
                        <checksumPolicy>warn</checksumPolicy>
                    </snapshots>
                    <url>__M2_REMOTEREPO_PLACEHOLDER__</url>
                    <layout>default</layout>
                </pluginRepository>
            </pluginRepositories>
        </profile>
    </profiles>
</settings>

--- maven2-component-info.xml DELETED ---

--- maven2-fastjar-manifest-fix.patch DELETED ---

--- maven2-shade-plugin-replacement.patch DELETED ---

--- maven2-plugins-project-info-reports-jdkversion.patch DELETED ---

--- maven2-sourcetarget.patch DELETED ---

--- NEW FILE: maven2-2.2.1-update-tests.patch ---
diff -up ./maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java.sav ./maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java
--- ./maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java.sav	2009-11-19 14:47:31.000000000 -0500
+++ ./maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java	2009-11-19 14:48:41.000000000 -0500
@@ -73,11 +73,9 @@ public class DefaultModelValidatorTest
     {
         ModelValidationResult result = validate( "invalid-ids-pom.xml" );
 
-        assertEquals( 2, result.getMessageCount() );
-
-        assertEquals( "'groupId' with value 'o/a/m' does not match a valid id pattern.", result.getMessage( 0 ) );
+        assertEquals( 1, result.getMessageCount() );
 
-        assertEquals( "'artifactId' with value 'm$-do$' does not match a valid id pattern.", result.getMessage( 1 ) );
+        assertEquals( "'artifactId' with value 'm$-do$' does not match a valid id pattern.", result.getMessage( 0 ) );
     }
 
     public void testMissingType()

--- NEW FILE: maven2-RELEASE.patch ---
diff -ur maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java apache-maven-2.2.1/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java
--- maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java	2007-01-11 02:47:53.000000000 -0500
+++ maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java	2010-10-19 17:11:07.000000000 -0400
@@ -46,7 +46,11 @@
         {
             try
             {
-                String version = resolveVersion( artifact, localRepository, remoteRepositories );
+                String version;
+				if (System.getProperty("maven2.ignore.versions") != null)  
+					version = "2.0.8";
+				else
+					version = resolveVersion( artifact, localRepository, remoteRepositories );
 
                 if ( Artifact.RELEASE_VERSION.equals( version ) )
                 {

--- maven2-plugins-doxiaupdatefix.patch DELETED ---

--- NEW FILE: maven2-2.2.1-jpp.patch ---
diff -up ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java.sav ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
--- ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java.sav	2009-08-06 15:11:34.000000000 -0400
+++ ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java	2009-11-19 14:17:42.000000000 -0500
@@ -58,6 +58,8 @@ import org.codehaus.plexus.util.FileUtil
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 
+import org.apache.maven.artifact.repository.layout.MavenJPackageDepmap;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -66,6 +68,7 @@ import java.net.URL;
 import java.security.NoSuchAlgorithmException;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -409,7 +412,20 @@ public class DefaultWagonManager
                              ArtifactRepository repository )
         throws TransferFailedException, ResourceDoesNotExistException
     {
+
+        String originalVersion = artifact.getVersion();
+        
+        if ( ( repository.getLayout() instanceof org.apache.maven.artifact.repository.layout.JPackageRepositoryLayout ) &&
+             ( System.getProperty("maven2.jpp.mode") != null ) )
+        {
+            MavenJPackageDepmap map = MavenJPackageDepmap.getInstance();
+            Hashtable newInfo = map.getMappedInfo(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion());
+
+            artifact.setVersion((String) newInfo.get("version"));
+        }
+
         String remotePath = repository.pathOf( artifact );
+        artifact.setVersion(originalVersion); // set it back
 
         ArtifactRepositoryPolicy policy = artifact.isSnapshot() ? repository.getSnapshots() : repository.getReleases();
 
@@ -421,8 +437,31 @@ public class DefaultWagonManager
         {
             getLogger().debug( "Skipping blacklisted repository " + repository.getId() );
         }
+        else if ((System.getProperty("maven2.jpp.mode") != null) && 
+                 (!repository.getUrl().startsWith("file:")))
+        {
+            // In JPP mode, repos other than those starting with file:// are 
+            // not allowed
+            getLogger().warn( "Skipping non filebased repository " + repository.getUrl() + " in full offline mode");
+        }
+        else if ((System.getProperty("maven2.jpp.mode") != null) && 
+                 (System.getProperty("maven2.jpp.signed") == null) &&
+                 (repository.getId().startsWith("__jpps")))
+        {
+            // In JPP mode, if use of signed JARs is not requested, the
+            // __jpps_repo__ is skipped
+            getLogger().warn( "Skipping jpp signed repository " + repository.getUrl() + " as maven2.jpp.signed is not set");
+        }
         else
         {
+            // In vanilla mode, the JPP repos should be ignored
+            if ((System.getProperty("maven2.jpp.mode") == null) &&
+                (repository.getId().startsWith("__jpp")))
+            {
+                getLogger().warn( "Skipping jpp repository " + repository.getUrl() + " in vanilla mode");
+                return;
+            }
+
             getLogger().debug( "Trying repository " + repository.getId() );
             getRemoteFile( getMirrorRepository( repository ), artifact.getFile(), remotePath, downloadMonitor,
                                    policy.getChecksumPolicy(), false );
diff -up ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java.sav ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
--- ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java.sav	2009-08-06 15:11:34.000000000 -0400
+++ ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java	2009-11-18 16:54:39.000000000 -0500
@@ -85,7 +85,7 @@ public class DefaultRepositoryMetadataMa
                     boolean checkForUpdates =
                         !file.exists() || policy.checkOutOfDate( new Date( file.lastModified() ) );
 
-                    if ( checkForUpdates )
+                    if ( checkForUpdates && (System.getProperty("maven2.jpp.mode") == null))
                     {
                         if ( wagonManager.isOnline() )
                         {
diff -up ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java.sav ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
--- ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java.sav	2009-08-06 15:11:34.000000000 -0400
+++ ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java	2009-11-18 16:54:39.000000000 -0500
@@ -206,7 +206,8 @@ public class DefaultArtifactResolver
                 try
                 {
                     // TODO: force should be passed to the wagon manager
-                    if ( artifact.getRepository() != null )
+                    if ( (artifact.getRepository() != null) &&
+                         (System.getProperty("maven2.jpp.mode") == null))
                     {
                         // the transformations discovered the artifact - so use it exclusively
                         wagonManager.getArtifact( artifact, artifact.getRepository() );
diff -up ./maven-artifact/pom.xml.sav ./maven-artifact/pom.xml
--- ./maven-artifact/pom.xml.sav	2009-08-06 15:11:32.000000000 -0400
+++ ./maven-artifact/pom.xml	2009-11-19 14:54:43.000000000 -0500
@@ -39,5 +39,10 @@ under the License.
       <artifactId>plexus-container-default</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>jdom</groupId>
+      <artifactId>jdom</artifactId>
+      <version>1.0</version>
+    </dependency>
   </dependencies>
 </project>
diff -up ./maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java.sav ./maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java
--- ./maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java.sav	2009-08-06 15:11:31.000000000 -0400
+++ ./maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java	2009-11-19 14:15:45.000000000 -0500
@@ -23,6 +23,9 @@ import org.apache.maven.artifact.Artifac
 import org.apache.maven.artifact.handler.ArtifactHandler;
 import org.apache.maven.artifact.metadata.ArtifactMetadata;
 import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.layout.MavenJPackageDepmap;
+
+import java.util.Hashtable;
 
 /**
  * @author jdcasey
@@ -42,6 +45,8 @@ public class DefaultRepositoryLayout
 
         StringBuffer path = new StringBuffer();
 
+        String baseVersion = artifact.getBaseVersion();
+
         path.append( formatAsDirectory( artifact.getGroupId() ) ).append( PATH_SEPARATOR );
         path.append( artifact.getArtifactId() ).append( PATH_SEPARATOR );
         path.append( artifact.getBaseVersion() ).append( PATH_SEPARATOR );
@@ -76,7 +81,17 @@ public class DefaultRepositoryLayout
 
             if ( metadata.storedInArtifactVersionDirectory() )
             {
-                path.append( metadata.getBaseVersion() ).append( PATH_SEPARATOR );
+                String baseVersion = metadata.getBaseVersion();
+
+                if (System.getProperty("maven2.jpp.mode") != null)
+                {
+                    MavenJPackageDepmap map = MavenJPackageDepmap.getInstance();
+                    Hashtable newInfo = map.getMappedInfo(metadata.getGroupId(), metadata.getArtifactId(), baseVersion);
+
+                    baseVersion = (String) newInfo.get("version");
+                }
+
+                path.append( baseVersion ).append( PATH_SEPARATOR );
             }
         }
 
diff -up ./maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java.sav ./maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
--- ./maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java.sav	2009-08-06 15:11:32.000000000 -0400
+++ ./maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java	2009-11-18 16:54:39.000000000 -0500
@@ -341,7 +341,7 @@ public class DefaultArtifactCollector
                                 // set the recommended version
                                 // TODO: maybe its better to just pass the range through to retrieval and use a transformation?
                                 ArtifactVersion version;
-                                if ( artifact.isSelectedVersionKnown() )
+                                if ( artifact.isSelectedVersionKnown() && System.getProperty("maven2.jpp.mode") == null)
                                 {
                                     version = artifact.getSelectedVersion();
                                 }
@@ -380,7 +380,12 @@ public class DefaultArtifactCollector
                                 //this is dangerous because artifact.getSelectedVersion() can
                                 //return null. However it is ok here because we first check if the
                                 //selected version is known. As currently coded we can't get a null here.
-                                artifact.selectVersion( version.toString() );
+
+                                if ( !artifact.isSelectedVersionKnown() && System.getProperty("maven2.jpp.mode") != null)
+                                    artifact.selectVersion( "DUMMY_VER" );
+                                else
+                                    artifact.selectVersion( version.toString() );
+                                
                                 fireEvent( ResolutionListener.SELECT_VERSION_FROM_RANGE, listeners, child );
                             }
 
diff -up ./maven-artifact/src/main/resources/META-INF/plexus/components.xml.sav ./maven-artifact/src/main/resources/META-INF/plexus/components.xml
--- ./maven-artifact/src/main/resources/META-INF/plexus/components.xml.sav	2009-08-06 15:11:32.000000000 -0400
+++ ./maven-artifact/src/main/resources/META-INF/plexus/components.xml	2009-11-18 16:54:39.000000000 -0500
@@ -31,6 +31,12 @@ under the License.
       <implementation>org.apache.maven.artifact.repository.layout.LegacyRepositoryLayout</implementation>
     </component>
 
+    <component>
+      <role>org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout</role>
+      <role-hint>jpp</role-hint>
+      <implementation>org.apache.maven.artifact.repository.layout.JPackageRepositoryLayout</implementation>
+    </component>
+
     <!--
      |
      | ArtifactHandlerManager
diff -up ./maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java.sav ./maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
diff -up ./maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java.sav ./maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java
--- ./maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java.sav	2009-11-19 11:36:53.000000000 -0500
+++ ./maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java	2009-11-19 11:47:25.000000000 -0500
@@ -60,6 +60,7 @@ public class MavenPluginCollector
             {
                 pluginsInProcess.add( key );
 
+                System.err.println("*DEBUG*: Putting in plugin descriptor list " + key + " and goal prefix is " + pluginDescriptor.getGoalPrefix());
                 pluginDescriptors.put( key, pluginDescriptor );
 
                 // TODO: throw an (not runtime) exception if there is a prefix overlap - means doing so elsewhere
@@ -75,6 +76,17 @@ public class MavenPluginCollector
     public PluginDescriptor getPluginDescriptor( Plugin plugin )
     {
         String key = PluginUtils.constructVersionedKey( plugin );
+        System.err.println("*DEBUG*: Constructed plugin version key is " + key);
+
+        PluginDescriptor descriptor = (PluginDescriptor) pluginDescriptors.get( key );
+
+        // In JPP mode, we give it a second chance
+        if ( ( descriptor == null ) && 
+             ( System.getProperty("maven2.jpp.mode") != null ) )
+        {
+            //for descriptors
+        }
+
         return (PluginDescriptor) pluginDescriptors.get( key );
     }
 
diff -up ./maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java.sav ./maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java
--- ./maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java.sav	2009-11-19 11:08:06.000000000 -0500
+++ ./maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java	2009-11-19 11:08:29.000000000 -0500
@@ -57,8 +57,10 @@ public class MavenPluginValidator
             {
                 errors.add( "Plugin's descriptor contains the wrong artifact ID: " + pluginDescriptor.getArtifactId() );
             }
-            
-            if ( !pluginArtifact.getBaseVersion().equals( pluginDescriptor.getVersion() ) )
+
+            if ( !pluginArtifact.getBaseVersion().equals( pluginDescriptor.getVersion() ) && 
+                 ( System.getProperty("maven2.jpp.mode") == null ) 
+               )            
             {
                 errors.add( "Plugin's descriptor contains the wrong version: " + pluginDescriptor.getVersion() );
             }
diff -up ./maven-core/src/main/java/org/apache/maven/plugin/PluginUtils.java.sav ./maven-core/src/main/java/org/apache/maven/plugin/PluginUtils.java
--- ./maven-core/src/main/java/org/apache/maven/plugin/PluginUtils.java.sav	2009-11-19 11:51:04.000000000 -0500
+++ ./maven-core/src/main/java/org/apache/maven/plugin/PluginUtils.java	2009-11-19 12:00:15.000000000 -0500
@@ -72,7 +72,13 @@ class PluginUtils
         String baseVersion = ArtifactUtils.toSnapshotVersion( version );
 
         StringBuffer key = new StringBuffer( 128 );
-        key.append( groupId ).append( ':' ).append( artifactId ).append( ':' ).append( baseVersion );
+
+        // In JPP mode, we don't want to use versions in keys
+
+        if (System.getProperty("maven2.jpp.mode") == null)
+            key.append( groupId ).append( ':' ).append( artifactId ).append( ':' ).append( baseVersion );
+        else
+            key.append( groupId ).append( ':' ).append( artifactId );
         return key.toString();
     }
 
diff -up ./maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java.sav ./maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
--- ./maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java.sav	2009-08-06 15:11:28.000000000 -0400
+++ ./maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java	2009-11-18 16:54:39.000000000 -0500
@@ -224,9 +224,15 @@ public class DefaultPluginVersionManager
         }
 
         // if we still haven't found a version, then fail early before we get into the update goop.
-        if ( StringUtils.isEmpty( version ) )
+        if ( (StringUtils.isEmpty( version )) && (System.getProperty("maven2.jpp.mode") == null))
         {
             throw new PluginVersionNotFoundException( groupId, artifactId );
+        } else if (System.getProperty("maven2.jpp.mode") != null)
+        {
+            // Doesn't matter what we have here. We need *something* because 
+            // metadata is not retrieved in offline mode, so there needs to be
+            // some kind of version
+            version = "DUMMY_VER";
         }
 
         // if the plugin registry is inactive, then the rest of this goop is useless...
diff -up ./maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java.sav ./maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
--- ./maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java.sav	2009-08-06 15:11:37.000000000 -0400
+++ ./maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java	2009-11-18 16:54:39.000000000 -0500
@@ -43,7 +43,7 @@ import java.util.List;
 public class DefaultModelValidator
     implements ModelValidator
 {
-    private static final String ID_REGEX = "[A-Za-z0-9_\\-.]+";
+    private static final String ID_REGEX = "[A-Za-z0-9_/\\\\.-]+";
 
     ///////////////////////////////////////////////////////////////////////////
     // ModelValidator Implementation
@@ -88,7 +88,13 @@ public class DefaultModelValidator
 
             validateStringNotEmpty( "dependencies.dependency.type", result, d.getType(), d.getManagementKey() );
 
-            validateStringNotEmpty( "dependencies.dependency.version", result, d.getVersion(), d.getManagementKey() );
+            // In JPP mode, don't bother validating. But do put a dummy 
+            // version if one is not provided
+            if ((System.getProperty("maven2.jpp.mode") != null) &&
+                (d.getVersion() == null)) 
+                d.setVersion("DUMMY_VER");
+            else
+                validateStringNotEmpty( "dependencies.dependency.version", result, d.getVersion(), d.getManagementKey() );
 
             if ( Artifact.SCOPE_SYSTEM.equals( d.getScope() ) )
             {
diff -up ./maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml.sav ./maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
--- ./maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml.sav	2009-08-06 15:11:38.000000000 -0400
+++ ./maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml	2009-11-19 13:12:23.000000000 -0500
@@ -32,6 +32,24 @@ under the License.
         <enabled>false</enabled>
       </snapshots>
     </repository>
+    <repository>
+      <id>__jpps_repo__</id>
+      <name>JPackage Maven Repository</name>
+      <layout>jpp</layout>
+      <url>file:///usr/share/maven2/repository-signed</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+    <repository>
+      <id>__jpp_repo__</id>
+      <name>JPackage Maven Repository</name>
+      <layout>jpp</layout>
+      <url>file:///usr/share/maven2/repository</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
   </repositories>
 
   <pluginRepositories>
@@ -47,6 +65,31 @@ under the License.
         <updatePolicy>never</updatePolicy>
       </releases>
     </pluginRepository>
+    <pluginRepository>
+      <id>__jpps_repo__</id>
+      <name>JPackage Maven Repository</name>
+      <layout>jpp</layout>
+      <url>file:///usr/share/maven2/repository-signed</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <releases>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+    </pluginRepository>
+    <pluginRepository>
+      <id>__jpp_repo__</id>
+      <name>JPackage Maven Repository</name>
+      <layout>jpp</layout>
+      <url>file:///usr/share/maven2/repository</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <releases>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+    </pluginRepository>
+
   </pluginRepositories>
 
   <build>
diff -up ./pom.xml.sav ./pom.xml
--- ./pom.xml.sav	2009-08-06 15:11:38.000000000 -0400
+++ ./pom.xml	2009-11-19 14:54:29.000000000 -0500
@@ -481,6 +481,11 @@ under the License.
         <artifactId>classworlds</artifactId>
         <version>1.1</version>
       </dependency>
+      <dependency>
+        <groupId>jdom</groupId>
+        <artifactId>jdom</artifactId>
+        <version>1.0</version>
+      </dependency>
     </dependencies>
     <!--start-->
   </dependencyManagement>

--- maven2-enable-bootstrap-repository.patch DELETED ---

--- NEW FILE: maven2-2.2.1-enable-bootstrap-repo.patch ---
diff -up ./maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml.sav ./maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
--- ./maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml.sav	2009-11-19 21:48:25.214582305 -0500
+++ ./maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml	2009-11-20 00:02:16.608725006 -0500
@@ -33,6 +33,15 @@ under the License.
       </snapshots>
     </repository>
     <repository>
+      <id>__bootstrap_jpp_repo__</id>
+      <name>Maven Bootstrap Repository</name>
+      <layout>default</layout>
+      <url>file:///usr/share/maven2/bootstrap_repo</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+    <repository>
       <id>__jpp_repo__</id>
       <name>JPackage Maven Repository</name>
       <layout>jpp</layout>
@@ -57,6 +66,18 @@ under the License.
       </releases>
     </pluginRepository>
     <pluginRepository>
+      <id>__bootstrap_jpp_repo__</id>
+      <name>Maven Bootstrap Repository</name>
+      <layout>default</layout>
+      <url>file:///usr/share/maven2/bootstrap_repo</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <releases>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+    </pluginRepository>
+    <pluginRepository>
       <id>__jpp_repo__</id>
       <name>JPackage Maven Repository</name>
       <layout>jpp</layout>

--- maven2-run-it-tests.sh DELETED ---

Index: maven2-MavenJPackageDepmap.java
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven2/devel/maven2-MavenJPackageDepmap.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** maven2-MavenJPackageDepmap.java	12 Mar 2010 20:26:31 -0000	1.2
--- maven2-MavenJPackageDepmap.java	10 Oct 2011 21:17:32 -0000	1.3
***************
*** 92,105 ****
  
  		if (System.getProperty("maven2.ignore.versions") != null || System.getProperty("maven2.jpp.mode") != null) {
! 			//System.err.println("Processing file: /usr/share/java-utils/xml/maven2-versionless-depmap.xml");
  			processDepmapFile("/etc/maven/maven2-versionless-depmap.xml");
  		}
  
! 		//System.err.println("Processing file: /usr/share/java-utils/xml/maven2-depmap.xml");
  		processDepmapFile("/etc/maven/maven2-depmap.xml");
  
  		String customFileName = System.getProperty("maven2.jpp.depmap.file", null); 
  		if (customFileName != null) {
! 			//System.err.println("Processing file: " + customFileName);
  			processDepmapFile(customFileName);
  		}
--- 92,105 ----
  
  		if (System.getProperty("maven2.ignore.versions") != null || System.getProperty("maven2.jpp.mode") != null) {
! 			debug("Processing file: /usr/share/java-utils/xml/maven2-versionless-depmap.xml");
  			processDepmapFile("/etc/maven/maven2-versionless-depmap.xml");
  		}
  
! 		debug("Processing file: /usr/share/java-utils/xml/maven2-depmap.xml");
  		processDepmapFile("/etc/maven/maven2-depmap.xml");
  
  		String customFileName = System.getProperty("maven2.jpp.depmap.file", null); 
  		if (customFileName != null) {
! 			debug("Processing file: " + customFileName);
  			processDepmapFile(customFileName);
  		}
***************
*** 148,162 ****
  
  				if (System.getProperty("maven2.ignore.versions") == null && System.getProperty("maven2.jpp.mode") == null) {
! 					//System.err.println("*** Adding: " + mG+","+mA+","+mV + " => " +  jppG+","+jppA+","+jppV + " to map...");
  					jppArtifactMap.put(mG+","+mA+","+mV, jppG+","+jppA+","+jppV);
  				} else {
! 					//System.err.println("*** Adding: " + mG+","+mA + " => " +  jppG+","+jppA+","+jppV + " to map...");
  					jppArtifactMap.put(mG+","+mA, jppG+","+jppA+","+jppV);
  				}
  			} else {
! 					//System.err.println("*** Adding: " + mG+","+mA+"," + " => " +  "JPP/maven2,empty-dep,"+mV + " to map...");
  					jppArtifactMap.put(mG+","+mA, "JPP/maven2,empty-dep,"+mV);
  			}
  		}
  	}
  }
--- 148,167 ----
  
  				if (System.getProperty("maven2.ignore.versions") == null && System.getProperty("maven2.jpp.mode") == null) {
! 					debug("*** Adding: " + mG+","+mA+","+mV + " => " +  jppG+","+jppA+","+jppV + " to map...");
  					jppArtifactMap.put(mG+","+mA+","+mV, jppG+","+jppA+","+jppV);
  				} else {
! 					debug("*** Adding: " + mG+","+mA + " => " +  jppG+","+jppA+","+jppV + " to map...");
  					jppArtifactMap.put(mG+","+mA, jppG+","+jppA+","+jppV);
  				}
  			} else {
! 					debug("*** Adding: " + mG+","+mA+"," + " => " +  "JPP/maven2,empty-dep,"+mV + " to map...");
  					jppArtifactMap.put(mG+","+mA, "JPP/maven2,empty-dep,"+mV);
  			}
  		}
  	}
+ 
+     private static void debug(String msg) {
+         if (System.getProperty("maven2.jpp.debug") != null)
+             System.err.println(msg);
+     }
  }

--- maven2-commons-cli-1.1.patch DELETED ---




More information about the JPackage-commits mailing list