This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository plexus-containers.
commit a3b1486292fac35af9f6d1017c314c0559ea34d7
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Tue Nov 7 10:37:38 2017 +0100
Install the Maven artifacts for plexus-component-annotations and
plexus-container-default with the 'debian' generic version
---
debian/changelog | 3 +++
debian/control | 8 ++++----
debian/libplexus-containers1.5-java.poms | 4 ++--
debian/maven.rules | 3 ---
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2719033..fe65be0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ plexus-containers (1.7.1-6) UNRELEASED; urgency=medium
* Team upload.
* Renamed the package to plexus-containers
+ * Install the Maven artifacts for plexus-component-annotations and
+ plexus-container-default with the 'debian' generic version and relocate
+ the version 1.5.5
* Standards-Version updated to 4.1.1
-- Emmanuel Bourg <ebo...@apache.org> Tue, 07 Nov 2017 09:59:55 +0100
diff --git a/debian/control b/debian/control
index a69ad16..b48a4d5 100644
--- a/debian/control
+++ b/debian/control
@@ -46,8 +46,8 @@ Depends:
libplexus-utils2-java,
libxbean-reflect-java,
${misc:Depends}
-Breaks: libplexus-containers1.5-java (<< 1.6-2~)
-Replaces: libplexus-containers1.5-java (<< 1.6-2~)
+Breaks: libplexus-containers1.5-java (<< 1.6-2~), libplexus-containers-java
+Replaces: libplexus-containers1.5-java (<< 1.6-2~), libplexus-containers-java
Description: Plexus Inversion-of-control Container
The Plexus project provides a full software stack for creating and executing
software projects. Based on the Plexus container, the applications can
@@ -59,8 +59,8 @@ Description: Plexus Inversion-of-control Container
Package: libplexus-component-annotations-java
Architecture: all
Depends: ${misc:Depends}
-Breaks: libplexus-containers1.5-java (<< 1.6-2~)
-Replaces: libplexus-containers1.5-java (<< 1.6-2~)
+Breaks: libplexus-containers1.5-java (<< 1.6-2~), libplexus-containers-java
+Replaces: libplexus-containers1.5-java (<< 1.6-2~), libplexus-containers-java
Description: Plexus Component Annotations
Plexus Component Java 5 annotations, to describe Plexus components
properties in java sources with standard annotations instead of javadoc
diff --git a/debian/libplexus-containers1.5-java.poms
b/debian/libplexus-containers1.5-java.poms
index f14459f..2b80f63 100644
--- a/debian/libplexus-containers1.5-java.poms
+++ b/debian/libplexus-containers1.5-java.poms
@@ -26,7 +26,7 @@
# Empty by default. [mh_install]
#
pom.xml --no-parent --has-package-version
--package=libplexus-container-default1.5-java
-plexus-component-annotations/pom.xml --no-parent --has-package-version
--package=libplexus-component-annotations-java
--usj-name=plexus-component-annotations-1.5
+plexus-component-annotations/pom.xml --no-parent --has-package-version
--package=libplexus-component-annotations-java
--usj-name=plexus-component-annotations-1.5
--relocate=org.codehaus.plexus:plexus-component-annotations:1.5.5
plexus-component-metadata/pom.xml --has-package-version
--package=libplexus-component-metadata-java
plexus-component-javadoc/pom.xml --ignore
-plexus-container-default/pom.xml --has-package-version
--package=libplexus-container-default1.5-java
--usj-name=plexus-container-default-1.5
+plexus-container-default/pom.xml --has-package-version
--package=libplexus-container-default1.5-java
--usj-name=plexus-container-default-1.5
--relocate=org.codehaus.plexus:plexus-container-default:1.5.5
diff --git a/debian/maven.rules b/debian/maven.rules
index 7bff7c8..3bd5b5f 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -24,11 +24,8 @@ s/com.google.collections/com.google.guava/
s/google-collections/guava/ * s/.*/de
org.codehaus.plexus plexus-classworlds jar s/.*/2.x/ * *
org.codehaus.plexus plexus-utils jar s/.*/2.x/ * *
-org.codehaus.plexus plexus-component-annotations jar s/.*/1.5.5/ * *
org.codehaus.plexus plexus-component-javadoc jar s/.*/1.5.5/ * *
org.codehaus.plexus plexus-component-metadata maven-plugin * * *
-org.codehaus.plexus plexus-container-default jar s/.*/1.5.5/ * *
-org.codehaus.plexus plexus-containers pom s/.*/1.5.5/ * *
org.apache.maven s/maven-project/maven-core/ * s/.*/3.x/ * *
org.apache.maven maven-* * s/.*/3.x/ * *
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/plexus-containers.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
