[pkg-java] r8937 - in trunk/maven2-core/debian: . patches

Ludovic Claude ludovicc-guest at alioth.debian.org
Tue Jul 7 23:45:48 UTC 2009 

Author: ludovicc-guest
Date: 2009-07-07 23:45:48 +0000 (Tue, 07 Jul 2009)
New Revision: 8937

Modified:
   trunk/maven2-core/debian/build.properties
   trunk/maven2-core/debian/build.xml
   trunk/maven2-core/debian/changelog
   trunk/maven2-core/debian/orig-tar.sh
   trunk/maven2-core/debian/patches/plugin-versions.patch
   trunk/maven2-core/debian/patches/remove_webdav_support.patch
   trunk/maven2-core/debian/watch
Log:
* New version

Modified: trunk/maven2-core/debian/build.properties
===================================================================
--- trunk/maven2-core/debian/build.properties	2009-07-07 23:41:55 UTC (rev 8936)
+++ trunk/maven2-core/debian/build.properties	2009-07-07 23:45:48 UTC (rev 8937)
@@ -1,5 +1,6 @@
 javadoc.dir=build/docs/api
 maven.test.skip=true
+build.javaVersion=1.5
 classpath.compile = \
             ${basedir}/maven-artifact/build/maven-artifact-${version}.jar:\
             ${basedir}/maven-repository-metadata/build/maven-repository-metadata-${version}.jar:\

Modified: trunk/maven2-core/debian/build.xml
===================================================================
--- trunk/maven2-core/debian/build.xml	2009-07-07 23:41:55 UTC (rev 8936)
+++ trunk/maven2-core/debian/build.xml	2009-07-07 23:45:48 UTC (rev 8937)
@@ -60,7 +60,7 @@
         <modello model="maven-plugin-registry/plugin-registry.mdo" plugin="java" output="maven-plugin-registry/build/generated-sources" version="1.0.0"/>
         <modello model="maven-repository-metadata/src/main/mdo/metadata.mdo" plugin="java" output="maven-repository-metadata/build/generated-sources" version="1.0.0"/>
         <modello model="maven-model/src/main/mdo/maven.mdo" plugin="java" output="maven-model/build/generated-sources" version="4.0.0"/>
-        <modello model="maven-toolchain/src/main/mdo/toolchains.xml" plugin="java" output="maven-toolchain/build/generated-sources" version="1.0.0"/>
+        <modello model="maven-toolchain/src/main/mdo/toolchains.mdo" plugin="java" output="maven-toolchain/build/generated-sources" version="1.0.0"/>
 
         <modello model="maven-settings/src/main/mdo/settings.mdo" plugin="xpp3-reader" output="maven-settings/build/generated-sources" version="1.0.0"/>
         <modello model="maven-profile/src/main/mdo/profiles.mdo" plugin="xpp3-reader" output="maven-profile/build/generated-sources" version="1.0.0"/>
@@ -69,7 +69,7 @@
         <modello model="maven-plugin-registry/plugin-registry.mdo" plugin="xpp3-reader" output="maven-plugin-registry/build/generated-sources" version="1.0.0"/>
         <modello model="maven-repository-metadata/src/main/mdo/metadata.mdo" plugin="xpp3-reader" output="maven-repository-metadata/build/generated-sources" version="1.0.0"/>
         <modello model="maven-model/src/main/mdo/maven.mdo" plugin="xpp3-reader" output="maven-model/build/generated-sources" version="4.0.0"/>
-        <modello model="maven-toolchain/src/main/mdo/toolchains.xml" plugin="xpp3-reader" output="maven-toolchain/build/generated-sources" version="1.0.0"/>
+        <modello model="maven-toolchain/src/main/mdo/toolchains.mdo" plugin="xpp3-reader" output="maven-toolchain/build/generated-sources" version="1.0.0"/>
 
         <modello model="maven-settings/src/main/mdo/settings.mdo" plugin="xpp3-writer" output="maven-settings/build/generated-sources" version="1.0.0"/>
         <modello model="maven-profile/src/main/mdo/profiles.mdo" plugin="xpp3-writer" output="maven-profile/build/generated-sources" version="1.0.0"/>
@@ -78,7 +78,7 @@
         <modello model="maven-plugin-registry/plugin-registry.mdo" plugin="xpp3-writer" output="maven-plugin-registry/build/generated-sources" version="1.0.0"/>
         <modello model="maven-repository-metadata/src/main/mdo/metadata.mdo" plugin="xpp3-writer" output="maven-repository-metadata/build/generated-sources" version="1.0.0"/>
         <modello model="maven-model/src/main/mdo/maven.mdo" plugin="xpp3-writer" output="maven-model/build/generated-sources" version="4.0.0"/>
