Repository: knox Updated Branches: refs/heads/master b5e73f184 -> 5181adb5f
KNOX-1458 - Support JDK 9/10/11 * Add dependencies for deprecated/removed JDK features (javax.annotations, javax.xml.bind) Signed-off-by: Kevin Risden <kris...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/5181adb5 Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/5181adb5 Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/5181adb5 Branch: refs/heads/master Commit: 5181adb5ff727dae4c68585b04f2dc50b2acffbc Parents: b5e73f1 Author: Kevin Risden <kris...@apache.org> Authored: Mon Sep 24 21:35:27 2018 -0400 Committer: Kevin Risden <kris...@apache.org> Committed: Fri Nov 16 15:50:58 2018 -0500 ---------------------------------------------------------------------- .travis.yml | 10 +++------ gateway-adapter/pom.xml | 5 +++++ gateway-provider-rewrite/pom.xml | 5 +++++ gateway-server/pom.xml | 19 ++++++++++++++++ gateway-service-admin/pom.xml | 13 +++++++++++ gateway-service-definitions/pom.xml | 18 ++++++++++++++++ gateway-service-remoteconfig/pom.xml | 13 +++++++++++ gateway-service-test/pom.xml | 15 ++++++++++++- gateway-spi/pom.xml | 5 +++++ gateway-test/pom.xml | 13 ++++++++++- gateway-util-common/pom.xml | 5 +++++ pom.xml | 36 ++++++++++++++++++++++++++++++- 12 files changed, 147 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/5181adb5/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index f31a99f..abe04fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,13 +21,9 @@ matrix: fast_finish: true include: - env: IMAGE=maven:3-jdk-8 - #- env: IMAGE=maven:3-jdk-9 - #- env: IMAGE=maven:3-jdk-10 - #- env: IMAGE=maven:3-jdk-11 - #allow_failures: - #- env: IMAGE=maven:3-jdk-9 - #- env: IMAGE=maven:3-jdk-10 - #- env: IMAGE=maven:3-jdk-11 + - env: IMAGE=maven:3-jdk-9 + - env: IMAGE=maven:3-jdk-10 + - env: IMAGE=maven:3-jdk-11 env: global: http://git-wip-us.apache.org/repos/asf/knox/blob/5181adb5/gateway-adapter/pom.xml ---------------------------------------------------------------------- diff --git a/gateway-adapter/pom.xml b/gateway-adapter/pom.xml index 2005b24..5a15c4d 100644 --- a/gateway-adapter/pom.xml +++ b/gateway-adapter/pom.xml @@ -120,5 +120,10 @@ <groupId>org.apache.knox</groupId> <artifactId>gateway-service-storm</artifactId> </dependency> + + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + </dependency> </dependencies> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/knox/blob/5181adb5/gateway-provider-rewrite/pom.xml ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite/pom.xml b/gateway-provider-rewrite/pom.xml index f17a1f1..6b8d3eb 100644 --- a/gateway-provider-rewrite/pom.xml +++ b/gateway-provider-rewrite/pom.xml @@ -117,6 +117,11 @@ </dependency> <dependency> + <groupId>com.sun.activation</groupId> + <artifactId>javax.activation</artifactId> + </dependency> + + <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/knox/blob/5181adb5/gateway-server/pom.xml ---------------------------------------------------------------------- diff --git a/gateway-server/pom.xml b/gateway-server/pom.xml index 49ee538..a447987 100644 --- a/gateway-server/pom.xml +++ b/gateway-server/pom.xml @@ -136,6 +136,12 @@ </dependency> <dependency> + <groupId>com.sun.xml.ws</groupId> + <artifactId>jaxws-ri</artifactId> + <type>pom</type> + </dependency> + + <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> </dependency> @@ -340,6 +346,19 @@ <artifactId>nimbus-jose-jwt</artifactId> </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-core</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + </dependency> + <!-- ********** ********** ********** ********** ********** ********** --> <!-- ********** Test Dependencies ********** --> <!-- ********** ********** ********** ********** ********** ********** --> http://git-wip-us.apache.org/repos/asf/knox/blob/5181adb5/gateway-service-admin/pom.xml ---------------------------------------------------------------------- diff --git a/gateway-service-admin/pom.xml b/gateway-service-admin/pom.xml index 78d9669..3ab2af6 100644 --- a/gateway-service-admin/pom.xml +++ b/gateway-service-admin/pom.xml @@ -79,6 +79,19 @@ </dependency> <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-core</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + </dependency> + + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/knox/blob/5181adb5/gateway-service-definitions/pom.xml ---------------------------------------------------------------------- diff --git a/gateway-service-definitions/pom.xml b/gateway-service-definitions/pom.xml index 55a034e..7df3b7b 100644 --- a/gateway-service-definitions/pom.xml +++ b/gateway-service-definitions/pom.xml @@ -31,6 +31,24 @@ <dependencies> <dependency> + <groupId>com.sun.activation</groupId> + <artifactId>javax.activation</artifactId> + </dependency> + + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-core</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + </dependency> + + <dependency> <groupId>org.eclipse.persistence</groupId> <artifactId>eclipselink</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/knox/blob/5181adb5/gateway-service-remoteconfig/pom.xml ---------------------------------------------------------------------- diff --git a/gateway-service-remoteconfig/pom.xml b/gateway-service-remoteconfig/pom.xml index c64fd31..b95342a 100644 --- a/gateway-service-remoteconfig/pom.xml +++ b/gateway-service-remoteconfig/pom.xml @@ -62,6 +62,19 @@ </dependency> <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-core</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + </dependency> + + <dependency> <groupId>org.apache.knox</groupId> <artifactId>gateway-test-utils</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/knox/blob/5181adb5/gateway-service-test/pom.xml ---------------------------------------------------------------------- diff --git a/gateway-service-test/pom.xml b/gateway-service-test/pom.xml index 115b524..25fce27 100644 --- a/gateway-service-test/pom.xml +++ b/gateway-service-test/pom.xml @@ -43,6 +43,19 @@ </dependency> <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-core</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + </dependency> + + <dependency> <groupId>org.eclipse.persistence</groupId> <artifactId>eclipselink</artifactId> </dependency> @@ -99,4 +112,4 @@ <scope>test</scope> </dependency> </dependencies> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/knox/blob/5181adb5/gateway-spi/pom.xml ---------------------------------------------------------------------- diff --git a/gateway-spi/pom.xml b/gateway-spi/pom.xml index 22b2d4a..b4e5b02 100644 --- a/gateway-spi/pom.xml +++ b/gateway-spi/pom.xml @@ -129,6 +129,11 @@ </dependency> <dependency> + <groupId>com.sun.activation</groupId> + <artifactId>javax.activation</artifactId> + </dependency> + + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/knox/blob/5181adb5/gateway-test/pom.xml ---------------------------------------------------------------------- diff --git a/gateway-test/pom.xml b/gateway-test/pom.xml index 5784d07..8db50ee 100644 --- a/gateway-test/pom.xml +++ b/gateway-test/pom.xml @@ -123,6 +123,18 @@ </dependency> <dependency> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-yaml</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + <scope>test</scope> + </dependency> + + <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> <scope>test</scope> @@ -138,7 +150,6 @@ <artifactId>hamcrest-library</artifactId> <scope>test</scope> </dependency> - <dependency> <groupId>uk.co.datumedge</groupId> <artifactId>hamcrest-json</artifactId> http://git-wip-us.apache.org/repos/asf/knox/blob/5181adb5/gateway-util-common/pom.xml ---------------------------------------------------------------------- diff --git a/gateway-util-common/pom.xml b/gateway-util-common/pom.xml index 68e8462..f4ad392 100644 --- a/gateway-util-common/pom.xml +++ b/gateway-util-common/pom.xml @@ -55,6 +55,11 @@ </dependency> <dependency> + <groupId>com.sun.activation</groupId> + <artifactId>javax.activation</artifactId> + </dependency> + + <dependency> <groupId>org.apache.directory.server</groupId> <artifactId>apacheds-jdbm</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/knox/blob/5181adb5/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 5e7128e..2f2b8ec 100644 --- a/pom.xml +++ b/pom.xml @@ -141,8 +141,8 @@ <ant-nodeps.version>1.8.1</ant-nodeps.version> <asm.version>7.0</asm.version> <buildnumber-maven-plugin.version>1.4</buildnumber-maven-plugin.version> - <checkstyle.version>8.14</checkstyle.version> <cglib.version>3.2.9</cglib.version> + <checkstyle.version>8.14</checkstyle.version> <commons-beanutils.version>1.9.3</commons-beanutils.version> <commons-cli.version>1.4</commons-cli.version> <commons-codec.version>1.11</commons-codec.version> @@ -172,11 +172,14 @@ <jackson.version>2.9.7</jackson.version> <jacoco-maven-plugin.version>0.8.2</jacoco-maven-plugin.version> <jansi.version>1.17.1</jansi.version> + <javax.activation.version>1.2.0</javax.activation.version> <javax.annotation-api.version>1.2</javax.annotation-api.version> <javax.json.version>1.1.3</javax.json.version> <javax.servlet-api.version>3.1.0</javax.servlet-api.version> <javax.ws.rs-api.version>2.0</javax.ws.rs-api.version> <javax.websocket-api.version>1.1</javax.websocket-api.version> + <jaxb.version>2.3.0</jaxb.version> + <jaxws-ri.version>2.3.1</jaxws-ri.version> <jericho-html.version>3.4</jericho-html.version> <jersey.version>2.6</jersey.version> <jetty.version>9.4.14.v20181114</jetty.version> @@ -378,6 +381,7 @@ change the maven.compiler.{source,target} property --> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludedGroups> @@ -971,6 +975,7 @@ <artifactId>gateway-shell-samples</artifactId> <version>${project.version}</version> </dependency> + <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-common</artifactId> @@ -1063,6 +1068,35 @@ </dependency> <dependency> + <groupId>com.sun.activation</groupId> + <artifactId>javax.activation</artifactId> + <version>${javax.activation.version}</version> + </dependency> + + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb.version}</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-core</artifactId> + <version>${jaxb.version}</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <version>${jaxb.version}</version> + </dependency> + + <dependency> + <groupId>com.sun.xml.ws</groupId> + <artifactId>jaxws-ri</artifactId> + <version>${jaxws-ri.version}</version> + <type>pom</type> + </dependency> + + <dependency> <groupId>org.eclipse.persistence</groupId> <artifactId>eclipselink</artifactId> <version>${eclipselink.version}</version>