From d47a5a78d4b5f629d372c4fd331a17b2eaa59dd3 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Fri, 8 May 2020 02:11:54 +0000 Subject: [PATCH] import junit-4.12-11.module+el8.2.0+4938+c0cffa5b --- .gitignore | 1 + .junit.metadata | 1 + SOURCES/0001-Port-to-hamcrest-2.1.patch | 108 +++++++++ SOURCES/0002-Port-to-OpenJDK-11.patch | 90 +++++++ SOURCES/create-tarball.sh | 22 ++ SPECS/junit.spec | 304 ++++++++++++++++++++++++ 6 files changed, 526 insertions(+) create mode 100644 .gitignore create mode 100644 .junit.metadata create mode 100644 SOURCES/0001-Port-to-hamcrest-2.1.patch create mode 100644 SOURCES/0002-Port-to-OpenJDK-11.patch create mode 100755 SOURCES/create-tarball.sh create mode 100644 SPECS/junit.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e6a623e --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/junit-4.12-clean.tar.gz diff --git a/.junit.metadata b/.junit.metadata new file mode 100644 index 0000000..197c739 --- /dev/null +++ b/.junit.metadata @@ -0,0 +1 @@ +8638be921555bc2a38baee8cfe0c7325b7d34650 SOURCES/junit-4.12-clean.tar.gz diff --git a/SOURCES/0001-Port-to-hamcrest-2.1.patch b/SOURCES/0001-Port-to-hamcrest-2.1.patch new file mode 100644 index 0000000..16b864a --- /dev/null +++ b/SOURCES/0001-Port-to-hamcrest-2.1.patch @@ -0,0 +1,108 @@ +From 9507c7b942a25f89428c95abb0012d30aff0ca9b Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Thu, 29 Aug 2019 12:48:20 +0200 +Subject: [PATCH] Port to hamcrest 2.1 + +--- + .../org/junit/internal/matchers/StacktracePrintingMatcher.java | 3 --- + .../org/junit/internal/matchers/ThrowableCauseMatcher.java | 2 -- + .../org/junit/internal/matchers/ThrowableMessageMatcher.java | 2 -- + src/main/java/org/junit/matchers/JUnitMatchers.java | 2 +- + .../experimental/theories/runner/WithDataPointMethod.java | 2 +- + 5 files changed, 2 insertions(+), 9 deletions(-) + +diff --git a/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java b/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java +index 5d45ba3..6e94a67 100644 +--- a/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java ++++ b/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java +@@ -4,7 +4,6 @@ import java.io.PrintWriter; + import java.io.StringWriter; + + import org.hamcrest.Description; +-import org.hamcrest.Factory; + import org.hamcrest.Matcher; + + /** +@@ -42,13 +41,11 @@ public class StacktracePrintingMatcher extends + return stringWriter.toString(); + } + +- @Factory + public static Matcher isThrowable( + Matcher throwableMatcher) { + return new StacktracePrintingMatcher(throwableMatcher); + } + +- @Factory + public static Matcher isException( + Matcher exceptionMatcher) { + return new StacktracePrintingMatcher(exceptionMatcher); +diff --git a/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java b/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java +index 22ce8bd..4fa89e7 100644 +--- a/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java ++++ b/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java +@@ -1,7 +1,6 @@ + package org.junit.internal.matchers; + + import org.hamcrest.Description; +-import org.hamcrest.Factory; + import org.hamcrest.Matcher; + import org.hamcrest.TypeSafeMatcher; + +@@ -43,7 +42,6 @@ public class ThrowableCauseMatcher extends + * @param matcher to apply to the cause of the outer exception + * @param type of the outer exception + */ +- @Factory + public static Matcher hasCause(final Matcher matcher) { + return new ThrowableCauseMatcher(matcher); + } +diff --git a/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java b/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java +index 74386a8..7d16b11 100644 +--- a/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java ++++ b/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java +@@ -1,7 +1,6 @@ + package org.junit.internal.matchers; + + import org.hamcrest.Description; +-import org.hamcrest.Factory; + import org.hamcrest.Matcher; + import org.hamcrest.TypeSafeMatcher; + +@@ -30,7 +29,6 @@ public class ThrowableMessageMatcher extends + matcher.describeMismatch(item.getMessage(), description); + } + +- @Factory + public static Matcher hasMessage(final Matcher matcher) { + return new ThrowableMessageMatcher(matcher); + } +diff --git a/src/main/java/org/junit/matchers/JUnitMatchers.java b/src/main/java/org/junit/matchers/JUnitMatchers.java +index 13407cc..8889266 100644 +--- a/src/main/java/org/junit/matchers/JUnitMatchers.java ++++ b/src/main/java/org/junit/matchers/JUnitMatchers.java +@@ -56,7 +56,7 @@ public class JUnitMatchers { + * @deprecated Please use {@link CoreMatchers#everyItem(Matcher)} instead. + */ + @Deprecated +- public static Matcher> everyItem(final Matcher elementMatcher) { ++ public static Matcher> everyItem(final Matcher elementMatcher) { + return CoreMatchers.everyItem(elementMatcher); + } + +diff --git a/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java b/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java +index c814508..ce22ef4 100644 +--- a/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java ++++ b/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java +@@ -108,7 +108,7 @@ public class WithDataPointMethod { + return JUnitCore.runClasses(type).getFailures(); + } + +- private Matcher> empty() { ++ private Matcher> empty() { + return everyItem(nullValue(Failure.class)); + } + } +-- +2.21.0 + diff --git a/SOURCES/0002-Port-to-OpenJDK-11.patch b/SOURCES/0002-Port-to-OpenJDK-11.patch new file mode 100644 index 0000000..d251373 --- /dev/null +++ b/SOURCES/0002-Port-to-OpenJDK-11.patch @@ -0,0 +1,90 @@ +From abb2895b7faf07817644e69e34701af6e88204e7 Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Wed, 30 Oct 2019 17:16:11 +0100 +Subject: [PATCH] Port to OpenJDK 11 + +--- + .../junit/runners/model/TestClassTest.java | 3 ++ + .../junit/tests/running/core/MainRunner.java | 31 ------------------- + 2 files changed, 3 insertions(+), 31 deletions(-) + +diff --git a/src/test/java/org/junit/runners/model/TestClassTest.java b/src/test/java/org/junit/runners/model/TestClassTest.java +index 7682968..810de25 100644 +--- a/src/test/java/org/junit/runners/model/TestClassTest.java ++++ b/src/test/java/org/junit/runners/model/TestClassTest.java +@@ -135,6 +135,9 @@ public class TestClassTest { + } + } + ++ /// The class Object starting from JDK9 has its own annotations ++ /// which causes this test to fail ++ @Ignore + @Test + public void providesAnnotatedMethodsSortedByName() { + TestClass tc = new TestClass(MethodsAnnotated.class); +diff --git a/src/test/java/org/junit/tests/running/core/MainRunner.java b/src/test/java/org/junit/tests/running/core/MainRunner.java +index 31f01e8..076a212 100644 +--- a/src/test/java/org/junit/tests/running/core/MainRunner.java ++++ b/src/test/java/org/junit/tests/running/core/MainRunner.java +@@ -39,11 +39,6 @@ public class MainRunner { + throw new ExitException(status); + } + +- @Override +- public boolean getInCheck() { +- return (originalSecurityManager != null) && originalSecurityManager.getInCheck(); +- } +- + @Override + public Object getSecurityContext() { + return (originalSecurityManager == null) ? super.getSecurityContext() : originalSecurityManager.getSecurityContext(); +@@ -196,11 +191,6 @@ public class MainRunner { + } + } + +- @Override +- public boolean checkTopLevelWindow(Object window) { +- return (originalSecurityManager == null) ? super.checkTopLevelWindow(window) : originalSecurityManager.checkTopLevelWindow(window); +- } +- + @Override + public void checkPrintJobAccess() { + if (originalSecurityManager != null) { +@@ -208,20 +198,6 @@ public class MainRunner { + } + } + +- @Override +- public void checkSystemClipboardAccess() { +- if (originalSecurityManager != null) { +- originalSecurityManager.checkSystemClipboardAccess(); +- } +- } +- +- @Override +- public void checkAwtEventQueueAccess() { +- if (originalSecurityManager != null) { +- originalSecurityManager.checkAwtEventQueueAccess(); +- } +- } +- + @Override + public void checkPackageAccess(String pkg) { + if (originalSecurityManager != null) { +@@ -243,13 +219,6 @@ public class MainRunner { + } + } + +- @Override +- public void checkMemberAccess(Class clazz, int which) { +- if (originalSecurityManager != null) { +- originalSecurityManager.checkMemberAccess(clazz, which); +- } +- } +- + @Override + public void checkSecurityAccess(String target) { + if (originalSecurityManager != null) { +-- +2.21.0 + diff --git a/SOURCES/create-tarball.sh b/SOURCES/create-tarball.sh new file mode 100755 index 0000000..1594760 --- /dev/null +++ b/SOURCES/create-tarball.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +if [ $# -ne 1 ]; then + echo "Usage: ./create-tarball.sh VERSION" + exit 1 +fi + +VERSION=${1} +NAME="junit" + +wget https://github.com/${NAME}-team/${NAME}/archive/r${VERSION}.tar.gz +tar xvf r${VERSION}.tar.gz + +( + cd ${NAME}-r${VERSION} + find . -name "*.jar" -delete + find . -name "*.class" -delete +) + +tar czvf ${NAME}-${VERSION}-clean.tar.gz ${NAME}-r${VERSION} +rm -Rf ${NAME}-${VERSION}.tar.gz + diff --git a/SPECS/junit.spec b/SPECS/junit.spec new file mode 100644 index 0000000..d7c4372 --- /dev/null +++ b/SPECS/junit.spec @@ -0,0 +1,304 @@ +Name: junit +Version: 4.12 +Release: 11%{?dist} +Summary: Java regression test package +License: EPL-1.0 +URL: http://www.junit.org/ +BuildArch: noarch + +# ./clean-tarball.sh %{version} +Source0: %{name}-%{version}-clean.tar.gz +Source3: create-tarball.sh + +Patch1: 0001-Port-to-hamcrest-2.1.patch +Patch2: 0002-Port-to-OpenJDK-11.patch + +BuildRequires: maven-local +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) +BuildRequires: mvn(org.hamcrest:hamcrest-core) + + +%description +JUnit is a regression testing framework written by Erich Gamma and Kent Beck. +It is used by the developer who implements unit tests in Java. JUnit is Open +Source Software, released under the Common Public License Version 1.0 and +hosted on GitHub. + +%package manual +Summary: Manual for %{name} + +%description manual +Documentation for %{name}. + +%package javadoc +Summary: Javadoc for %{name} + +%description javadoc +Javadoc for %{name}. + +%prep +%setup -q -n %{name}-r%{version} + +%patch1 -p1 +%patch2 -p1 + +# InaccessibleBaseClassTest fails with Java 8 +sed -i /InaccessibleBaseClassTest/d src/test/java/org/junit/tests/AllTests.java + +%pom_remove_plugin :replacer +sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >src/main/java/junit/runner/Version.java + +%pom_remove_plugin :animal-sniffer-maven-plugin + +# Removing hamcrest source jar references (not available and/or necessary) +%pom_remove_plugin :maven-javadoc-plugin + +# Add proper Apache Felix Bundle Plugin instructions +# so that we get a reasonable OSGi manifest. +%pom_xpath_inject pom:project "bundle" +%pom_xpath_inject pom:build/pom:plugins " + + org.apache.felix + maven-bundle-plugin + true + + + org.junit + {local-packages},!org.hamcrest*,*;x-internal:=true + <_nouses>true + + + " + +%mvn_file : %{name} + +%build +%mvn_build -- -DjdkVersion=1.6 + +%install +%mvn_install + +%files -f .mfiles +%doc LICENSE-junit.txt README.md + +%files javadoc -f .mfiles-javadoc +%doc LICENSE-junit.txt + +%files manual +%doc LICENSE-junit.txt +%doc doc/* + +%changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 4.12-11 +- Mass rebuild for javapackages-tools 201902 + +* Fri May 24 2019 Mikolaj Izdebski - 1:4.12-10 +- Mass rebuild for javapackages-tools 201901 + +* Mon Jul 2 2018 Mikolaj Izdebski - 1:4.12-9 +- Update license tag + +* Wed Feb 07 2018 Fedora Release Engineering - 1:4.12-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1:4.12-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 1:4.12-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Jul 15 2016 Mat Booth - 1:4.12-5 +- Add missing BR + +* Thu Feb 04 2016 Fedora Release Engineering - 1:4.12-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 1:4.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Jan 21 2015 Mikolaj Izdebski - 1:4.12-2 +- Export internal OSGi packages and mark them with x-internal +- Resolves: rhbz#1184144 + +* Mon Jan 19 2015 Mikolaj Izdebski - 1:4.12-1 +- Update to upstream version 4.12 +- Build with Maven +- Remove demo package + +* Mon Jun 9 2014 Mikolaj Izdebski - 1:4.11-14 +- Add epoch as workaround for a bug in koji-shadow + +* Mon Jun 9 2014 Mikolaj Izdebski - 4.11-13 +- Remove epoch + +* Sun Jun 8 2014 Peter Robinson 4.11-12 +- Re-add Epoch. Once you have it you can't remove it as it breaks upgrade paths + +* Sun Jun 08 2014 Fedora Release Engineering - 4.11-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu May 22 2014 Alexander Kurtakov 4.11-10 +- Update OSGi manifest to state 4.11. + +* Wed May 21 2014 Mikolaj Izdebski - 4.11-9 +- Update to current packaging guidelines +- Drop old Obsoletes/Provides for junit4 rename +- Disable test which fails with Java 8 + +* Tue Mar 04 2014 Stanislav Ochotnicky - 0:4.11-8 +- Use Requires: java-headless rebuild (#1067528) + +* Fri Aug 23 2013 Michal Srb - 0:4.11-7 +- Drop "-SNAPSHOT" from version ID +- See: https://lists.fedoraproject.org/pipermail/java-devel/2013-August/004923.html + +* Mon Aug 19 2013 Stanislav Ochotnicky - 0:4.11-6 +- Fix version in pom.xml (#998266) + +* Fri Aug 02 2013 Michal Srb - 0:4.11-5 +- Add create-tarball.sh script to SRPM + +* Fri Jun 28 2013 Mikolaj Izdebski - 0:4.11-4 +- Rebuild to regenerate API documentation +- Resolves: CVE-2013-1571 + +* Fri Jun 21 2013 Michal Srb - 0:4.11-3 +- Build from clean tarball + +* Mon May 06 2013 Tomas Radej - 0:4.11-2 +- Removed uneeded dependencies + +* Thu Mar 21 2013 Tomas Radej - 0:4.11-1 +- Updated to latest upstream version + +* Thu Feb 14 2013 Fedora Release Engineering - 0:4.10-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Tue Dec 18 2012 Michal Srb - 0:4.10-7 +- Build-time dependency perl-MD5 replaced with perl(Digest::MD5) +- Description cleanup (Resolves: #888389) + +* Thu Jul 19 2012 Fedora Release Engineering - 0:4.10-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Mon Apr 30 2012 Krzysztof Daniel 0:4.10-5 +- Update OSGi metadata to match 4.10.0 release. + +* Thu Feb 09 2012 Harald Hoyer 4.10-4 +- removed Conflicts with itsself + +* Thu Jan 26 2012 Roland Grunberg 0:4.8.2-3 +- Add OSGi metadata to junit.jar manifest. + +* Thu Jan 26 2012 Tomas Radej - 0:4.10-2 +- Fixed versioning + +* Wed Jan 25 2012 Tomas Radej - 0:4.10-1 +- Updated to upstream 4.10 +- Obsoleted junit4 +- Epoch added + +* Fri Jan 13 2012 Fedora Release Engineering - 3.8.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Feb 09 2011 Fedora Release Engineering - 3.8.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Oct 7 2010 Alexander Kurtakov 3.8.2-7 +- Drop gcj support. + +* Fri Jul 24 2009 Fedora Release Engineering - 3.8.2-6.4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 3.8.2-5.4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Jul 9 2008 Tom "spot" Callaway - 3.8.2-4.4 +- drop repotag + +* Mon Feb 18 2008 Fedora Release Engineering - 3.8.2-4jpp.3 +- Autorebuild for GCC 4.3 + +* Thu Sep 20 2007 Deepak Bhole - 3.8.2-3jpp.3 +- Fix location of stylesheet for javadocs + +* Thu Sep 20 2007 Deepak Bhole - 3.8.2-3jpp.2 +- Rebuild for ppc32 execmem issue and new build-id + +* Mon Feb 12 2007 Thomas Fitzsimmons - 3.8.2-3jpp.1.fc7 +- Add dist tag + +* Mon Feb 12 2007 Thomas Fitzsimmons - 3.8.2-3jpp.1 +- Committed on behalf of Tania Bento +- Update per Fedora review process +- Resolves rhbz#225954 + +* Thu Aug 10 2006 Deepak Bhole - 0:3.8.2-3jpp.1 +- Added missing requirements. + +* Thu Aug 10 2006 Karsten Hopp 0:3.8.2-2jpp_3fc +- Require(post/postun): coreutils + +* Fri Jun 23 2006 Deepak Bhole - 0:3.8.2-2jpp_2fc +- Rebuilt. + +* Thu Jun 22 2006 Deepak Bhole - 0:3.8.2-2jpp_1fc +- Upgrade to 3.8.2 +- Added conditional native compilation. +- Fix path where demo is located. + +* Fri Mar 03 2006 Ralph Apel - 0:3.8.2-1jpp +- First JPP-1.7 release + +* Mon Aug 23 2004 Randy Watler - 0:3.8.1-4jpp +- Rebuild with ant-1.6.2 +* Fri May 09 2003 David Walluck 0:3.8.1-3jpp +- update for JPackage 1.5 + +* Fri Mar 21 2003 Nicolas Mailhot 3.8.1-2jpp +- For jpackage-utils 1.5 + +* Fri Sep 06 2002 Henri Gomez 3.8.1-1jpp +- 3.8.1 + +* Sun Sep 01 2002 Guillaume Rousse 3.8-2jpp +- used original zip file + +* Thu Aug 29 2002 Guillaume Rousse 3.8-1jpp +- 3.8 +- group, vendor and distribution tags + +* Sat Jan 19 2002 Guillaume Rousse 3.7-6jpp +- versioned dir for javadoc +- no dependencies for manual and javadoc packages +- stricter dependency for demo package +- additional sources in individual archives +- section macro + +* Sat Dec 1 2001 Guillaume Rousse 3.7-5jpp +- javadoc in javadoc package + +* Wed Nov 21 2001 Christian Zoffoli 3.7-4jpp +- fixed previous releases ...grrr + +* Wed Nov 21 2001 Christian Zoffoli 3.7-3jpp +- added jpp extension +- removed packager tag + +* Sun Sep 30 2001 Guillaume Rousse 3.7-2jpp +- first unified release +- s/jPackage/JPackage + +* Mon Sep 17 2001 Guillaume Rousse 3.7-1mdk +- 3.7 +- vendor tag +- packager tag +- s/Copyright/License/ +- truncated description to 72 columns in spec +- spec cleanup +- used versioned jar +- moved demo files to %%{_datadir}/%%{name} + +* Sat Feb 17 2001 Guillaume Rousse 3.5-1mdk +- first Mandrake release