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

[CORE-235] Fixing BOM dependency warnings #32

Merged
merged 3 commits into from
Sep 24, 2024
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 docs/standalone-server.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ The standalone server offers the following GraphQL endpoints:

- `/dataset/graphql` - GraphQL Queries using the [Dataset](schemas.md#dataset) schema.
- `/dataset/traversal/graphql` - GraphQL Queries using the [Traversal](schemas.md#traversal) schema.
- `/dataset/telicent/graphql` - GraphQL Queries using the [Telicent](schemas.md#telicent) schema.
- `/dataset/telicent/graphql` - GraphQL Queries using the [Telicent](schemas.md#telicent-ies) schema.
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,11 @@
*/
package io.telicent.jena.graphql.execution;

import graphql.ErrorType;
import graphql.GraphQLError;
import graphql.ParseAndValidateResult;
import graphql.validation.ValidationError;
import io.telicent.jena.graphql.schemas.CoreSchema;
import io.telicent.jena.graphql.utils.NodeFilter;
import org.apache.jena.sparql.core.DatasetGraphFactory;
import org.apache.jena.vocabulary.RDFS;
import org.testng.Assert;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;

import java.io.IOException;
import java.util.List;
import java.util.Map;

import static graphql.validation.ValidationErrorType.InvalidSyntax;

@SuppressWarnings("unchecked")
public class TestDatasetValidation extends AbstractExecutionTests {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,11 @@
*/
package io.telicent.jena.graphql.execution;

import graphql.ExecutionResult;
import io.telicent.jena.graphql.schemas.TraversalSchema;
import io.telicent.jena.graphql.schemas.models.NodeKind;
import org.apache.jena.riot.Lang;
import org.apache.jena.riot.RDFParserBuilder;
import org.apache.jena.sparql.core.DatasetGraph;
import org.apache.jena.sparql.core.DatasetGraphFactory;
import org.apache.jena.sparql.vocabulary.FOAF;
import org.testng.Assert;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
Expand Down
6 changes: 6 additions & 0 deletions graphql-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@
<groupId>io.telicent.smart-caches</groupId>
<artifactId>jaxrs-base-server</artifactId>
<version>${dependency.smart-caches}</version>
<exclusions>
<exclusion>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
import io.telicent.jena.graphql.server.application.resources.AbstractGraphQLResource;
import io.telicent.jena.graphql.server.model.GraphQLRequest;
import io.telicent.jena.graphql.utils.NodeFilter;
import io.telicent.smart.cache.server.jaxrs.applications.Server;
import io.telicent.smart.cache.server.jaxrs.applications.ServerBuilder;
import jakarta.servlet.ServletContext;
import jakarta.ws.rs.client.Entity;
import jakarta.ws.rs.client.Invocation;
Expand All @@ -26,10 +24,9 @@
import jakarta.ws.rs.core.Response;
import org.apache.jena.vocabulary.RDFS;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import static org.mockito.Mockito.*;
import java.io.IOException;

import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.Collections;
Expand Down
14 changes: 12 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,11 @@
<dependency.jena>5.1.0</dependency.jena>
<dependency.jackson>2.17.2</dependency.jackson>
<dependency.jersey>3.1.8</dependency.jersey>
<dependency.jwt-servlet>0.16.0</dependency.jwt-servlet>
<dependency.jwt-servlet>0.17.0</dependency.jwt-servlet>
<dependency.logback>1.5.8</dependency.logback>
<dependency.mockito>5.13.0</dependency.mockito>
<dependency.slf4j>2.0.16</dependency.slf4j>
<dependency.smart-caches>0.22.0</dependency.smart-caches>
<dependency.smart-caches>0.23.0</dependency.smart-caches>
<dependency.testng>7.10.2</dependency.testng>
<dependency.wiremock>3.9.1</dependency.wiremock>

Expand Down Expand Up @@ -170,6 +170,16 @@
<artifactId>wiremock</artifactId>
<version>${dependency.wiremock}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</exclusion>
<exclusion>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
Expand Down
16 changes: 16 additions & 0 deletions telicent-graph-schema/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@
<groupId>io.telicent.public</groupId>
<artifactId>jwt-servlet-auth-aws</artifactId>
<version>${dependency.jwt-servlet}</version>
<exclusions>
<exclusion>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Test Dependencies -->
Expand All @@ -41,6 +47,16 @@
<groupId>org.wiremock</groupId>
<artifactId>wiremock</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</exclusion>
<exclusion>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.testng</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
package io.telicent.jena.graphql.fetchers.telicent.graph;

import com.fasterxml.jackson.databind.ObjectMapper;
import graphql.com.google.common.collect.Streams;
import graphql.schema.DataFetcher;
import graphql.schema.DataFetchingEnvironment;
import io.telicent.jena.graphql.execution.telicent.graph.TelicentExecutionContext;
Expand All @@ -28,7 +27,6 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.jena.graph.Node;
import org.apache.jena.sparql.core.DatasetGraph;
import org.apache.jena.sparql.core.Quad;
import org.apache.jena.system.Txn;
import org.apache.jena.web.HttpSC;
import org.slf4j.Logger;
Expand Down