Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package maven-verifier for openSUSE:Factory checked in at 2023-09-07 21:12:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/maven-verifier (Old) and /work/SRC/openSUSE:Factory/.maven-verifier.new.1766 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-verifier" Thu Sep 7 21:12:45 2023 rev:4 rq:1109320 version:1.6 Changes: -------- --- /work/SRC/openSUSE:Factory/maven-verifier/maven-verifier.changes 2022-03-21 20:11:24.608403073 +0100 +++ /work/SRC/openSUSE:Factory/.maven-verifier.new.1766/maven-verifier.changes 2023-09-07 21:13:33.247049307 +0200 @@ -1,0 +2,5 @@ +Wed Sep 6 18:27:57 UTC 2023 - Fridrich Strba <[email protected]> + +- Remove unnecessary dependency on xmvn tools and parent pom + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ maven-verifier.spec ++++++ --- /var/tmp/diff_new_pack.ji9uX2/_old 2023-09-07 21:13:34.371089490 +0200 +++ /var/tmp/diff_new_pack.ji9uX2/_new 2023-09-07 21:13:34.371089490 +0200 @@ -1,7 +1,7 @@ # # spec file for package maven-verifier # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,29 +16,22 @@ # -%bcond_with tests Name: maven-verifier Version: 1.6 Release: 0 Summary: Test harness for Maven integration tests License: Apache-2.0 Group: Development/Libraries/Java -URL: http://maven.apache.org/shared/maven-verifier -Source0: http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip +URL: https://maven.apache.org/shared/maven-verifier +Source0: https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip Source1: %{name}-build.xml BuildRequires: ant BuildRequires: fdupes -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildRequires: junit BuildRequires: maven-shared-utils BuildRequires: unzip -BuildRequires: xmvn-install -BuildRequires: xmvn-resolve -BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:) BuildArch: noarch -%if %{with tests} -BuildRequires: ant-junit -%endif %description Provides a test harness for Maven integration tests. @@ -61,20 +54,25 @@ junit %{ant} \ -%if %{without tests} - -Dtest.skip=true \ -%endif jar javadoc -%{mvn_artifact} pom.xml target/%{name}-%{version}.jar - %install -%mvn_install +# jar +install -dm 0755 %{buildroot}%{_javadir}/%{name} +install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar +# pom +install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} +%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom +%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar +# javadoc +install -dm 0755 %{buildroot}%{_javadocdir}/%{name} +cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ %fdupes -s %{buildroot}%{_javadocdir} %files -f .mfiles %license LICENSE NOTICE -%files javadoc -f .mfiles-javadoc +%files javadoc +%{_javadocdir}/%{name} %license LICENSE NOTICE ++++++ maven-verifier-build.xml ++++++ --- /var/tmp/diff_new_pack.ji9uX2/_old 2023-09-07 21:13:34.403090634 +0200 +++ /var/tmp/diff_new_pack.ji9uX2/_new 2023-09-07 21:13:34.407090777 +0200 @@ -22,9 +22,7 @@ <property name="build.outputDir" value="${build.dir}/classes"/> <property name="build.srcDir" value="src/main/java"/> <property name="build.resourceDir" value="src/main/resources"/> - <property name="build.testOutputDir" value="${build.dir}/test-classes"/> - <property name="build.testDir" value="src/test/java"/> - <property name="build.testResourceDir" value="src/test/resources"/> + <property name="test.reports" value="${build.dir}/test-reports"/> <property name="reporting.outputDirectory" value="${build.dir}/site"/> @@ -37,11 +35,6 @@ <include name="**/*.jar"/> </fileset> </path> - <path id="build.test.classpath"> - <fileset dir="lib"> - <include name="**/*.jar"/> - </fileset> - </path> <!-- ====================================================================== --> <!-- Cleaning up target --> @@ -74,100 +67,6 @@ </target> <!-- ====================================================================== --> - <!-- Test-compilation target --> - <!-- ====================================================================== --> - - <target name="compile-tests" - depends="compile" - description="Compile the test code" - unless="test.skip"> - <mkdir dir="${build.testOutputDir}"/> - <javac destdir="${build.testOutputDir}" - nowarn="false" - debug="true" - optimize="false" - deprecation="true" - target="${compiler.target}" - verbose="false" - fork="false" - source="${compiler.source}"> - <src> - <pathelement location="${build.testDir}"/> - </src> - <classpath> - <path refid="build.test.classpath"/> - <pathelement location="${build.outputDir}"/> - </classpath> - </javac> - <copy todir="${build.testOutputDir}"> - <fileset dir="${build.testResourceDir}"/> - </copy> - </target> - - <!-- ====================================================================== --> - <!-- Run all tests --> - <!-- ====================================================================== --> - - <target name="test" - depends="compile-tests, junit-missing" - unless="junit.skipped" - description="Run the test cases"> - <mkdir dir="${test.reports}"/> - <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir="."> - <sysproperty key="basedir" value="."/> - <formatter type="xml"/> - <formatter type="plain" usefile="false"/> - <classpath> - <path refid="build.test.classpath"/> - <pathelement location="${build.outputDir}"/> - <pathelement location="${build.testOutputDir}"/> - </classpath> - <batchtest todir="${test.reports}" unless="test"> - <fileset dir="${build.testDir}"> - <include name="**/Test*.java"/> - <include name="**/*Test.java"/> - <include name="**/*TestCase.java"/> - <exclude name="**/*Abstract*Test.java"/> - </fileset> - </batchtest> - <batchtest todir="${test.reports}" if="test"> - <fileset dir="${build.testDir}"> - <include name="**/${test}.java"/> - <exclude name="**/*Abstract*Test.java"/> - </fileset> - </batchtest> - </junit> - </target> - - <target name="test-junit-present"> - <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/> - </target> - - <target name="test-junit-status" - depends="test-junit-present"> - <condition property="junit.missing"> - <and> - <isfalse value="${junit.present}"/> - <isfalse value="${test.skip}"/> - </and> - </condition> - <condition property="junit.skipped"> - <or> - <isfalse value="${junit.present}"/> - <istrue value="${test.skip}"/> - </or> - </condition> - </target> - - <target name="junit-missing" - depends="test-junit-status" - if="junit.missing"> - <echo>=================================== WARNING ===================================</echo> - <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo> - <echo>===============================================================================</echo> - </target> - - <!-- ====================================================================== --> <!-- Javadoc target --> <!-- ====================================================================== --> @@ -200,7 +99,7 @@ <!-- Package target --> <!-- ====================================================================== --> - <target name="package" depends="compile,test" description="Package the application"> + <target name="package" depends="compile" description="Package the application"> <jar jarfile="${build.dir}/${build.finalName}.jar" compress="true" index="false"
