Upgraded: apache-commons-lang3 from 3.8.1 to 3.14.0

microsoft · Feb 27, 2024 · 6317426 · 6317426
1 parent 2081eac
commit 6317426
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 15 deletions.
diff --git a/SPECS/apache-commons-lang3/apache-commons-lang3.signatures.json b/SPECS/apache-commons-lang3/apache-commons-lang3.signatures.json
@@ -1,7 +1,7 @@
 {
  "Signatures": {
-  "build.xml": "1a5cf4b6fcd4d693689b2c85fc13257ef73501b94565bca443faebeea9631acb",
-  "commons-lang3-3.8.1-src.tar.gz": "9682e67375b6f03700e5bbaa2acceac60bc2f9049e11cafae3ce411ccaf633fb",
-  "default.properties": "d7592766094a4af568e2393695ad53c3a7ecb691869735801d0fde099eedddf7"
+  "build.xml": "7673a50883da1387a0a9c2f339c34700e53103944233249b47146f7a0bf82b8a",
+  "commons-lang3-3.14.0-src.tar.gz": "bc007577652f7cda7d5dc8801f218f88396ea1981cb4482679e839f5781e3b60",
+  "default.properties": "c6dd1c0984b47371dcc7df5c8a24b92ec4215fc2c9a852fb5636882774bfc1cf"
  }
 }
diff --git a/SPECS/apache-commons-lang3/apache-commons-lang3.spec b/SPECS/apache-commons-lang3/apache-commons-lang3.spec
@@ -17,20 +17,23 @@
 %define short_name commons-%{base_name}
 Summary:        Apache Commons Lang Package
 Name:           apache-%{short_name}
-Version:        3.8.1
-Release:        5%{?dist}
+Version:        3.14.0
+Release:        1%{?dist}
 License:        Apache-2.0
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
 Group:          Development/Libraries/Java
 URL:            https://commons.apache.org/proper/commons-lang
-Source0:        https://archive.apache.org/dist/commons/lang/source/%{short_name}-%{version}-src.tar.gz
+Source0:        https://dlcdn.apache.org/commons/lang/source/%{short_name}-%{version}-src.tar.gz
+# maven is not being used here due to a circular dependency with this package.
+# Instead, ant is being used. ant relies on build.xml and default.properties.
+# Both files are used in other distributions like OpenSuse.
 Source1:        build.xml
 Source2:        default.properties
 BuildRequires:  ant
 BuildRequires:  ant-junit
 BuildRequires:  fdupes
-BuildRequires:  java-devel >= 1.7
+BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local-bootstrap
 BuildRequires:  junit
 Provides:       %{short_name} = %{version}-%{release}
@@ -69,7 +72,7 @@ sed -i 's/\r//' *.txt
 export OPT_JAR_LIST=`cat %{_sysconfdir}/ant.d/junit`
 export CLASSPATH=
 ant \
-    -Dcompile.source=1.7 -Dcompile.target=1.7 \
+    -Dcompile.source=1.8 -Dcompile.target=1.8 \
     -Dfinal.name=%{short_name} \
      jar javadoc
 
@@ -98,6 +101,9 @@ cp -pr target/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon Feb 26 2024 George Mileka <[email protected]> - 3.14.0-1
+- Updated to 3.14.0-1.
+
 * Fri Mar 17 2023 Mykhailo Bykhovtsev <[email protected]> - 3.8.1-5
 - Moved from extended to core
 - License verified

diff --git a/SPECS/apache-commons-lang3/build.xml b/SPECS/apache-commons-lang3/build.xml
@@ -133,13 +133,25 @@
         <copy file="NOTICE.txt"  tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
         <jar jarfile="${build.home}/${final.name}.jar">
             <manifest>
