generated from oracle/template-repo
-
Notifications
You must be signed in to change notification settings - Fork 34
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #107 from Achal1607/upgrade-codec
Upgrade commons-codec from 1.15 to 1.16.0
- Loading branch information
Showing
2 changed files
with
97 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps | ||
| index eb4b13b21b..796019ffcc 100644 | ||
| --- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps | ||
| +++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps | ||
| @@ -25,6 +25,7 @@ ide/db.sql.visualeditor/external/javacc-7.0.10.jar java/performance/external/jav | ||
| # bundled maven conflicts with other libraries | ||
| java/maven.embedder/external/apache-maven-3.9.5-bin.zip ide/slf4j.api/external/slf4j-api-1.7.36.jar | ||
| java/maven.embedder/external/apache-maven-3.9.5-bin.zip platform/o.apache.commons.lang3/external/commons-lang3-3.12.0.jar | ||
| +java/maven.embedder/external/apache-maven-3.9.6-bin.zip platform/o.apache.commons.codec/external/commons-codec-1.16.0.jar | ||
| java/maven.embedder/external/apache-maven-3.9.5-bin.zip ide/c.google.guava.failureaccess/external/failureaccess-1.0.1.jar | ||
|
|
||
| # Used to parse data during build, but need to as a lib for ide cluster | ||
| @@ -67,7 +68,7 @@ extide/gradle/external/gradle-7.4-bin.zip platform/libs.junit4/external/hamcrest | ||
| extide/gradle/external/gradle-7.4-bin.zip platform/libs.junit4/external/junit-4.13.2.jar | ||
| extide/gradle/external/gradle-7.4-bin.zip platform/libs.testng/external/jcommander-1.78.jar | ||
| extide/gradle/external/gradle-7.4-bin.zip enterprise/cloud.oracle/external/httpclient-4.5.13.jar | ||
| -extide/gradle/external/gradle-7.4-bin.zip platform/o.apache.commons.codec/external/commons-codec-1.15.jar | ||
| +extide/gradle/external/gradle-7.4-bin.zip platform/o.apache.commons.codec/external/commons-codec-1.16.0.jar | ||
| extide/gradle/external/gradle-7.4-bin.zip platform/libs.batik.read/external/xml-apis-1.4.01.jar | ||
|
|
||
| # These are the endorsed version of the javaee apis and create libraries, so they are better kept separate | ||
| diff --git a/platform/o.apache.commons.codec/build.xml b/platform/o.apache.commons.codec/build.xml | ||
| index 7c92908280..153806621a 100644 | ||
| --- a/platform/o.apache.commons.codec/build.xml | ||
| +++ b/platform/o.apache.commons.codec/build.xml | ||
| @@ -22,13 +22,13 @@ | ||
| <project name="platform/o.apache.commons.codec" default="build" basedir="."> | ||
| <import file="../../nbbuild/templates/projectized.xml"/> | ||
| <target name="jar" depends="-define-FileCRC32Calculator"> | ||
| - <FileCRC32Calculator file="external/commons-codec-1.15.jar" property="o.apache.commons.codec.crc32" /> | ||
| + <FileCRC32Calculator file="external/commons-codec-1.16.0.jar" property="o.apache.commons.codec.crc32" /> | ||
| <jar jarfile="${cluster}/${module.jar}"> | ||
| - <zipfileset src="external/commons-codec-1.15.jar"/> | ||
| + <zipfileset src="external/commons-codec-1.16.0.jar"/> | ||
| <manifest> | ||
| <attribute name="Bundle-SymbolicName" value="org.apache.commons.codec"/> | ||
| - <attribute name="Bundle-Version" value="1.15.0"/> | ||
| - <attribute name="Export-Package" value="org.apache.commons.codec;version="1.15.0",org.apache.commons.codec.binary;version="1.15.0",org.apache.commons.codec.digest;version="1.15.0",org.apache.commons.codec.language;version="1.15.0",org.apache.commons.codec.net;version="1.15.0""/> | ||
| + <attribute name="Bundle-Version" value="1.16.0"/> | ||
| + <attribute name="Export-Package" value="org.apache.commons.codec;version="1.16.0",org.apache.commons.codec.binary;version="1.16.0",org.apache.commons.codec.digest;version="1.16.0",org.apache.commons.codec.language;version="1.16.0",org.apache.commons.codec.net;version="1.16.0""/> | ||
| <attribute name="NB-Original-CRC" value="${o.apache.commons.codec.crc32}"/> | ||
| </manifest> | ||
| </jar> | ||
| diff --git a/platform/o.apache.commons.codec/external/binaries-list b/platform/o.apache.commons.codec/external/binaries-list | ||
| index 929ba7a788..3a2bfd8f69 100644 | ||
| --- a/platform/o.apache.commons.codec/external/binaries-list | ||
| +++ b/platform/o.apache.commons.codec/external/binaries-list | ||
| @@ -14,4 +14,4 @@ | ||
| # KIND, either express or implied. See the License for the | ||
| # specific language governing permissions and limitations | ||
| # under the License. | ||
| -49D94806B6E3DC933DACBD8ACB0FDBAB8EBD1E5D commons-codec:commons-codec:1.15 | ||
| +4E3EB3D79888D76B54E28B350915B5DC3919C9DE commons-codec:commons-codec:1.16.0 | ||
| diff --git a/platform/o.apache.commons.codec/external/commons-codec-1.15-license.txt b/platform/o.apache.commons.codec/external/commons-codec-1.16.0-license.txt | ||
| similarity index 99% | ||
| rename from platform/o.apache.commons.codec/external/commons-codec-1.15-license.txt | ||
| rename to platform/o.apache.commons.codec/external/commons-codec-1.16.0-license.txt | ||
| index daef4d6173..974dcad1f1 100644 | ||
| --- a/platform/o.apache.commons.codec/external/commons-codec-1.15-license.txt | ||
| +++ b/platform/o.apache.commons.codec/external/commons-codec-1.16.0-license.txt | ||
| @@ -1,7 +1,7 @@ | ||
| Name: Apache Commons Codec | ||
| Description: General encoding/decoding algorithms (for example phonetic, base64, URL). | ||
| Origin: https://commons.apache.org/proper/commons-codec/ | ||
| -Version: 1.15 | ||
| +Version: 1.16.0 | ||
| License: Apache-2.0 | ||
|
|
||
| Apache License | ||
| diff --git a/platform/o.apache.commons.codec/external/commons-codec-1.15-notice.txt b/platform/o.apache.commons.codec/external/commons-codec-1.16.0-notice.txt | ||
| similarity index 93% | ||
| rename from platform/o.apache.commons.codec/external/commons-codec-1.15-notice.txt | ||
| rename to platform/o.apache.commons.codec/external/commons-codec-1.16.0-notice.txt | ||
| index 9899d2108a..10aa94477b 100644 | ||
| --- a/platform/o.apache.commons.codec/external/commons-codec-1.15-notice.txt | ||
| +++ b/platform/o.apache.commons.codec/external/commons-codec-1.16.0-notice.txt | ||
| @@ -1,5 +1,5 @@ | ||
| Apache Commons Codec | ||
| -Copyright 2002-2020 The Apache Software Foundation | ||
| +Copyright 2002-2024 The Apache Software Foundation | ||
|
|
||
| This product includes software developed at | ||
| The Apache Software Foundation (https://www.apache.org/). | ||
| diff --git a/platform/o.apache.commons.codec/nbproject/project.xml b/platform/o.apache.commons.codec/nbproject/project.xml | ||
| index 77bf4742ce..3b96b99e4e 100644 | ||
| --- a/platform/o.apache.commons.codec/nbproject/project.xml | ||
| +++ b/platform/o.apache.commons.codec/nbproject/project.xml | ||
| @@ -28,7 +28,7 @@ | ||
| <public-packages/> | ||
| <class-path-extension> | ||
| <runtime-relative-path>org-apache-commons-codec.jar</runtime-relative-path> | ||
| - <binary-origin>external/commons-codec-1.15.jar</binary-origin> | ||
| + <binary-origin>external/commons-codec-1.16.0.jar</binary-origin> | ||
| </class-path-extension> | ||
| </data> | ||
| </configuration> |