Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package maven-file-management for
openSUSE:Factory checked in at 2023-09-07 21:12:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/maven-file-management (Old)
and /work/SRC/openSUSE:Factory/.maven-file-management.new.1766 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-file-management"
Thu Sep 7 21:12:48 2023 rev:4 rq:1109324 version:3.0.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/maven-file-management/maven-file-management.changes
2022-05-13 23:03:36.611147313 +0200
+++
/work/SRC/openSUSE:Factory/.maven-file-management.new.1766/maven-file-management.changes
2023-09-07 21:13:42.459378628 +0200
@@ -1,0 +2,5 @@
+Wed Sep 6 18:53:17 UTC 2023 - Fridrich Strba <fst...@suse.com>
+
+- Remove unnecessary dependency on xmvn tools and parent pom
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ maven-file-management.spec ++++++
--- /var/tmp/diff_new_pack.LY1DwV/_old 2023-09-07 21:13:43.471414806 +0200
+++ /var/tmp/diff_new_pack.LY1DwV/_new 2023-09-07 21:13:43.471414806 +0200
@@ -1,7 +1,7 @@
#
# spec file for package maven-file-management
#
-# 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,19 +16,18 @@
#
-%bcond_with tests
Name: maven-file-management
Version: 3.0.0
Release: 0
Summary: Maven File Management API
License: Apache-2.0
Group: Development/Libraries/Java
-URL: http://maven.apache.org/shared/file-management
-Source0:
http://repo1.maven.org/maven2/org/apache/maven/shared/file-management/%{version}/file-management-%{version}-source-release.zip
+URL: https://maven.apache.org/shared/file-management
+Source0:
https://repo1.maven.org/maven2/org/apache/maven/shared/file-management/%{version}/file-management-%{version}-source-release.zip
Source1: %{name}-build.xml
BuildRequires: ant
BuildRequires: fdupes
-BuildRequires: javapackages-local
+BuildRequires: javapackages-local >= 6
BuildRequires: maven-lib
BuildRequires: maven-shared-io
BuildRequires: maven-shared-utils
@@ -36,13 +35,7 @@
BuildRequires: plexus-containers-container-default
BuildRequires: plexus-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 component for plugins to easily resolve project dependencies.
@@ -68,20 +61,25 @@
plexus/utils
%{ant} \
-%if %{without tests}
- -Dtest.skip=true \
-%endif
jar javadoc
-%{mvn_artifact} pom.xml target/file-management-%{version}.jar
-
%install
-%mvn_install
+# jar
+install -dm 0755 %{buildroot}%{_javadir}/%{name}
+install -pm 0644 target/file-management-%{version}.jar
%{buildroot}%{_javadir}/%{name}/file-management.jar
+# pom
+install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
+%{mvn_install_pom} pom.xml
%{buildroot}%{_mavenpomdir}/%{name}/file-management.pom
+%add_maven_depmap %{name}/file-management.pom %{name}/file-management.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-file-management-build.xml ++++++
--- /var/tmp/diff_new_pack.LY1DwV/_old 2023-09-07 21:13:43.507416092 +0200
+++ /var/tmp/diff_new_pack.LY1DwV/_new 2023-09-07 21:13:43.511416236 +0200
@@ -25,10 +25,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"/>
<property name="build.mdoDir" value="src/main/mdo"/>
@@ -43,11 +40,6 @@
<include name="**/*.jar"/>
</fileset>
</path>
- <path id="build.test.classpath">
- <fileset dir="lib">
- <include name="**/*.jar"/>
- </fileset>
- </path>
<!-- ======================================================================
-->
<!-- Cleaning up target
-->
@@ -119,101 +111,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"
- encoding="UTF-8"
- 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
-->
<!-- ======================================================================
-->
@@ -250,7 +147,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"
