Accepting request 1286671 from Java:packages

minimal fix to mess up the green colour of staging

OBS-URL: https://build.opensuse.org/request/show/1286671
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-commons-fileupload?expand=0&rev=5

apache-commons-fileupload-build.xml

@@ -8,7 +8,7 @@
 
   <property file="build.properties"/>
 
-  <property name="build.finalName" value="commons-fileupload-1.5"/>
+  <property name="build.finalName" value="commons-fileupload-1.6.0"/>
   <property name="build.dir" value="target"/>
   <property name="build.outputDir" value="${build.dir}/classes"/>
   <property name="build.srcDir.0" value="src/main/java"/>
@@ -220,21 +220,21 @@
 		<attribute name="Bundle-Name" value="Apache Commons FileUpload"/>
 		<attribute name="Bundle-SymbolicName" value="org.apache.commons.fileupload"/>
 		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
-		<attribute name="Bundle-Version" value="1.5.0"/>
+		<attribute name="Bundle-Version" value="1.6.0"/>
 		<attribute name="DynamicImport-Package" value="javax.portlet"/>
-		<attribute name="Export-Package" value="org.apache.commons.fileupload;version=&quot;1.5&quot;,org.apache.commons.fileupload.disk;version=&quot;1.5&quot;,org.apache.commons.fileupload.portlet;version=&quot;1.5&quot;,org.apache.commons.fileupload.servlet;version=&quot;1.5&quot;,org.apache.commons.fileupload.util;version=&quot;1.5&quot;"/>
+		<attribute name="Export-Package" value="org.apache.commons.fileupload;version=&quot;1.6.0&quot;,org.apache.commons.fileupload.disk;version=&quot;1.6.0&quot;,org.apache.commons.fileupload.portlet;version=&quot;1.6.0&quot;,org.apache.commons.fileupload.servlet;version=&quot;1.6.0&quot;,org.apache.commons.fileupload.util;version=&quot;1.6.0&quot;"/>
 		<attribute name="Implementation-Title" value="Apache Commons FileUpload"/>
 		<attribute name="Implementation-URL" value="http://commons.apache.org/proper/commons-fileupload/"/>
 		<attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
 		<attribute name="Implementation-Vendor-Id" value="org.apache"/>
-		<attribute name="Implementation-Version" value="1.5"/>
+		<attribute name="Implementation-Version" value="1.6.0"/>
 		<attribute name="Import-Package" value="javax.servlet,javax.servlet.http,org.apache.commons.io,org.apache.commons.io.output"/>
 		<attribute name="Include-Resource" value="META-INF/NOTICE.txt=NOTICE.txt,META-INF/LICENSE.txt=LICENSE.txt"/>
 		<attribute name="Private-Package" value="org.apache.commons.fileupload.util.mime"/>
 		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.8))&quot;"/>
 		<attribute name="Specification-Title" value="Apache Commons FileUpload"/>
 		<attribute name="Specification-Vendor" value="The Apache Software Foundation"/>
-		<attribute name="Specification-Version" value="1.5"/>
+		<attribute name="Specification-Version" value="1.6"/>
       </manifest>
     </jar>
   </target>

apache-commons-fileupload.changes