-                <attribute name="Specification-Title" value="Commons Lang"/>
-                <attribute name="Specification-Version" value="${component.version}"/>
-                <attribute name="Specification-Vendor" value="The Apache Software Foundation"/>
+                <attribute name="Automatic-Module-Name" value="org.apache.commons.lang3"/>
+                <attribute name="Bundle-Description" value="Apache Commons Lang, a package of Java utility classes for the  classes that are in java.lang's hierarchy, or are considered to be so  standard as to justify existence in java.lang."/>
+                <attribute name="Bundle-DocURL" value="http://commons.apache.org/proper/commons-lang/"/>
+                <attribute name="Bundle-License" value="https://www.apache.org/licenses/LICENSE-2.0.txt"/>
+                <attribute name="Bundle-ManifestVersion" value="2"/>
+                <attribute name="Bundle-Name" value="Apache Commons Lang"/>
+                <attribute name="Bundle-SymbolicName" value="org.apache.commons.lang3"/>
+                <attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
+                <attribute name="Bundle-Version" value="${component.version}"/>
+                <attribute name="Export-Package" value="org.apache.commons.lang3;version=&quot;${component.version}&quot;,org.apache.commons.lang3.arch;version=&quot;${component.version}&quot;,org.apache.commons.lang3.builder;version=&quot;${component.version}&quot;,org.apache.commons.lang3.concurrent;version=&quot;${component.version}&quot;,org.apache.commons.lang3.event;version=&quot;${component.version}&quot;,org.apache.commons.lang3.exception;version=&quot;${component.version}&quot;,org.apache.commons.lang3.math;version=&quot;${component.version}&quot;,org.apache.commons.lang3.mutable;version=&quot;${component.version}&quot;,org.apache.commons.lang3.reflect;version=&quot;${component.version}&quot;,org.apache.commons.lang3.text;version=&quot;${component.version}&quot;,org.apache.commons.lang3.text.translate;version=&quot;${component.version}&quot;,org.apache.commons.lang3.time;version=&quot;${component.version}&quot;,org.apache.commons.lang3.tuple;version=&quot;${component.version}&quot;"/>
                 <attribute name="Implementation-Title" value="Commons Lang"/>
                 <attribute name="Implementation-Version" value="${component.version}"/>
                 <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
                 <attribute name="Implementation-Vendor-Id" value="org.apache"/>
+                <attribute name="Include-Resource" value="META-INF/LICENSE.txt=LICENSE.txt,META-INF/NOTICE.txt=NOTICE.txt"/>
+                <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${compile.target}))&quot;"/>
+                <attribute name="Specification-Title" value="Commons Lang"/>
+                <attribute name="Specification-Version" value="${component.version}"/>
+                <attribute name="Specification-Vendor" value="The Apache Software Foundation"/>
                 <attribute name="X-Compile-Source-JDK" value="${compile.source}"/>
                 <attribute name="X-Compile-Target-JDK" value="${compile.target}"/>
             </manifest>

diff --git a/SPECS/apache-commons-lang3/default.properties b/SPECS/apache-commons-lang3/default.properties
@@ -18,7 +18,7 @@
 # $Id: default.properties 1671054 2015-04-03 12:28:16Z britter $
 
 # The location of the "junit.jar" JAR file
-junit.jar = ${junit.home}/junit-4.12.jar
+junit.jar = ${junit.home}/junit-5.5.2.jar
 
 # The location of the Easymock jar
 easymock.jar = ${easymock.home}/easymock-3.3.1.jar
@@ -42,7 +42,7 @@ component.package = org.apache.commons.lang3
 component.title = Core Language Utilities
 
 # The current version number of this component
-component.version = 3.8.1
+component.version = 3.14
 
 # The name that is used to create the jar file
 final.name = ${component.name}-${component.version}
@@ -73,12 +73,12 @@ compile.optimize = true
 # In particular, if you use JDK 1.4+ the generated classes will not be usable
 # for a 1.1 Java VM unless you explicitly set this attribute to the value 1.1
 # (which is the default value for JDK 1.1 to 1.3).
-compile.target = 1.7
+compile.target = 1.8
 
 # Specifies the source version for the Java compiler.
 # Corresponds to the source attribute for the ant javac task.
 # Valid values are 1.3, 1.4, 1.5.
-compile.source = 1.7
+compile.source = 1.8
 
 # Specifies the source encoding.
 compile.encoding = ISO-8859-1