This is an automated email from the git hooks/post-receive script. nomadium-guest pushed a commit to branch master in repository jmock2.
commit 79ad0230c5a8602f56a8925ba42ef0f37a237c9e Author: Miguel Landaeta <[email protected]> Date: Sun Sep 29 19:46:16 2013 -0300 Add 2.7-SNAPSHOT hacks This commit should be reverted when upstream releases 2.7 proper. --- debian/changelog | 3 + debian/patches/08mavenpoms | 160 ++++++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 15 ++++- 4 files changed, 178 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b412e30..90e3e22 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ jmock2 (2.7~snapshot+201309170925-gitd7fe69b5+dfsg-1) UNRELEASED; urgency=low [ Miguel Landaeta ] * Team upload. + * Fix wrong dependencies on junit in POM files. (Closes: #721538). + Added patch (upstream is not providing POM files anymore): + - 08mavenpoms * Prevent FTBFS errors by ignoring some unit tests failures. Added patches: - 06donthaltonjunitfailure - 07missinghamcrestjar diff --git a/debian/patches/08mavenpoms b/debian/patches/08mavenpoms new file mode 100644 index 0000000..b9c5df9 --- /dev/null +++ b/debian/patches/08mavenpoms @@ -0,0 +1,160 @@ +Description: Include Maven POM files + Upstream is not including POM files in the source code. + I implemented a get-orig-pom to fetch those files from the + Maven central repo. Those downloaded files are included in + this patch. Since 2.7-SNAPSHOT doesn't have published Maven + artifacts, I had to work with 2.6.0 files. +Author: Miguel Landaeta <[email protected]> +Forwarded: no +Last-Update: 2013-09-29 + +--- /dev/null ++++ jmock2-2.7~snapshot+201309170925-gitd7fe69b5+dfsg/maven/jmock-junit3/pom.xml +@@ -0,0 +1,25 @@ ++<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> ++ <groupId>org.jmock</groupId> ++ <artifactId>jmock-parent</artifactId> ++ <version>2.7-SNAPSHOT</version> ++ </parent> ++ <artifactId>jmock-junit3</artifactId> ++ <packaging>jar</packaging> ++ <name>jMock JUnit 3 Extension</name> ++ ++ <dependencies> ++ <dependency> ++ <groupId>${pom.groupId}</groupId> ++ <artifactId>jmock</artifactId> ++ <version>${pom.version}</version> ++ </dependency> ++ <dependency> ++ <groupId>junit</groupId> ++ <artifactId>junit</artifactId> ++ <version>3.8.2</version> ++ </dependency> ++ </dependencies> ++ ++</project> +--- /dev/null ++++ jmock2-2.7~snapshot+201309170925-gitd7fe69b5+dfsg/maven/jmock-junit4/pom.xml +@@ -0,0 +1,31 @@ ++<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> ++ <groupId>org.jmock</groupId> ++ <artifactId>jmock-parent</artifactId> ++ <version>2.7-SNAPSHOT</version> ++ </parent> ++ <artifactId>jmock-junit4</artifactId> ++ <packaging>jar</packaging> ++ <name>jMock JUnit 4 Extension</name> ++ ++ <dependencies> ++ <dependency> ++ <groupId>${pom.groupId}</groupId> ++ <artifactId>jmock</artifactId> ++ <version>${pom.version}</version> ++ </dependency> ++ <dependency> ++ <groupId>junit</groupId> ++ <artifactId>junit-dep</artifactId> ++ <version>4.4</version> ++ <exclusions> ++ <exclusion> <!-- Excluded as already a transitive dep of jmock --> ++ <groupId>org.hamcrest</groupId> ++ <artifactId>hamcrest-core</artifactId> ++ </exclusion> ++ </exclusions> ++ </dependency> ++ </dependencies> ++ ++</project> +--- /dev/null ++++ jmock2-2.7~snapshot+201309170925-gitd7fe69b5+dfsg/maven/jmock-legacy/pom.xml +@@ -0,0 +1,30 @@ ++<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> ++ <groupId>org.jmock</groupId> ++ <artifactId>jmock-parent</artifactId> ++ <version>2.7-SNAPSHOT</version> ++ </parent> ++ <artifactId>jmock-legacy</artifactId> ++ <packaging>jar</packaging> ++ <name>jMock Legacy Extension</name> ++ ++ <dependencies> ++ <dependency> ++ <groupId>${pom.groupId}</groupId> ++ <artifactId>jmock</artifactId> ++ <version>${pom.version}</version> ++ </dependency> ++ <dependency> ++ <groupId>org.objenesis</groupId> ++ <artifactId>objenesis</artifactId> ++ <version>1.0</version> ++ </dependency> ++ <dependency> ++ <groupId>cglib</groupId> ++ <artifactId>cglib-nodep</artifactId> ++ <version>2.1_3</version> ++ </dependency> ++ </dependencies> ++ ++</project> +--- /dev/null ++++ jmock2-2.7~snapshot+201309170925-gitd7fe69b5+dfsg/maven/jmock-script/pom.xml +@@ -0,0 +1,23 @@ ++<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> ++ <groupId>org.jmock</groupId> ++ <artifactId>jmock-parent</artifactId> ++ <version>2.7-SNAPSHOT</version> ++ </parent> ++ <artifactId>jmock-script</artifactId> ++ <packaging>jar</packaging> ++ <name>jMock Script Extension</name> ++ <dependencies> ++ <dependency> ++ <groupId>${pom.groupId}</groupId> ++ <artifactId>jmock</artifactId> ++ <version>${pom.version}</version> ++ </dependency> ++ <dependency> ++ <groupId>org.beanshell</groupId> ++ <artifactId>bsh</artifactId> ++ <version>2.0b4</version> ++ </dependency> ++ </dependencies> ++</project> +\ No newline at end of file +--- /dev/null ++++ jmock2-2.7~snapshot+201309170925-gitd7fe69b5+dfsg/maven/jmock/pom.xml +@@ -0,0 +1,25 @@ ++<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> ++ <groupId>org.jmock</groupId> ++ <artifactId>jmock-parent</artifactId> ++ <version>2.7-SNAPSHOT</version> ++ </parent> ++ <artifactId>jmock</artifactId> ++ <packaging>jar</packaging> ++ <name>jMock 2 Core</name> ++ ++ <dependencies> ++ <dependency> ++ <groupId>org.hamcrest</groupId> ++ <artifactId>hamcrest-core</artifactId> ++ <version>1.1</version> ++ </dependency> ++ <dependency> ++ <groupId>org.hamcrest</groupId> ++ <artifactId>hamcrest-library</artifactId> ++ <version>1.1</version> ++ </dependency> ++ </dependencies> ++ ++</project> diff --git a/debian/patches/series b/debian/patches/series index 5ed861a..ebeb1ec 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ 04javadoc 06donthaltonjunitfailure 07missinghamcrestjar +08mavenpoms diff --git a/debian/rules b/debian/rules index a77bdba..5e425a1 100755 --- a/debian/rules +++ b/debian/rules @@ -7,10 +7,12 @@ JAVA_HOME := /usr/lib/jvm/default-java DEB_JARS := hamcrest-core hamcrest-library junit4 cglib-nodep bsh asm3 objenesis \ ant-junit DEB_ANT_BUILD_TARGET = zip.jars javadoc -UVERSION := $(shell dpkg-parsechangelog|grep ^Version:|cut -f2 -d' '|sed 's/+dfsg-[^-]*$$//') +#UVERSION := $(shell dpkg-parsechangelog|grep ^Version:|cut -f2 -d' '|sed 's/+dfsg-[^-]*$$//') +UVERSION := 2.7-SNAPSHOT ANT_ARGS := -Dversion=$(UVERSION) PKG := libjmock2-java JARSUFFIXES := legacy script junit3 junit4 +MAVEN_REPO_URL := http://repo1.maven.org/maven2/ common-install-prehook-indep:: jh_installjavadoc -plibjmock2-java-doc build/jmock-$(UVERSION)/doc @@ -30,3 +32,14 @@ clean:: get-orig-source: uscan --force-download --verbose + +# this is an ugly hack, since there are not published maven artifacts for 2.7-SNAPSHOT +#UVERSION := 2.6.0 +get-orig-pom: + test '! -d maven' && mkdir -p maven/jmock + curl $(MAVEN_REPO_URL)/org/jmock/jmock/$(UVERSION)/jmock-$(UVERSION).pom --output maven/jmock/pom.xml + for SFX in $(JARSUFFIXES); do \ + mkdir -p maven/jmock-$$SFX; \ + curl $(MAVEN_REPO_URL)/org/jmock/jmock-$$SFX/$(UVERSION)/jmock-$$SFX-$(UVERSION).pom \ + --output maven/jmock-$$SFX/pom.xml; \ + done -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jmock2.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
