Upgrade apache-commons-net to 3.11.0 and fix build error (#15005)

Author: sandeepkarambelkar

SPECS-EXTENDED/apache-commons-net/apache-commons-net-build.xml

@@ -10,7 +10,7 @@
 
   <property name="project.groupId" value="commons-net"/>
   <property name="project.artifactId" value="commons-net"/>
-  <property name="project.version" value="3.6"/>
+  <property name="project.version" value="3.11.0"/>
   <property name="project.name" value="Apache Commons Net"/>
   <property name="project.description" value="Apache Commons Net library contains a collection of network utilities and protocol implementations. Supported protocols include: Echo, Finger, FTP, NNTP, NTP, POP3(S), SMTP(S), Telnet, Whois"/>
   <property name="project.url" value="http://commons.apache.org/proper/commons-net/"/>
@@ -19,12 +19,12 @@
   <property name="project.organization.name" value="The Apache Software Foundation"/>
   <property name="project.organization.id" value="org.apache"/>
 
-  <property name="bundle.version" value="${project.version}.0"/>
-
-  <property name="compiler.source" value="1.6"/>
+  <property name="spec.version" value="3.11"/>
+  
+  <property name="compiler.source" value="1.8"/>
   <property name="compiler.target" value="${compiler.source}"/>
 
-  <property name="build.finalName" value="${project.artifactId}-3.6"/>
+  <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
   <property name="build.dir" value="target"/>
   <property name="build.outputDir" value="${build.dir}/classes"/>
   <property name="build.srcDir" value="src/main/java"/>
@@ -235,23 +235,23 @@
 		<attribute name="Bundle-Name" value="${project.name}"/>
 		<attribute name="Bundle-SymbolicName" value="org.apache.commons.${project.artifactId}"/>
 		<attribute name="Bundle-Vendor" value="${project.organization.name}"/>
-		<attribute name="Bundle-Version" value="${bundle.version}"/>
-		<attribute name="Export-Package" value="org.apache.commons.net;version=&quot;${project.version}&quot;,org.apache.commons.net.bsd;version=&quot;${project.version}&quot;,org.apache.commons.net.chargen;version=&quot;${project.version}&quot;,org.apache.commons.net.daytime;version=&quot;${project.version}&quot;,org.apache.commons.net.discard;version=&quot;${project.version}&quot;,org.apache.commons.net.echo;version=&quot;${project.version}&quot;,org.apache.commons.net.finger;version=&quot;${project.version}&quot;,org.apache.commons.net.ftp;version=&quot;${project.version}&quot;,org.apache.commons.net.ftp.parser;version=&quot;${project.version}&quot;,org.apache.commons.net.imap;version=&quot;${project.version}&quot;,org.apache.commons.net.io;version=&quot;${project.version}&quot;,org.apache.commons.net.nntp;version=&quot;${project.version}&quot;,org.apache.commons.net.ntp;version=&quot;${project.version}&quot;,org.apache.commons.net.pop3;version=&quot;${project.version}&quot;,org.apache.commons.net.smtp;version=&quot;${project.version}&quot;,org.apache.commons.net.telnet;version=&quot;${project.version}&quot;,org.apache.commons.net.tftp;version=&quot;${project.version}&quot;,org.apache.commons.net.time;version=&quot;${project.version}&quot;,org.apache.commons.net.util;version=&quot;${project.version}&quot;,org.apache.commons.net.whois;version=&quot;${project.version}&quot;"/>
+		<attribute name="Bundle-Version" value="${project.version}"/>
+		<attribute name="Export-Package" value="org.apache.commons.net.bsd;version=&quot;${project.version}&quot;,org.apache.commons.net.chargen;version=&quot;${project.version}&quot;,org.apache.commons.net.daytime;version=&quot;${project.version}&quot;,org.apache.commons.net.discard;version=&quot;${project.version}&quot;,org.apache.commons.net.echo;version=&quot;${project.version}&quot;,org.apache.commons.net.examples.cidr;version=&quot;${project.version}&quot;,org.apache.commons.net.examples.ftp;version=&quot;${project.version}&quot;,org.apache.commons.net.examples.mail;version=&quot;${project.version}&quot;,org.apache.commons.net.examples.nntp;version=&quot;${project.version}&quot;,org.apache.commons.net.examples.ntp;version=&quot;${project.version}&quot;,org.apache.commons.net.examples.telnet;version=&quot;${project.version}&quot;,org.apache.commons.net.examples.unix;version=&quot;${project.version}&quot;,org.apache.commons.net.examples.util;version=&quot;${project.version}&quot;,org.apache.commons.net.examples;version=&quot;${project.version}&quot;,org.apache.commons.net.finger;version=&quot;${project.version}&quot;,org.apache.commons.net.ftp.parser;version=&quot;${project.version}&quot;,org.apache.commons.net.ftp;version=&quot;${project.version}&quot;,org.apache.commons.net.imap;version=&quot;${project.version}&quot;,org.apache.commons.net.io;version=&quot;${project.version}&quot;,org.apache.commons.net.nntp;version=&quot;${project.version}&quot;,org.apache.commons.net.ntp;version=&quot;${project.version}&quot;,org.apache.commons.net.pop3;version=&quot;${project.version}&quot;,org.apache.commons.net.smtp;version=&quot;${project.version}&quot;,org.apache.commons.net.telnet;version=&quot;${project.version}&quot;,org.apache.commons.net.tftp;version=&quot;${project.version}&quot;,org.apache.commons.net.time;version=&quot;${project.version}&quot;,org.apache.commons.net.util;version=&quot;${project.version}&quot;,org.apache.commons.net.whois;version=&quot;${project.version}&quot;,org.apache.commons.net;version=&quot;${project.version}&quot;"/>
 		<attribute name="Implementation-Title" value="${project.name}"/>
 		<attribute name="Implementation-URL" value="${project.url}"/>
 		<attribute name="Implementation-Vendor" value="${project.organization.name}"/>
 		<attribute name="Implementation-Vendor-Id" value="${project.organization.id}"/>
 		<attribute name="Implementation-Version" value="${project.version}"/>
 		<attribute name="Import-Package" value="javax.crypto,javax.crypto.spec,javax.net,javax.net.ssl"/>
-		<attribute name="Include-Resource" value="examples/examples.properties=src/main/resources/examples/examples.properties,META-INF/NOTICE.txt=NOTICE.txt,META-INF/LICENSE.txt=LICENSE.txt"/>
+		<attribute name="Include-Resource" value="org/apache/commons/net/examples/examples.properties=src/main/resources/org/apache/commons/net/examples/examples.properties,META-INF/NOTICE.txt=NOTICE.txt,META-INF/LICENSE.txt=LICENSE.txt"/>
 		<attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/>
 		<attribute name="JavaPackages-GroupId" value="${project.groupId}"/>
 		<attribute name="JavaPackages-Version" value="${project.version}"/>
 		<attribute name="Private-Package" value="examples,examples.cidr,examples.ftp,examples.mail,examples.nntp,examples.ntp,examples.telnet,examples.unix,examples.util"/>
 		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${compiler.target}))&quot;"/>
 		<attribute name="Specification-Title" value="${project.name}"/>
 		<attribute name="Specification-Vendor" value="${project.organization.name}"/>
