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 24d002018d2ed1fdf6e1512e514f346d0dbd4cc4 Author: Emmanuel Bourg <[email protected]> Date: Thu Jul 27 12:48:43 2017 +0200 Refreshed the patch --- debian/changelog | 2 +- debian/patches/pom_fixes.patch | 56 ++++++++++++++++++++++-------------------- 2 files changed, 31 insertions(+), 27 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4125cec..2d7731b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -plexus-resources (1.0.1-1) UNRELEASED; urgency=medium +plexus-resources (1.1.0-1) UNRELEASED; urgency=medium * Team upload. * New upstream release diff --git a/debian/patches/pom_fixes.patch b/debian/patches/pom_fixes.patch index dd09d38..cb71d3b 100644 --- a/debian/patches/pom_fixes.patch +++ b/debian/patches/pom_fixes.patch @@ -6,9 +6,9 @@ Last-Update: <2013-05-21> --- a/pom.xml +++ b/pom.xml -@@ -21,6 +21,10 @@ - <tag>plexus-resources-1.0.1</tag> - </scm> +@@ -31,6 +31,10 @@ + </site> + </distributionManagement> + <properties> + <configs.path>target/config</configs.path> @@ -17,29 +17,33 @@ Last-Update: <2013-05-21> <dependencies> <dependency> <groupId>org.codehaus.plexus</groupId> -@@ -31,4 +35,94 @@ - <artifactId>plexus-container-default</artifactId> - </dependency> +@@ -56,6 +60,12 @@ </dependencies> -+ -+ <build> + + <build> + <resources> -+ <resource> -+ <directory>${configs.path}</directory> -+ <targetPath>META-INF</targetPath> -+ </resource> ++ <resource> ++ <directory>${configs.path}</directory> ++ <targetPath>META-INF</targetPath> ++ </resource> + </resources> -+ <plugins> -+ <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> + <pluginManagement> + <plugins> + <plugin> +@@ -82,6 +92,85 @@ + </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> @@ -109,6 +113,6 @@ Last-Update: <2013-05-21> + </configuration> + <version>2.2</version> + </plugin> -+ </plugins> -+ </build> - </project> + </plugins> + </build> + -- 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
