This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository plexus-resources.
commit 2bab5ff6c794ef457f4c5d2be16c0c3447e45fa7 Author: Emmanuel Bourg <[email protected]> Date: Thu Jul 27 12:56:51 2017 +0200 Generate components.xml with plexus-component-metadata --- debian/changelog | 1 + debian/control | 2 +- debian/patches/pom_fixes.patch | 68 ++++-------------------------------------- 3 files changed, 8 insertions(+), 63 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2d7731b..6408757 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ plexus-resources (1.1.0-1) UNRELEASED; urgency=medium * Team upload. * New upstream release - Refreshed the patch + * Generate components.xml with plexus-component-metadata * Relocated the version 1.x to the generic 'debian' version * Build with the DH sequencer instead of CDBS * Track and download the new releases from GitHub diff --git a/debian/control b/debian/control index 5a0f9f8..26da96c 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Eugene Zhukov <[email protected]> Build-Depends: debhelper (>= 10), default-jdk, maven-debian-helper (>= 1.6.1) -Build-Depends-Indep: libplexus-containers1.5-java (>= 1.5.5), libplexus-utils-java, libmaven-antrun-plugin-java (>= 1.6) +Build-Depends-Indep: libplexus-containers1.5-java (>= 1.5.5), libplexus-utils-java, libplexus-component-metadata-java Standards-Version: 4.0.0 Vcs-Git: https://anonscm.debian.org/git/pkg-java/plexus-resources.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/plexus-resources.git diff --git a/debian/patches/pom_fixes.patch b/debian/patches/pom_fixes.patch index cb71d3b..369f387 100644 --- a/debian/patches/pom_fixes.patch +++ b/debian/patches/pom_fixes.patch @@ -30,73 +30,17 @@ Last-Update: <2013-05-21> <pluginManagement> <plugins> <plugin> -@@ -82,6 +92,85 @@ +@@ -82,6 +92,29 @@ </execution> </executions> </plugin> + <plugin> -+ <artifactId>maven-antrun-plugin</artifactId> -+ <version>1.6</version> -+ <executions> -+ <execution> -+ <phase>generate-resources</phase> -+ <configuration> -+ <target> -+ <mkdir dir="${configs.path}/plexus"/> -+ <echo file="${configs.path}/plexus/components.xml"><![CDATA[<component-set> -+ <components> -+ <component> -+ <role>org.codehaus.plexus.resource.loader.ResourceLoader</role> -+ <role-hint>url</role-hint> -+ <implementation>org.codehaus.plexus.resource.loader.URLResourceLoader</implementation> -+ <instantiation-strategy>per-lookup</instantiation-strategy> -+ <description></description> -+ <isolated-realm>false</isolated-realm> -+ </component> -+ <component> -+ <role>org.codehaus.plexus.resource.ResourceManager</role> -+ <role-hint>default</role-hint> -+ <implementation>org.codehaus.plexus.resource.DefaultResourceManager</implementation> -+ <instantiation-strategy>per-lookup</instantiation-strategy> -+ <description></description> -+ <isolated-realm>false</isolated-realm> -+ <requirements> -+ <requirement> -+ <role>org.codehaus.plexus.resource.loader.ResourceLoader</role> -+ <field-name>resourceLoaders</field-name> -+ </requirement> -+ </requirements> -+ </component> -+ <component> -+ <role>org.codehaus.plexus.resource.loader.ResourceLoader</role> -+ <role-hint>jar</role-hint> -+ <implementation>org.codehaus.plexus.resource.loader.JarResourceLoader</implementation> -+ <instantiation-strategy>per-lookup</instantiation-strategy> -+ <description></description> -+ <isolated-realm>false</isolated-realm> -+ </component> -+ <component> -+ <role>org.codehaus.plexus.resource.loader.ResourceLoader</role> -+ <role-hint>classloader</role-hint> -+ <implementation>org.codehaus.plexus.resource.loader.ThreadContextClasspathResourceLoader</implementation> -+ <description></description> -+ <isolated-realm>false</isolated-realm> -+ </component> -+ <component> -+ <role>org.codehaus.plexus.resource.loader.ResourceLoader</role> -+ <role-hint>file</role-hint> -+ <implementation>org.codehaus.plexus.resource.loader.FileResourceLoader</implementation> -+ <instantiation-strategy>per-lookup</instantiation-strategy> -+ <description></description> -+ <isolated-realm>false</isolated-realm> -+ </component> -+ </components> -+</component-set>]]> -+ </echo> -+ </target> -+ </configuration> ++ <groupId>org.codehaus.plexus</groupId> ++ <artifactId>plexus-component-metadata</artifactId> ++ <executions> ++ <execution> + <goals> -+ <goal>run</goal> ++ <goal>generate-metadata</goal> + </goals> + </execution> + </executions> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-resources.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