-		<attribute name="Specification-Version" value="${project.version}"/>
+		<attribute name="Specification-Version" value="${spec.version}"/>
       </manifest>
     </jar>
   </target>
@@ -263,3 +263,4 @@
   <target name="jar" depends="package" description="Builds the jar for the application"/>
 
 </project>
+

SPECS-EXTENDED/apache-commons-net/apache-commons-net.signatures.json

@@ -1,6 +1,6 @@
 {
  "Signatures": {
-  "apache-commons-net-build.xml": "78b61a466249b1d8fdcfcc5a8172d4deda6eedc38e80a3491952bd9cc1dc10f0",
-  "commons-net-3.6-src.tar.gz": "b93715bccb078a31bbd1c1191346c4c2d6d4a06117a9b925c40da7d99aad0c58"
+  "apache-commons-net-build.xml": "8b443492e8d6ee653df12c019fd65cf4c9843108c46ec9aa3e126dcf16ccf724",
+  "commons-net-3.11.0-src.tar.gz": "e52a91b3fad129cbe8401bb6477c65596b12b9eebb554342a6e6fe13f77f9ff6"
  }
-}
+}

SPECS-EXTENDED/apache-commons-net/apache-commons-net.spec

@@ -22,13 +22,13 @@ Distribution:   Azure Linux
 %global short_name   commons-%{base_name}
 %bcond_with tests
 Name:           apache-%{short_name}
-Version:        3.6
-Release:        3%{?dist}
+Version:        3.11.0
+Release:        1%{?dist}
 Summary:        Internet protocol suite Java library
 License:        Apache-2.0
 Group:          Development/Libraries/Java
 URL:            http://commons.apache.org/%{base_name}/
-Source0:        http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
+Source0:        https://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
 Source1:        %{name}-build.xml
 BuildRequires:  ant
 BuildRequires:  fdupes
@@ -57,7 +57,7 @@ Group:          Documentation/HTML
 %{summary}.
 
 %prep
-%setup -q -n %{short_name}-%{version}-src
+%autosetup -p1 -n %{short_name}-%{version}-src
 cp %{SOURCE1} build.xml
 %pom_remove_parent .
 
@@ -69,6 +69,8 @@ cp %{SOURCE1} build.xml
   jar javadoc
 
 %install
+mv target/site/apidocs/legal/ADDITIONAL_LICENSE_INFO .
+mv target/site/apidocs/legal/LICENSE .
 # pom
 install -dm 0755 %{buildroot}%{_javadir}
 install -pm 0644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{short_name}.jar
@@ -92,6 +94,11 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Nov 04 2025 Sandeep Karambelkar <skarambelkar@microsoft.com> - 3.11.0-1
+- Upgrade to 3.11.0
+- Fix Build Issues
+- License verified
+
 * Thu Oct 14 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 3.6-3
 - Converting the 'Release' tag to the '[number].[distribution]' format.
 

cgmanifest.json

@@ -425,8 +425,8 @@
         "type": "other",
         "other": {
           "name": "apache-commons-net",
-          "version": "3.6",
-          "downloadUrl": "http://archive.apache.org/dist/commons/net/source/commons-net-3.6-src.tar.gz"
+          "version": "3.11.0",
+          "downloadUrl": "https://archive.apache.org/dist/commons/net/source/commons-net-3.11.0-src.tar.gz"
         }
       }
     },

toolkit/resources/manifests/package/license_file_exceptions.json

@@ -31,6 +31,13 @@
                 "^/usr/share/doc/tar-[0-9\\.]+/tar\\.html/GNU-Free-Documentation-License\\.html$"
             ]
         },
+        {
+            "PackageName": "apache-commons-net-javadoc",
+            "IgnoredFilesRegexList": [
+                "^/usr/share/javadoc/apache-commons-net/org/apache/commons/net/bsd/.*",
+                "^/usr/share/javadoc/apache-commons-net/src-html/org/apache/commons/net/bsd/.*"
+            ]
+        },
         {
             "_comment1": "OpenSSL has multiple structs, constants and procedures that have the word 'NOTICE' in them, like 'NOTICEREF_free'.",
             "_comment2": "These man pages are for those items, not actual license notices.",