diff --git a/.gitignore b/.gitignore index e7a509e..e6a623e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/junit-4.11-clean.tar.gz +SOURCES/junit-4.12-clean.tar.gz diff --git a/.rh-java-common-junit.metadata b/.rh-java-common-junit.metadata index 09a8682..197c739 100644 --- a/.rh-java-common-junit.metadata +++ b/.rh-java-common-junit.metadata @@ -1 +1 @@ -61c8e6ceabc6c649fc257fa2ad8141d1dadb2219 SOURCES/junit-4.11-clean.tar.gz +8638be921555bc2a38baee8cfe0c7325b7d34650 SOURCES/junit-4.12-clean.tar.gz diff --git a/SOURCES/junit-OSGi-MANIFEST.MF b/SOURCES/junit-OSGi-MANIFEST.MF deleted file mode 100644 index 19d299e..0000000 --- a/SOURCES/junit-OSGi-MANIFEST.MF +++ /dev/null @@ -1,33 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ClassPath: . -Bundle-Vendor: %providerName -Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Bundle-Name: %pluginName -Bundle-SymbolicName: org.junit -Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/too - ls:org.eclipse.orbit/org.junit;tag=v201303080030 -Require-Bundle: org.hamcrest.core;bundle-version="1.3.0";visibility:=r - eexport -Export-Package: junit.extensions;version="4.11.0",junit.framework;vers - ion="4.11.0",junit.runner;version="4.11.0",junit.textui;version="4.11 - .0",org.junit;version="4.11.0",org.junit.experimental;version="4.11.0 - ",org.junit.experimental.categories;version="4.11.0",org.junit.experi - mental.max;version="4.11.0",org.junit.experimental.results;version="4 - .11.0",org.junit.experimental.runners;version="4.11.0",org.junit.expe - rimental.theories;version="4.11.0",org.junit.experimental.theories.in - ternal;version="4.11.0";x-internal:=true,org.junit.experimental.theor - ies.suppliers;version="4.11.0",org.junit.internal;version="4.11.0";x- - internal:=true,org.junit.internal.builders;version="4.11.0";x-interna - l:=true,org.junit.internal.matchers;version="4.11.0";x-internal:=true - ,org.junit.internal.requests;version="4.11.0";x-internal:=true,org.ju - nit.internal.runners;version="4.11.0";x-internal:=true,org.junit.inte - rnal.runners.model;version="4.11.0";x-internal:=true,org.junit.intern - al.runners.rules;version="4.11.0";x-internal:=true,org.junit.internal - .runners.statements;version="4.11.0";x-internal:=true,org.junit.match - ers;version="4.11.0",org.junit.rules;version="4.11.0",org.junit.runne - r;version="4.11.0",org.junit.runner.manipulation;version="4.11.0",org - .junit.runner.notification;version="4.11.0",org.junit.runners;version - ="4.11.0",org.junit.runners.model;version="4.11.0" -Bundle-Version: 4.11.0.v201303080030 -Bundle-ManifestVersion: 2 diff --git a/SOURCES/junit-ignore-bridge-methods.patch b/SOURCES/junit-ignore-bridge-methods.patch deleted file mode 100644 index c54cdf8..0000000 --- a/SOURCES/junit-ignore-bridge-methods.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 80542f2c5d3d52812405829d8e1c5b0a0acc3e7e Mon Sep 17 00:00:00 2001 -From: Michael Simacek -Date: Tue, 1 Dec 2015 11:21:07 +0100 -Subject: [PATCH] Ignore bridge methods - ---- - src/main/java/org/junit/runners/model/TestClass.java | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/main/java/org/junit/runners/model/TestClass.java b/src/main/java/org/junit/runners/model/TestClass.java -index 93209ea..baca84d 100644 ---- a/src/main/java/org/junit/runners/model/TestClass.java -+++ b/src/main/java/org/junit/runners/model/TestClass.java -@@ -43,6 +43,7 @@ public class TestClass { - - for (Class eachClass : getSuperClasses(fClass)) { - for (Method eachMethod : MethodSorter.getDeclaredMethods(eachClass)) { -+ if (!eachMethod.isBridge()) - addToAnnotationLists(new FrameworkMethod(eachMethod), - fMethodsForAnnotations); - } --- -2.5.0 - diff --git a/SOURCES/junit-no-hamcrest-src.patch b/SOURCES/junit-no-hamcrest-src.patch deleted file mode 100644 index 105ce60..0000000 --- a/SOURCES/junit-no-hamcrest-src.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/build.xml b/build.xml -index 0efaf87..2efa11c 100644 ---- a/build.xml -+++ b/build.xml -@@ -30,7 +30,6 @@ - - - -- - - - -@@ -125,10 +124,6 @@ - - - -- -- -- -- - - - -@@ -138,7 +133,7 @@ - - - -- -+ - - - -- - - - diff --git a/SPECS/junit.spec b/SPECS/junit.spec index 3e3e795..02d1ef6 100644 --- a/SPECS/junit.spec +++ b/SPECS/junit.spec @@ -33,32 +33,25 @@ # Name: %{?scl_prefix}%{pkg_name} -Version: 4.11 -Release: 8.16%{?dist} +Version: 4.12 +Release: 1%{?dist} Epoch: 0 Summary: Java regression test package -License: CPL +License: EPL URL: http://www.junit.org/ BuildArch: noarch -# ./clean-tarball.sh %{version} +# ./create-tarball.sh %{version} Source0: %{pkg_name}-%{version}-clean.tar.gz -Source2: junit-OSGi-MANIFEST.MF Source3: create-tarball.sh -# Removing hamcrest source jar references (not available and/or necessary) -Patch0: %{pkg_name}-no-hamcrest-src.patch -Patch1: %{pkg_name}-ignore-bridge-methods.patch - -BuildRequires: %{?scl_prefix}ant -BuildRequires: %{?scl_prefix_maven}ant-contrib -BuildRequires: %{?scl_prefix}javapackages-tools -BuildRequires: %{?scl_prefix}hamcrest -BuildRequires: perl(Digest::MD5) -BuildRequires: zip - -Requires: %{?scl_prefix}hamcrest +BuildRequires: %{?scl_prefix}maven-local +BuildRequires: %{?scl_prefix_maven}mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: %{?scl_prefix_maven}mvn(org.apache.maven.plugins:maven-enforcer-plugin) +BuildRequires: %{?scl_prefix_maven}mvn(org.apache.maven.plugins:maven-shade-plugin) +BuildRequires: %{?scl_prefix}mvn(org.hamcrest:hamcrest-core) +Obsoletes: %{name}-demo < 4.12 %description JUnit is a regression testing framework written by Erich Gamma and Kent Beck. @@ -79,81 +72,87 @@ Summary: Javadoc for %{pkg_name} %description javadoc Javadoc for %{pkg_name}. -%package demo -Summary: Demos for %{pkg_name} -Requires: %{name} = %{epoch}:%{version}-%{release} - -%description demo -Demonstrations and samples for %{pkg_name}. - %prep %setup -q -n %{pkg_name}-r%{version} %{?scl:scl enable %{scl_maven} %{scl} - <<"EOF"} set -e -x -%patch0 -p1 -%patch1 -p1 -cp build/maven/junit-pom-template.xml pom.xml -# fix placeholder version in pom -%pom_xpath_set pom:project/pom:version "%{version}" +# 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 + + + " + +# junit 4.11 bundled hamcrest, we need to re-add it to keep compatibility +%pom_add_plugin :maven-shade-plugin ' + + + + shade + + + + + org.hamcrest:hamcrest-core + + + + +' + +%mvn_file : %{pkg_name} %{pkg_name}4 -ln -s $(build-classpath hamcrest/core) lib/hamcrest-core-1.3.jar %{?scl:EOF} %build %{?scl:scl enable %{scl_maven} %{scl} - <<"EOF"} set -e -x -ant dist -Dversion-status= - -# inject OSGi manifest -mkdir -p META-INF -cp -p %{SOURCE2} META-INF/MANIFEST.MF -touch META-INF/MANIFEST.MF -zip -u %{pkg_name}%{version}/%{pkg_name}-%{version}.jar META-INF/MANIFEST.MF +%mvn_build %{?scl:EOF} %install %{?scl:scl enable %{scl_maven} %{scl} - <<"EOF"} set -e -x -# jars -install -d -m 755 %{buildroot}%{_javadir} -install -m 644 %{pkg_name}%{version}/%{pkg_name}-%{version}.jar %{buildroot}%{_javadir}/%{pkg_name}.jar -# Many packages still use the junit4.jar directly -ln -s %{_javadir}/%{pkg_name}.jar %{buildroot}%{_javadir}/%{pkg_name}4.jar - -# pom -install -d -m 755 %{buildroot}%{_mavenpomdir} -install -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{pkg_name}.pom -%add_maven_depmap - -# javadoc -install -d -m 755 %{buildroot}%{_javadocdir}/%{name} -cp -pr %{pkg_name}%{version}/javadoc/* %{buildroot}%{_javadocdir}/%{name} - -# demo -install -d -m 755 %{buildroot}%{_datadir}/%{pkg_name}/demo/%{pkg_name} - -cp -pr %{pkg_name}%{version}/%{pkg_name}/* %{buildroot}%{_datadir}/%{pkg_name}/demo/%{pkg_name} +%mvn_install %{?scl:EOF} - %files -f .mfiles -%doc LICENSE README CODING_STYLE -%{_javadir}/%{pkg_name}4.jar +%doc LICENSE-junit.txt README.md -%files demo -%doc LICENSE -%{_datadir}/%{pkg_name} - -%files javadoc -%doc LICENSE -%doc %{_javadocdir}/%{name} +%files javadoc -f .mfiles-javadoc +%doc LICENSE-junit.txt %files manual -%doc LICENSE README CODING_STYLE -%doc junit%{version}/doc/* +%doc LICENSE-junit.txt +%doc doc/* %changelog +* Mon Jan 09 2017 Michael Simacek - 0:4.12-1 +- Update to upstream version 4.12 +- Resolves: rhbz#1401033 + * Wed Feb 17 2016 Michael Simacek - 0:4.11-8.16 - Ignore bridge methods to fix build under JDK 7