[maven2-core] 03/38: * New version
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Feb 27 13:24:16 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository maven2-core.
commit 5ebc29b05b927ebc5c093d4e88dfac3dc2dc381a
Author: Ludovic Claude <ludovic.claude at laposte.net>
Date: Tue Jul 7 23:45:48 2009 +0000
* New version
---
debian/build.properties | 1 +
debian/build.xml | 6 +++---
debian/changelog | 2 +-
debian/orig-tar.sh | 0
debian/patches/plugin-versions.patch | 9 +++++++++
debian/patches/remove_webdav_support.patch | 26 +++++++++-----------------
debian/watch | 2 +-
7 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/debian/build.properties b/debian/build.properties
index 4198a74..8adc1e2 100644
--- a/debian/build.properties
+++ b/debian/build.properties
@@ -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:\
diff --git a/debian/build.xml b/debian/build.xml
index 6fc500a..30c1c6e 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -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/"
diff --git a/debian/changelog b/debian/changelog
index 0ae0b93..7e3eb76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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.
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
old mode 100644
new mode 100755
diff --git a/debian/patches/plugin-versions.patch b/debian/patches/plugin-versions.patch
index 489dec1..62ba357 100644
--- a/debian/patches/plugin-versions.patch
+++ b/debian/patches/plugin-versions.patch
@@ -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>
diff --git a/debian/patches/remove_webdav_support.patch b/debian/patches/remove_webdav_support.patch
index 864a5db..ba83269 100644
--- a/debian/patches/remove_webdav_support.patch
+++ b/debian/patches/remove_webdav_support.patch
@@ -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>
diff --git a/debian/watch b/debian/watch
index 7e361b3..1b8b7dc 100644
--- a/debian/watch
+++ b/debian/watch
@@ -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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven2-core.git
More information about the pkg-java-commits
mailing list