Skip to content

Commit

Permalink
Dependency bump (#380)
Browse files Browse the repository at this point in the history 
* Bumping OCI Java SDK, junit, Jackson, OpenCSV.

* Bumping Jackson to 2.18.0

* Rollback maven enforcer version to make Github runners happy.
  • Loading branch information
@Craigacp
Craigacp authored Oct 11, 2024
1 parent 0c99100 commit b20b2d8
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 39 deletions.
2 changes: 0 additions & 2 deletions Interop/OCI/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,12 +235,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.3.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
<configuration>
<archive>
<manifestEntries>
Expand Down
10 changes: 5 additions & 5 deletions THIRD_PARTY_LICENSES.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
==============================
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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.

Expand Down
62 changes: 30 additions & 32 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<olcut.version>5.2.1</olcut.version>

<!-- Oracle dependencies -->
<oci.sdk.version>3.37.0</oci.sdk.version>
<oci.sdk.version>3.43.2</oci.sdk.version>

<!-- 3rd party backend dependencies -->
<liblinear.version>2.44</liblinear.version>
Expand All @@ -56,10 +56,10 @@
<xgboost.version>1.6.2</xgboost.version>

<!-- 3rd party other dependencies -->
<junit.version>5.9.1</junit.version>
<opencsv.version>5.7.1</opencsv.version>
<junit.version>5.10.2</junit.version>
<opencsv.version>5.9</opencsv.version>
<protobuf.version>3.19.6</protobuf.version>
<jackson.version>2.14.3</jackson.version>
<jackson.version>2.18.0</jackson.version>

<!-- Other properties -->
<!-- Turn off tests which rely on native code -->
Expand All @@ -85,12 +85,6 @@
<organization>Oracle Labs</organization>
<organizationUrl>https://labs.oracle.com</organizationUrl>
</developer>
<developer>
<name>Kate Silverstein</name>
<email>[email protected]</email>
<organization>Oracle Labs</organization>
<organizationUrl>https://labs.oracle.com</organizationUrl>
</developer>
<developer>
<name>Stephen Green</name>
<email>[email protected]</email>
Expand Down Expand Up @@ -151,69 +145,77 @@
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
<version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<!-- Pinned to 2.7 due to a bug in symlink handling which is fixed in the upcoming 3.3.0 release -->
<version>2.7</version>
<version>3.3.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
<version>3.3.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.4.1</version>
<version>3.7.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>3.0.0-M4</version>
<version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.2.0</version>
<version>3.7.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.0.0-M1</version>
<version>3.1.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.3.0</version>
<version>3.7.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0</version>
<version>3.5.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.9.1</version>
<version>3.12.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>3.0.0-M1</version>
<version>3.1.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.4.2</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.4.1</version>
<configuration>
<additionalJOptions>
<additionalJOption>-Xmaxerrs</additionalJOption>
Expand Down Expand Up @@ -245,7 +247,7 @@
</tag>
</tags>
<overview>./Core/src/main/javadoc/overview.html</overview>
<bottom>Copyright &#169; 2015&#x2013;2022 Oracle and/or its affiliates. All rights reserved.</bottom>
<bottom>Copyright &#169; 2015&#x2013;2024 Oracle and/or its affiliates. All rights reserved.</bottom>
<groups>
<group>
<title>Core Packages</title>
Expand Down Expand Up @@ -308,7 +310,7 @@
<linksource>false</linksource>
<nohelp>true</nohelp>
<overview>./Core/src/main/javadoc/overview.html</overview>
<bottom>Copyright &#169; 2015&#x2013;2022 Oracle and/or its affiliates. All rights reserved.</bottom>
<bottom>Copyright &#169; 2015&#x2013;2024 Oracle and/or its affiliates. All rights reserved.</bottom>
<groups>
<group>
<title>Core Packages</title>
Expand Down Expand Up @@ -357,7 +359,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.13.0</version>
<configuration>
<release>17</release>
<source>17</source>
Expand All @@ -373,7 +375,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.2.1</version>
<executions>
<execution>
<id>enforce</id>
Expand All @@ -394,14 +395,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.3.0</version>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<!-- Turn off ONNX, XGBoost and TF tests on ARM platforms as the binaries are not available -->
<!-- Turn off XGBoost and TF tests on ARM platforms as the binaries are not available -->
<id>arm</id>
<properties>
<skipXGBoostTests>true</skipXGBoostTests>
Expand All @@ -415,7 +415,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -436,9 +435,8 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.4.1</version>
<configuration>
<bottom>Copyright &#169; 2015&#x2013;2022 Oracle and/or its affiliates. All rights reserved.</bottom>
<bottom>Copyright &#169; 2015&#x2013;2024 Oracle and/or its affiliates. All rights reserved.</bottom>
</configuration>
<executions>
<execution>
Expand Down

0 comments on commit b20b2d8

Please sign in to comment.