[SCM] Exec Maven Plugin branch, master, updated. upload_20091204-2-ga367f13
Gabriele Giacone
gg0-guest at alioth.debian.org
Thu Dec 24 15:52:02 UTC 2009
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Exec Maven Plugin".
The branch, master has been updated
via a367f13bcbfb562540b6223ded268e64f68f88a8 (commit)
from c332331e5cc25e0a79bb2c2bff2ac9fbaf78680b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a367f13bcbfb562540b6223ded268e64f68f88a8
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date: Thu Dec 24 16:51:12 2009 +0100
+dfsg, enabled tests, fixed long descr
-----------------------------------------------------------------------
Summary of changes:
debian/README.source | 8 +-
debian/changelog | 11 +-
debian/control | 6 +-
debian/maven.properties | 2 +-
debian/orig-tar.sh | 3 +-
debian/patches/00EnabledTests | 187 ++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 2 +-
debian/watch | 3 +-
.../org/codehaus/mojo/exec/ExecJavaMojoTest.java | 2 +-
.../java/org/codehaus/mojo/exec/ExecMojoTest.java | 2 +-
src/test/projects/project1/pom.xml | 4 +-
src/test/projects/project12/pom.xml | 4 +-
src/test/projects/project13/pom.xml | 6 +-
src/test/projects/project14/pom.xml | 6 +-
src/test/projects/project2/pom.xml | 6 +-
src/test/projects/project3/pom.xml | 6 +-
src/test/projects/project6/pom.xml | 2 +-
src/test/projects/project6/project5lib/pom.xml | 6 +-
.../commons-io/commons-io/1.1/commons-io-1.1.jar | Bin 61562 -> 0 bytes
.../commons-io/commons-io/1.1/commons-io-1.1.jar | Bin 61562 -> 0 bytes
21 files changed, 234 insertions(+), 33 deletions(-)
diff --git a/debian/README.source b/debian/README.source
index 9c7e0ec..30c71d7 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,5 +1,5 @@
Information about exec-maven-plugin
-------------------------------
+-----------------------------------
This package was debianized using the mh_make command
from the maven-debian-helper package.
@@ -7,3 +7,9 @@ from the maven-debian-helper package.
The build system uses Maven but prevents it from downloading
anything from the Internet, making the build compliant with
the Debian policy.
+
+The following binary files have been removed from upstream tarball:
+
+src/test/repository/commons-io/commons-io/commons-io/1.1/commons-io-1.1.jar
+src/test/repository/commons-io/commons-io/1.1/commons-io-1.1.jar
+
diff --git a/debian/changelog b/debian/changelog
index 3d165e9..c2c17d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
-exec-maven-plugin (1.1.1-2) unstable; urgency=low
+exec-maven-plugin (1.1.1+dfsg-1) unstable; urgency=low
- *
+ * Create a +dfsg tarball:
+ - Removed jars from upstream tarball
+ - Updated debian/rules, debian/watch, debian/orig-tar.sh accordingly
+ * Fixed long description
+ * Enabled build tests
+ * Updated maintainer email address
- -- Gabriele Giacone <1o5g4r8o at gmail.com> Mon, 07 Dec 2009 02:22:00 +0100
+ -- Gabriele Giacone <1o5g4r8o at gmail.com> Sat, 19 Dec 2009 14:17:48 +0100
exec-maven-plugin (1.1.1-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 6eeec1c..4584572 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,6 @@ Architecture: all
Depends: ${misc:Depends}, ${maven:Depends}
Recommends: ${maven:OptionalDepends}
Description: Exec Maven Plugin
- The plugin provides 2 goals to help execute system and Java programs: exec:exec,
- execute programs and Java programs in a separate process and exec:java, execute
- Java programs in the same VM.
+ The plugin provides 2 goals to help execute system and Java programs:
+ exec:exec, execute programs and Java programs in a separate process and
+ exec:java, execute Java programs in the same VM.
diff --git a/debian/maven.properties b/debian/maven.properties
index d2f1b82..ab18ddd 100644
--- a/debian/maven.properties
+++ b/debian/maven.properties
@@ -1 +1 @@
-maven.test.skip=true
+maven.test.skip=false
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index e06bc85..20c2290 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -3,7 +3,8 @@
VERSION=$2
TAR=../exec-maven-plugin_$VERSION.orig.tar.gz
DIR=exec-maven-plugin-$VERSION
-TAG=$(echo "exec-maven-plugin-$VERSION" | sed -re's/~(alpha|beta)/-\1-/')
+TAG=$(echo "exec-maven-plugin-$VERSION" \
+ | sed -re 's/~(alpha|beta)/-\1-/' -e 's/\+dfsg//')
svn export http://svn.codehaus.org/mojo/tags/${TAG}/ $DIR
GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' $DIR
diff --git a/debian/patches/00EnabledTests b/debian/patches/00EnabledTests
new file mode 100644
index 0000000..08aa649
--- /dev/null
+++ b/debian/patches/00EnabledTests
@@ -0,0 +1,187 @@
+Description: Patches to execute build test using Debian maven repo
+Author: Gabriele Giacone <1o5g4r8o at gmail.com>
+
+--- exec-maven-plugin-1.1.1.orig/src/test/java/org/codehaus/mojo/exec/ExecJavaMojoTest.java
++++ exec-maven-plugin-1.1.1/src/test/java/org/codehaus/mojo/exec/ExecJavaMojoTest.java
+@@ -260,7 +260,7 @@ public class ExecJavaMojoTest
+ ArtifactRepositoryLayout localRepositoryLayout =
+ (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, "default" );
+
+- String path = "src/test/repository";
++ String path = "debian/maven-repo";
+
+ ArtifactRepository localRepository = new DefaultArtifactRepository( "local", "file://" +
+ new File( path ).getAbsolutePath(), localRepositoryLayout );
+--- exec-maven-plugin-1.1.1.orig/src/test/java/org/codehaus/mojo/exec/ExecMojoTest.java
++++ exec-maven-plugin-1.1.1/src/test/java/org/codehaus/mojo/exec/ExecMojoTest.java
+@@ -243,7 +243,7 @@ public class ExecMojoTest
+ ArtifactRepositoryLayout localRepositoryLayout =
+ (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, "default" );
+
+- String path = "src/test/repository";
++ String path = "debian/maven-repo";
+
+ ArtifactRepository localRepository = new DefaultArtifactRepository( "local", "file://" +
+ new File( path ).getAbsolutePath(), localRepositoryLayout );
+--- exec-maven-plugin-1.1.1.orig/src/test/projects/project12/pom.xml
++++ exec-maven-plugin-1.1.1/src/test/projects/project12/pom.xml
+@@ -32,12 +32,12 @@
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+- <version>1.1</version>
++ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+- <version>1.0.4</version>
++ <version>debian</version>
+ </dependency>
+ </dependencies>
+
+--- exec-maven-plugin-1.1.1.orig/src/test/projects/project13/pom.xml
++++ exec-maven-plugin-1.1.1/src/test/projects/project13/pom.xml
+@@ -34,17 +34,17 @@
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+- <version>1.1</version>
++ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+- <version>1.0.4</version>
++ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+- <version>3.8.1</version>
++ <version>debian</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+--- exec-maven-plugin-1.1.1.orig/src/test/projects/project2/pom.xml
++++ exec-maven-plugin-1.1.1/src/test/projects/project2/pom.xml
+@@ -12,18 +12,18 @@
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+- <version>1.2.9</version>
++ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+- <version>1.1</version>
++ <version>debian</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+- <version>3.8.1</version>
++ <version>debian</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+--- exec-maven-plugin-1.1.1.orig/src/test/projects/project1/pom.xml
++++ exec-maven-plugin-1.1.1/src/test/projects/project1/pom.xml
+@@ -32,12 +32,12 @@
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+- <version>1.1</version>
++ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+- <version>1.0.4</version>
++ <version>debian</version>
+ </dependency>
+ </dependencies>
+
+--- exec-maven-plugin-1.1.1.orig/src/test/projects/project6/pom.xml
++++ exec-maven-plugin-1.1.1/src/test/projects/project6/pom.xml
+@@ -10,7 +10,7 @@
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+- <version>3.8.1</version>
++ <version>debian</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+--- exec-maven-plugin-1.1.1.orig/src/test/projects/project6/project5lib/pom.xml
++++ exec-maven-plugin-1.1.1/src/test/projects/project6/project5lib/pom.xml
+@@ -15,18 +15,18 @@
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+- <version>1.2.9</version>
++ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+- <version>1.1</version>
++ <version>debian</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+- <version>3.8.1</version>
++ <version>debian</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+--- exec-maven-plugin-1.1.1.orig/src/test/projects/project3/pom.xml
++++ exec-maven-plugin-1.1.1/src/test/projects/project3/pom.xml
+@@ -32,17 +32,17 @@
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+- <version>1.1</version>
++ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+- <version>1.0.4</version>
++ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+- <version>1.0.1</version>
++ <version>debian</version>
+ </dependency>
+ </dependencies>
+
+--- exec-maven-plugin-1.1.1.orig/src/test/projects/project14/pom.xml
++++ exec-maven-plugin-1.1.1/src/test/projects/project14/pom.xml
+@@ -34,17 +34,17 @@
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+- <version>1.1</version>
++ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+- <version>1.0.4</version>
++ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+- <version>3.8.1</version>
++ <version>debian</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..cfd5eeb
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+00EnabledTests
diff --git a/debian/rules b/debian/rules
index b76c54a..a6d30c7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,4 +6,4 @@ include /usr/share/cdbs/1/class/maven.mk
JAVA_HOME := /usr/lib/jvm/default-java
get-orig-source:
- uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+ uscan --force-download --rename
diff --git a/debian/watch b/debian/watch
index 7f5b057..72b4b93 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,5 @@
version=3
-opts="uversionmangle=s/-(alpha|beta)-/~$1/" \
+opts="uversionmangle=s/-(alpha|beta)-/~$1/,\
+dversionmangle=s/\+dfsg//" \
http://svn.codehaus.org/mojo/tags/ \
exec-maven-plugin-(\d.*)/ debian debian/orig-tar.sh
diff --git a/src/test/java/org/codehaus/mojo/exec/ExecJavaMojoTest.java b/src/test/java/org/codehaus/mojo/exec/ExecJavaMojoTest.java
index 62fc9fb..28a1828 100644
--- a/src/test/java/org/codehaus/mojo/exec/ExecJavaMojoTest.java
+++ b/src/test/java/org/codehaus/mojo/exec/ExecJavaMojoTest.java
@@ -260,7 +260,7 @@ public class ExecJavaMojoTest
ArtifactRepositoryLayout localRepositoryLayout =
(ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, "default" );
- String path = "src/test/repository";
+ String path = "debian/maven-repo";
ArtifactRepository localRepository = new DefaultArtifactRepository( "local", "file://" +
new File( path ).getAbsolutePath(), localRepositoryLayout );
diff --git a/src/test/java/org/codehaus/mojo/exec/ExecMojoTest.java b/src/test/java/org/codehaus/mojo/exec/ExecMojoTest.java
index 6167797..9f4c685 100644
--- a/src/test/java/org/codehaus/mojo/exec/ExecMojoTest.java
+++ b/src/test/java/org/codehaus/mojo/exec/ExecMojoTest.java
@@ -243,7 +243,7 @@ public class ExecMojoTest
ArtifactRepositoryLayout localRepositoryLayout =
(ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, "default" );
- String path = "src/test/repository";
+ String path = "debian/maven-repo";
ArtifactRepository localRepository = new DefaultArtifactRepository( "local", "file://" +
new File( path ).getAbsolutePath(), localRepositoryLayout );
diff --git a/src/test/projects/project1/pom.xml b/src/test/projects/project1/pom.xml
index f40a300..98a598f 100644
--- a/src/test/projects/project1/pom.xml
+++ b/src/test/projects/project1/pom.xml
@@ -32,12 +32,12 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.1</version>
+ <version>debian</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
+ <version>debian</version>
</dependency>
</dependencies>
diff --git a/src/test/projects/project12/pom.xml b/src/test/projects/project12/pom.xml
index f903d0f..4c16fea 100644
--- a/src/test/projects/project12/pom.xml
+++ b/src/test/projects/project12/pom.xml
@@ -32,12 +32,12 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.1</version>
+ <version>debian</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
+ <version>debian</version>
</dependency>
</dependencies>
diff --git a/src/test/projects/project13/pom.xml b/src/test/projects/project13/pom.xml
index 8a68bcd..85c3ad0 100644
--- a/src/test/projects/project13/pom.xml
+++ b/src/test/projects/project13/pom.xml
@@ -34,17 +34,17 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.1</version>
+ <version>debian</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
+ <version>debian</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>debian</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/test/projects/project14/pom.xml b/src/test/projects/project14/pom.xml
index 4df02dd..35e0a61 100644
--- a/src/test/projects/project14/pom.xml
+++ b/src/test/projects/project14/pom.xml
@@ -34,17 +34,17 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.1</version>
+ <version>debian</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
+ <version>debian</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>debian</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/test/projects/project2/pom.xml b/src/test/projects/project2/pom.xml
index d449e1a..899761d 100644
--- a/src/test/projects/project2/pom.xml
+++ b/src/test/projects/project2/pom.xml
@@ -12,18 +12,18 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.9</version>
+ <version>debian</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.1</version>
+ <version>debian</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>debian</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/test/projects/project3/pom.xml b/src/test/projects/project3/pom.xml
index fac3d78..f71da9b 100644
--- a/src/test/projects/project3/pom.xml
+++ b/src/test/projects/project3/pom.xml
@@ -32,17 +32,17 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.1</version>
+ <version>debian</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
+ <version>debian</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>1.0.1</version>
+ <version>debian</version>
</dependency>
</dependencies>
diff --git a/src/test/projects/project6/pom.xml b/src/test/projects/project6/pom.xml
index 294b568..7584d25 100644
--- a/src/test/projects/project6/pom.xml
+++ b/src/test/projects/project6/pom.xml
@@ -10,7 +10,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>debian</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/src/test/projects/project6/project5lib/pom.xml b/src/test/projects/project6/project5lib/pom.xml
index acc7c5b..a101542 100644
--- a/src/test/projects/project6/project5lib/pom.xml
+++ b/src/test/projects/project6/project5lib/pom.xml
@@ -15,18 +15,18 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.9</version>
+ <version>debian</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.1</version>
+ <version>debian</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>debian</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/test/repository/commons-io/commons-io/1.1/commons-io-1.1.jar b/src/test/repository/commons-io/commons-io/1.1/commons-io-1.1.jar
deleted file mode 100644
index 624fc1a..0000000
Binary files a/src/test/repository/commons-io/commons-io/1.1/commons-io-1.1.jar and /dev/null differ
diff --git a/src/test/repository/commons-io/commons-io/commons-io/1.1/commons-io-1.1.jar b/src/test/repository/commons-io/commons-io/commons-io/1.1/commons-io-1.1.jar
deleted file mode 100644
index 624fc1a..0000000
Binary files a/src/test/repository/commons-io/commons-io/commons-io/1.1/commons-io-1.1.jar and /dev/null differ
hooks/post-receive
--
Exec Maven Plugin
More information about the pkg-java-commits
mailing list