@@ -1,3 +1,46 @@
+-------------------------------------------------------------------
+Tue Jun 17 16:04:25 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to upstream version 1.6.0
+  * Fixes bsc#1244657, CVE-2025-48976
+  * New features:
+    + [1.x] Enable multipart/related on FileUpload #314.
+    + Add JApiCmp to the default Maven goal.
+    + Add partHeaderSizeMax, a new limit that sets a maximum number
+      of bytes for each individual multipart header. The default is
+      512 bytes.
+  * Fixed Bugs:
+    + Replace use of Locale.ENGLISH with Locale.ROOT.
+    + Remove unused exception from FileUploadBase.createItem(Map,
+      boolean).
+    + Migrate from deprecated API in DiskFileItem.getOutputStream().
+    + Use try-with-resources.
+    + Port to Java 1.4 Throwable APIs (!).
+    + Remove -nouses directive from maven-bundle-plugin. OSGi
+      package imports now state 'uses' definitions for package
+      imports, this doesn't affect JPMS (from
+      org.apache.commons:commons-parent:80).
+    + DiskFileItem.getInputStream() now uses NIO.
+    + Last statement in DiskFileItem.finalize() method should be a
+      call to super.finalize().
+    + org.apache.commons.fileupload.FileUploadBase
+      .FileUploadIOException is now a proper Java 1.4-style
+      exception (propagates its cause to super).
+    + Use java.util.Base64 instead of custom code.
+  * Changes:
+    + Bump Java from 6 to 8.
+    + Bump org.apache.commons:commons-parent from 62 to 84, upgrades
+      Doxia from 1 to 2.
+    + Bump commons-io from 2.11.0 to 2.19.0.
+    + Bump javax.servlet:servlet-api from 2.4 to 2.5.
+    + Bump JUnit from junit:junit:4.13.2
+      org.junit.vintage:junit-vintage-engine from parent POM.
+
+-------------------------------------------------------------------
+Wed Oct  2 15:31:16 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Spec file cleanup
+
 -------------------------------------------------------------------
 Tue May 23 04:40:49 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 

apache-commons-fileupload.spec

@@ -1,7 +1,7 @@
 #
-# spec file
+# spec file for package apache-commons-fileupload
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,24 +20,23 @@
 %global short_name commons-%{base_name}
 %bcond_without  portlet
 Name:           apache-%{short_name}
-Version:        1.5
+Version:        1.6.0
 Release:        0
 Summary:        API to work with HTML file upload
 License:        Apache-2.0
 Group:          Development/Libraries/Java
-URL:            http://commons.apache.org/fileupload/
-Source0:        http://archive.apache.org/dist/commons/fileupload/source/commons-fileupload-%{version}-src.tar.gz
+URL:            https://commons.apache.org/fileupload/
+Source0:        https://archive.apache.org/dist/commons/fileupload/source/commons-fileupload-%{version}-src.tar.gz
 Source1:        %{name}-build.xml
 BuildRequires:  ant
 BuildRequires:  apache-commons-io
 BuildRequires:  fdupes
 BuildRequires:  glassfish-servlet-api
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 5
 Provides:       jakarta-%{short_name} = %{version}-%{release}
 Obsoletes:      jakarta-%{short_name} < %{version}-%{release}
 Provides:       %{short_name} = %{version}-%{release}
 Obsoletes:      %{short_name} < %{version}-%{release}
-Requires:       mvn(commons-io:commons-io)
 BuildArch:      noarch
 %if %{with portlet}
 BuildRequires:  apache-portlet-1_0-api
@@ -58,7 +57,7 @@ Group:          Documentation/HTML
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n commons-fileupload-%{version}-src
+%setup -q -n %{short_name}-%{version}-src
 cp %{SOURCE1} build.xml
 sed -i 's/\r//' LICENSE.txt
 sed -i 's/\r//' NOTICE.txt
@@ -73,7 +72,7 @@ sed -i "s|<groupId>portlet-api</groupId>|<groupId>javax.portlet</groupId>|" pom.
 rm -r src/main/java/org/apache/commons/fileupload/portlet
 %endif
 
-%{pom_remove_parent}
+%pom_remove_parent
 
 %build
 mkdir -p lib
@@ -96,7 +95,7 @@ install -pm 0644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{s
 ln -sf %{short_name}.jar %{buildroot}%{_javadir}/%{name}.jar
 # pom
 install -dm 0755 %{buildroot}%{_mavenpomdir}
-install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}.pom
+%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}.pom
 %add_maven_depmap %{short_name}.pom %{short_name}.jar -a org.apache.commons:commons-fileupload
 # javadoc
 install -dm 0755 %{buildroot}%{_javadocdir}/%{name}

commons-fileupload-1.5-src.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bb2d61657c82d9f728d09be99fee0b665ef85428d98cabc45579037c831449ca
-size 1108028

commons-fileupload-1.6.0-src.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2e5b90da7bbf53529022fdbe020a072619fad7aed1f8efa8b7f9eb09081f0738
+size 3412034