Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[Minor] Updating dependencies, removing redundant exclusions and addressing warnings. #134

Merged
merged 2 commits into from
Jan 9, 2025
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
2 changes: 1 addition & 1 deletion NOTICE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Telicent Smart Cache Graph
==========================

Copyright (c) 2024 Telicent Ltd.
Copyright (C) 2022-2025 Telicent Ltd
129 changes: 108 additions & 21 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,22 +88,24 @@
<dependency.fuseki-server>${dependency.jena}</dependency.fuseki-server>
<dependency.graphql>0.9.1</dependency.graphql>
<dependency.jwt-servlet-auth>0.17.5</dependency.jwt-servlet-auth>
<dependency.smart-caches-core>0.25.1</dependency.smart-caches-core>
<dependency.smart-caches-core>0.25.2</dependency.smart-caches-core>

<!-- External dependencies -->
<dependency.jackson>2.18.2</dependency.jackson>
<dependency.kafka>3.9.0</dependency.kafka>
<dependency.kotlin>2.1.0</dependency.kotlin>
<dependency.otel>1.33.0</dependency.otel> <!-- These two must be in-step. -->
<dependency.otel-semconv>1.30.1-alpha</dependency.otel-semconv> <!-- These two must be in-step. -->

<!-- Logging dependencies -->
<dependency.log4j2>2.24.3</dependency.log4j2>
<dependency.logback>1.5.15</dependency.logback>
<dependency.logback>1.5.16</dependency.logback>
<dependency.slf4j>2.0.13</dependency.slf4j>

<!-- Test dependencies -->
<dependency.junit5>5.11.4</dependency.junit5>
<dependency.junit5-platform>1.11.4</dependency.junit5-platform>
<dependency.mockito>5.14.2</dependency.mockito>
<dependency.mockito>5.15.2</dependency.mockito>
<dependency.testcontainers>1.20.4</dependency.testcontainers>

<dependency.yaml-config>1.0.7</dependency.yaml-config>
Expand All @@ -129,13 +131,45 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</exclusion>
<exclusion>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-suite-engine</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Complete Fuseki Main server as a single jar -->
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-arq</artifactId>
<version>${dependency.jena}</version>
</dependency>

<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-base</artifactId>
<version>${dependency.jena}</version>
</dependency>

<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-cmds</artifactId>
<version>${dependency.jena}</version>
</dependency>

<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-core</artifactId>
<version>${dependency.jena}</version>
</dependency>

<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-dboe-base</artifactId>
<version>${dependency.jena}</version>
</dependency>

<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-fuseki-core</artifactId>
<version>${dependency.jena}</version>
</dependency>

<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-fuseki-server</artifactId>
Expand All @@ -147,6 +181,24 @@
<artifactId>jena-fuseki-webapp</artifactId>
<version>${dependency.jena}</version>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-rdfpatch</artifactId>
<version>${dependency.jena}</version>
</dependency>

<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-tdb1</artifactId>
<version>${dependency.jena}</version>
</dependency>

<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-tdb2</artifactId>
<version>${dependency.jena}</version>
</dependency>

<!-- Fuseki-Kafka connector -->
<dependency>
<groupId>io.telicent.jena</groupId>
Expand All @@ -159,7 +211,11 @@
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>io.telicent.jena</groupId>
<artifactId>jena-kafka-connector</artifactId>
<version>${dependency.fuseki-kafka}</version>
</dependency>
<!-- ABAC engine -->
<dependency>
<!-- Used in scg-system -->
Expand All @@ -173,6 +229,11 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.telicent.jena</groupId>
<artifactId>rdf-abac-core</artifactId>
<version>${dependency.rdf-abac}</version>
</dependency>
<dependency>
<groupId>io.telicent.jena</groupId>
<artifactId>rdf-abac-fmod</artifactId>
Expand All @@ -184,25 +245,34 @@
<groupId>io.telicent.public</groupId>
<artifactId>jwt-servlet-auth-aws</artifactId>
<version>${dependency.jwt-servlet-auth}</version>
<exclusions>
<exclusion>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.telicent.public</groupId>
<artifactId>jwt-servlet-auth-core</artifactId>
<version>${dependency.jwt-servlet-auth}</version>
</dependency>
<dependency>
<groupId>io.telicent.public</groupId>
<artifactId>jwt-servlet-auth-servlet5</artifactId>
<version>${dependency.jwt-servlet-auth}</version>
</dependency>
<dependency>
<groupId>io.telicent.smart-caches</groupId>
<artifactId>configurator</artifactId>
<version>${dependency.smart-caches-core}</version>
</dependency>
<dependency>
<groupId>io.telicent.smart-caches</groupId>
<artifactId>jwt-auth-common</artifactId>
<version>${dependency.smart-caches-core}</version>
</dependency>

<!-- GraphQL -->
<dependency>
<groupId>io.telicent.jena.graphql</groupId>
<artifactId>graphql-jena-core</artifactId>
<version>${dependency.graphql}</version>
</dependency>
<dependency>
<groupId>io.telicent.jena.graphql</groupId>
<artifactId>graphql-fuseki-module</artifactId>
Expand All @@ -225,6 +295,17 @@
</dependency>

<!-- External Dependencies -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${dependency.jackson}</version>
</dependency>
<!-- Kafka for Event Sourcing -->
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
<version>${dependency.kafka}</version>
</dependency>

<!-- Logging dependencies -->
<dependency>
Expand All @@ -236,12 +317,6 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${dependency.log4j2}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
Expand Down Expand Up @@ -335,6 +410,12 @@
<version>${dependency.mockito}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${dependency.testcontainers}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>kafka</artifactId>
Expand All @@ -347,6 +428,12 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>${dependency.testcontainers}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.telicent.public</groupId>
<artifactId>fuseki-yaml-config</artifactId>
Expand Down Expand Up @@ -465,7 +552,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${plugin.surefire}</version>
<configuration>
<argLine>@{jacocoArgLine} -XX:+EnableDynamicAgentLoading</argLine>
<argLine>@{jacocoArgLine} -javaagent:${org.mockito:mockito-core:jar} -XX:+EnableDynamicAgentLoading -Xshare:off</argLine>
</configuration>
</plugin>

Expand Down
5 changes: 3 additions & 2 deletions scg-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,14 @@
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
<exclude>META-INF/*.xml</exclude>
<exclude>META-INF/MANIFEST.MF</exclude>
<exclude>META-INF.versions.9.module-info</exclude>
<exclude>META-INF/versions/9/module-info</exclude>
<exclude>META-INF/versions/**</exclude>
<exclude>META-INF/DEPENDENCIES</exclude>
<exclude>META-INF/LICENSE-notice.md</exclude>
<exclude>META-INF/maven/com.google.guava/guava/pom.properties</exclude>
<exclude>META-INF/maven/com.google.guava/guava/pom.xml</exclude>
<exclude>META-INF/org/apache/logging/log4j/core/config/plugins/Log4j2Plugins.dat</exclude>
<exclude>META-INF/proguard/*.pro</exclude>
<exclude>logback.xml</exclude>
</excludes>
Expand Down
Loading
Loading