[pkg-java] r16715 - in trunk/plexus-resources/debian: . patches
Eugene Zhukov
eugene-guest at alioth.debian.org
Tue May 21 18:46:06 UTC 2013
Author: eugene-guest
Date: 2013-05-21 18:46:06 +0000 (Tue, 21 May 2013)
New Revision: 16715
Removed:
trunk/plexus-resources/debian/patches/config_resources.patch
Modified:
trunk/plexus-resources/debian/control
trunk/plexus-resources/debian/patches/pom_fixes.patch
trunk/plexus-resources/debian/patches/series
Log:
fixed misbehaving pathes
Modified: trunk/plexus-resources/debian/control
===================================================================
--- trunk/plexus-resources/debian/control 2013-05-21 15:18:46 UTC (rev 16714)
+++ trunk/plexus-resources/debian/control 2013-05-21 18:46:06 UTC (rev 16715)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Eugene Zhukov <jevgeni.zh at gmail.com>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.6.1)
+Build-Depends: debhelper (>= 8), cdbs, default-jdk, maven-debian-helper (>= 1.6.1)
Build-Depends-Indep: libplexus-containers1.5-java (>= 1.5.5), libplexus-utils-java
Standards-Version: 3.9.4
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-resources
Deleted: trunk/plexus-resources/debian/patches/config_resources.patch
===================================================================
--- trunk/plexus-resources/debian/patches/config_resources.patch 2013-05-21 15:18:46 UTC (rev 16714)
+++ trunk/plexus-resources/debian/patches/config_resources.patch 2013-05-21 18:46:06 UTC (rev 16715)
@@ -1,57 +0,0 @@
-Description: resource config
- * resource configuration from parent project
-Author: Eugene Zhukov <jevgeni.zh at gmail.com>
-Last-Update: <2013-05-16>
-
---- /dev/null
-+++ plexus-resources-1.0~alpha7/src/main/config/plexus/components.xml
-@@ -0,0 +1,49 @@
-+<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>
Modified: trunk/plexus-resources/debian/patches/pom_fixes.patch
===================================================================
--- trunk/plexus-resources/debian/patches/pom_fixes.patch 2013-05-21 15:18:46 UTC (rev 16714)
+++ trunk/plexus-resources/debian/patches/pom_fixes.patch 2013-05-21 18:46:06 UTC (rev 16715)
@@ -1,24 +1,102 @@
Description: classpath and parent project config
- * configuration from parent project
- * adds classpath to MANIFEST.MF
+ * configuration from parent project
+ * maven-jar-plugin adds Class-Path to MANIFEST.MF
Author: Eugene Zhukov <jevgeni.zh at gmail.com>
-Last-Update: <2013-05-16>
+Last-Update: <2013-05-21>
---- plexus-resources-1.0~alpha7.orig/pom.xml
-+++ plexus-resources-1.0~alpha7/pom.xml
-@@ -30,4 +30,28 @@
+--- a/pom.xml
++++ b/pom.xml
+@@ -20,6 +20,10 @@
+ <url>http://fisheye.codehaus.org/browse/plexus/plexus-components/tags/plexus-resources-1.0-alpha-7</url>
+ </scm>
+
++ <properties>
++ <configs.path>target/config</configs.path>
++ </properties>
++
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+@@ -30,4 +34,94 @@
<artifactId>plexus-container-default</artifactId>
</dependency>
</dependencies>
+
+ <build>
+ <resources>
-+ <resource>
-+ <directory>src/main/config</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>
++ <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>
++ <goals>
++ <goal>run</goal>
++ </goals>
++ </execution>
++ </executions>
++ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
@@ -30,8 +108,7 @@
+ </archive>
+ </configuration>
+ <version>2.2</version>
-+ </plugin>
++ </plugin>
+ </plugins>
+ </build>
-+
</project>
Modified: trunk/plexus-resources/debian/patches/series
===================================================================
--- trunk/plexus-resources/debian/patches/series 2013-05-21 15:18:46 UTC (rev 16714)
+++ trunk/plexus-resources/debian/patches/series 2013-05-21 18:46:06 UTC (rev 16715)
@@ -1,2 +1 @@
-config_resources.patch
pom_fixes.patch
More information about the pkg-java-commits
mailing list