[maven] 03/06: Install generic 3.x artifacts in /usr/share/maven-repo (Closes: #698975) Renamed the jars in /usr/share/java to maven3-xxx.jar to avoid conflicts with Maven 2 Installed versionless jars in /usr/share/java
Emmanuel Bourg
ebourg-guest at alioth.debian.org
Mon Oct 21 20:51:25 UTC 2013
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository maven.
commit d82887bff5e95ca24eeb1f8ef2524d31c27f03ae
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon Oct 21 22:35:51 2013 +0200
Install generic 3.x artifacts in /usr/share/maven-repo (Closes: #698975)
Renamed the jars in /usr/share/java to maven3-xxx.jar to avoid conflicts with Maven 2
Installed versionless jars in /usr/share/java
---
.gitignore | 1 -
debian/changelog | 4 ++++
debian/{maven.rules => maven.buildRules} | 0
debian/maven.links | 36 ++++++++++++++++++++----------
debian/maven.poms | 23 +++++++++----------
debian/maven.rules | 26 ++++++++++-----------
debian/rules | 17 ++++++++++++--
7 files changed, 67 insertions(+), 40 deletions(-)
diff --git a/.gitignore b/.gitignore
index ca5efa1..adc6c00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,3 @@ bin/
.idea
.DS_Store
-.pc
diff --git a/debian/changelog b/debian/changelog
index 64a259e..e7ec09d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ maven (3.0.5-1) UNRELEASED; urgency=low
* Updated modello.diff to use Guava instead of Google Collections
(Closes: #725588)
* Updated maven-clean-plugin version from 2.3 to 2.5
+ * Install generic 3.x artifacts in /usr/share/maven-repo (Closes: #698975)
+ * Renamed the jars in /usr/share/java to maven3-xxx.jar to avoid conflicts
+ with Maven 2
+ * Installed versionless jars in /usr/share/java
* debian/rules: Improved the clean target
* debian/orig-tar.sh:
- Use XZ compression for the upstream tarball
diff --git a/debian/maven.rules b/debian/maven.buildRules
similarity index 100%
copy from debian/maven.rules
copy to debian/maven.buildRules
diff --git a/debian/maven.links b/debian/maven.links
index 312084a..f535f5d 100644
--- a/debian/maven.links
+++ b/debian/maven.links
@@ -23,18 +23,30 @@
/usr/share/java/sisu-inject-bean.jar /usr/share/maven/lib/sisu-inject-bean.jar
/usr/share/java/sisu-inject-plexus.jar /usr/share/maven/lib/sisu-inject-plexus.jar
-/usr/share/java/maven-aether-provider-3.x.jar /usr/share/maven/lib/maven-aether-provider-3.x.jar
-/usr/share/java/maven-artifact-3.x.jar /usr/share/maven/lib/maven-artifact-3.x.jar
-/usr/share/java/maven-compat-3.x.jar /usr/share/maven/lib/maven-compat-3.x.jar
-/usr/share/java/maven-core-3.x.jar /usr/share/maven/lib/maven-core-3.x.jar
-/usr/share/java/maven-embedder-3.x.jar /usr/share/maven/lib/maven-embedder-3.x.jar
-/usr/share/java/maven-model-builder-3.x.jar /usr/share/maven/lib/maven-model-builder-3.x.jar
-/usr/share/java/maven-model-3.x.jar /usr/share/maven/lib/maven-model-3.x.jar
-/usr/share/java/maven-plugin-api-3.x.jar /usr/share/maven/lib/maven-plugin-api-3.x.jar
-/usr/share/java/maven-repository-metadata-3.x.jar /usr/share/maven/lib/maven-repository-metadata-3.x.jar
-/usr/share/java/maven-settings-builder-3.x.jar /usr/share/maven/lib/maven-settings-builder-3.x.jar
-/usr/share/java/maven-settings-3.x.jar /usr/share/maven/lib/maven-settings-3.x.jar
+/usr/share/java/maven3-aether-provider.jar /usr/share/maven/lib/maven-aether-provider-3.x.jar
+/usr/share/java/maven3-artifact.jar /usr/share/maven/lib/maven-artifact-3.x.jar
+/usr/share/java/maven3-compat.jar /usr/share/maven/lib/maven-compat-3.x.jar
+/usr/share/java/maven3-core.jar /usr/share/maven/lib/maven-core-3.x.jar
+/usr/share/java/maven3-embedder.jar /usr/share/maven/lib/maven-embedder-3.x.jar
+/usr/share/java/maven3-model-builder.jar /usr/share/maven/lib/maven-model-builder-3.x.jar
+/usr/share/java/maven3-model.jar /usr/share/maven/lib/maven-model-3.x.jar
+/usr/share/java/maven3-plugin-api.jar /usr/share/maven/lib/maven-plugin-api-3.x.jar
+/usr/share/java/maven3-repository-metadata.jar /usr/share/maven/lib/maven-repository-metadata-3.x.jar
+/usr/share/java/maven3-settings-builder.jar /usr/share/maven/lib/maven-settings-builder-3.x.jar
+/usr/share/java/maven3-settings.jar /usr/share/maven/lib/maven-settings-3.x.jar
+
+/usr/share/java/maven3-aether-provider.jar /usr/share/java/maven-aether-provider-3.x.jar
+/usr/share/java/maven3-artifact.jar /usr/share/java/maven-artifact-3.x.jar
+/usr/share/java/maven3-compat.jar /usr/share/java/maven-compat-3.x.jar
+/usr/share/java/maven3-core.jar /usr/share/java/maven-core-3.x.jar
+/usr/share/java/maven3-embedder.jar /usr/share/java/maven-embedder-3.x.jar
+/usr/share/java/maven3-model-builder.jar /usr/share/java/maven-model-builder-3.x.jar
+/usr/share/java/maven3-model.jar /usr/share/java/maven-model-3.x.jar
+/usr/share/java/maven3-plugin-api.jar /usr/share/java/maven-plugin-api-3.x.jar
+/usr/share/java/maven3-repository-metadata.jar /usr/share/java/maven-repository-metadata-3.x.jar
+/usr/share/java/maven3-settings-builder.jar /usr/share/java/maven-settings-builder-3.x.jar
+/usr/share/java/maven3-settings.jar /usr/share/java/maven-settings-3.x.jar
/usr/share/java/wagon-file-2.x.jar /usr/share/maven/lib/wagon-file.jar
/usr/share/java/wagon-http-shaded-2.x.jar /usr/share/maven/lib/wagon-http-shaded.jar
-/usr/share/java/wagon-provider-api-2.x.jar /usr/share/maven/lib/wagon-provider-api.jar
\ No newline at end of file
+/usr/share/java/wagon-provider-api-2.x.jar /usr/share/maven/lib/wagon-provider-api.jar
diff --git a/debian/maven.poms b/debian/maven.poms
index b6f367b..fe1a925 100644
--- a/debian/maven.poms
+++ b/debian/maven.poms
@@ -1,15 +1,14 @@
pom.xml
apache-maven/pom.xml
-maven-aether-provider/pom.xml --artifact=maven-aether-provider/target/maven-aether-provider-3.0.5.jar --java-lib --no-usj-versionless --usj-version=3.x
-maven-artifact/pom.xml --artifact=maven-artifact/target/maven-artifact-3.0.5.jar --java-lib --no-usj-versionless --usj-version=3.x
-maven-compat/pom.xml --artifact=maven-compat/target/maven-compat-3.0.5.jar --java-lib --no-usj-versionless --usj-version=3.x
-maven-core/pom.xml --artifact=maven-core/target/maven-core-3.0.5.jar --java-lib --no-usj-versionless --usj-version=3.x
-maven-embedder/pom.xml --artifact=maven-embedder/target/maven-embedder-3.0.5.jar --java-lib --no-usj-versionless --usj-version=3.x
-maven-model/pom.xml --artifact=maven-model/target/maven-model-3.0.5.jar --java-lib --no-usj-versionless --usj-version=3.x
-maven-model-builder/pom.xml --artifact=maven-model-builder/target/maven-model-builder-3.0.5.jar --java-lib --no-usj-versionless --usj-version=3.x
-maven-plugin-api/pom.xml --artifact=maven-plugin-api/target/maven-plugin-api-3.0.5.jar --java-lib --no-usj-versionless --usj-version=3.x
-maven-repository-metadata/pom.xml --artifact=maven-repository-metadata/target/maven-repository-metadata-3.0.5.jar --java-lib --no-usj-versionless --usj-version=3.x
-maven-settings/pom.xml --artifact=maven-settings/target/maven-settings-3.0.5.jar --java-lib --no-usj-versionless --usj-version=3.x
-maven-settings-builder/pom.xml --artifact=maven-settings-builder/target/maven-settings-builder-3.0.5.jar --java-lib --no-usj-versionless --usj-version=3.x
-
+maven-aether-provider/pom.xml --has-package-version
+maven-artifact/pom.xml --has-package-version
+maven-compat/pom.xml --has-package-version
+maven-core/pom.xml --has-package-version
+maven-embedder/pom.xml --has-package-version
+maven-model/pom.xml --has-package-version
+maven-model-builder/pom.xml --has-package-version
+maven-plugin-api/pom.xml --has-package-version
+maven-repository-metadata/pom.xml --has-package-version
+maven-settings/pom.xml --has-package-version
+maven-settings-builder/pom.xml --has-package-version
diff --git a/debian/maven.rules b/debian/maven.rules
index 0f42dae..c4b1e67 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -20,16 +20,16 @@ org.apache.maven.plugins maven-surefire-plugin * s/.*/2.10/ * *
org.apache.maven.plugins maven-jar-plugin * s/.*/2.2/ * *
org.apache.maven.plugins maven-compiler-plugin * s/.*/2.0.2/ * *
-org.apache.maven apache-maven pom s/.*/3.0.5/ * *
-org.apache.maven maven-aether-provider jar s/.*/3.0.5/ * *
-org.apache.maven maven-artifact jar s/.*/3.0.5/ * *
-org.apache.maven maven-compat jar s/.*/3.0.5/ * *
-org.apache.maven maven-core jar s/.*/3.0.5/ * *
-org.apache.maven maven-embedder jar s/.*/3.0.5/ * *
-org.apache.maven maven-model-builder jar s/.*/3.0.5/ * *
-org.apache.maven maven-model jar s/.*/3.0.5/ * *
-org.apache.maven maven-plugin-api jar s/.*/3.0.5/ * *
-org.apache.maven maven-repository-metadata jar s/.*/3.0.5/ * *
-org.apache.maven maven-settings-builder jar s/.*/3.0.5/ * *
-org.apache.maven maven-settings jar s/.*/3.0.5/ * *
-org.apache.maven maven pom s/.*/3.0.5/ * *
+org.apache.maven apache-maven pom s/.*/3.x/ * *
+org.apache.maven maven-aether-provider jar s/.*/3.x/ * *
+org.apache.maven maven-artifact jar s/.*/3.x/ * *
+org.apache.maven maven-compat jar s/.*/3.x/ * *
+org.apache.maven maven-core jar s/.*/3.x/ * *
+org.apache.maven maven-embedder jar s/.*/3.x/ * *
+org.apache.maven maven-model-builder jar s/.*/3.x/ * *
+org.apache.maven maven-model jar s/.*/3.x/ * *
+org.apache.maven maven-plugin-api jar s/.*/3.x/ * *
+org.apache.maven maven-repository-metadata jar s/.*/3.x/ * *
+org.apache.maven maven-settings-builder jar s/.*/3.x/ * *
+org.apache.maven maven-settings jar s/.*/3.x/ * *
+org.apache.maven maven pom s/.*/3.x/ * *
diff --git a/debian/rules b/debian/rules
index de2bba9..e63a723 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,7 @@ get-orig-source:
-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
configure/$(PACKAGE)::
- mh_patchpoms -p$(PACKAGE)
+ mh_patchpoms -p$(PACKAGE) --rules=debian/maven.buildRules
makebuilddir/$(PACKAGE)::
install -d $(DEB_BUILDDIR)/debian/tmp/maven-repo
@@ -33,7 +33,20 @@ makebuilddir/$(PACKAGE)::
-ln -s /usr/share/java/maven-ant-tasks.jar $(DEB_BUILDDIR)/maven-ant-tasks-2.1.1.jar
install/$(PACKAGE)::
- mh_install -p$(PACKAGE)
+ mh_unpatchpoms -p$(PACKAGE)
+
+ mh_installpoms -p$(PACKAGE)
+ mh_installjar -p$(PACKAGE) -l --usj-name=maven3-aether-provider maven-aether-provider/pom.xml maven-aether-provider/target/maven-aether-provider-$(VERSION).jar
+ mh_installjar -p$(PACKAGE) -l --usj-name=maven3-artifact maven-artifact/pom.xml maven-artifact/target/maven-artifact-$(VERSION).jar
+ mh_installjar -p$(PACKAGE) -l --usj-name=maven3-compat maven-compat/pom.xml maven-compat/target/maven-compat-$(VERSION).jar
+ mh_installjar -p$(PACKAGE) -l --usj-name=maven3-core maven-core/pom.xml maven-core/target/maven-core-$(VERSION).jar
+ mh_installjar -p$(PACKAGE) -l --usj-name=maven3-embedder maven-embedder/pom.xml maven-embedder/target/maven-embedder-$(VERSION).jar
+ mh_installjar -p$(PACKAGE) -l --usj-name=maven3-model maven-model/pom.xml maven-model/target/maven-model-$(VERSION).jar
+ mh_installjar -p$(PACKAGE) -l --usj-name=maven3-model-builder maven-model-builder/pom.xml maven-model-builder/target/maven-model-builder-$(VERSION).jar
+ mh_installjar -p$(PACKAGE) -l --usj-name=maven3-plugin-api maven-plugin-api/pom.xml maven-plugin-api/target/maven-plugin-api-$(VERSION).jar
+ mh_installjar -p$(PACKAGE) -l --usj-name=maven3-repository-metadata maven-repository-metadata/pom.xml maven-repository-metadata/target/maven-repository-metadata-$(VERSION).jar
+ mh_installjar -p$(PACKAGE) -l --usj-name=maven3-settings maven-settings/pom.xml maven-settings/target/maven-settings-$(VERSION).jar
+ mh_installjar -p$(PACKAGE) -l --usj-name=maven3-settings-builder maven-settings-builder/pom.xml maven-settings-builder/target/maven-settings-builder-$(VERSION).jar
binary-post-install/$(PACKAGE)::
# compress manpages
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven.git
More information about the pkg-java-commits
mailing list