[Jpackage-commits] dist/maven-shared/devel .cvsignore, 1.1, 1.2 maven-shared-8-jpp-depmap.xml, NONE, 1.1 maven-shared-ant-pom.patch, NONE, 1.1 maven-shared-file-management-pom.patch, NONE, 1.1 maven-shared-io-ArtifactLocatorStrategyTest.patch, NONE, 1.1 maven-shared-plugin-tools-pom.patch, NONE, 1.1 maven-shared-pom.patch, NONE, 1.1 maven-shared-settings.xml, NONE, 1.1 maven-shared.spec, NONE, 1.1 sources, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Wed May 28 21:12:04 CEST 2008


Update of /home/projects/jpackage/cvs/dist/maven-shared/devel
In directory ryu.zarb.org:/tmp/cvs-serv8422/devel

Modified Files:
	.cvsignore sources 
Added Files:
	maven-shared-8-jpp-depmap.xml maven-shared-ant-pom.patch 
	maven-shared-file-management-pom.patch 
	maven-shared-io-ArtifactLocatorStrategyTest.patch 
	maven-shared-plugin-tools-pom.patch maven-shared-pom.patch 
	maven-shared-settings.xml maven-shared.spec 
Log Message:
Import from JPP 5.0

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-shared/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	28 May 2008 19:11:38 -0000	1.1
--- .cvsignore	28 May 2008 19:12:02 -0000	1.2
***************
*** 0 ****
--- 1,3 ----
+ maven-enforcer-rule-api-1.0-alpha-2.tar.gz
+ maven-shared-autogenerated-files.tar.gz
+ maven-shared-components-8.tar.gz

--- NEW FILE: maven-shared-file-management-pom.patch ---
--- file-management/pom.xml.sav	2007-11-27 19:06:50.000000000 +0100
+++ file-management/pom.xml	2007-11-27 19:07:12.000000000 +0100
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>[1.1,)</version>
+      <version>1.1</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

--- NEW FILE: maven-shared-pom.patch ---
--- pom.xml.sav0	2007-10-23 02:16:51.000000000 +0200
+++ pom.xml	2008-01-21 09:11:13.000000000 +0100
@@ -4,7 +4,6 @@
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-parent</artifactId>
     <version>7</version>
-    <relativePath>../pom/maven/pom.xml</relativePath>
   </parent>
   <groupId>org.apache.maven.shared</groupId>
   <artifactId>maven-shared-components</artifactId>
@@ -40,10 +39,17 @@
     <module>maven-plugin-testing-tools</module>
     <module>maven-test-tools</module>
     <module>maven-repository-builder</module>
+<!--
     <module>maven-script</module>
+-->
     <module>maven-common-artifact-filters</module>
     <module>maven-dependency-analyzer</module>
+    <module>maven-dependency-tree</module>
     <module>maven-shared-jar</module>
+    <module>maven-osgi</module>
+    <module>maven-downloader</module>
+
+    <module>maven-enforcer-rule-api</module>
   </modules>
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-components-8</connection>
@@ -62,4 +68,4 @@
       </plugins>
     </pluginManagement>
   </build>
-</project>
\ No newline at end of file
+</project>

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-shared/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	28 May 2008 19:11:38 -0000	1.1
--- sources	28 May 2008 19:12:02 -0000	1.2
***************
*** 0 ****
--- 1,3 ----
+ 619301c51df85fd1ed245fd1c550494d  maven-enforcer-rule-api-1.0-alpha-2.tar.gz
+ 09485345909fc5ebf8ac2896a2118fcf  maven-shared-autogenerated-files.tar.gz
+ f56bd9b4d221409e5e82af77c4ea1049  maven-shared-components-8.tar.gz

--- NEW FILE: maven-shared-ant-pom.patch ---
--- maven-ant/pom.xml.sav1	2007-11-27 17:26:32.000000000 +0100
+++ maven-ant/pom.xml	2007-11-27 17:27:00.000000000 +0100
@@ -24,7 +24,7 @@
   <dependencies>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
+      <artifactId>plexus-containers-container-default</artifactId>
       <version>1.0-alpha-13</version>
     </dependency>  
     <dependency>

