This is an automated email from the git hooks/post-receive script. nomadium pushed a commit to branch master in repository maven-bundle-plugin.
commit 8f7964d81ecac17f7c8eedb13700cccc86675b86 Author: Miguel Landaeta <[email protected]> Date: Fri May 22 21:18:27 2015 -0300 Prepare 2.4.0-1 upload --- debian/changelog | 9 +++++++++ debian/control | 2 +- debian/maven.cleanIgnoreRules | 1 + debian/maven.ignoreRules | 15 --------------- debian/maven.publishedRules | 1 + debian/maven.rules | 21 ++------------------- debian/patches/remove_bndlib_spring_support.diff | 10 +++++----- 7 files changed, 19 insertions(+), 40 deletions(-) diff --git a/debian/changelog b/debian/changelog index 63d836b..6b2d8cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +maven-bundle-plugin (2.4.0-1) UNRELEASED; urgency=medium + + * Team upload. + * New upstream release. + * Refresh patch: remove_bndlib_spring_support.diff. + * Set 2.1.0~ as minimum version for bnd dependency. + + -- Miguel Landaeta <[email protected]> Mon, 09 Mar 2015 17:29:08 -0300 + maven-bundle-plugin (2.3.7-2) unstable; urgency=medium * Team upload. diff --git a/debian/control b/debian/control index 26b8700..7cf2c52 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Damien Raude-Morvan <[email protected]> Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.4) -Build-Depends-Indep: bnd (>= 1.50.0), +Build-Depends-Indep: bnd (>= 2.1.0~), default-jdk-doc, libfelix-bundlerepository-java, libfelix-osgi-obr-java, diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/maven.cleanIgnoreRules @@ -0,0 +1 @@ + diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules index f7fe8c6..a6f3dbf 100644 --- a/debian/maven.ignoreRules +++ b/debian/maven.ignoreRules @@ -1,18 +1,3 @@ -# Maven ignore rules - ignore some Maven dependencies and plugins -# Format of this file is: -# [group] [artifact] [type] [version] [classifier] [scope] -# where each element can be either -# - the exact string, for example org.apache for the group, or 3.1 -# for the version. In this case, the element is simply matched -# and left as it is -# - * (the star character, alone). In this case, anything will -# match and be left as it is. For example, using * on the -# position of the artifact field will match any artifact id -# All elements much match before a rule can be applied -# Example rule: match jar with groupid= junit, artifactid= junit -# and version starting with 3., this dependency is then removed -# from the POM -# junit junit jar s/3\\..*/3.x/ org.apache.maven.plugins maven-changes-plugin * * * * org.apache.maven.shared maven-plugin-testing-harness * * * * diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/maven.publishedRules @@ -0,0 +1 @@ + diff --git a/debian/maven.rules b/debian/maven.rules index 4323a2a..b33e737 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1,22 +1,5 @@ -# Maven rules - transform Maven dependencies and plugins -# Format of this file is: -# [group] [artifact] [type] [version] [classifier] [scope] -# where each element can be either -# - the exact string, for example org.apache for the group, or 3.1 -# for the version. In this case, the element is simply matched -# and left as it is -# - * (the star character, alone). In this case, anything will -# match and be left as it is. For example, using * on the -# position of the artifact field will match any artifact id -# - a regular expression of the form s/match/replace/ -# in this case, elements that match are transformed using -# the regex rule. -# All elements much match before a rule can be applied -# Example rule: match jar with groupid= junit, artifactid= junit -# and version starting with 3., replacing the version with 3.x -# junit junit jar s/3\\..*/3.x/ +org.apache.maven.shared maven-dependency-tree jar s/.*/debian/ * * org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * * -biz.aQute s/bnd/bndlib/ * s/.*/debian/ * * s/net.sf.kxml/kxml2/ kxml2 jar s/.*/debian/ * * -s/org.apache.felix/org.osgi/ org.osgi.core * s/.*/debian/ +s/org.apache.felix/org.osgi/ org.osgi.core * s/.*/debian/ * * diff --git a/debian/patches/remove_bndlib_spring_support.diff b/debian/patches/remove_bndlib_spring_support.diff index d4b30cb..7d8cb43 100644 --- a/debian/patches/remove_bndlib_spring_support.diff +++ b/debian/patches/remove_bndlib_spring_support.diff @@ -6,15 +6,15 @@ Last-Update: 2011-10-13 --- a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java +++ b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java -@@ -74,7 +74,6 @@ - import aQute.lib.osgi.FileResource; - import aQute.lib.osgi.Jar; - import aQute.lib.osgi.Processor; +@@ -77,7 +77,6 @@ import aQute.bnd.osgi.FileResource; + import aQute.bnd.osgi.Jar; + import aQute.bnd.osgi.Packages; + import aQute.bnd.osgi.Processor; -import aQute.lib.spring.SpringXMLType; /** -@@ -1213,9 +1212,6 @@ +@@ -1260,9 +1259,6 @@ public class BundlePlugin extends AbstractMojo properties.put( "classifier", classifier == null ? "" : classifier ); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-bundle-plugin.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
