From 1eb2d2ed3123dcc4dc774d51967a4a1093d6f13a Mon Sep 17 00:00:00 2001 From: Adam Pocock Date: Mon, 24 Jun 2024 11:45:19 -0400 Subject: [PATCH 1/3] Bumping OCI Java SDK, junit, Jackson, OpenCSV. --- Interop/OCI/pom.xml | 2 -- THIRD_PARTY_LICENSES.txt | 10 +++---- pom.xml | 64 +++++++++++++++++++--------------------- 3 files changed, 36 insertions(+), 40 deletions(-) diff --git a/Interop/OCI/pom.xml b/Interop/OCI/pom.xml index 79565bdaf..75fea26ed 100644 --- a/Interop/OCI/pom.xml +++ b/Interop/OCI/pom.xml @@ -235,12 +235,10 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.1 org.apache.maven.plugins maven-jar-plugin - 3.2.0 diff --git a/THIRD_PARTY_LICENSES.txt b/THIRD_PARTY_LICENSES.txt index 75a9835d7..7b25ac587 100644 --- a/THIRD_PARTY_LICENSES.txt +++ b/THIRD_PARTY_LICENSES.txt @@ -524,7 +524,7 @@ XGBoost 1.6.2 - Apache 2.0 limitations under the License. -OpenCSV 5.7.1 - Apache 2.0 +OpenCSV 5.9 - Apache 2.0 Apache License Version 2.0, January 2004 @@ -728,7 +728,7 @@ OpenCSV 5.7.1 - Apache 2.0 See the License for the specific language governing permissions and limitations under the License. -junit 5.9.1 - Eclipse Public License 2.0 +junit 5.10.2 - Eclipse Public License 2.0 Eclipse Public License - v 2.0 ============================== @@ -829,7 +829,7 @@ If it is not possible or desirable to put the notice in a particular file, then You may add additional accurate notices of copyright ownership. -Apache Maven 3.6.3 - Apache 2.0 +Apache Maven 3.9.8 - Apache 2.0 Apache License Version 2.0, January 2004 @@ -1432,7 +1432,7 @@ ONNX v1.9.0 - Apache 2.0 the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier + same "print2d page" as the copyright notice for easier identification within third-party archives. Copyright [yyyy] [name of copyright owner] @@ -1484,7 +1484,7 @@ of the input file used when generating it. This code is not standalone and requires a support library to be linked with it. This support library is itself covered by the above license. -oci-java-sdk 3.37.0 - Dual licensed UPL/Apache 2.0 +oci-java-sdk 3.43.2 - Dual licensed UPL/Apache 2.0 Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. diff --git a/pom.xml b/pom.xml index dc07926a9..a100a6a95 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,7 @@ 5.2.1 - 3.37.0 + 3.43.2 2.44 @@ -56,10 +56,10 @@ 1.6.2 - 5.9.1 - 5.7.1 + 5.10.2 + 5.9 3.19.6 - 2.14.3 + 2.17.1 @@ -85,12 +85,6 @@ Oracle Labs https://labs.oracle.com - - Kate Silverstein - kate.silverstein@oracle.com - Oracle Labs - https://labs.oracle.com - Stephen Green stephen.x.green@oracle.com @@ -151,61 +145,70 @@ + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M5 + 3.3.0 org.apache.maven.plugins maven-resources-plugin - - 2.7 + 3.3.1 org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.1 org.apache.maven.plugins maven-javadoc-plugin - 3.4.1 + 3.7.0 org.apache.maven.plugins maven-release-plugin - 3.0.0-M4 + 3.1.0 org.apache.maven.plugins maven-dependency-plugin - 3.2.0 + 3.7.1 org.apache.maven.plugins maven-deploy-plugin - 3.0.0-M1 + 3.1.2 org.apache.maven.plugins maven-assembly-plugin - 3.3.0 + 3.7.1 org.apache.maven.plugins maven-enforcer-plugin - 3.0.0 + 3.5.0 org.apache.maven.plugins maven-site-plugin - 3.9.1 + 3.12.1 org.apache.maven.plugins maven-install-plugin - 3.0.0-M1 + 3.1.2 + + + org.apache.maven.plugins + maven-jar-plugin + 3.4.2 @@ -213,7 +216,6 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.4.1 -Xmaxerrs @@ -245,7 +247,7 @@ ./Core/src/main/javadoc/overview.html - Copyright © 2015–2022 Oracle and/or its affiliates. All rights reserved. + Copyright © 2015–2024 Oracle and/or its affiliates. All rights reserved. Core Packages @@ -308,7 +310,7 @@ false true ./Core/src/main/javadoc/overview.html - Copyright © 2015–2022 Oracle and/or its affiliates. All rights reserved. + Copyright © 2015–2024 Oracle and/or its affiliates. All rights reserved. Core Packages @@ -357,7 +359,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.13.0 17 17 @@ -373,7 +375,6 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.2.1 enforce @@ -381,7 +382,7 @@ - 3.8 + 3.9 @@ -394,14 +395,13 @@ org.apache.maven.plugins maven-assembly-plugin - 3.3.0 - + arm true @@ -415,7 +415,6 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 attach-sources @@ -436,9 +435,8 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.4.1 - Copyright © 2015–2022 Oracle and/or its affiliates. All rights reserved. + Copyright © 2015–2024 Oracle and/or its affiliates. All rights reserved. From dba6f547bab659613e532594026ca1810418e8bb Mon Sep 17 00:00:00 2001 From: Adam Pocock Date: Fri, 11 Oct 2024 11:05:13 -0400 Subject: [PATCH 2/3] Bumping Jackson to 2.18.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a100a6a95..e6b71b884 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ 5.10.2 5.9 3.19.6 - 2.17.1 + 2.18.0 From 9b316dea8b3c18a0875dbca71cca9fd50a42cdb8 Mon Sep 17 00:00:00 2001 From: Adam Pocock Date: Fri, 11 Oct 2024 11:19:49 -0400 Subject: [PATCH 3/3] Rollback maven enforcer version to make Github runners happy. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e6b71b884..d6735cab4 100644 --- a/pom.xml +++ b/pom.xml @@ -382,7 +382,7 @@ - 3.9 + 3.8