This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 7dbe086b1 Remove RDF packages from distribution.
7dbe086b1 is described below
commit 7dbe086b1486dbcd093a48c9209dccb6091aa0f2
Author: JamesBognar <[email protected]>
AuthorDate: Sat Sep 17 10:32:39 2022 -0400
Remove RDF packages from distribution.
---
juneau-all/pom.xml | 5 -----
.../juneau-examples-core/build-overlay/pom.xml | 5 -----
juneau-examples/juneau-examples-core/pom.xml | 4 ----
.../juneau-examples-rest-jetty/build-overlay/pom.xml | 19 -------------------
.../build-overlay/pom.xml | 8 --------
juneau-examples/juneau-examples-rest/pom.xml | 4 ----
juneau-utest/pom.xml | 5 -----
.../juneau/transforms/RoundTripObjectSwapTest.java | 7 ++++---
pom.xml | 6 ------
9 files changed, 4 insertions(+), 59 deletions(-)
diff --git a/juneau-all/pom.xml b/juneau-all/pom.xml
index 78be64cc3..35d14d4dc 100644
--- a/juneau-all/pom.xml
+++ b/juneau-all/pom.xml
@@ -59,11 +59,6 @@
<artifactId>juneau-microservice-core</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-core</artifactId>
- <optional>true</optional>
- </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
diff --git a/juneau-examples/juneau-examples-core/build-overlay/pom.xml
b/juneau-examples/juneau-examples-core/build-overlay/pom.xml
index 50fc095a5..d01a4fa93 100644
--- a/juneau-examples/juneau-examples-core/build-overlay/pom.xml
+++ b/juneau-examples/juneau-examples-core/build-overlay/pom.xml
@@ -52,11 +52,6 @@
<artifactId>juneau-config</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-core</artifactId>
- <version>${jena.version}</version>
- </dependency>
</dependencies>
</project>
diff --git a/juneau-examples/juneau-examples-core/pom.xml
b/juneau-examples/juneau-examples-core/pom.xml
index 30ee0f26d..bc28b8d39 100644
--- a/juneau-examples/juneau-examples-core/pom.xml
+++ b/juneau-examples/juneau-examples-core/pom.xml
@@ -56,10 +56,6 @@
<artifactId>juneau-config</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-core</artifactId>
- </dependency>
</dependencies>
<build>
diff --git a/juneau-examples/juneau-examples-rest-jetty/build-overlay/pom.xml
b/juneau-examples/juneau-examples-rest-jetty/build-overlay/pom.xml
index 1650f8b03..c0abc746f 100644
--- a/juneau-examples/juneau-examples-rest-jetty/build-overlay/pom.xml
+++ b/juneau-examples/juneau-examples-rest-jetty/build-overlay/pom.xml
@@ -42,7 +42,6 @@
<derby.version>${derby.version}</derby.version>
<springboot.version>${springboot.version}</springboot.version>
<juneau.version>${version}</juneau.version>
- <jena.version>${jena.version}</jena.version>
<junit.version>${junit.version}</junit.version>
<hibernate.version>${hibernate.version}</hibernate.version>
<xml.apis.version>${xml.apis.version}</xml.apis.version>
@@ -86,24 +85,6 @@
<version>\${xml.apis.version}</version>
</dependency>
- <!-- Optional RDF support -->
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-core</artifactId>
- <version>\${jena.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-core</artifactId>
- <version>\${jena.version}</version>
- </dependency>
-
<!-- Other -->
<dependency>
<groupId>junit</groupId>
diff --git
a/juneau-examples/juneau-examples-rest-springboot/build-overlay/pom.xml
b/juneau-examples/juneau-examples-rest-springboot/build-overlay/pom.xml
index b55f48849..e8110d87a 100644
--- a/juneau-examples/juneau-examples-rest-springboot/build-overlay/pom.xml
+++ b/juneau-examples/juneau-examples-rest-springboot/build-overlay/pom.xml
@@ -50,7 +50,6 @@
<maven.javadoc.skip>true</maven.javadoc.skip>
<juneau.version>${version}</juneau.version>
- <jena.version>${jena.version}</jena.version>
<springboot.version>2.4.2</springboot.version>
</properties>
@@ -108,13 +107,6 @@
<artifactId>xml-apis</artifactId>
</dependency>
- <!-- Optional RDF support -->
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-core</artifactId>
- <version>\${jena.version}</version>
- </dependency>
-
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
diff --git a/juneau-examples/juneau-examples-rest/pom.xml
b/juneau-examples/juneau-examples-rest/pom.xml
index d8cd94eb2..b9ea753ca 100644
--- a/juneau-examples/juneau-examples-rest/pom.xml
+++ b/juneau-examples/juneau-examples-rest/pom.xml
@@ -53,10 +53,6 @@
<artifactId>juneau-examples-core</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-core</artifactId>
- </dependency>
<!-- Needed for JPA persistence of PetStore beans -->
<dependency>
diff --git a/juneau-utest/pom.xml b/juneau-utest/pom.xml
index a3613ed65..671992196 100644
--- a/juneau-utest/pom.xml
+++ b/juneau-utest/pom.xml
@@ -54,11 +54,6 @@
<artifactId>juneau-rest-mock</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-core</artifactId>
- <optional>false</optional>
- </dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/transforms/RoundTripObjectSwapTest.java
b/juneau-utest/src/test/java/org/apache/juneau/transforms/RoundTripObjectSwapTest.java
index 3f8a9a7a6..8154c61e7 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/transforms/RoundTripObjectSwapTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/transforms/RoundTripObjectSwapTest.java
@@ -15,7 +15,8 @@ package org.apache.juneau.transforms;
import static org.apache.juneau.internal.StringUtils.*;
import static org.junit.runners.MethodSorters.*;
-import org.apache.jena.ext.com.google.common.base.*;
+import java.util.*;
+
import org.apache.juneau.*;
import org.apache.juneau.swap.*;
import org.junit.*;
@@ -44,7 +45,7 @@ public abstract class RoundTripObjectSwapTest<T,S> {
@Test
public void testSwap() throws Exception {
S s = ss.swap(bs, o);
- if (! Objects.equal(expected, s)) {
+ if (! Objects.equals(expected, s)) {
fail("Test [{0} swap] failed. Expected=[{1}],
Actual=[{2}]", label, expected, s);
}
}
@@ -54,7 +55,7 @@ public abstract class RoundTripObjectSwapTest<T,S> {
S s = ss.swap(bs, o);
T o2 = ss.unswap(bs, s, bs.getClassMetaForObject(o));
S s2 = ss.swap(bs, o2);
- if (! Objects.equal(s, s2)) {
+ if (! Objects.equals(s, s2)) {
System.err.println("s=["+s+"], o=["+o+"],
o.type=["+o.getClass().getName()+"], o2=["+o2+"],
o2.type=["+o2.getClass().getName()+"]"); // NOT DEBUG
fail("Test [{0} unswap] failed. Expected=[{1}],
Actual=[{2}]", label, s, s2);
}
diff --git a/pom.xml b/pom.xml
index 2aef6479d..721138b31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,6 @@
<maven.compiler.target>1.8</maven.compiler.target>
<jaxb.version>2.3.1</jaxb.version>
- <jena.version>3.10.0</jena.version>
<junit.version>4.13.1</junit.version>
<jaxrs.version>1.1.1</jaxrs.version>
<servlet.version>4.0.1</servlet.version>
@@ -56,11 +55,6 @@
<dependencyManagement>
<dependencies>
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-core</artifactId>
- <version>${jena.version}</version>
- </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
