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

Bumping versions of XGBoost, jackson, protobuf and OCI #288

Merged
merged 1 commit into from
Oct 7, 2022
Merged
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
32 changes: 31 additions & 1 deletion Interop/OCI/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.29</version>
<version>1.7.33</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
Expand All @@ -134,6 +134,36 @@
<groupId>com.oracle.labs.olcut</groupId>
<artifactId>olcut-config-json</artifactId>
<version>${olcut.version}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- patch jackson -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<!-- test dependencies -->
<dependency>
Expand Down
40 changes: 35 additions & 5 deletions Json/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,6 @@
</properties>

<dependencies>
<dependency>
<groupId>com.oracle.labs.olcut</groupId>
<artifactId>olcut-config-json</artifactId>
<version>${olcut.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>tribuo-core</artifactId>
Expand All @@ -48,6 +43,41 @@
<artifactId>tribuo-data</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.oracle.labs.olcut</groupId>
<artifactId>olcut-config-json</artifactId>
<version>${olcut.version}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- patch jackson -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>tribuo-core</artifactId>
Expand Down
31 changes: 31 additions & 0 deletions Reproducibility/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,37 @@
<groupId>com.oracle.labs.olcut</groupId>
<artifactId>olcut-config-json</artifactId>
<version>${olcut.version}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- patch jackson -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>

<!-- test time dependencies -->
Expand Down
12 changes: 6 additions & 6 deletions THIRD_PARTY_LICENSES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Liblinear-java 2.43 - BSD License
Liblinear-java 2.44 - BSD License

Copyright (c) 2007-2019 The LIBLINEAR Project.
Copyright (c) 2007-2022 The LIBLINEAR Project.
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -319,7 +319,7 @@ Copyright 2019, 2020, 2022 The TensorFlow Authors. All rights reserved.
See the License for the specific language governing permissions and
limitations under the License.

XGBoost 1.6.1 - Apache 2.0
XGBoost 1.6.2 - Apache 2.0

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -728,7 +728,7 @@ OpenCSV 5.6 - Apache 2.0
See the License for the specific language governing permissions and
limitations under the License.

junit 5.7.1 - Eclipse Public License 2.0
junit 5.9.1 - Eclipse Public License 2.0

Eclipse Public License - v 2.0
==============================
Expand Down Expand Up @@ -1449,7 +1449,7 @@ ONNX v1.9.0 - Apache 2.0
See the License for the specific language governing permissions and
limitations under the License.

protobuf-java 3.19.4 - 3-clause BSD
protobuf-java 3.19.6 - 3-clause BSD

Copyright 2008 Google Inc. All rights reserved.

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 2.38.0 - Dual licensed UPL/Apache 2.0
oci-java-sdk 2.46.0 - Dual licensed UPL/Apache 2.0

Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.

Expand Down
5 changes: 5 additions & 0 deletions distribution/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,11 @@
<artifactId>tribuo-classification-explanations</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.tribuo</groupId>
<artifactId>tribuo-classification-fs</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.tribuo</groupId>
<artifactId>tribuo-classification-liblinear</artifactId>
Expand Down
9 changes: 5 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,20 @@
<olcut.version>5.2.1</olcut.version>

<!-- Oracle dependencies -->
<oci.sdk.version>2.38.0</oci.sdk.version>
<oci.sdk.version>2.46.0</oci.sdk.version>

<!-- 3rd party backend dependencies -->
<liblinear.version>2.44</liblinear.version>
<libsvm.version>3.25</libsvm.version>
<onnxruntime.version>1.12.1</onnxruntime.version>
<tensorflow.version>0.4.2</tensorflow.version>
<xgboost.version>1.6.1</xgboost.version>
<xgboost.version>1.6.2</xgboost.version>

<!-- 3rd party other dependencies -->
<junit.version>5.7.1</junit.version>
<junit.version>5.9.1</junit.version>
<opencsv.version>5.6</opencsv.version>
<protobuf.version>3.19.4</protobuf.version>
<protobuf.version>3.19.6</protobuf.version>
<jackson.version>2.14.0-rc1</jackson.version>

<!-- Other properties -->
<!-- Turn off tests which rely on native code -->
Expand Down