[pkg-java] r7669 - in trunk/surefire/debian: . patches
twerner at alioth.debian.org
twerner at alioth.debian.org
Mon Dec 15 20:00:21 UTC 2008
Author: twerner
Date: 2008-12-15 20:00:21 +0000 (Mon, 15 Dec 2008)
New Revision: 7669
Modified:
trunk/surefire/debian/
trunk/surefire/debian/copyright
trunk/surefire/debian/patches/pom.diff
Log:
package builds now
Property changes on: trunk/surefire/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Modified: trunk/surefire/debian/copyright
===================================================================
--- trunk/surefire/debian/copyright 2008-12-15 19:41:53 UTC (rev 7668)
+++ trunk/surefire/debian/copyright 2008-12-15 20:00:21 UTC (rev 7669)
@@ -7,8 +7,6 @@
The package was downloaded from <http://maven.apache.org/surefire/>.
-FIXME
-
Copyright: 2005-2008 The Apache Software Foundation.
License:
Modified: trunk/surefire/debian/patches/pom.diff
===================================================================
--- trunk/surefire/debian/patches/pom.diff 2008-12-15 19:41:53 UTC (rev 7668)
+++ trunk/surefire/debian/patches/pom.diff 2008-12-15 20:00:21 UTC (rev 7669)
@@ -1,10 +1,8 @@
-This patch disables some artifacts that cannot be built now.
-
diff --git a/maven-surefire-plugin/pom.xml b/maven-surefire-plugin/pom.xml
-index 84fb8cc..4153f46 100644
+index 330abe1..4153f46 100644
--- a/maven-surefire-plugin/pom.xml
+++ b/maven-surefire-plugin/pom.xml
-@@ -92,7 +92,9 @@
+@@ -92,12 +92,15 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
@@ -15,15 +13,13 @@
</dependency>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
-@@ -103,7 +105,6 @@
+ <artifactId>surefire-booter</artifactId>
+ </dependency>
++ <!--
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- </dependency>
-- -->
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
-@@ -124,6 +125,7 @@
+@@ -122,16 +125,19 @@
<artifactId>maven-toolchain</artifactId>
<version>1.0</version>
</dependency>
@@ -31,11 +27,87 @@
</dependencies>
<build>
+ <plugins>
++ <!--
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <stagingSiteURL>scp://people.apache.org/www/maven.apache.org/plugins/${project.artifactId}-${project.version}</stagingSiteURL>
+ </configuration>
+ </plugin>
++ -->
+ </plugins>
+ </build>
+
diff --git a/pom.xml b/pom.xml
-index de52e98..ac874a2 100644
+index d8c6504..ac874a2 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -168,8 +168,8 @@
+@@ -19,12 +19,14 @@
+
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
++ <!--
+ <parent>
+ <artifactId>maven-parent</artifactId>
+ <groupId>org.apache.maven</groupId>
+ <version>7</version>
+ <relativePath>../pom/maven/pom.xml</relativePath>
+ </parent>
++ -->
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire</artifactId>
+ <packaging>pom</packaging>
+@@ -101,11 +103,13 @@
+ <artifactId>surefire-booter</artifactId>
+ <version>2.4.3</version>
+ </dependency>
++ <!--
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.5.1</version>
+ </dependency>
++ -->
+ </dependencies>
+ </dependencyManagement>
+ <dependencies>
+@@ -124,10 +128,12 @@
+ </dependencies>
+ <build>
+ <plugins>
++ <!--
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.0-beta-5</version>
+ </plugin>
++ -->
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+@@ -135,17 +141,19 @@
+ <target>1.3</target>
+ </configuration>
+ </plugin>
++ <!--
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.0.4</version>
+ </plugin>
++ -->
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+- <version>2.3.1</version>
+- </plugin>
++ <version>2.4.3</version>
++ </plugin>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+@@ -160,8 +168,8 @@
<module>surefire-booter</module>
<module>surefire-providers</module>
<module>maven-surefire-plugin</module>
@@ -47,11 +119,32 @@
<profiles>
diff --git a/surefire-api/pom.xml b/surefire-api/pom.xml
-index aa6deba..2c26e49 100644
+index 08d573c..2c26e49 100644
--- a/surefire-api/pom.xml
+++ b/surefire-api/pom.xml
-@@ -73,7 +73,16 @@
+@@ -28,6 +28,7 @@
+ <name>SureFire API</name>
+ <build>
+ <plugins>
++ <!--
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+@@ -59,17 +60,29 @@
+ </execution>
+ </executions>
+ </plugin>
++ -->
+ </plugins>
+ </build>
+ <dependencies>
++ <!--
<dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
++ -->
+ <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.1</version>
@@ -68,6 +161,40 @@
</dependency>
</dependencies>
</project>
+diff --git a/surefire-booter/pom.xml b/surefire-booter/pom.xml
+index 5f21786..a0920e4 100644
+--- a/surefire-booter/pom.xml
++++ b/surefire-booter/pom.xml
+@@ -9,6 +9,7 @@
+ <name>SureFire Booter</name>
+ <build>
+ <plugins>
++ <!--
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+@@ -35,6 +36,7 @@
+ </execution>
+ </executions>
+ </plugin>
++ -->
+ </plugins>
+ </build>
+ <dependencies>
+@@ -42,9 +44,11 @@
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-api</artifactId>
+ </dependency>
++ <!--
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
++ -->
+ </dependencies>
+-</project>
+\ No newline at end of file
++</project>
diff --git a/surefire-providers/pom.xml b/surefire-providers/pom.xml
index d10457e..3618bfd 100644
--- a/surefire-providers/pom.xml
More information about the pkg-java-commits
mailing list