Hello community, here is the log from the commit of package junit for openSUSE:Factory checked in at 2019-02-04 21:23:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/junit (Old) and /work/SRC/openSUSE:Factory/.junit.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "junit" Mon Feb 4 21:23:16 2019 rev:23 rq:667693 version:4.12 Changes: -------- --- /work/SRC/openSUSE:Factory/junit/junit.changes 2018-07-24 17:32:49.668095353 +0200 +++ /work/SRC/openSUSE:Factory/.junit.new.28833/junit.changes 2019-02-04 21:23:17.799626760 +0100 @@ -1,0 +2,15 @@ +Mon Jan 21 23:36:15 UTC 2019 - Jan Engelhardt <[email protected]> + +- Trim repeated metadata from description. + +------------------------------------------------------------------- +Wed Dec 26 06:27:56 UTC 2018 - Fridrich Strba <[email protected]> + +- Upgrade to 4.12 +- Removed patches: + * junit-jdk8.patch + * junit-jdk9.patch + * junit-no-hamcrest-src.patch + + Integrated directly in the added build.xml file + +------------------------------------------------------------------- Old: ---- junit-4.11.pom junit-jdk8.patch junit-jdk9.patch junit-no-hamcrest-src.patch r4.11.tar.gz New: ---- build.xml r4.12.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ junit.spec ++++++ --- /var/tmp/diff_new_pack.BPIcoK/_old 2019-02-04 21:23:18.327626631 +0100 +++ /var/tmp/diff_new_pack.BPIcoK/_new 2019-02-04 21:23:18.327626631 +0100 @@ -1,7 +1,7 @@ # # spec file for package junit # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,36 +12,29 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: junit -Version: 4.11 +Version: 4.12 Release: 0 Summary: Java regression test package License: CPL-1.0 Group: Development/Libraries/Java Url: http://www.junit.org/ Source0: https://github.com/junit-team/junit/archive/r%{version}.tar.gz -#Source1: http://search.maven.org/remotecontent?filepath=junit/junit/4.11/junit-4.11.pom -Source1: junit-4.11.pom -#PATCH-FIX-OPENSUSE: do not use bundled hamcrest sources, which btw fixes hamcrest build with junit4 -Patch0: junit-no-hamcrest-src.patch -#PATCH-FIX-UPSTREAM: build with jdk8 and newer, already in upstream repo -Patch1: junit-jdk8.patch -Patch2: junit-jdk9.patch -Patch3: junit-jdk10.patch -Patch4: junit-jdk11.patch +Source1: build.xml +Patch0: junit-jdk10.patch +Patch1: junit-jdk11.patch BuildRequires: ant BuildRequires: fdupes BuildRequires: hamcrest >= 1.3 BuildRequires: java-devel >= 1.6.0 BuildRequires: javapackages-local -BuildRequires: javapackages-tools BuildRequires: perl(Digest::MD5) Requires: hamcrest -Requires: java >= 1.6.0 +Requires: java >= 1.6 Requires(post): javapackages-tools Requires(postun): javapackages-tools Provides: junit4 = %{version} @@ -50,45 +43,30 @@ %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} -Group: Documentation/Other -Provides: junit4-manual = %{version} -Obsoletes: junit4-manual <= 4.10 - -%description manual -Manual for %{name}. +It is used by the developer who implements unit tests in Java. %package javadoc Summary: Javadoc for %{name} Group: Documentation/HTML Provides: junit4-javadoc = %{version} Obsoletes: junit4-javadoc <= 4.10 - -%description javadoc -Javadoc for %{name}. - -%package demo -Summary: Demos for %{name} -Group: Documentation/Other -Requires: %{name} = %{version} +Provides: junit4-manual = %{version} +Obsoletes: junit4-manual <= 4.10 Provides: junit4-demo = %{version} Obsoletes: junit4-demo <= 4.10 +Provides: %{name}-manual = %{version} +Obsoletes: %{name}-manual < %{version} +Provides: %{name}-demo = %{version} +Obsoletes: %{name}-demo < %{version} -%description demo -Demos for %{name}. +%description javadoc +Javadoc for %{name}. %prep -%setup -q -n junit-r%{version} +%setup -q -n junit4-r%{version} +cp %{SOURCE1} . %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 find . -type f -name "*.jar" -or -name "*.class" | xargs -t rm -rf @@ -96,7 +74,7 @@ %build export CLASSPATH=$(build-classpath hamcrest/core) -ant dist -Dversion-status= +ant jars javadoc -Dversion-status= %install # jars @@ -107,7 +85,7 @@ # pom install -d -m 755 %{buildroot}%{_mavenpomdir} -install -m 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom +install -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %add_maven_depmap # javadoc @@ -115,11 +93,6 @@ cp -pr junit%{version}/javadoc/* %{buildroot}%{_javadocdir}/%{name} %fdupes -s %{buildroot}%{_javadocdir}/%{name} -# demo -install -d -m 755 %{buildroot}%{_datadir}/%{name}/demo/junit # Not using % name for last part because it is - # part of package name -cp -pr junit%{version}/junit/* %{buildroot}%{_datadir}/%{name}/demo/junit - %check cat > test.java <<EOF @@ -137,19 +110,17 @@ grep 'Exception in thread "main" java.lang.AssertionError: Hello world from junit' %files -%doc CODING_STYLE LICENSE README acknowledgements.txt +%doc CODING_STYLE.txt LICENSE-junit.txt README.md acknowledgements.txt %{_javadir}/%{name}.jar %{_javadir}/junit4.jar %{_mavenpomdir}/* +%if %{defined _maven_repository} +%{_mavendepmapfragdir}/%{name} +%else %{_datadir}/maven-metadata/%{name}.xml* - -%files demo -%{_datadir}/%{name} +%endif %files javadoc %{_javadocdir}/%{name} -%files manual -%doc junit%{version}/doc/* - %changelog ++++++ build.xml ++++++ <project name="junit" default="dist" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant"> <tstamp /> <taskdef resource="net/sf/antcontrib/antcontrib.properties"/> <property file="${user.home}/.junit.properties" /> <property name="src" value="src/main/java" /> <property name="target" location="target" /> <property name="bin" location="${target}/main" /> <property name="version-base" value="4.12" /> <property name="version-status" value="-SNAPSHOT" /> <property name="version" value="${version-base}${version-status}" /> <property name="dist" value="junit${version}" /> <property name="versionfile" value="${src}/junit/runner/Version.java" /> <property name="zipfile" value="${dist}/${dist}.zip" /> <property name="testsrc" location="src/test/java" /> <property name="testrsrc" location="src/test/resources" /> <property name="testbin" location="${target}/test/java" /> <property name="unjarred" value="**/*.jar, ${testfiles}, doc/**, README.html, .classpath, .project, cpl-v10.html" /> <property name="binjar" value="junit-${version}.jar" /> <property name="srcjar" value="junit-${version}-src.jar" /> <property name="docjar" value="junit-${version}-javadoc.jar" /> <property name="depjar" value="junit-dep-${version}.jar" /> <property name="depsrcjar" value="junit-dep-${version}-src.jar" /> <property name="depdocjar" value="junit-dep-${version}-javadoc.jar" /> <property name="javadocdir" location="${dist}/javadoc" /> <property name="javadoczip" location="${dist}-javadoc.zip" /> <property name="hamcrestlib" location="lib/hamcrest-core-1.3.jar" /> <property name="hamcrestlibsources" location="lib/hamcrest-core-1.3-sources.jar" /> <property name="hamcrestsrc" location="${dist}/temp.hamcrest.source" /> <property name="maven.deploy.goal" value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" /> <target name="init"> <tstamp/> </target> <target name="versiontag" depends="init"> <filter token="version" value="${version}" /> <copy file="${versionfile}.template" tofile="${versionfile}" filtering="on" overwrite="true" /> </target> <target name="clean"> <!-- If two builds are made within a minute --> <delete dir="${dist}" quiet="true" /> <!-- Delete all previous temporary build artifacts --> <delete dir="${target}" quiet="true" /> <delete file="${zipfile}" quiet="true"/> <delete file="${javadoczip}" /> </target> <macrodef name="junit_compilation"> <attribute name="srcdir"/> <attribute name="destdir"/> <attribute name="classpath"/> <sequential> <mkdir dir="@{destdir}"/> <javac srcdir="@{srcdir}" destdir="@{destdir}" debug="on" classpath="@{classpath}" includeantruntime="false" source="1.6" target="1.6" > <compilerarg value="-Xlint:unchecked" /> </javac> </sequential> </macrodef> <target name="build" depends="versiontag"> <junit_compilation srcdir="${src}" destdir="${bin}" classpath="${hamcrestlib}"/> <unjar src="${hamcrestlib}" dest="${bin}" /> <junit_compilation srcdir="${testsrc}" destdir="${testbin}" classpath="${hamcrestlib};${bin}"/> </target> <target name="jars" depends="build"> <mkdir dir="${dist}" /> <jar jarfile="${dist}/${srcjar}" basedir="${src}" excludes="${unjarred}, **/*.class" /> <jar jarfile="${dist}/${binjar}" basedir="${bin}" excludes="${unjarred}, **/*.java, build.xml" /> <jar jarfile="${dist}/${depjar}" basedir="${bin}" excludes="${unjarred}, org/hamcrest/**, **/*.java, build.xml" /> </target> <target name="all.maven.jars" depends="jars,javadoc"> <mkdir dir="${dist}" /> <jar jarfile="${dist}/${depsrcjar}" basedir="${src}" excludes="${unjarred}, **/*.class" /> <jar jarfile="${dist}/${depdocjar}" basedir="${javadocdir}" excludes="${unjarred}, org/hamcrest/**" /> </target> <target name="samples-and-tests"> <copy todir="${dist}"> <fileset dir="${testbin}" /> <fileset dir="${testsrc}" /> <fileset dir="${testrsrc}" /> </copy> </target> <target name="javadoc"> <javadoc destdir="${javadocdir}" source="1.6" author="false" version="false" use="false" windowtitle="JUnit API" > <excludepackage name="junit.*" /> <excludepackage name="org.junit.internal.*" /> <excludepackage name="org.junit.experimental.theories.internal.*" /> <sourcepath location="${src}" /> <sourcepath location="${hamcrestsrc}" /> </javadoc> </target> <target name="javadoczip"> <delete file="${javadoczip}" /> <antcall target="javadoc" /> <zip basedir="${javadocdir}" file="${javadoczip}" /> </target> <target name="populate-dist" depends="clean, build, jars, samples-and-tests, javadoc" > <copy todir="${dist}/doc"> <fileset dir="doc"/> </copy> <copy file="README.md" tofile="${dist}/README.md" /> <copy file="BUILDING" tofile="${dist}/BUILDING" /> <copy file="epl-v10.html" tofile="${dist}/epl-v10.html" /> <copy file="build.xml" tofile="${dist}/build.xml" /> </target> <macrodef name="run-dist-tests"> <!-- Runs the tests against the built jar files --> <element name="extra-args" implicit="yes" /> <sequential> <java classname="org.junit.runner.JUnitCore" fork="yes" failonerror="true"> <extra-args /> <arg value="org.junit.tests.AllTests"/> <classpath> <pathelement location="${dist}" /> <pathelement location="${dist}/${binjar}" /> </classpath> </java> </sequential> </macrodef> <macrodef name="run-local-tests"> <!-- Runs the tests against the local class files --> <sequential> <java classname="org.junit.runner.JUnitCore" fork="yes" failonerror="true"> <arg value="org.junit.tests.AllTests"/> <classpath> <pathelement location="${bin}" /> <pathelement location="${testbin}" /> <pathelement location="${hamcrestlib}" /> </classpath> </java> </sequential> </macrodef> <target name="test" depends="build"> <run-local-tests /> </target> <target name="dist" depends="populate-dist"> <run-dist-tests> <jvmarg value="-Dignore.this=ignored"/> </run-dist-tests> </target> <target name="profile" depends="populate-dist"> <run-dist-tests> <jvmarg value="-agentlib:hprof=cpu=samples"/> </run-dist-tests> </target> <target name="zip" depends="dist"> <zip zipfile="${zipfile}" basedir="." includes="${dist}/**" /> </target> <target name="upload.to.sourceforge" depends="zip"> <ftp server="upload.sourceforge.net" userid="anonymous" password="[email protected]" remotedir="incoming" > <fileset dir="${dist}" includes="*.jar" /> <fileset file="${zipfile}" /> </ftp> <echo message="To upload docs, use build/upload_docs.sh" /> </target> <!-- to do automatic build upload, you need the maven ant tasks jar. --> <!-- therefore, you must run ant as ant -lib build/lib stage.maven --> <macrodef name="push.maven.artifact"> <attribute name="file" /> <attribute name="pom" /> <attribute name="packaging" /> <attribute name="url" /> <attribute name="repo.id" /> <element name="artifact.args" implicit="true" optional="true" /> <sequential> <artifact:mvn failonerror="true"> <arg value="${maven.deploy.goal}" /> <arg value="-Durl=@{url}" /> <arg value="-DrepositoryId=@{repo.id}" /> <arg value="-DpomFile=@{pom}" /> <arg value="-Dfile=@{file}" /> <arg value="-Dpackaging=@{packaging}" /> <artifact.args /> <arg value="-Pgpg" /> </artifact:mvn> </sequential> </macrodef> <macrodef name="push.maven.jar"> <attribute name="jar" /> <attribute name="pom" /> <attribute name="url" /> <attribute name="repo.id" /> <element name="artifact.args" implicit="true" optional="true" /> <sequential> <echo message="Pushing JAR to Maven: @{jar} -> @{url}" /> <push.maven.artifact file="@{jar}" pom="@{pom}" packaging="jar" url="@{url}" repo.id="@{repo.id}"> <artifact.args /> </push.maven.artifact> </sequential> </macrodef> <macrodef name="push.maven.pom"> <attribute name="pom" /> <attribute name="url" /> <attribute name="repo.id" /> <element name="artifact.args" implicit="true" optional="true" /> <sequential> <echo message="Pushing POM to Maven: @{pom} -> @{url}" /> <push.maven.artifact file="@{pom}" pom="@{pom}" packaging="pom" url="@{url}" repo.id="@{repo.id}"> <artifact.args /> </push.maven.artifact> </sequential> </macrodef> <macrodef name="push.junit.maven.artifact"> <attribute name="url" /> <attribute name="repo.id" /> <attribute name="is.snapshot" default="true" /> <sequential> <local name="m.prefix" /> <property name="m.prefix" value="${dist}/junit-dep-${version}" /> <local name="m.jar" /> <property name="m.jar" value="${m.prefix}.jar" /> <local name="m.sources.jar" /> <property name="m.sources.jar" value="${m.prefix}-src.jar" /> <local name="m.javadoc.jar" /> <property name="m.javadoc.jar" value="${m.prefix}-javadoc.jar" /> <local name="m.pom" /> <property name="m.pom" value="${dist}/pom-junit.xml" /> <filter token="version" value="${version}" /> <copy file="build/maven/junit-pom-template.xml" tofile="${m.pom}" filtering="on" overwrite="true" /> <push.maven.jar jar="${m.jar}" pom="${m.pom}" url="@{url}" repo.id="@{repo.id}" /> <if> <equals arg1="@{is.snapshot}" arg2="false" /> <then> <push.maven.jar jar="${m.sources.jar}" pom="${m.pom}" url="@{url}" repo.id="@{repo.id}"> <arg value="-Dclassifier=sources" /> </push.maven.jar> <push.maven.jar jar="${m.javadoc.jar}" pom="${m.pom}" url="@{url}" repo.id="@{repo.id}"> <arg value="-Dclassifier=javadoc" /> </push.maven.jar> </then> </if> </sequential> </macrodef> <macrodef name="push.junit-dep.maven.artifact"> <attribute name="url" /> <attribute name="repo.id" /> <sequential> <local name="m.pom" /> <property name="m.pom" value="${dist}/pom-junit-dep.xml" /> <filter token="version" value="${version}" /> <copy file="build/maven/junit-dep-pom-template.xml" tofile="${m.pom}" filtering="on" overwrite="true" /> <push.maven.pom pom="${m.pom}" url="@{url}" repo.id="@{repo.id}" /> </sequential> </macrodef> <target name="stage.maven" depends="all.maven.jars"> <property name="stage.url" value="https://oss.sonatype.org/service/local/staging/deploy/maven2/"; /> <property name="stage.repo.id" value="sonatype-nexus-staging" /> <push.junit.maven.artifact url="${stage.url}" repo.id="${stage.repo.id}" is.snapshot="false" /> <push.junit-dep.maven.artifact url="${stage.url}" repo.id="${stage.repo.id}" /> </target> <target name="snapshot.maven" depends="all.maven.jars"> <property name="snapshot.url" value="https://oss.sonatype.org/content/repositories/snapshots/"; /> <property name="snapshot.repo.id" value="sonatype-nexus-snapshots" /> <push.junit.maven.artifact url="${snapshot.url}" repo.id="${snapshot.repo.id}" /> <push.junit-dep.maven.artifact url="${snapshot.url}" repo.id="${snapshot.repo.id}" /> </target> <target name="print.version"> <echo message="${version}" /> </target> </project> ++++++ r4.11.tar.gz -> r4.12.tar.gz ++++++ ++++ 32488 lines of diff (skipped)
