This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch juneau-8.1.4-branch
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/juneau-8.1.4-branch by this
push:
new 64089fe85 Revert to base.
64089fe85 is described below
commit 64089fe8570e7c3a4112add89e51471e6924a8e0
Author: James Bognar <[email protected]>
AuthorDate: Wed Oct 16 10:44:53 2024 -0400
Revert to base.
---
juneau-core/juneau-config/pom.xml | 6 +--
juneau-core/juneau-core-utest/pom.xml | 12 +++--
.../juneau/transforms/LocalizedDatesTest.java | 1 +
juneau-core/juneau-dto/pom.xml | 9 ++--
juneau-core/juneau-marshall-rdf/pom.xml | 6 +--
juneau-core/juneau-marshall/pom.xml | 9 ++--
juneau-doc/pom.xml | 4 +-
.../juneau-examples-core/build-overlay/pom.xml | 4 +-
juneau-examples/juneau-examples-core/pom.xml | 4 +-
.../juneau-examples-rest-jetty-ftest/pom.xml | 1 -
.../build-overlay/pom.xml | 8 +--
juneau-examples/juneau-examples-rest-jetty/pom.xml | 1 -
.../build-overlay/pom.xml | 4 +-
.../juneau-examples-rest-springboot/pom.xml | 4 +-
.../juneau-microservice-core/pom.xml | 4 +-
.../juneau-microservice-ftest/pom.xml | 16 ++++--
.../juneau-microservice-jetty/pom.xml | 4 +-
.../juneau-my-jetty-microservice/pom.xml | 8 +--
.../juneau-my-springboot-microservice/pom.xml | 6 +--
juneau-rest/juneau-rest-client-utest/pom.xml | 14 +++--
juneau-rest/juneau-rest-client/pom.xml | 16 ++++--
juneau-rest/juneau-rest-mock-utest/pom.xml | 6 +--
juneau-rest/juneau-rest-mock/pom.xml | 16 ++++--
juneau-rest/juneau-rest-server-jaxrs/pom.xml | 6 +--
juneau-rest/juneau-rest-server-rdf/pom.xml | 6 +--
juneau-rest/juneau-rest-server-springboot/pom.xml | 6 +--
juneau-rest/juneau-rest-server-utest/pom.xml | 18 ++++---
juneau-rest/juneau-rest-server/pom.xml | 17 ++++--
pom.xml | 62 ++++++++++++++--------
29 files changed, 169 insertions(+), 109 deletions(-)
diff --git a/juneau-core/juneau-config/pom.xml
b/juneau-core/juneau-config/pom.xml
index 1f88ff7be..c71a1bdde 100644
--- a/juneau-core/juneau-config/pom.xml
+++ b/juneau-core/juneau-config/pom.xml
@@ -40,8 +40,8 @@
<!-- Skip javadoc generation since we generate them in the
aggregate pom -->
<maven.javadoc.skip>true</maven.javadoc.skip>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
</properties>
<build>
@@ -49,7 +49,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>5.1.9</version>
+ <version>3.2.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/juneau-core/juneau-core-utest/pom.xml
b/juneau-core/juneau-core-utest/pom.xml
index 61bb42db2..b7846aace 100644
--- a/juneau-core/juneau-core-utest/pom.xml
+++ b/juneau-core/juneau-core-utest/pom.xml
@@ -54,6 +54,10 @@
<artifactId>jena-core</artifactId>
<optional>false</optional>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -63,9 +67,9 @@
<properties>
<!-- Skip javadoc generation since we generate them in the
aggregate pom -->
<maven.javadoc.skip>true</maven.javadoc.skip>
-
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
</properties>
<build>
@@ -73,7 +77,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>5.1.9</version>
+ <version>3.2.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/LocalizedDatesTest.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/LocalizedDatesTest.java
index ee217f70a..d29681222 100644
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/LocalizedDatesTest.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/LocalizedDatesTest.java
@@ -26,6 +26,7 @@ import org.junit.runners.*;
@RunWith(Parameterized.class)
@SuppressWarnings("deprecation")
+@Ignore
public class LocalizedDatesTest {
private static Calendar testDate = new
GregorianCalendar(TimeZone.getTimeZone("GMT"));
diff --git a/juneau-core/juneau-dto/pom.xml b/juneau-core/juneau-dto/pom.xml
index 536054cc0..0caba1919 100644
--- a/juneau-core/juneau-dto/pom.xml
+++ b/juneau-core/juneau-dto/pom.xml
@@ -37,16 +37,15 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>${jaxb.version}</version>
</dependency>
</dependencies>
<properties>
<!-- Skip javadoc generation since we generate them in the
aggregate pom -->
<maven.javadoc.skip>true</maven.javadoc.skip>
-
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
</properties>
<build>
@@ -54,7 +53,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>5.1.9</version>
+ <version>3.2.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/juneau-core/juneau-marshall-rdf/pom.xml
b/juneau-core/juneau-marshall-rdf/pom.xml
index fbc2f6ae5..8b3f03f07 100644
--- a/juneau-core/juneau-marshall-rdf/pom.xml
+++ b/juneau-core/juneau-marshall-rdf/pom.xml
@@ -49,8 +49,8 @@
<!-- Skip javadoc generation since we generate them in the
aggregate pom -->
<maven.javadoc.skip>true</maven.javadoc.skip>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
</properties>
<build>
@@ -58,7 +58,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>5.1.9</version>
+ <version>3.2.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/juneau-core/juneau-marshall/pom.xml
b/juneau-core/juneau-marshall/pom.xml
index c588c86ce..421aee319 100644
--- a/juneau-core/juneau-marshall/pom.xml
+++ b/juneau-core/juneau-marshall/pom.xml
@@ -31,16 +31,15 @@
<properties>
<!-- Skip javadoc generation since we generate them in the
aggregate pom -->
<maven.javadoc.skip>true</maven.javadoc.skip>
-
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
</properties>
<dependencies>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>${jaxb.version}</version>
</dependency>
</dependencies>
@@ -49,7 +48,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>5.1.9</version>
+ <version>3.2.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/juneau-doc/pom.xml b/juneau-doc/pom.xml
index 2ced8b89d..04b9837f3 100644
--- a/juneau-doc/pom.xml
+++ b/juneau-doc/pom.xml
@@ -102,7 +102,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>5.1.9</version>
+ <version>3.2.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -125,5 +125,5 @@
</plugin>
</plugins>
</build>
-
+
</project>
diff --git a/juneau-examples/juneau-examples-core/build-overlay/pom.xml
b/juneau-examples/juneau-examples-core/build-overlay/pom.xml
index ab7b7b9d0..50fc095a5 100644
--- a/juneau-examples/juneau-examples-core/build-overlay/pom.xml
+++ b/juneau-examples/juneau-examples-core/build-overlay/pom.xml
@@ -27,8 +27,8 @@
<!-- Skip javadoc generation since we generate them in the
aggregate pom -->
<maven.javadoc.skip>true</maven.javadoc.skip>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
</properties>
<dependencies>
diff --git a/juneau-examples/juneau-examples-core/pom.xml
b/juneau-examples/juneau-examples-core/pom.xml
index a4f2051f0..2471f0cd2 100644
--- a/juneau-examples/juneau-examples-core/pom.xml
+++ b/juneau-examples/juneau-examples-core/pom.xml
@@ -31,8 +31,8 @@
<!-- Skip javadoc generation since we generate them in the
aggregate pom -->
<maven.javadoc.skip>true</maven.javadoc.skip>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
</properties>
<dependencies>
diff --git a/juneau-examples/juneau-examples-rest-jetty-ftest/pom.xml
b/juneau-examples/juneau-examples-rest-jetty-ftest/pom.xml
index c81197002..f83cb405b 100644
--- a/juneau-examples/juneau-examples-rest-jetty-ftest/pom.xml
+++ b/juneau-examples/juneau-examples-rest-jetty-ftest/pom.xml
@@ -61,7 +61,6 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>${jaxb.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
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 cfb98f2e6..6bb96537f 100644
--- a/juneau-examples/juneau-examples-rest-jetty/build-overlay/pom.xml
+++ b/juneau-examples/juneau-examples-rest-jetty/build-overlay/pom.xml
@@ -33,8 +33,8 @@
<properties>
<encoding>UTF-8</encoding>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -127,8 +127,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>11</source>
- <target>11</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
diff --git a/juneau-examples/juneau-examples-rest-jetty/pom.xml
b/juneau-examples/juneau-examples-rest-jetty/pom.xml
index 06ad95d18..e940bc760 100644
--- a/juneau-examples/juneau-examples-rest-jetty/pom.xml
+++ b/juneau-examples/juneau-examples-rest-jetty/pom.xml
@@ -54,7 +54,6 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>${jaxb.version}</version>
</dependency>
</dependencies>
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 78a3afe31..4cced1573 100644
--- a/juneau-examples/juneau-examples-rest-springboot/build-overlay/pom.xml
+++ b/juneau-examples/juneau-examples-rest-springboot/build-overlay/pom.xml
@@ -43,8 +43,8 @@
<properties>
<encoding>UTF-8</encoding>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/juneau-examples/juneau-examples-rest-springboot/pom.xml
b/juneau-examples/juneau-examples-rest-springboot/pom.xml
index 4b809f501..a39d69483 100644
--- a/juneau-examples/juneau-examples-rest-springboot/pom.xml
+++ b/juneau-examples/juneau-examples-rest-springboot/pom.xml
@@ -35,8 +35,8 @@
<maven.javadoc.skip>true</maven.javadoc.skip>
<!-- Java 8 required because Jetty requires it. -->
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
<springframework.version>2.0.1.RELEASE</springframework.version>
</properties>
diff --git a/juneau-microservice/juneau-microservice-core/pom.xml
b/juneau-microservice/juneau-microservice-core/pom.xml
index c09147b74..116ec3b5d 100644
--- a/juneau-microservice/juneau-microservice-core/pom.xml
+++ b/juneau-microservice/juneau-microservice-core/pom.xml
@@ -32,8 +32,8 @@
<maven.javadoc.skip>true</maven.javadoc.skip>
<!-- Java 8 required because Jetty requires it. -->
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
</properties>
<dependencies>
diff --git a/juneau-microservice/juneau-microservice-ftest/pom.xml
b/juneau-microservice/juneau-microservice-ftest/pom.xml
index 44f2df2bf..160d44112 100644
--- a/juneau-microservice/juneau-microservice-ftest/pom.xml
+++ b/juneau-microservice/juneau-microservice-ftest/pom.xml
@@ -29,10 +29,10 @@
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
-
+
<!-- Java 8 required because Jetty requires it. -->
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
</properties>
<dependencies>
@@ -74,6 +74,14 @@
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-core-utest</artifactId>
@@ -87,7 +95,7 @@
<type>test-jar</type>
</dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
diff --git a/juneau-microservice/juneau-microservice-jetty/pom.xml
b/juneau-microservice/juneau-microservice-jetty/pom.xml
index 29b3518fa..af2c234a5 100644
--- a/juneau-microservice/juneau-microservice-jetty/pom.xml
+++ b/juneau-microservice/juneau-microservice-jetty/pom.xml
@@ -32,8 +32,8 @@
<maven.javadoc.skip>true</maven.javadoc.skip>
<!-- Java 8 required because Jetty requires it. -->
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
</properties>
<dependencies>
diff --git a/juneau-microservice/juneau-my-jetty-microservice/pom.xml
b/juneau-microservice/juneau-my-jetty-microservice/pom.xml
index dee7165c5..25e74a4fe 100644
--- a/juneau-microservice/juneau-my-jetty-microservice/pom.xml
+++ b/juneau-microservice/juneau-my-jetty-microservice/pom.xml
@@ -24,7 +24,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-microservice</artifactId>
@@ -34,12 +34,12 @@
<artifactId>juneau-my-jetty-microservice</artifactId>
<name>juneau/microservice/my-jetty-microservice</name>
<description>Apache Juneau Jetty Microservice Template</description>
-
+
<properties>
<juneau.version>8.1.4-SNAPSHOT</juneau.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
-
+
<dependencies>
<dependency>
<groupId>org.apache.juneau</groupId>
@@ -47,7 +47,7 @@
<version>${juneau.version}</version>
</dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
diff --git a/juneau-microservice/juneau-my-springboot-microservice/pom.xml
b/juneau-microservice/juneau-my-springboot-microservice/pom.xml
index 9690f4eaf..d34e26edb 100644
--- a/juneau-microservice/juneau-my-springboot-microservice/pom.xml
+++ b/juneau-microservice/juneau-my-springboot-microservice/pom.xml
@@ -34,12 +34,12 @@
<artifactId>juneau-my-springboot-microservice</artifactId>
<name>juneau/microservice/my-springboot-microservice</name>
<description>Apache Juneau Spring Boot Microservice
Template</description>
-
+
<properties>
<juneau.version>8.1.4-SNAPSHOT</juneau.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
-
+
<dependencies>
<dependency>
<groupId>org.apache.juneau</groupId>
@@ -52,7 +52,7 @@
<version>${juneau.version}</version>
</dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
diff --git a/juneau-rest/juneau-rest-client-utest/pom.xml
b/juneau-rest/juneau-rest-client-utest/pom.xml
index e1abff389..44265627f 100644
--- a/juneau-rest/juneau-rest-client-utest/pom.xml
+++ b/juneau-rest/juneau-rest-client-utest/pom.xml
@@ -37,6 +37,14 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -67,9 +75,9 @@
<properties>
<!-- Skip javadoc generation since we generate them in the
aggregate pom -->
<maven.javadoc.skip>true</maven.javadoc.skip>
-
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
</properties>
<build>
diff --git a/juneau-rest/juneau-rest-client/pom.xml
b/juneau-rest/juneau-rest-client/pom.xml
index 9379b02f9..46e75b96c 100644
--- a/juneau-rest/juneau-rest-client/pom.xml
+++ b/juneau-rest/juneau-rest-client/pom.xml
@@ -38,14 +38,22 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
+ </dependency>
</dependencies>
<properties>
<!-- Skip javadoc generation since we generate them in the
aggregate pom -->
<maven.javadoc.skip>true</maven.javadoc.skip>
-
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
</properties>
<build>
@@ -53,7 +61,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>5.1.9</version>
+ <version>3.2.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/juneau-rest/juneau-rest-mock-utest/pom.xml
b/juneau-rest/juneau-rest-mock-utest/pom.xml
index a1749d36b..5eb18d266 100644
--- a/juneau-rest/juneau-rest-mock-utest/pom.xml
+++ b/juneau-rest/juneau-rest-mock-utest/pom.xml
@@ -54,8 +54,8 @@
<!-- Skip javadoc generation since we generate them in the
aggregate pom -->
<maven.javadoc.skip>true</maven.javadoc.skip>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
</properties>
<build>
@@ -63,7 +63,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>5.1.9</version>
+ <version>3.2.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/juneau-rest/juneau-rest-mock/pom.xml
b/juneau-rest/juneau-rest-mock/pom.xml
index d1bf1a1e0..b20334e17 100644
--- a/juneau-rest/juneau-rest-mock/pom.xml
+++ b/juneau-rest/juneau-rest-mock/pom.xml
@@ -43,6 +43,14 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
+ </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
@@ -52,9 +60,9 @@
<properties>
<!-- Skip javadoc generation since we generate them in the
aggregate pom -->
<maven.javadoc.skip>true</maven.javadoc.skip>
-
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
</properties>
<build>
@@ -62,7 +70,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>5.1.9</version>
+ <version>3.2.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/juneau-rest/juneau-rest-server-jaxrs/pom.xml
b/juneau-rest/juneau-rest-server-jaxrs/pom.xml
index 4d2e98aac..ca4196cfc 100644
--- a/juneau-rest/juneau-rest-server-jaxrs/pom.xml
+++ b/juneau-rest/juneau-rest-server-jaxrs/pom.xml
@@ -59,8 +59,8 @@
<!-- Skip javadoc generation since we generate them in the
aggregate pom -->
<maven.javadoc.skip>true</maven.javadoc.skip>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
</properties>
<build>
@@ -81,7 +81,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>5.1.9</version>
+ <version>3.2.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/juneau-rest/juneau-rest-server-rdf/pom.xml
b/juneau-rest/juneau-rest-server-rdf/pom.xml
index cb6c9af5d..282acee49 100644
--- a/juneau-rest/juneau-rest-server-rdf/pom.xml
+++ b/juneau-rest/juneau-rest-server-rdf/pom.xml
@@ -49,8 +49,8 @@
<!-- Skip javadoc generation since we generate them in the
aggregate pom -->
<maven.javadoc.skip>true</maven.javadoc.skip>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
</properties>
<build>
@@ -71,7 +71,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>5.1.9</version>
+ <version>3.2.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/juneau-rest/juneau-rest-server-springboot/pom.xml
b/juneau-rest/juneau-rest-server-springboot/pom.xml
index 6157a37be..56127362a 100644
--- a/juneau-rest/juneau-rest-server-springboot/pom.xml
+++ b/juneau-rest/juneau-rest-server-springboot/pom.xml
@@ -53,8 +53,8 @@
<!-- Skip javadoc generation since we generate them in the
aggregate pom -->
<maven.javadoc.skip>true</maven.javadoc.skip>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
</properties>
<build>
@@ -75,7 +75,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>5.1.9</version>
+ <version>3.2.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/juneau-rest/juneau-rest-server-utest/pom.xml
b/juneau-rest/juneau-rest-server-utest/pom.xml
index 4d1d248f5..fc62c0030 100644
--- a/juneau-rest/juneau-rest-server-utest/pom.xml
+++ b/juneau-rest/juneau-rest-server-utest/pom.xml
@@ -41,12 +41,14 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>${jaxb.version}</version>
</dependency>
<dependency>
- <groupId>javax.xml.parsers</groupId>
- <artifactId>jaxp-api</artifactId>
- <version>1.4.5</version>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
</dependency>
<dependency>
<groupId>org.apache.juneau</groupId>
@@ -69,9 +71,9 @@
<properties>
<!-- Skip javadoc generation since we generate them in the
aggregate pom -->
<maven.javadoc.skip>true</maven.javadoc.skip>
-
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
</properties>
<build>
@@ -92,7 +94,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>5.1.9</version>
+ <version>3.2.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/juneau-rest/juneau-rest-server/pom.xml
b/juneau-rest/juneau-rest-server/pom.xml
index 3ab6c34a7..dc03d7ce4 100644
--- a/juneau-rest/juneau-rest-server/pom.xml
+++ b/juneau-rest/juneau-rest-server/pom.xml
@@ -51,16 +51,23 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>${jaxb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
</dependency>
</dependencies>
<properties>
<!-- Skip javadoc generation since we generate them in the
aggregate pom -->
<maven.javadoc.skip>true</maven.javadoc.skip>
-
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
</properties>
<build>
@@ -81,7 +88,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>5.1.9</version>
+ <version>3.2.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/pom.xml b/pom.xml
index 2c05635e3..dea6eecf7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<packaging>pom</packaging>
<name>juneau</name>
<description>Apache Juneau</description>
-
+
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
@@ -32,8 +32,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
<jaxb.version>2.3.1</jaxb.version>
<jena.version>3.10.0</jena.version>
@@ -77,6 +77,12 @@
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb.version}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
@@ -87,6 +93,18 @@
<artifactId>httpmime</artifactId>
<version>${httpclient.version}</version>
</dependency>
+ <dependency>
+ <!-- Java 11 -->
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ <version>1.2.0</version>
+ </dependency>
+ <dependency>
+ <!-- Java 11 -->
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
+ <version>1.2.0</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -101,7 +119,7 @@
</modules>
<distributionManagement>
- <!-- Uncomment to generate Maven site in /tmp/site -->
+ <!-- Uncomment to generate Maven site in /tmp/site -->
<!--site>
<id>${project.artifactId}-site</id>
<url>file:///tmp/site</url>
@@ -129,9 +147,9 @@
</execution>
</executions>
</plugin>
-
- <!--
- Runs Apache Rat against all source code to make
sure all files have licenses.
+
+ <!--
+ Runs Apache Rat against all source code to make
sure all files have licenses.
-->
<plugin>
<groupId>org.apache.rat</groupId>
@@ -144,8 +162,8 @@
<exclude>**/DEPENDENCIES</exclude>
<exclude>**/target/**</exclude>
<exclude>**/empty.txt</exclude>
-
-
+
+
<!-- Eclipse metadata files -->
<exclude>**/.settings/**</exclude>
<exclude>**/.project</exclude>
@@ -155,21 +173,21 @@
<!-- Overlay files -->
<exclude>**/*.2</exclude>
-
+
<!-- Generated by embedded
jetty server -->
<exclude>**/jetty.out.xml</exclude>
<exclude>**/derby.log</exclude>
-
+
<!-- Generated in
juneau-microservice-template for some reason -->
<exclude>**/dependency-reduced-pom.xml</exclude>
<!-- Generated by
juneau-docs.jar -->
<exclude>**/docs.txt</exclude>
<exclude>**/toc.txt</exclude>
-
+
<!-- Files needed by Heroku
as-is -->
- <exclude>**/app.json</exclude>
- <exclude>**/Procfile</exclude>
+ <exclude>**/app.json</exclude>
+ <exclude>**/Procfile</exclude>
</excludes>
<consoleOutput>true</consoleOutput>
<!-- Note: useEclipseDefaultExcludes
does not work for subprojects. See RAT-107 -->
@@ -187,7 +205,7 @@
<pluginManagement>
<plugins>
-
+
<!-- Generates the javadocs for all non-test
projects. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -202,7 +220,7 @@
<windowtitle>Apache Juneau
${project.version}</windowtitle>
<author>true</author>
<linksource>true</linksource>
- <source>11</source>
+ <source>1.8</source>
<bootclasspath>${sun.boot.class.path}</bootclasspath>
<overview>${basedir}/juneau-doc/src/main/javadoc/overview.html</overview>
<stylesheetfile>${basedir}/juneau-doc/src/main/javadoc/javadoc.css</stylesheetfile>
@@ -234,7 +252,7 @@
<tagletClass>org.apache.juneau.doc.internal.SourceTag</tagletClass>
<tagletpath>${basedir}/juneau-doc/target/juneau-doc-${project.version}.jar</tagletpath>
</taglet>
-
+
<!--org.apache.juneau.doc.internal.DocTag</taglet-->
<!--
taglet>org.apache.juneau.doc.internal.PropertyTag</taglet-->
</taglets>
@@ -260,8 +278,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>11</source>
- <target>11</target>
+ <source>1.8</source>
+ <target>1.8</target>
<compilerArgument>-parameters</compilerArgument>
<testCompilerArgument>-parameters</testCompilerArgument>
</configuration>
@@ -340,8 +358,8 @@
</reporting>
<url>https://juneau.apache.org/</url>
- <!--
- Inherited from parent pom
+ <!--
+ Inherited from parent pom
<organization>
<name>The Apache Software Foundation</name>
<url>https://www.apache.org/</url>
@@ -353,7 +371,7 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf/juneau.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/juneau.git</developerConnection>
<url>https://github.com/apache/juneau</url>
- <tag>juneau-8.1.4-RC2</tag>
+ <tag>juneau-8.1.4-RC1</tag>
</scm>
<issueManagement>
<system>Jira</system>
