Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgraded: apache-commons-lang3 from 3.8.1 to 3.14.0 #8106

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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"
}
}
65 changes: 36 additions & 29 deletions SPECS/apache-commons-lang3/apache-commons-lang3.spec
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,29 @@
%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
Source1: build.xml
Source2: default.properties
BuildRequires: ant
BuildRequires: ant-junit
BuildRequires: fdupes
BuildRequires: java-devel >= 1.7
Source0: https://archive.apache.org/dist/commons/lang/source/commons-lang3-%{version}-src.tar.gz
# Source1: default.properties
BuildRequires: javapackages-bootstrap
BuildRequires: javapackages-local-bootstrap
BuildRequires: maven-resources-plugin-javadoc
# BuildRequires: maven-local
# BuildRequires: mvn(org.apache.maven.plugins:maven-javadoc-plugin)

# BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
# BuildRequires: mvn(org.sonatype.plexus:plexus-cipher)
# BuildRequires: mvn(junit:junit)
# BuildRequires: mvn(org.codehaus.modello:modello-maven-plugin)
# BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata)
# BuildRequires: mvn(org.codehaus.plexus:plexus-container-default)

BuildRequires: fdupes
BuildRequires: junit
Provides: %{short_name} = %{version}-%{release}
BuildArch: noarch
Expand All @@ -58,36 +66,32 @@ Javadoc for %{name}.

%prep
%setup -q -n %{short_name}-%{version}-src
cp %{SOURCE1} .
cp %{SOURCE2} .
sed -i 's/\r//' *.txt
# %pom_remove_plugin -r :maven-javadoc-plugin:q
# cp %{SOURCE1} .
# sed -i 's/\r//' *.txt

%pom_remove_parent .
%pom_xpath_inject "pom:project" "<groupId>org.apache.commons</groupId>" .
# %pom_remove_parent .
# %pom_xpath_inject "pom:project" "<groupId>org.apache.commons</groupId>" .

%build
export OPT_JAR_LIST=`cat %{_sysconfdir}/ant.d/junit`
export CLASSPATH=
ant \
-Dcompile.source=1.7 -Dcompile.target=1.7 \
-Dfinal.name=%{short_name} \
jar javadoc
%mvn_build -f

%install
%mvn_install

# jars
install -dm 755 %{buildroot}%{_javadir}
install -m 0644 target/%{short_name}.jar %{buildroot}%{_javadir}/%{name}.jar
ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
# install -dm 755 %{buildroot}%{_javadir}
# install -m 0644 target/%{short_name}.jar %{buildroot}%{_javadir}/%{name}.jar
# ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
# pom
install -dm 755 %{buildroot}%{_mavenpomdir}
install -m 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
%add_maven_depmap %{name}.pom %{name}.jar
# install -dm 755 %{buildroot}%{_mavenpomdir}
# install -m 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
# %add_maven_depmap %{name}.pom %{name}.jar

# javadoc
install -dm 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
%fdupes -s %{buildroot}%{_javadocdir}/%{name}/
# install -dm 755 %{buildroot}%{_javadocdir}/%{name}
# cp -pr target/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
# %fdupes -s %{buildroot}%{_javadocdir}/%{name}/

%files -f .mfiles
%license LICENSE.txt NOTICE.txt
Expand All @@ -98,6 +102,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
Expand Down
18 changes: 15 additions & 3 deletions SPECS/apache-commons-lang3/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions SPECS/apache-commons-lang3/default.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}
Expand Down Expand Up @@ -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
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"Signatures": {
"maven-javadoc-plugin-3.6.2-source-release.zip": "bfb50d63163584a547481c723dc268548efaa749e1800bc925994d8cb06dfb02"
}
}
36 changes: 36 additions & 0 deletions SPECS/maven-javadoc-plugin/maven-javadoc-plugin.spec
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@

Summary: Maven Resources Plugin
Name: maven-javadoc-plugin
Version: 3.6.2
Release: 1%{?dist}
License: ASL 2.0
Vendor: Microsoft Corporation
Distribution: Azure Linux
URL: https://maven.apache.org/plugins/maven-javadoc-plugin
Source0: https://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
BuildRequires: javapackages-bootstrap
BuildRequires: javapackages-local-bootstrap
BuildArch: noarch

%description
The Javadoc Plugin uses the Javadoc tool to generate javadocs for the specified
project

%prep
%setup -q

%build
%{mvn_build}

%install
%{mvn_install}

%files -f .mfiles
%license LICENSE NOTICE

%files -f .mfiles
%license LICENSE NOTICE

%changelog
* Mon Nov 06 2023 CBL-Mariner Servicing Account <[email protected]> - 3.3.1-1
- Auto-upgrade to 3.3.1 - Azure Linux 3.0 - package upgrades
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"Signatures": {
"maven-reporting-api-3.1.1-source-release.zip": "3ce3604002dd5f4698ed4068ea74254f95e2988007486f4e05cecd5ae55dd586"
}
}
43 changes: 43 additions & 0 deletions SPECS/maven-reporting-api/maven-reporting-api.spec
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
Summary: API to manage report generation
Name: maven-reporting-api
Version: 3.1.1
Release: 1%{?dist}
License: Apache-2.0
Vendor: Microsoft Corporation
Distribution: Azure Linux
URL: https://maven.apache.org/shared/maven-reporting-api
Source0: https://archive.apache.org/dist/maven/reporting/%{name}-%{version}-source-release.zip
BuildArch: noarch
BuildRequires: gnupg2
BuildRequires: maven-local
# BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:)
BuildRequires: maven-parent
BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api)

%description
API to manage report generation. Maven-reporting-api is included in the
Maven 2.x core distribution, but was moved to shared components to
achieve report decoupling from the Maven 3 core.

%prep
# %{gpgverify} --data=%{SOURCE0} --signature=%{SOURCE1} --keyring=%{SOURCE2}
%autosetup

# Fix end of line encoding
sed -i.orig 's/\\r//' README.md
touch -r README.md.orig README.md
rm README.md.orig

%build
%mvn_build

%install
%mvn_install

%files -f .mfiles
%doc README.md
%license LICENSE NOTICE

%changelog
* Tue Feb 27 2024 Jiri Vanek <[email protected]> - 1:3.1.1-6
- Rebuilt for java-21-openjdk as system jdk
Loading