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.

Sign up for GitHub

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

Upgrading Apache Ant, Commons Compress, Commons IO and Maven, FlexMark and Guava #6480

Merged
merged 2 commits into from
Oct 5, 2023
Merged

Upgrading Apache Ant, Commons Compress, Commons IO and Maven, FlexMark and Guava #6480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a502ec
Upgrading to Apache Maven 3.9.4.
lahodaj Sep 25, 2023
6382d54
Upgrading Apache Ant, Commons Compress, Commons IO and Guava and Flex…
lahodaj Sep 25, 2023
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
4 changes: 2 additions & 2 deletions enterprise/cloud.oracle/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.apache.commons.io</code-name-base>
<code-name-base>org.apache.commons.commons_io</code-name-base>
<run-dependency>
<specification-version>2.6.0</specification-version>
<specification-version>2.13.0</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion extide/o.apache.tools.ant.module/arch.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@
<li>
<api group="java" name="Ant" type="import" category="third" url="https://ant.apache.org">
Ant itself, of course.
1.8.0+ is required, 1.10.8 recommended (and currently bundled); some features may be limited to newer versions.
1.8.0+ is required, 1.10.14 recommended (and currently bundled); some features may be limited to newer versions.
</api>
</li>
</ol>
Expand Down
18 changes: 11 additions & 7 deletions extide/o.apache.tools.ant.module/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,19 @@
</target>

<target name="netbeans-extra" depends="jar-bridge">
<unzip src="external/apache-ant-1.10.14-bin.zip" dest="build"/>
<mkdir dir="${cluster}/ant/lib"/>
<copy todir="${cluster}/ant/lib">
<fileset dir="external/lib"/>
<fileset dir="build/apache-ant-1.10.14/lib" includes="*.jar"/>
</copy>
<mkdir dir="${cluster}/ant/bin"/>
<copy todir="${cluster}/ant/bin">
<fileset dir="build/apache-ant-1.10.14/bin"/>
</copy>
<mkdir dir="${cluster}/ant/etc"/>
<copy todir="${cluster}/ant/etc">
<fileset dir="build/apache-ant-1.10.14/etc"/>
</copy>
<unzip dest="${cluster}/ant">
<fileset dir="external">
<include name="ant-misc-*.zip"/>
</fileset>
</unzip>
</target>

<target name="test-build" depends="jar-bridge,projectized-common.test-build"/>
Expand All @@ -80,7 +84,7 @@
<fileset dir="${cluster}">
<include name="ant/lib/*.jar"/>
</fileset>
<mapper type="glob" from="ant${file.separator}lib${file.separator}*.jar" to="apache-*-1.10.8.jar"/>
<mapper type="glob" from="ant${file.separator}lib${file.separator}*.jar" to="apache-*-1.10.14.jar"/>
</copy>
<copy file="${cluster}/ant/nblib/bridge.jar" tofile="${dir}/org-apache-tools-ant-module-bridge.jar"/>
<!-- XXX ought to only do this in case jnlp.sign.jars=true -->
Expand Down
10 changes: 5 additions & 5 deletions ...nt.module/external/ant-1.10.8-license.txt → ...t.module/external/ant-1.10.14-license.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Name: Apache Ant
Origin: Apache Software Foundation
Version: 1.10.8
Files: ant-misc-1.10.8.zip ant-1.10.8.jar ant-antlr-1.10.8.jar ant-apache-bcel-1.10.8.jar ant-apache-bsf-1.10.8.jar ant-apache-log4j-1.10.8.jar ant-apache-oro-1.10.8.jar ant-apache-regexp-1.10.8.jar ant-apache-resolver-1.10.8.jar ant-apache-xalan2-1.10.8.jar ant-commons-logging-1.10.8.jar ant-commons-net-1.10.8.jar ant-jai-1.10.8.jar ant-javamail-1.10.8.jar ant-jdepend-1.10.8.jar ant-jmf-1.10.8.jar ant-jsch-1.10.8.jar ant-junit-1.10.8.jar ant-junit4-1.10.8.jar ant-launcher-1.10.8.jar ant-netrexx-1.10.8.jar ant-swing-1.10.8.jar ant-testutil-1.10.8.jar ant-xz-1.10.8.jar
Version: 1.10.14
Files: apache-ant-1.10.14-bin.zip
Description: Ant build tool.
License: Apache-2.0-ant
URL: https://builds.apache.org/view/All/job/Ant_Nightly/lastBuild/
URL: https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.14-bin.zip

