[pkg-java] r17156 - in trunk/xml-maven-plugin/debian: . patches
Eugene Zhukov
eugene-guest at alioth.debian.org
Mon Aug 19 20:22:49 UTC 2013
Author: eugene-guest
Date: 2013-08-19 20:22:49 +0000 (Mon, 19 Aug 2013)
New Revision: 17156
Removed:
trunk/xml-maven-plugin/debian/patches/pom_fixes.patch
Modified:
trunk/xml-maven-plugin/debian/control
trunk/xml-maven-plugin/debian/copyright
trunk/xml-maven-plugin/debian/maven.rules
trunk/xml-maven-plugin/debian/patches/series
trunk/xml-maven-plugin/debian/patches/test_exclude.patch
Log:
dropped one patch, minor improvements
Modified: trunk/xml-maven-plugin/debian/control
===================================================================
--- trunk/xml-maven-plugin/debian/control 2013-08-17 18:36:15 UTC (rev 17155)
+++ trunk/xml-maven-plugin/debian/control 2013-08-19 20:22:49 UTC (rev 17156)
@@ -3,10 +3,10 @@
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-Indep: libmaven-invoker-plugin-java, libjaxp1.3-java, libmaven2-core-java, libplexus-io-java,
- libplexus-resources-java, libplexus-utils-java, libxerces2-java, libxml-commons-resolver1.1-java (>= 1.2),
- libmaven-plugin-testing-java, libsaxonb-java (>= 8.7), libxalan2-java, libmaven-plugin-tools-java
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.5)
+Build-Depends-Indep: libmaven-invoker-plugin-java, libjaxp1.3-java, libmaven2-core-java, libplexus-io-java,
+ libplexus-resources-java, libplexus-utils-java, libxerces2-java, libxml-commons-resolver1.1-java (>= 1.2),
+ libmaven-plugin-testing-java, libsaxonb-java (>= 9.1.0.8), libxalan2-java, libmaven-plugin-tools-java
Standards-Version: 3.9.4
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/xml-maven-plugin
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/xml-maven-plugin
Modified: trunk/xml-maven-plugin/debian/copyright
===================================================================
--- trunk/xml-maven-plugin/debian/copyright 2013-08-17 18:36:15 UTC (rev 17155)
+++ trunk/xml-maven-plugin/debian/copyright 2013-08-19 20:22:49 UTC (rev 17156)
@@ -11,7 +11,7 @@
License: Apache-2.0
License: Apache-2.0
- On Debian GNU/Linux system you can find the complete text of the
- Apache-2.0 license in '/usr/share/common-licenses/Apache-2.0'
+ On Debian systems, the full text of the Apache-2.0 license
+ can be found in the file '/usr/share/common-licenses/Apache-2.0'
Modified: trunk/xml-maven-plugin/debian/maven.rules
===================================================================
--- trunk/xml-maven-plugin/debian/maven.rules 2013-08-17 18:36:15 UTC (rev 17155)
+++ trunk/xml-maven-plugin/debian/maven.rules 2013-08-19 20:22:49 UTC (rev 17156)
@@ -1,5 +1,6 @@
org.codehaus.plexus plexus-resources jar s/1\..*/1.x/ * *
+s/net.sf.saxon/net.sourceforge.saxon s/saxon/saxon jar s/8.7/9.1.0.8 * *
s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-harness * s/.*/debian/ * *
s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-tools * s/.*/debian/ * *
s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing * s/.*/debian/ * *
Deleted: trunk/xml-maven-plugin/debian/patches/pom_fixes.patch
===================================================================
--- trunk/xml-maven-plugin/debian/patches/pom_fixes.patch 2013-08-17 18:36:15 UTC (rev 17155)
+++ trunk/xml-maven-plugin/debian/patches/pom_fixes.patch 2013-08-19 20:22:49 UTC (rev 17156)
@@ -1,52 +0,0 @@
-Description: fixed deps
- * fixed dependencies according to debian local maven repo
- * maven-jar-plugin added for Class-Path in metainf
-Author: Eugene Zhukov <jevgeni.zh at gmail.com>
-Last-Update: 2013-07-22
-
---- a/pom.xml
-+++ b/pom.xml
-@@ -145,15 +145,15 @@
- </exclusions>
- </dependency>
- <dependency>
-- <groupId>org.apache.maven.shared</groupId>
-+ <groupId>org.apache.maven.plugin-testing</groupId>
- <artifactId>maven-plugin-testing-harness</artifactId>
-- <version>1.1</version>
-+ <version>1.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>net.sf.saxon</groupId>
-+ <groupId>net.sourceforge.saxon</groupId>
- <artifactId>saxon</artifactId>
-- <version>8.7</version>
-+ <version>9.1.0.8</version>
- <scope>test</scope>
- </dependency>
- <dependency>
-@@ -167,8 +167,23 @@
- <build>
- <plugins>
- <plugin>
-+ <groupId>org.apache.maven.plugins</groupId>
-+ <artifactId>maven-jar-plugin</artifactId>
-+ <configuration>
-+ <archive>
-+ <manifest>
-+ <addClasspath>true</addClasspath>
-+ <classpathLayoutType>custom</classpathLayoutType>
-+ <customClasspathLayout>/usr/share/java/$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout>
-+ </manifest>
-+ </archive>
-+ </configuration>
-+ <version>2.2</version>
-+ </plugin>
-+ <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-invoker-plugin</artifactId>
-+ <version>1.5</version>
- <configuration>
- <projectsDirectory>src/it</projectsDirectory>
- <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
Modified: trunk/xml-maven-plugin/debian/patches/series
===================================================================
--- trunk/xml-maven-plugin/debian/patches/series 2013-08-17 18:36:15 UTC (rev 17155)
+++ trunk/xml-maven-plugin/debian/patches/series 2013-08-19 20:22:49 UTC (rev 17156)
@@ -1,2 +1 @@
test_exclude.patch
-pom_fixes.patch
Modified: trunk/xml-maven-plugin/debian/patches/test_exclude.patch
===================================================================
--- trunk/xml-maven-plugin/debian/patches/test_exclude.patch 2013-08-17 18:36:15 UTC (rev 17155)
+++ trunk/xml-maven-plugin/debian/patches/test_exclude.patch 2013-08-19 20:22:49 UTC (rev 17156)
@@ -1,20 +1,20 @@
Description: one test excluded
* one test case excluded, fails because of Saxon newer version
Author: Eugene Zhukov <jevgeni.zh at gmail.com>
-Last-Update: <2013-05-03>
+Last-Update: 2013-05-03
---- a/src/test/java/org/codehaus/mojo/xml/test/TransformMojoTest.java
-+++ b/src/test/java/org/codehaus/mojo/xml/test/TransformMojoTest.java
-@@ -187,7 +187,7 @@
+--- xml-maven-plugin-1.0.orig/src/test/java/org/codehaus/mojo/xml/test/TransformMojoTest.java
++++ xml-maven-plugin-1.0/src/test/java/org/codehaus/mojo/xml/test/TransformMojoTest.java
+@@ -187,7 +187,7 @@ public class TransformMojoTest
/**
* Builds the it7 test project.
- */
-+
++ *
public void testIt8() throws Exception
{
if ( !java1_6_Aware() )
-@@ -203,7 +203,7 @@
+@@ -203,7 +203,7 @@ public class TransformMojoTest
assertEquals("http://www.saxonica.com/", eval( doc1, "/root/vendor-url" ) );
assertEquals("2.0", eval( doc1, "/root/version" ) );
}
More information about the pkg-java-commits
mailing list