[pkg-java] r16672 - in trunk/plexus-resources/debian: . patches
Eugene Zhukov
eugene-guest at alioth.debian.org
Thu May 16 11:39:28 UTC 2013
Author: eugene-guest
Date: 2013-05-16 11:39:28 +0000 (Thu, 16 May 2013)
New Revision: 16672
Added:
trunk/plexus-resources/debian/patches/config_resources.patch
trunk/plexus-resources/debian/patches/pom_fixes.patch
Removed:
trunk/plexus-resources/debian/patches/configs.patch
Modified:
trunk/plexus-resources/debian/control
trunk/plexus-resources/debian/patches/series
Log:
fixed patches and maven-debian-helper version
Modified: trunk/plexus-resources/debian/control
===================================================================
--- trunk/plexus-resources/debian/control 2013-05-16 10:27:35 UTC (rev 16671)
+++ trunk/plexus-resources/debian/control 2013-05-16 11:39:28 UTC (rev 16672)
@@ -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 (>= 8), cdbs, default-jdk, maven-debian-helper (>= 1.5)
+Build-Depends: debhelper (>= 7), 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
Added: trunk/plexus-resources/debian/patches/config_resources.patch
===================================================================
--- trunk/plexus-resources/debian/patches/config_resources.patch (rev 0)
+++ trunk/plexus-resources/debian/patches/config_resources.patch 2013-05-16 11:39:28 UTC (rev 16672)
@@ -0,0 +1,57 @@
+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>
Deleted: trunk/plexus-resources/debian/patches/configs.patch
===================================================================
--- trunk/plexus-resources/debian/patches/configs.patch 2013-05-16 10:27:35 UTC (rev 16671)
+++ trunk/plexus-resources/debian/patches/configs.patch 2013-05-16 11:39:28 UTC (rev 16672)
@@ -1,88 +0,0 @@
-Description: classpath and parent project config
- * configuration from parent project
- * adds classpath to MANIFEST.MF
-Author: Eugene Zhukov <jevgeni.zh at gmail.com>
-Last-Update: <2013-05-03>
-
---- a/pom.xml
-+++ b/pom.xml
-@@ -30,4 +30,27 @@
- <artifactId>plexus-container-default</artifactId>
- </dependency>
- </dependencies>
-+
-+ <build>
-+ <resources>
-+ <resource>
-+ <directory>src/main/config</directory>
-+ <targetPath>META-INF</targetPath>
-+ </resource>
-+ </resources>
-+ <plugins>
-+ <plugin>
-+ <groupId>org.apache.maven.plugins</groupId>
-+ <artifactId>maven-jar-plugin</artifactId>
-+ <configuration>
-+ <archive>
-+ <manifest>
-+ <addClasspath>true</addClasspath>
-+ </manifest>
-+ </archive>
-+ </configuration>
-+ <version>2.2</version>
-+ </plugin>
-+ </plugins>
-+ </build>
- </project>
---- /dev/null
-+++ b/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>
Added: trunk/plexus-resources/debian/patches/pom_fixes.patch
===================================================================
--- trunk/plexus-resources/debian/patches/pom_fixes.patch (rev 0)
+++ trunk/plexus-resources/debian/patches/pom_fixes.patch 2013-05-16 11:39:28 UTC (rev 16672)
@@ -0,0 +1,37 @@
+Description: classpath and parent project config
+ * configuration from parent project
+ * adds classpath to MANIFEST.MF
+Author: Eugene Zhukov <jevgeni.zh at gmail.com>
+Last-Update: <2013-05-16>
+
+--- plexus-resources-1.0~alpha7.orig/pom.xml
++++ plexus-resources-1.0~alpha7/pom.xml
+@@ -30,4 +30,28 @@
+ <artifactId>plexus-container-default</artifactId>
+ </dependency>
+ </dependencies>
++
++ <build>
++ <resources>
++ <resource>
++ <directory>src/main/config</directory>
++ <targetPath>META-INF</targetPath>
++ </resource>
++ </resources>
++ <plugins>
++ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-jar-plugin</artifactId>
++ <configuration>
++ <archive>
++ <manifest>
++ <addClasspath>true</addClasspath>
++ </manifest>
++ </archive>
++ </configuration>
++ <version>2.2</version>
++ </plugin>
++ </plugins>
++ </build>
++
+ </project>
Modified: trunk/plexus-resources/debian/patches/series
===================================================================
--- trunk/plexus-resources/debian/patches/series 2013-05-16 10:27:35 UTC (rev 16671)
+++ trunk/plexus-resources/debian/patches/series 2013-05-16 11:39:28 UTC (rev 16672)
@@ -1 +1,2 @@
-configs.patch
+config_resources.patch
+pom_fixes.patch
More information about the pkg-java-commits
mailing list