-        <modello model="maven-toolchain/src/main/mdo/toolchains.xml" plugin="xpp3-writer" output="maven-toolchain/build/generated-sources" version="1.0.0"/>
+        <modello model="maven-toolchain/src/main/mdo/toolchains.mdo" plugin="xpp3-writer" output="maven-toolchain/build/generated-sources" version="1.0.0"/>
 
         <mkdir dir="maven-core/${build.outputDirectory}/org/apache/maven/messages/" />
         <copy todir="maven-core/${build.outputDirectory}/org/apache/maven/messages/" 

Modified: trunk/maven2-core/debian/changelog
===================================================================
--- trunk/maven2-core/debian/changelog	2009-07-07 23:41:55 UTC (rev 8936)
+++ trunk/maven2-core/debian/changelog	2009-07-07 23:45:48 UTC (rev 8937)
@@ -1,4 +1,4 @@
-maven2-core (2.1.0-0ubuntu1~ppa11) jaunty; urgency=low
+maven2-core (2.2.0-1) unstable; urgency=low
 
   * Initial release, contains the Maven libraries from
     the maven2 package which is now split in two for build reasons.


Property changes on: trunk/maven2-core/debian/orig-tar.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: trunk/maven2-core/debian/patches/plugin-versions.patch
===================================================================
--- trunk/maven2-core/debian/patches/plugin-versions.patch	2009-07-07 23:41:55 UTC (rev 8936)
+++ trunk/maven2-core/debian/patches/plugin-versions.patch	2009-07-07 23:45:48 UTC (rev 8937)
@@ -9,6 +9,15 @@
           </plugin>
           <plugin>
             <artifactId>maven-compiler-plugin</artifactId>
+@@ -88,7 +88,7 @@
+          </plugin>
+          <plugin>
+            <artifactId>maven-dependency-plugin</artifactId>
+-           <version>2.0</version>
++           <version>2.1</version>
+          </plugin>
+          <plugin>
+            <artifactId>maven-deploy-plugin</artifactId>
 @@ -104,7 +104,7 @@
           </plugin>
           <plugin>

Modified: trunk/maven2-core/debian/patches/remove_webdav_support.patch
===================================================================
--- trunk/maven2-core/debian/patches/remove_webdav_support.patch	2009-07-07 23:41:55 UTC (rev 8936)
+++ trunk/maven2-core/debian/patches/remove_webdav_support.patch	2009-07-07 23:45:48 UTC (rev 8937)
@@ -1,28 +1,20 @@
 --- a/maven-core/pom.xml
 +++ b/maven-core/pom.xml
-@@ -45,11 +45,6 @@
+@@ -45,17 +45,6 @@
      </dependency>
      <dependency>
        <groupId>org.apache.maven.wagon</groupId>
 -      <artifactId>wagon-webdav-jackrabbit</artifactId>
 -      <scope>runtime</scope>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>commons-logging</groupId>
+-          <artifactId>commons-logging</artifactId>
+-        </exclusion>
+-      </exclusions>
 -    </dependency>
 -    <dependency>
 -      <groupId>org.apache.maven.wagon</groupId>
-       <artifactId>wagon-http-lightweight</artifactId>
+       <artifactId>wagon-http</artifactId>
        <scope>runtime</scope>
-     </dependency>
---- a/pom.xml
-+++ b/pom.xml
-@@ -439,11 +439,6 @@
-       </dependency>
-       <dependency>
-         <groupId>org.apache.maven.wagon</groupId>
--        <artifactId>wagon-webdav-jackrabbit</artifactId>
--        <version>${wagonVersion}</version>
--      </dependency>
--      <dependency>
--        <groupId>org.apache.maven.wagon</groupId>
-         <artifactId>wagon-http-lightweight</artifactId>
-         <version>${wagonVersion}</version>
-       </dependency>
+       <exclusions>

Modified: trunk/maven2-core/debian/watch
===================================================================
--- trunk/maven2-core/debian/watch	2009-07-07 23:41:55 UTC (rev 8936)
+++ trunk/maven2-core/debian/watch	2009-07-07 23:45:48 UTC (rev 8937)
@@ -1,4 +1,4 @@
 version=3
 opts=uversionmangle=s/-RC/~RC/ \
   http://svn.apache.org/repos/asf/maven/components/tags/ \
-  maven-([0-9].*)/ debian debian/orig-tar.sh
+  maven-(2.*)/ debian debian/orig-tar.sh

More information about the pkg-java-commits mailing list