Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package maven-filtering for openSUSE:Factory
checked in at 2023-09-06 19:00:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/maven-filtering (Old)
and /work/SRC/openSUSE:Factory/.maven-filtering.new.1766 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-filtering"
Wed Sep 6 19:00:07 2023 rev:6 rq:1109286 version:3.3.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/maven-filtering/maven-filtering.changes
2022-07-14 16:33:52.280605305 +0200
+++
/work/SRC/openSUSE:Factory/.maven-filtering.new.1766/maven-filtering.changes
2023-09-06 19:04:41.585461011 +0200
@@ -1,0 +2,22 @@
+Wed Sep 6 13:00:35 UTC 2023 - Fridrich Strba <[email protected]>
+
+- Upgrade to version 3.3.1
+ * Changes of 3.3.1
+ + MSHARED-1175: Copying x resources from rel/path to rel/path
+ + MSHARED-1213: Bug: filtering existing but 0 byte file
+ + MSHARED-1199: Upgrade parent pom to 39
+ + MSHARED-1112: Ignore setting permissions on non existing dest
+ files/symlinks
+ + MSHARED-1144: remove rendundant error message
+ * Changes of 3.3.0
+ + fixed cloning of MavenResourcesExecution's instances using
+ copyOf() method
+ + MRESOURCES-258: Copying and filtering logic is delegated to
+ FileUtils
+ + replace deprecated methods
+ + replace deprecated code in favor of Java 7 core and apache
+ commons libraries
+ declare dependencies
+ + MSHARED-1080: Parent POM 36, Java8, drop legacy.
+
+-------------------------------------------------------------------
Old:
----
maven-filtering-3.2.0-source-release.zip
New:
----
maven-filtering-3.3.1-source-release.zip
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ maven-filtering.spec ++++++
--- /var/tmp/diff_new_pack.cOJcP9/_old 2023-09-06 19:04:43.109515340 +0200
+++ /var/tmp/diff_new_pack.cOJcP9/_new 2023-09-06 19:04:43.113515483 +0200
@@ -1,7 +1,7 @@
#
# spec file for package maven-filtering
#
-# 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
@@ -17,7 +17,7 @@
Name: maven-filtering
-Version: 3.2.0
+Version: 3.3.1
Release: 0
Summary: Shared component providing resource filtering
License: Apache-2.0
@@ -26,32 +26,17 @@
Source0:
https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
Source1: %{name}-build.xml
BuildRequires: ant
-BuildRequires: apache-commons-cli
BuildRequires: apache-commons-io
BuildRequires: atinject
BuildRequires: fdupes
-BuildRequires: google-guice
-BuildRequires: guava
-BuildRequires: javapackages-local
-BuildRequires: jdom2
-BuildRequires: jsr-305
+BuildRequires: javapackages-local >= 6
BuildRequires: maven-lib
-BuildRequires: maven-shared-utils
-BuildRequires: objectweb-asm
BuildRequires: plexus-build-api
-BuildRequires: plexus-classworlds
-BuildRequires: plexus-cli
-BuildRequires: plexus-containers-component-annotations
BuildRequires: plexus-interpolation
-BuildRequires: plexus-metadata-generator
BuildRequires: plexus-utils
-BuildRequires: qdox
BuildRequires: sisu-inject
-BuildRequires: sisu-plexus
+BuildRequires: slf4j
BuildRequires: unzip
-BuildRequires: xmvn-install
-BuildRequires: xmvn-resolve
-BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:)
BuildArch: noarch
%description
@@ -70,47 +55,43 @@
%setup -q
cp %{SOURCE1} build.xml
+%pom_xpath_remove pom:project/pom:parent/pom:relativePath
+
%build
mkdir -p lib
build-jar-repository -s lib \
+ atinject \
+ commons-io \
maven/maven-core \
maven/maven-model \
maven/maven-settings \
- org.eclipse.sisu.plexus \
- plexus-containers/plexus-component-annotations \
- maven-shared-utils/maven-shared-utils \
+ org.eclipse.sisu.inject \
plexus/utils \
plexus/interpolation \
plexus/plexus-build-api \
- commons-io \
- jsr-305 \
- \
- atinject \
- commons-cli \
- guava/guava \
- guice/google-guice-no_aop \
- jdom2/jdom2 \
- objectweb-asm/asm \
- org.eclipse.sisu.inject \
- plexus-classworlds \
- plexus-metadata-generator \
- plexus/cli \
- qdox
+ slf4j/api
-# Tests use a package that is no longer present in plexus-build-api (v0.0.7)
%{ant} \
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
%changelog
++++++ maven-filtering-build.xml ++++++
--- /var/tmp/diff_new_pack.cOJcP9/_old 2023-09-06 19:04:43.145516624 +0200
+++ /var/tmp/diff_new_pack.cOJcP9/_new 2023-09-06 19:04:43.145516624 +0200
@@ -10,11 +10,11 @@
<property name="project.groupId" value="org.apache.maven.shared"/>
<property name="project.artifactId" value="maven-filtering"/>
- <property name="project.version" value="3.2.0"/>
+ <property name="project.version" value="3.3.1"/>
<property name="project.name" value="Apache Maven Filtering"/>
<property name="project.organization.name" value="The Apache Software
Foundation"/>
- <property name="spec.version" value="3.2"/>
+ <property name="spec.version" value="3.3"/>
<property name="compiler.source" value="1.8"/>
<property name="compiler.target" value="${compiler.source}"/>
@@ -69,31 +69,25 @@
</target>
<!-- ======================================================================
-->
- <!-- Target to generate Plexus component.xml
-->
+ <!-- Sisu javax.inject.Named generation target
-->
<!-- ======================================================================
-->
- <target name="plexus"
+ <target name="sisu"
depends="compile"
- description="Generate Plexus component.xml">
- <mkdir dir="${build.outputDir}/META-INF/plexus"/>
- <java classname="org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli"
- failonerror="true"
- fork="true">
- <!-- <jvmarg value="-verbose"/> -->
- <classpath>
- <path refid="build.classpath"/>
- <pathelement location="${build.outputDir}"/>
- </classpath>
- <arg value="-X"/>
- <arg value="-s"/>
- <arg value="${build.srcDir}"/>
- <arg value="-c"/>
- <arg value="${build.outputDir}"/>
- <arg value="-m"/>
- <arg value="${build.outputDir}/META-INF/plexus"/>
- <arg value="-o"/>
- <arg value="${build.outputDir}/META-INF/plexus/components.xml"/>
- </java>
+ description="Generate javax.inject.Name index">
+ <sequential>
+ <java classname="org.eclipse.sisu.space.SisuIndex"
+ failonerror="true"
+ fork="true">
+ <classpath>
+ <path refid="build.classpath"/>
+ </classpath>
+ <arg value="${build.outputDir}"/>
+ </java>
+ <move todir="${build.outputDir}/META-INF">
+ <fileset dir="META-INF"/>
+ </move>
+ </sequential>
</target>
<!-- ======================================================================
-->
@@ -129,7 +123,7 @@
<!-- Package target
-->
<!-- ======================================================================
-->
- <target name="package" depends="plexus" description="Package the
application">
+ <target name="package" depends="sisu" description="Package the application">
<jar jarfile="${build.dir}/${build.finalName}.jar"
compress="true"
index="false"