/*
* Apache License
Expand Down Expand Up @@ -201,7 +201,7 @@ URL: https://builds.apache.org/view/All/job/Ant_Nightly/lastBuild/
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
Expand All @@ -211,7 +211,7 @@ URL: https://builds.apache.org/view/All/job/Ant_Nightly/lastBuild/
*/

W3C� SOFTWARE NOTICE AND LICENSE
http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
https://www.w3.org/Consortium/Legal/2002/copyright-software-20021231

This work (and included software, documentation such as READMEs, or other
related items) is being provided by the copyright holders under the following
Expand Down
9 changes: 9 additions & 0 deletions extide/o.apache.tools.ant.module/external/ant-1.10.14-notice.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Apache Ant
Copyright 1999-2023 The Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (https://www.apache.org/).

The <sync> task is based on code Copyright (c) 2002, Landmark
Graphics Corp that has been kindly donated to the Apache Software
Foundation.
6 changes: 0 additions & 6 deletions extide/o.apache.tools.ant.module/external/ant-1.10.8-notice.txt
View file
Open in desktop

This file was deleted.

25 changes: 1 addition & 24 deletions extide/o.apache.tools.ant.module/external/binaries-list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
A4CDC20F1F620A6208B42F81C224CDB6B9C1968D ant-misc-1.10.8.zip
AE148ABB0532B685C5EEB22FDEC9D124E89BE5DE org.apache.ant:ant:1.10.8
3D728985E3B6A71B80D10DB0D574A60B496590A1 org.apache.ant:ant-antlr:1.10.8
0F2ADD1F8BCA7992322BBDFC63B596B00A8DB8FD org.apache.ant:ant-apache-bcel:1.10.8
5B095EBB1C1A1B0F6A3B889D3161BCE4CE07860D org.apache.ant:ant-apache-bsf:1.10.8
9A3E49630CAF4A67AD6188DC0D9C2D4C52CDF279 org.apache.ant:ant-apache-log4j:1.10.8
6B261964B550BE885C9656BA268A8DCD140F6314 org.apache.ant:ant-apache-oro:1.10.8
0E8C9E896CA9A10BBF205FE396EBF6808CB45B86 org.apache.ant:ant-apache-regexp:1.10.8
73CE9524001122178D9E7DB9F7FEB68642FC0651 org.apache.ant:ant-apache-resolver:1.10.8
015B6F2317E0EAC2EE1F07C34D315184B4D7A63A org.apache.ant:ant-apache-xalan2:1.10.8
741230FB8C8EEB99AAB9EC7074CC871FDB7B1FDA org.apache.ant:ant-commons-logging:1.10.8
2AADB99C4AF42A1B69E35269551D3C636E247899 org.apache.ant:ant-commons-net:1.10.8
0B2D6F189F2EFEC0C5A01725094EEC2D95E8F88F org.apache.ant:ant-jai:1.10.8
BFD7AA4221EA0A9B98DB9E0C908E0426CCB1F2E7 org.apache.ant:ant-javamail:1.10.8
64206C8AC4DA3E444470651865688C12C5ABB14E org.apache.ant:ant-jdepend:1.10.8
9B606CF8EF4787A56281A827C66E8AA11972596E org.apache.ant:ant-jmf:1.10.8
C4D8745B230F2B38B540D5DDD1ABB287DA1F416A org.apache.ant:ant-jsch:1.10.8
F75D2CBE7F63DB600FC34E23AA447C27095056CF org.apache.ant:ant-junit:1.10.8
07222C675958C696D6EA3609E8A5C57E4D426F1E org.apache.ant:ant-junit4:1.10.8
2CA8688D2DAD5694237576DB782B37279989614D org.apache.ant:ant-launcher:1.10.8
94EBEAB3DBF8A6FC135996AD91854CA0223EE255 org.apache.ant:ant-netrexx:1.10.8
12AE1CFC42449D3F9017318E751F221C685C2750 org.apache.ant:ant-swing:1.10.8
5981C0AE8195D838577493854F6B56ADF07DD33A org.apache.ant:ant-testutil:1.10.8
E8425D9ECEAB2AAC51CC1CCA5D719645F8601D12 org.apache.ant:ant-xz:1.10.8
A5D56956DC0A19395F6E01CF5D3056EC2EDE86A8 https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.14-bin.zip apache-ant-1.10.14-bin.zip
48 changes: 24 additions & 24 deletions extide/o.apache.tools.ant.module/external/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,31 +24,31 @@
<mkdir dir="lib"/>
<copy todir="lib">
<fileset dir=".">
<include name="ant-antlr-1.10.8.jar" />
<include name="ant-apache-bcel-1.10.8.jar" />
<include name="ant-apache-bsf-1.10.8.jar" />
<include name="ant-apache-log4j-1.10.8.jar" />
<include name="ant-apache-oro-1.10.8.jar" />
<include name="ant-apache-regexp-1.10.8.jar" />
<include name="ant-apache-resolver-1.10.8.jar" />
<include name="ant-apache-xalan2-1.10.8.jar" />
<include name="ant-commons-logging-1.10.8.jar" />
<include name="ant-commons-net-1.10.8.jar" />
<include name="ant-jai-1.10.8.jar" />
<include name="ant-javamail-1.10.8.jar" />
<include name="ant-jdepend-1.10.8.jar" />
<include name="ant-jmf-1.10.8.jar" />
<include name="ant-jsch-1.10.8.jar" />
<include name="ant-junit-1.10.8.jar" />
<include name="ant-junit4-1.10.8.jar" />
<include name="ant-launcher-1.10.8.jar" />
<include name="ant-netrexx-1.10.8.jar" />
<include name="ant-swing-1.10.8.jar" />
<include name="ant-testutil-1.10.8.jar" />
<include name="ant-xz-1.10.8.jar" />
<include name="ant-1.10.8.jar" />
<include name="ant-antlr-1.10.14.jar" />
<include name="ant-apache-bcel-1.10.14.jar" />
<include name="ant-apache-bsf-1.10.14.jar" />
<include name="ant-apache-log4j-1.10.14.jar" />
<include name="ant-apache-oro-1.10.14.jar" />
<include name="ant-apache-regexp-1.10.14.jar" />
<include name="ant-apache-resolver-1.10.14.jar" />
<include name="ant-apache-xalan2-1.10.14.jar" />
<include name="ant-commons-logging-1.10.14.jar" />
<include name="ant-commons-net-1.10.14.jar" />
<include name="ant-jai-1.10.14.jar" />
<include name="ant-javamail-1.10.14.jar" />
<include name="ant-jdepend-1.10.14.jar" />
<include name="ant-jmf-1.10.14.jar" />
<include name="ant-jsch-1.10.14.jar" />
<include name="ant-junit-1.10.14.jar" />
<include name="ant-junit4-1.10.14.jar" />
<include name="ant-launcher-1.10.14.jar" />
<include name="ant-netrexx-1.10.14.jar" />
<include name="ant-swing-1.10.14.jar" />
<include name="ant-testutil-1.10.14.jar" />
<include name="ant-xz-1.10.14.jar" />
<include name="ant-1.10.14.jar" />
</fileset>
<globmapper from="*-1.10.8.jar" to="*.jar"/>
<globmapper from="*-1.10.14.jar" to="*.jar"/>
</copy>
</target>
<target name="clean">
Expand Down
2 changes: 1 addition & 1 deletion extide/o.apache.tools.ant.module/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ extra.module.files=\
ant/lib/,\
ant/bin/,\
ant/etc/
extra.license.files=external/ant-1.10.8-license.txt
extra.license.files=external/ant-1.10.14-license.txt
nbm.executable.files=\
ant/bin/ant,\
ant/bin/antRun,\
Expand Down
4 changes: 2 additions & 2 deletions platform/o.apache.commons.io/build.xml → ide/c.google.guava.failureaccess/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
under the License.

-->
<project name="platform/o.apache.commons.io" default="build" basedir=".">
<project name="ide/c.google.guava.failureaccess" default="build" basedir=".">
<import file="../../nbbuild/templates/projectized.xml"/>
<target name="jar"/>
</project>
</project>
17 changes: 17 additions & 0 deletions ide/c.google.guava.failureaccess/external/binaries-list
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
1DCF1DE382A0BF95A3D8B0849546C88BAC1292C9 com.google.guava:failureaccess:1.0.1
12 changes: 4 additions & 8 deletions ...rver/external/commons-2.5.3.6-license.txt → .../external/failureaccess-1.0.1-license.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
Name: Apache Commons
Description: Assist with developing IO functionality
Origin: Apache Software Foundation
Name: Guava - Failure Access Library
Version: 1.0.1
License: Apache-2.0
Version: 2.5.3.6
URL: https://commons.apache.org/
Files: commons-io-2.5.jar

Origin: https://github.com/google/guava
Description: A Guava subproject


Apache License
Expand Down Expand Up @@ -209,4 +206,3 @@ Files: commons-io-2.5.jar
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

1 change: 1 addition & 0 deletions ide/c.google.guava.failureaccess/manifest.mf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
OpenIDE-Module: com.google.guava.failureaccess
22 changes: 22 additions & 0 deletions ide/c.google.guava.failureaccess/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.8
spec.version.base=1.0.1
release.external/failureaccess-1.0.1.jar=modules/com-google-guava-failureaccess.jar
is.autoload=true
nbm.module.author=Tomas Stupka
35 changes: 35 additions & 0 deletions ide/c.google.guava.failureaccess/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.

-->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
<data xmlns="http://www.netbeans.org/ns/nb-module-project/2">
<code-name-base>com.google.guava.failureaccess</code-name-base>
<module-dependencies/>
<public-packages/>
<class-path-extension>
<runtime-relative-path>com-google-guava-failureaccess.jar</runtime-relative-path>
<binary-origin>external/failureaccess-1.0.1.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
</project>
2 changes: 1 addition & 1 deletion ide/c.google.guava/external/binaries-list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
C6AD87D2575AF8AC8EC38E28E75AEFA882CC3A1F com.google.guava:guava:27.0-jre
5E64EC7E056456BEF3A4BC4C6FDAEF71E8AB6318 com.google.guava:guava:32.1.2-jre
2 changes: 1 addition & 1 deletion ...guava/external/guava-27.0-jre-license.txt → ...ava/external/guava-32.1.2-jre-license.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: Guava
Version: 27.0
Version: 32.1.2
License: Apache-2.0
Origin: https://github.com/google/guava
Description: Guava is a set of core libraries that includes new collection types (such as multimap and multiset), immutable collections, a graph library, and utilities for concurrency, I/O, hashing, primitives, strings, and more.
Expand Down
2 changes: 1 addition & 1 deletion ide/c.google.guava/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.8
spec.version.base=27.15.0
release.external/guava-27.0-jre.jar=modules/com-google-guava.jar
release.external/guava-32.1.2-jre.jar=modules/com-google-guava.jar
is.autoload=true
nbm.module.author=Tomas Stupka
2 changes: 1 addition & 1 deletion ide/c.google.guava/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<public-packages/>
<class-path-extension>
<runtime-relative-path>com-google-guava.jar</runtime-relative-path>
<binary-origin>external/guava-27.0-jre.jar</binary-origin>
<binary-origin>external/guava-32.1.2-jre.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion ide/libs.commons_compress/external/binaries-list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
4AF2060EA9B0C8B74F1854C6CAFE4D43CFC161FC org.apache.commons:commons-compress:1.23.0
B4B1B5A3D9573B2970FDDAB236102C0A4D27D35E org.apache.commons:commons-compress:1.24.0
12 changes: 0 additions & 12 deletions ide/libs.commons_compress/external/commons-compress-1.23.0-notice.txt
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions ...ernal/commons-compress-1.23.0-license.txt → ...ernal/commons-compress-1.24.0-license.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Name: Commons Compress
Version: 1.23.0
OSR: 19203
Version: 1.24.0
Description: The Apache Commons Compress library defines an API for working with ar, cpio, Unix dump, tar, zip, gzip, XZ, Pack200, bzip2, 7z, arj, lzma, snappy, DEFLATE, lz4, Brotli, Zstandard, DEFLATE64 and Z files.
Origin: https://commons.apache.org/proper/commons-compress/index.html
License: Apache-2.0
Expand Down
Loading