From 94bbabc3c827ee7adcc2069cabbc5c7f545eeb331c0178ea68083b64be1a74bc Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 26 Apr 2022 17:12:47 +0000
Subject: [PATCH 1/2] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/maven-filtering?expand=0&rev=7

---
 maven-filtering-3.1.1-source-release.zip |   3 -
 maven-filtering-3.2.0-source-release.zip |   3 +
 maven-filtering-build.xml                | 111 +----------------------
 maven-filtering.spec                     |  36 ++++----
 4 files changed, 25 insertions(+), 128 deletions(-)
 delete mode 100644 maven-filtering-3.1.1-source-release.zip
 create mode 100644 maven-filtering-3.2.0-source-release.zip

diff --git a/maven-filtering-3.1.1-source-release.zip b/maven-filtering-3.1.1-source-release.zip
deleted file mode 100644
index 350fed8..0000000
--- a/maven-filtering-3.1.1-source-release.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:df17c02da9c0dee03efa89a9273d4e4185bd80ca607c020d15ed6b0b196c9927
-size 152814
diff --git a/maven-filtering-3.2.0-source-release.zip b/maven-filtering-3.2.0-source-release.zip
new file mode 100644
index 0000000..832ffa9
--- /dev/null
+++ b/maven-filtering-3.2.0-source-release.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c7655bfb5c653ab04289efbf63e9606bf1fa44f3a0b9e07bc5ad76118c33e13b
+size 161793
diff --git a/maven-filtering-build.xml b/maven-filtering-build.xml
index 7a28efa..8d2a597 100644
--- a/maven-filtering-build.xml
+++ b/maven-filtering-build.xml
@@ -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.1.1"/>
+  <property name="project.version" value="3.2.0"/>
   <property name="project.name" value="Apache Maven Filtering"/>
   <property name="project.organization.name" value="The Apache Software Foundation"/>
 
-  <property name="spec.version" value="3.1"/>
+  <property name="spec.version" value="3.2"/>
 
   <property name="compiler.source" value="1.8"/>
   <property name="compiler.target" value="${compiler.source}"/>
@@ -24,10 +24,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"/>
 
   <!-- ====================================================================== -->
@@ -39,11 +36,6 @@
       <include name="**/*.jar"/>
     </fileset>
   </path>
-  <path id="build.test.classpath">
-    <fileset dir="lib">
-      <include name="**/*.jar"/>
-    </fileset>
-  </path>
 
   <!-- ====================================================================== -->
   <!-- Cleaning up target                                                     -->
@@ -104,101 +96,6 @@
     </java>
   </target>
 
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests"
-          depends="plexus"
-          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                                                         -->
   <!-- ====================================================================== -->
@@ -232,7 +129,7 @@
   <!-- Package target                                                         -->
   <!-- ====================================================================== -->
 
-  <target name="package" depends="plexus,test" description="Package the application">
+  <target name="package" depends="plexus" description="Package the application">
     <jar jarfile="${build.dir}/${build.finalName}.jar"
          compress="true"
          index="false"
diff --git a/maven-filtering.spec b/maven-filtering.spec
index 3384522..d0a75e1 100644
--- a/maven-filtering.spec
+++ b/maven-filtering.spec
@@ -17,16 +17,17 @@
 
 
 Name:           maven-filtering
-Version:        3.1.1
+Version:        3.2.0
 Release:        0
 Summary:        Shared component providing resource filtering
 License:        Apache-2.0
 Group:          Development/Libraries/Java
-URL:            http://maven.apache.org/shared/%{name}/index.html
-Source0:        http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
+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
@@ -48,7 +49,6 @@ BuildRequires:  qdox
 BuildRequires:  sisu-inject
 BuildRequires:  sisu-plexus
 BuildRequires:  unzip
-BuildRequires:  xbean
 BuildRequires:  xmvn-install
 BuildRequires:  xmvn-resolve
 BuildRequires:  mvn(org.apache.maven.shared:maven-shared-components:pom:)
@@ -73,32 +73,32 @@ cp %{SOURCE1} build.xml
 %build
 mkdir -p lib
 build-jar-repository -s lib \
+    maven/maven-core \
+    maven/maven-model \
+    maven/maven-settings \
+    org.eclipse.sisu.plexus \
+    plexus-containers/plexus-component-annotations \
+    maven-shared-utils/maven-shared-utils \
+    plexus/utils \
+    plexus/interpolation \
+    plexus/plexus-build-api \
+    commons-io \
+    jsr-305 \
+    \
     atinject \
     commons-cli \
     guava/guava \
     guice/google-guice-no_aop \
     jdom2/jdom2 \
-    jsr-305 \
-    maven/maven-core \
-    maven/maven-model \
-    maven/maven-settings \
-    maven-shared-utils/maven-shared-utils \
     objectweb-asm/asm \
     org.eclipse.sisu.inject \
-    org.eclipse.sisu.plexus \
     plexus-classworlds \
-    plexus/cli \
-    plexus-containers/plexus-component-annotations \
-    plexus/interpolation \
     plexus-metadata-generator \
-    plexus/plexus-build-api \
-    plexus/utils \
-    qdox \
-    xbean/xbean-reflect
+    plexus/cli \
+    qdox
 
 # Tests use a package that is no longer present in plexus-build-api (v0.0.7)
 %{ant} \
-  -Dtest.skip=true \
   jar javadoc
 
 %{mvn_artifact} pom.xml target/%{name}-%{version}.jar

From 02613e83476ed6900ea0b3f06329aa4c06f3b51e095a80ecfb9822558fdae2cd Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Thu, 28 Apr 2022 11:54:48 +0000
Subject: [PATCH 2/2] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/maven-filtering?expand=0&rev=8

---
 maven-filtering.changes | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maven-filtering.changes b/maven-filtering.changes
index 93414e8..8252237 100644
--- a/maven-filtering.changes
+++ b/maven-filtering.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 28 11:53:54 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to version 3.2.0
+  * needed by maven-resources-plugin 3.2.0
+
 -------------------------------------------------------------------
 Sun Mar 20 20:12:41 UTC 2022 - Fridrich Strba <fstrba@suse.com>