[pkg-java] r16523 - in trunk/junit4/debian: . patches
Emmanuel Bourg
ebourg-guest at alioth.debian.org
Thu Apr 11 15:29:18 UTC 2013
Author: ebourg-guest
Date: 2013-04-11 15:29:18 +0000 (Thu, 11 Apr 2013)
New Revision: 16523
Added:
trunk/junit4/debian/patches/003_javadoc-fix.patch
Removed:
trunk/junit4/debian/patches/workaround_typing_bug.diff
Modified:
trunk/junit4/debian/MANIFEST.MF
trunk/junit4/debian/ant.properties
trunk/junit4/debian/changelog
trunk/junit4/debian/control
trunk/junit4/debian/orig-tar.sh
trunk/junit4/debian/patches/java7-ignore-test.patch
trunk/junit4/debian/patches/manifest_jar.diff
trunk/junit4/debian/patches/series
trunk/junit4/debian/rules
trunk/junit4/debian/watch
Log:
New upstream release
Refreshed the patches
Updated the OGSi metadata in the manifest
Improved the integration of the Javadoc
debian/control: Bump Standards-Version to 3.9.4 (no changes)
debian/watch: Changed the URL to point to the new Github project page
Modified: trunk/junit4/debian/MANIFEST.MF
===================================================================
--- trunk/junit4/debian/MANIFEST.MF 2013-04-11 10:11:23 UTC (rev 16522)
+++ trunk/junit4/debian/MANIFEST.MF 2013-04-11 15:29:18 UTC (rev 16523)
@@ -1,50 +1,64 @@
Manifest-Version: 1.0
Class-Path: hamcrest-core.jar
-Export-Package: junit.extensions;version="3.8.2";uses:="junit.framewor
- k",junit.framework;version="3.8.2";uses:="org.junit.runner,org.junit.
- runner.manipulation,org.junit.runner.notification",junit.runner;versi
- on="3.8.2";uses:="junit.framework",junit.textui;version="3.8.2";uses:
- ="junit.framework,junit.runner",org.hamcrest;version="4.7.0",org.hamc
- rest.core;version="4.7.0";uses:="org.hamcrest",org.hamcrest.internal;
- version="4.7.0";uses:="org.hamcrest",org.junit;version="4.7.0";uses:=
- "org.hamcrest,org.junit.internal",org.junit.experimental;version="4.7
- .0";uses:="org.junit.runner,org.junit.runners.model",org.junit.experi
- mental.max;version="4.7.0";uses:="org.junit.runner,org.junit.runner.n
- otification,org.junit.runners,org.junit.runners.model",org.junit.expe
- rimental.results;version="4.7.0";uses:="org.hamcrest,org.junit.intern
- al.matchers,org.junit.runner",org.junit.experimental.runners;version=
- "4.7.0";uses:="org.junit.runners,org.junit.runners.model",org.junit.e
- xperimental.theories;version="4.7.0";uses:="org.junit.experimental.th
- eories.internal,org.junit.internal,org.junit.runners,org.junit.runner
- s.model",org.junit.experimental.theories.internal;version="4.7.0";use
- s:="org.junit.experimental.theories,org.junit.runners.model",org.juni
- t.experimental.theories.suppliers;version="4.7.0";uses:="org.junit.ex
- perimental.theories",org.junit.internal;version="4.7.0";uses:="org.ha
- mcrest,org.junit.runner,org.junit.runner.notification",org.junit.inte
- rnal.builders;version="4.7.0";uses:="org.junit.runner,org.junit.runne
- r.notification,org.junit.runners.model",org.junit.internal.matchers;v
- ersion="4.7.0";uses:="org.hamcrest",org.junit.internal.requests;versi
- on="4.7.0";uses:="org.junit.runner,org.junit.runner.manipulation",org
- .junit.internal.runners;version="4.7.0";uses:="junit.framework,org.ju
- nit.runner,org.junit.runner.manipulation,org.junit.runner.notificatio
- n",org.junit.internal.runners.model;version="4.7.0";uses:="org.junit.
- internal,org.junit.runner,org.junit.runner.notification",org.junit.in
- ternal.runners.statements;version="4.7.0";uses:="org.junit.runners.mo
- del",org.junit.matchers;version="4.7.0";uses:="org.hamcrest,org.junit
- .internal.matchers",org.junit.rules;version="4.7.0";uses:="org.hamcre
- st,org.junit.internal.matchers,org.junit.runners.model",org.junit.run
- ner;version="4.7.0";uses:="junit.framework,org.junit.internal,org.jun
- it.runner.manipulation,org.junit.runner.notification,org.junit.runner
- s.model",org.junit.runner.manipulation;version="4.7.0";uses:="org.jun
- it.runner",org.junit.runner.notification;version="4.7.0";uses:="org.j
- unit.runner",org.junit.runners;version="4.7.0";uses:="org.junit.inter
- nal.runners,org.junit.internal.runners.model,org.junit.runner,org.jun
- it.runner.manipulation,org.junit.runner.notification,org.junit.runner
- s.model",org.junit.runners.model;version="4.7.0";uses:="org.junit.int
- ernal.runners.model,org.junit.runner"
Bundle-Vendor: JUnit
-Bundle-Version: 4.7.0
+Bundle-Version: 4.11
Bundle-Name: JUnit Testing Framework
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.junit
-
+Export-Package: org.junit.experimental.theories.suppliers;uses:="org.jun
+ it.experimental.theories";version="4.11",org.junit.experimental.theorie
+ s;uses:="org.junit.experimental.theories.internal,org.junit.internal,or
+ g.junit.runners.model,org.junit.runners,org.junit";version="4.11",org.j
+ unit.experimental.theories.internal;uses:="org.junit.experimental.theor
+ ies,org.junit.runners.model";version="4.11",org.junit.internal.runners;
+ uses:="org.junit.runner,org.junit.internal,org.junit.runner.notificatio
+ n,org.junit.runners.model,junit.framework,org.junit.runner.manipulation
+ ,junit.extensions,org.junit";version="4.11",org.junit.internal;uses:="o
+ rg.hamcrest,org.junit,org.junit.runners,org.junit.runner,org.junit.runn
+ er.notification";version="4.11",org.junit.internal.runners.model;uses:=
+ "org.junit.internal,org.junit.runner,org.junit.runners.model,org.junit.
+ runner.notification";version="4.11",org.junit.experimental.categories;u
+ ses:="org.junit.runner.manipulation,org.junit.runner,org.junit.runners,
+ org.junit.runners.model";version="4.11",org.junit.runner.manipulation;u
+ ses:="org.junit.runner";version="4.11",org.junit.rules;uses:="org.hamcr
+ est,org.junit,org.junit.runners.model,org.junit.internal,org.junit.inte
+ rnal.matchers,org.junit.runner,org.junit.matchers,org.junit.internal.ru
+ nners.statements";version="4.11",org.junit.runner;uses:="org.junit.runn
+ ers.model,org.junit.runners,junit.framework,org.junit.internal.runners,
+ org.junit.internal,junit.runner,org.junit.runner.notification,org.junit
+ .runner.manipulation,org.junit.internal.requests,org.junit.internal.bui
+ lders";version="4.11",org.junit.runners;uses:="org.junit.internal.runne
+ rs,org.junit.runners.model,org.junit.internal.runners.model,org.junit.i
+ nternal.runners.rules,org.junit.rules,org.junit.runner,org.junit.runner
+ .notification,org.junit.internal.runners.statements,org.junit,org.junit
+ .internal,org.junit.runner.manipulation,org.junit.internal.builders";ve
+ rsion="4.11",org.junit.matchers;uses:="org.junit.internal.matchers,org.
+ hamcrest.core,org.hamcrest";version="4.11",org.junit.runner.notificatio
+ n;uses:="org.junit.runner";version="4.11",org.junit.experimental.result
+ s;uses:="org.junit.runner,org.junit.runner.notification,org.junit.inter
+ nal,org.hamcrest";version="4.11",org.junit.experimental.max;uses:="org.
+ junit.runner,org.junit.runners,org.junit.internal.runners,org.junit.run
+ ners.model,org.junit.internal.requests,junit.framework,org.junit.runner
+ .notification";version="4.11",org.junit.internal.builders;uses:="org.ju
+ nit.runner,org.junit.runners.model,org.junit,org.junit.runner.notificat
+ ion,junit.framework,org.junit.internal.runners,org.junit.runners";versi
+ on="4.11",org.junit;uses:="org.junit.internal,org.hamcrest,org.junit.ru
+ nners";version="4.11",org.junit.experimental.runners;uses:="org.junit.r
+ unners,org.junit.runners.model";version="4.11",org.junit.internal.runne
+ rs.rules;uses:="org.junit.rules,org.junit.runners.model,org.junit";vers
+ ion="4.11",org.junit.internal.matchers;uses:="org.hamcrest,org.junit.in
+ ternal";version="4.11",org.junit.internal.requests;uses:="org.junit.run
+ ner,org.junit.internal.builders,org.junit.runner.manipulation,org.junit
+ .internal.runners";version="4.11",org.junit.experimental;uses:="org.jun
+ it.runner,org.junit.runners.model,org.junit.runners";version="4.11",org
+ .junit.runners.model;uses:="org.junit.internal.runners.model,org.junit.
+ internal.runners,org.junit.runner,org.junit.internal,org.junit";version
+ ="4.11",org.junit.internal.runners.statements;uses:="org.junit.internal
+ ,org.junit.runners.model";version="4.11",junit.runner;uses:="junit.fram
+ ework";version="4.11",junit.textui;uses:="junit.framework,junit.runner"
+ ;version="4.11",junit.extensions;uses:="junit.framework";version="4.11"
+ ,junit.framework;uses:="org.junit.runner.manipulation,org.junit.runner,
+ org.junit.runner.notification,org.junit,org.junit.internal";version="4.
+ 11"
+Import-Package: org.hamcrest;version="1.3",org.hamcrest.core;version="1.
+ 3"
Modified: trunk/junit4/debian/ant.properties
===================================================================
--- trunk/junit4/debian/ant.properties 2013-04-11 10:11:23 UTC (rev 16522)
+++ trunk/junit4/debian/ant.properties 2013-04-11 15:29:18 UTC (rev 16523)
@@ -1,2 +1,3 @@
hamcrestlib=/usr/share/java/hamcrest-core.jar
manifest=debian/MANIFEST.MF
+version-status=
Modified: trunk/junit4/debian/changelog
===================================================================
--- trunk/junit4/debian/changelog 2013-04-11 10:11:23 UTC (rev 16522)
+++ trunk/junit4/debian/changelog 2013-04-11 15:29:18 UTC (rev 16523)
@@ -1,11 +1,19 @@
-junit4 (4.10-4) UNRELEASED; urgency=low
+junit4 (4.11-1) experimental; urgency=low
* Team upload.
+ * New upstream release
+ * Refreshed the patches
+ * Updated the OGSi metadata in the manifest
+ * Improved the integration of the Javadoc
+ * debian/control: Bump Standards-Version to 3.9.4 (no changes)
+ * debian/watch: Changed the URL to point to the new Github project page
+
+ [ Tony Mancill ]
* Update watchfile to fix Github breakage. (Closes: #693524)
- Update unused debug line in orig-tar.sh too.
- Thank you to Jonathan McCrohan <jmccrohan at gmail.com>
- -- tony mancill <tmancill at debian.org> Sat, 17 Nov 2012 11:47:27 -0800
+ -- Emmanuel Bourg <ebourg at apache.org> Thu, 11 Apr 2013 16:14:44 +0200
junit4 (4.10-3) unstable; urgency=low
Modified: trunk/junit4/debian/control
===================================================================
--- trunk/junit4/debian/control 2013-04-11 10:11:23 UTC (rev 16522)
+++ trunk/junit4/debian/control 2013-04-11 15:29:18 UTC (rev 16523)
@@ -5,14 +5,15 @@
Varun Hiremath <varun at debian.org>,
Damien Raude-Morvan <drazzib at debian.org>,
Ludovic Claude <ludovic.claude at laposte.net>,
- Jakub Adam <jakub.adam at ktknet.cz>
+ Jakub Adam <jakub.adam at ktknet.cz>,
+ Emmanuel Bourg <ebourg at apache.org>
Priority: optional
Build-Depends: ant, cdbs, debhelper (>= 7), default-jdk
Build-Depends-Indep: default-jdk-doc,
- libhamcrest-java (>> 1.1-6),
+ libhamcrest-java (>= 1.3),
libhamcrest-java-doc,
maven-repo-helper
-Standards-Version: 3.9.3.1
+Standards-Version: 3.9.4
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/junit4/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/junit4/
Homepage: http://www.junit.org/
Modified: trunk/junit4/debian/orig-tar.sh
===================================================================
--- trunk/junit4/debian/orig-tar.sh 2013-04-11 10:11:23 UTC (rev 16522)
+++ trunk/junit4/debian/orig-tar.sh 2013-04-11 15:29:18 UTC (rev 16523)
@@ -13,9 +13,9 @@
mkdir $DIR
tar -x -v -z -f $ORIG_TAR
rm $ORIG_TAR
-find . -maxdepth 2 -wholename "./KentBeck-junit-*/*" -exec mv '{}' $DIR \;
+find . -maxdepth 2 -wholename "./junit-*/*" -exec mv '{}' $DIR \;
GZIP=--best tar -c -z -f $TAR -X debian/orig-tar.exclude $DIR
-rm -rf $DIR KentBeck-junit-*
+rm -rf $DIR junit-*
# move to directory 'tarballs'
if [ -r .svn/deb-layout ]; then
Added: trunk/junit4/debian/patches/003_javadoc-fix.patch
===================================================================
--- trunk/junit4/debian/patches/003_javadoc-fix.patch (rev 0)
+++ trunk/junit4/debian/patches/003_javadoc-fix.patch 2013-04-11 15:29:18 UTC (rev 16523)
@@ -0,0 +1,33 @@
+Description: Links the documentation with the Javadoc installed locally for the JRE and Hamcrest
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -140,21 +140,22 @@
+ </exec>
+ </target>
+
+- <target name="javadoc" depends="unjar.hamcrest">
++ <target name="javadoc">
+ <javadoc destdir="${javadocdir}"
+ author="false"
+ version="false"
+ use="false"
+- windowtitle="JUnit API"
+- stylesheetfile="stylesheet.css"
++ windowtitle="JUnit ${version} API"
++ doctitle="JUnit ${version} API"
+ >
+ <excludepackage name="junit.*" />
+ <excludepackage name="org.junit.internal.*" />
+ <excludepackage name="org.junit.experimental.theories.internal.*" />
+
+ <sourcepath location="${src}" />
+- <sourcepath location="${hamcrestsrc}" />
+- <link href="http://java.sun.com/javase/6/docs/api/" />
++ <classpath path="${hamcrestlib}"/>
++ <link href="/usr/share/doc/default-jre/api" />
++ <link href="/usr/share/doc/libhamcrest-java/api" />
+ </javadoc>
+ </target>
+
Modified: trunk/junit4/debian/patches/java7-ignore-test.patch
===================================================================
--- trunk/junit4/debian/patches/java7-ignore-test.patch 2013-04-11 10:11:23 UTC (rev 16522)
+++ trunk/junit4/debian/patches/java7-ignore-test.patch 2013-04-11 15:29:18 UTC (rev 16523)
@@ -6,23 +6,21 @@
Author: James Page <james.page at ubuntu.com>
Forwarded: not-needed
-Index: junit4/src/test/java/org/junit/tests/running/classes/ParentRunnerTest.java
-===================================================================
---- junit4.orig/src/test/java/org/junit/tests/running/classes/ParentRunnerTest.java 2012-05-21 14:04:38.165350000 +0100
-+++ junit4/src/test/java/org/junit/tests/running/classes/ParentRunnerTest.java 2012-05-21 14:29:26.162439110 +0100
-@@ -9,6 +9,7 @@
-
+--- a/src/test/java/org/junit/tests/running/classes/ParentRunnerTest.java
++++ b/src/test/java/org/junit/tests/running/classes/ParentRunnerTest.java
+@@ -10,6 +10,7 @@
import org.hamcrest.Matcher;
+ import org.hamcrest.TypeSafeMatcher;
import org.junit.Test;
+import org.junit.Ignore;
- import org.junit.internal.matchers.TypeSafeMatcher;
import org.junit.runner.Description;
import org.junit.runner.JUnitCore;
-@@ -38,6 +39,7 @@
- }
- }
+ import org.junit.runner.Request;
+@@ -39,6 +40,7 @@
+ }
+ @Test
+ @Ignore
- @Test
- public void useChildHarvester() throws InitializationError {
- log= "";
+ public void useChildHarvester() throws InitializationError {
+ log = "";
+ ParentRunner<?> runner = new BlockJUnit4ClassRunner(FruitTest.class);
Modified: trunk/junit4/debian/patches/manifest_jar.diff
===================================================================
--- trunk/junit4/debian/patches/manifest_jar.diff 2013-04-11 10:11:23 UTC (rev 16522)
+++ trunk/junit4/debian/patches/manifest_jar.diff 2013-04-11 15:29:18 UTC (rev 16523)
@@ -6,7 +6,7 @@
--- a/build.xml
+++ b/build.xml
-@@ -92,11 +92,13 @@
+@@ -96,11 +96,13 @@
jarfile="${dist}/${binjar}"
basedir="${bin}"
excludes="${unjarred}, **/*.java, build.xml"
Modified: trunk/junit4/debian/patches/series
===================================================================
--- trunk/junit4/debian/patches/series 2013-04-11 10:11:23 UTC (rev 16522)
+++ trunk/junit4/debian/patches/series 2013-04-11 15:29:18 UTC (rev 16523)
@@ -1,3 +1,3 @@
-workaround_typing_bug.diff
manifest_jar.diff
java7-ignore-test.patch
+003_javadoc-fix.patch
Deleted: trunk/junit4/debian/patches/workaround_typing_bug.diff
===================================================================
--- trunk/junit4/debian/patches/workaround_typing_bug.diff 2013-04-11 10:11:23 UTC (rev 16522)
+++ trunk/junit4/debian/patches/workaround_typing_bug.diff 2013-04-11 15:29:18 UTC (rev 16523)
@@ -1,114 +0,0 @@
-Description: Fix "invalid inferred types for T; actual arguments do not
- conforms to inferred formal arguments" when building junit4 with openjdk
- under recent hotspot.
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Forwarded: no
-Bug-Debian: http://bugs.debian.org/662807
-Last-Update: 2012-03-07
-
---- a/src/main/java/org/junit/internal/matchers/CombinableMatcher.java
-+++ b/src/main/java/org/junit/internal/matchers/CombinableMatcher.java
-@@ -24,11 +24,11 @@
-
- @SuppressWarnings("unchecked")
- public CombinableMatcher<T> and(Matcher<? extends T> matcher) {
-- return new CombinableMatcher<T>(allOf(matcher, fMatcher));
-+ return new CombinableMatcher<T>(allOf((Matcher)matcher, fMatcher));
- }
-
- @SuppressWarnings("unchecked")
- public CombinableMatcher<T> or(Matcher<? extends T> matcher) {
-- return new CombinableMatcher<T>(anyOf(matcher, fMatcher));
-+ return new CombinableMatcher<T>(anyOf((Matcher)matcher, fMatcher));
- }
--}
-\ No newline at end of file
-+}
---- a/src/main/java/org/junit/internal/matchers/IsCollectionContaining.java
-+++ b/src/main/java/org/junit/internal/matchers/IsCollectionContaining.java
-@@ -41,7 +41,7 @@
-
- @Factory
- public static <T> Matcher<Iterable<T>> hasItem(T element) {
-- return hasItem(equalTo(element));
-+ return hasItem((Matcher)equalTo(element));
- }
-
- @Factory
-@@ -51,7 +51,7 @@
- for (Matcher<? extends T> elementMatcher : elementMatchers) {
- all.add(hasItem(elementMatcher));
- }
-- return allOf(all);
-+ return allOf((Collection)all);
- }
-
- @Factory
-@@ -61,7 +61,7 @@
- for (T element : elements) {
- all.add(hasItem(element));
- }
-- return allOf(all);
-+ return allOf((Collection)all);
- }
-
- }
---- a/src/test/java/org/junit/tests/assertion/AssertionTest.java
-+++ b/src/test/java/org/junit/tests/assertion/AssertionTest.java
-@@ -12,6 +12,7 @@
-
- import java.math.BigDecimal;
-
-+import org.hamcrest.Matcher;
- import org.junit.Assert;
- import org.junit.ComparisonFailure;
- import org.junit.Test;
-@@ -446,7 +447,7 @@
- String expectedMessage = "identifier\nExpected: is an instance of java.lang.Integer\n got: \"actual\"\n";
-
- try {
-- assertThat("identifier", "actual", is(Integer.class));
-+ assertThat("identifier", "actual", (Matcher) is(Integer.class));
- } catch (AssertionError e) {
- assertEquals(expectedMessage, e.getMessage());
- }
---- a/src/test/java/org/junit/tests/assertion/BothTest.java
-+++ b/src/test/java/org/junit/tests/assertion/BothTest.java
-@@ -17,17 +17,17 @@
- @RunWith(Theories.class)
- public class BothTest {
- @DataPoint
-- public static Matcher<Integer> IS_3= is(3);
-+ public static Matcher<Integer> IS_3= (Matcher) is(3);
-
- @DataPoint
-- public static Matcher<Integer> IS_4= is(4);
-+ public static Matcher<Integer> IS_4= (Matcher) is(4);
-
- @DataPoint
- public static int THREE= 3;
-
- @Test
- public void bothPasses() {
-- assertThat(3, both(is(Integer.class)).and(is(3)));
-+ assertThat(3, both(is(Integer.class)).and((Matcher)is(3)));
- }
-
- @Theory
-@@ -46,7 +46,7 @@
-
- @Test
- public void eitherPasses() {
-- assertThat(3, either(is(3)).or(is(4)));
-+ assertThat(3, either(is(3)).or((Matcher)is(4)));
- }
-
- @Theory
-@@ -66,6 +66,6 @@
- }
-
- @Test public void subclassesAreOkInSecondPositionOnly() {
-- assertThat(3, both(is(Integer.class)).and(is(3)));
-+ assertThat(3, both(is(Integer.class)).and((Matcher)is(3)));
- }
- }
Modified: trunk/junit4/debian/rules
===================================================================
--- trunk/junit4/debian/rules 2013-04-11 10:11:23 UTC (rev 16522)
+++ trunk/junit4/debian/rules 2013-04-11 15:29:18 UTC (rev 16523)
@@ -10,7 +10,7 @@
DEB_JARS := ant-nodeps hamcrest-core
binary-post-install/junit4::
- sed "s/@artifactId@/junit/;s/@version@/$(VERSION)/" build/maven/pom-template.xml > debian/pom.xml
+ sed "s/@artifactId@/junit/;s/@version@/$(VERSION)/" build/maven/junit-pom-template.xml > debian/pom.xml
mh_installpoms -pjunit4
mh_installjar -pjunit4 -njunit4 -l debian/pom.xml junit$(VERSION)/junit-dep-$(VERSION).jar
@@ -19,6 +19,7 @@
clean::
-rm debian/pom.xml
+ -rm src/main/java/junit/runner/Version.java
mh_clean
upstream-from-git:
Modified: trunk/junit4/debian/watch
===================================================================
--- trunk/junit4/debian/watch 2013-04-11 10:11:23 UTC (rev 16522)
+++ trunk/junit4/debian/watch 2013-04-11 15:29:18 UTC (rev 16523)
@@ -1,3 +1,2 @@
version=3
-http://github.com/KentBeck/junit/tags/ .*/r(\d[\d\.]+)\.tar\.gz debian debian/orig-tar.sh
-
+http://github.com/junit-team/junit/tags/ .*/r(\d[\d\.]+)\.tar\.gz debian debian/orig-tar.sh
More information about the pkg-java-commits
mailing list