[pkg-java] r18261 - in trunk/mvel/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-07-16 15:56:08 +0000 (Wed, 16 Jul 2014)
New Revision: 18261

Added:
   trunk/mvel/debian/maven.ignoreRules
Modified:
   trunk/mvel/debian/changelog
   trunk/mvel/debian/maven.rules
   trunk/mvel/debian/patches/pom.diff
Log:
Added d/maven.ignoreRules to avoid patching the pom for disabling plugins



Modified: trunk/mvel/debian/changelog
===================================================================
--- trunk/mvel/debian/changelog	2014-07-16 15:44:54 UTC (rev 18260)
+++ trunk/mvel/debian/changelog	2014-07-16 15:56:08 UTC (rev 18261)
@@ -4,6 +4,7 @@
   * Fixed a compilation error with Java 8
   * Fixed the OptimizerFactory class and the unit tests to work
     with the system version of ASM
+  * Added d/maven.ignoreRules to avoid patching the pom for disabling plugins
   * debian/watch: Updated to watch the release tags on Github
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 16 Jul 2014 17:43:57 +0200

Added: trunk/mvel/debian/maven.ignoreRules
===================================================================
--- trunk/mvel/debian/maven.ignoreRules	                        (rev 0)
+++ trunk/mvel/debian/maven.ignoreRules	2014-07-16 15:56:08 UTC (rev 18261)
@@ -0,0 +1,3 @@
+
+org.apache.maven.plugins maven-release-plugin * * * *
+org.apache.maven.wagon wagon-webdav * * * *

Modified: trunk/mvel/debian/maven.rules
===================================================================
--- trunk/mvel/debian/maven.rules	2014-07-16 15:44:54 UTC (rev 18260)
+++ trunk/mvel/debian/maven.rules	2014-07-16 15:56:08 UTC (rev 18261)
@@ -1,2 +1,5 @@
-junit junit jar s/3\..*/3.x/ *
-asm asm jar s/.*/3.x/ *
+
+asm asm jar s/.*/3.x/ * *
+com.thoughtworks.xstream xstream jar s/.*/debian/ * *
+junit junit jar s/3\..*/3.x/ * *
+asm * * s/3\..*/3.x/ * *

Modified: trunk/mvel/debian/patches/pom.diff
===================================================================
--- trunk/mvel/debian/patches/pom.diff	2014-07-16 15:44:54 UTC (rev 18260)
+++ trunk/mvel/debian/patches/pom.diff	2014-07-16 15:56:08 UTC (rev 18261)
@@ -1,100 +1,9 @@
-Description: Disable some maven plugins
- and add dependency on asm 3.x
-Forwarded: no
+Description: Add a dependency on asm 3.x
 Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2010-02-24
+Forwarded: not-needed
 --- a/pom.xml
 +++ b/pom.xml
-@@ -24,6 +24,8 @@
-     </pluginRepositories>
- 
-     <build>
-+
-+<!--
-         <extensions>
-             <extension>
-                 <groupId>org.apache.maven.wagon</groupId>
-@@ -31,13 +33,12 @@
-                 <version>1.0-beta-2</version>
-             </extension>
-         </extensions>
--
-+-->
- 
-         <plugins>
-             <plugin>
-                 <groupId>org.apache.maven.plugins</groupId>
-                 <artifactId>maven-compiler-plugin</artifactId>
--                <version>2.0.1</version>
-                 <configuration>
-                     <source>1.5</source>
-                     <target>1.5</target>
-@@ -90,19 +91,18 @@
-                 </configuration>
-             </plugin>
- 
-+<!--
-             <plugin>
-                 <groupId>org.apache.maven.plugins</groupId>
-                 <artifactId>maven-release-plugin</artifactId>
--                <version>2.0-beta-9</version>
-                 <configuration>
-                     <tagBase>https://svn.codehaus.org/mvel/tags/</tagBase>
--                    <!-- See http://jira.codehaus.org/browse/SCM-406 -->
-                     <remoteTagging>false</remoteTagging>
--                    <!-- Further non-mandatory but useful settings... -->
-                     <preparationGoals>clean install</preparationGoals>
-                     <autoVersionSubmodules>true</autoVersionSubmodules>
-                 </configuration>
-             </plugin>
-+-->
-             
-             <plugin>
-               <artifactId>maven-jar-plugin</artifactId>
-@@ -112,11 +112,11 @@
-                 </archive> 
-               </configuration>
-             </plugin>  
--            
-+
-+<!--            
- 			<plugin>
- 				<groupId>org.apache.felix</groupId>
- 				<artifactId>maven-bundle-plugin</artifactId>
--				<version>2.0.1</version>
- 				<extensions>true</extensions>
- 				<executions>
- 					<execution>
-@@ -135,7 +135,10 @@
- 						<Import-Package>sun.*;resolution:=optional, *</Import-Package>
- 					</instructions>
- 				</configuration>
--			</plugin>             
-+			</plugin>
-+
-+-->
-+
-         </plugins>
- 		
-               <resources>           
-@@ -162,14 +165,14 @@
-         <dependency>
-             <groupId>junit</groupId>
-             <artifactId>junit</artifactId>
--            <version>3.8.1</version>
-+            <version>3.x</version>
-             <scope>test</scope>
-         </dependency>
- 
-         <dependency>
-             <groupId>com.thoughtworks.xstream</groupId>
-             <artifactId>xstream</artifactId>
--            <version>1.3.1</version>
-+            <version>debian</version>
-             <scope>test</scope>
-         </dependency>
- 
-@@ -179,6 +182,13 @@
+@@ -179,6 +179,13 @@
          <!--<version>1.0.2.GA</version>-->
          <!--<scope>test</scope>-->
          <!--</dependency>        -->