--- NEW FILE: maven-shared-plugin-tools-pom.patch ---
--- maven-plugin-tools/pom.xml.sav	2008-01-18 16:51:39.000000000 +0100
+++ maven-plugin-tools/pom.xml	2008-01-18 16:52:20.000000000 +0100
@@ -43,17 +43,17 @@
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-plugin-tools-api</artifactId>
-        <version>${project.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-plugin-tools-model</artifactId>
-        <version>${project.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-plugin-tools-java</artifactId>
-        <version>${project.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>

--- NEW FILE: maven-shared.spec ---
# Copyright (c) 2000-2008, 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
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
[...1542 lines suppressed...]
* Tue Jan 22 2008 Ralph Apel <r.apel at r-apel.de> 0:8-0.p8.1jpp
- Move version to the parent-version
- Conserve proper version for each component
- maven-shared-components-8 package set

* Fri Oct 27 2006 Deepak Bhole <dbhole at redhat.com> 1.0-4jpp
- Update for maven 9jpp

* Fri Sep 15 2006 Deepak Bhole <dbhole at redhat.com> 1.0-3jpp
- Removed the file-management-pom.patch (no longer required)
- Install poms

* Wed Sep 13 2006 Ralph Apel <r.apel at r-apel.de> 0:1.0-2jpp
- Add plugin-testing-harness subpackage

* Mon Sep 11 2006 Ralph Apel <r.apel at r-apel.de> 0:1.0-1jpp
- First release
- Add gcj_support option
- Add post/postun Requires for javadoc


--- NEW FILE: maven-shared-settings.xml ---
<settings>
	<profiles>
		<profile>
			<id>JPP</id>
			<repositories>
				<repository>
					<id>internal</id>
					<layout>jpp</layout>
					<url>__INTERNAL_REPO_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>external</id>
					<layout>jpp</layout>
					<url>__EXTERNAL_REPO_PLACEHOLDER__</url>
				</repository>
			</repositories>
			<pluginRepositories>
				<pluginRepository>
					<id>plugins-internal</id>
					<name>plugins-internal</name>
					<layout>jpp</layout>
					<url>__INTERNAL_REPO_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-external</id>
					<name>plugins-external</name>
					<layout>jpp</layout>
					<url>__EXTERNAL_REPO_PLACEHOLDER__</url>
				</pluginRepository>
			</pluginRepositories>
		</profile>
	</profiles>
	<activeProfiles>
		<activeProfile>JPP</activeProfile>
	</activeProfiles>
</settings>

--- NEW FILE: maven-shared-8-jpp-depmap.xml ---
<dependencies>
        <dependency>
          <maven>
                <groupId>easymock</groupId>
                <artifactId>easymock</artifactId>
                <version>1.2_Java1.3</version>
          </maven>
          <jpp>
                <groupId>JPP</groupId>
                <artifactId>easymock</artifactId>
                <version>1.2</version>
          </jpp>
        </dependency>
        <dependency>
          <maven>
                <groupId>junit-addons</groupId>
                <artifactId>junit-addons</artifactId>
                <version>1.4</version>
          </maven>
          <jpp>
                <groupId>JPP</groupId>
                <artifactId>junit-addons</artifactId>
                <version>1.4</version>
          </jpp>
        </dependency>
        <dependency>
          <maven>
                <groupId>jetty</groupId>
                <artifactId>org.mortbay.jetty</artifactId>
                <version>5.1.10</version>
          </maven>
          <jpp>
                <groupId>JPP/jetty5</groupId>
                <artifactId>jetty5</artifactId>
                <version>5.1.12</version>
          </jpp>
        </dependency>
        <dependency>
          <maven>
                <groupId>asm</groupId>
                <artifactId>asm</artifactId>
                <version>3.0</version>
          </maven>
          <jpp>
                <groupId>JPP/objectweb-asm</groupId>
                <artifactId>asm</artifactId>
                <version>3.1</version>
          </jpp>
        </dependency>

        <dependency>
          <maven>
                <groupId>javax.servlet</groupId>
                <artifactId>servlet-api</artifactId>
                <version>2.4</version>
          </maven>
          <jpp>
                <groupId>JPP</groupId>
                <artifactId>servlet_2_4_api</artifactId>
                <version>2.4</version>
          </jpp>
        </dependency>

</dependencies>

--- NEW FILE: maven-shared-io-ArtifactLocatorStrategyTest.patch ---
--- maven-shared-io/src/test/java/org/apache/maven/shared/io/location/ArtifactLocatorStrategyTest.java.sav0	2007-11-16 09:44:56.000000000 +0100
+++ maven-shared-io/src/test/java/org/apache/maven/shared/io/location/ArtifactLocatorStrategyTest.java	2007-11-16 09:46:02.000000000 +0100
@@ -463,7 +463,7 @@
         {
             resolver.resolve( artifact, Collections.EMPTY_LIST, localRepository );
             resolverControl.setThrowable( new ArtifactNotFoundException( "not found", "group", "artifact", "version",
-                                                                         "jar", Collections.EMPTY_LIST,
+                                                                         "jar", "", Collections.EMPTY_LIST,
                                                                          "http://nowhere.com", Collections.EMPTY_LIST,
                                                                          new NullPointerException() ) );
         }
@@ -513,7 +513,7 @@
         {
             resolver.resolve( artifact, Collections.EMPTY_LIST, localRepository );
             resolverControl.setThrowable( new ArtifactResolutionException( "resolution failed", "group", "artifact",
-                                                                           "version", "jar", Collections.EMPTY_LIST,
+                                                                           "version", "jar", "", Collections.EMPTY_LIST,
                                                                            Collections.EMPTY_LIST,
                                                                            new NullPointerException() ) );
         }




More information about the JPackage-commits mailing list