diff --git a/maven-filtering-3.2.0-source-release.zip b/maven-filtering-3.2.0-source-release.zip
deleted file mode 100644
index 832ffa9..0000000
--- a/maven-filtering-3.2.0-source-release.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c7655bfb5c653ab04289efbf63e9606bf1fa44f3a0b9e07bc5ad76118c33e13b
-size 161793
diff --git a/maven-filtering-3.3.1-source-release.zip b/maven-filtering-3.3.1-source-release.zip
new file mode 100644
index 0000000..70dfaad
--- /dev/null
+++ b/maven-filtering-3.3.1-source-release.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6c080b49c40b963b0781438520319d0b41d46c63ddda5e6c5f7ee0cefb68f38d
+size 172597
diff --git a/maven-filtering-build.xml b/maven-filtering-build.xml
index 8d2a597..37c0673 100644
--- a/maven-filtering-build.xml
+++ b/maven-filtering-build.xml
@@ -10,11 +10,11 @@
-
+
-
+
@@ -69,31 +69,25 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ description="Generate javax.inject.Name index">
+
+
+
+
+
+
+
+
+
+
+
@@ -129,7 +123,7 @@
-
+
+
+- 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.
+
-------------------------------------------------------------------
Thu Apr 28 11:53:54 UTC 2022 - Fridrich Strba
diff --git a/maven-filtering.spec b/maven-filtering.spec
index d0a75e1..dba91e9 100644
--- a/maven-filtering.spec
+++ b/maven-filtering.spec
@@ -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 @@ URL: https://maven.apache.org/shared/%{name}/index.html
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 @@ This package contains the API documentation for %{name}.
%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