Repository: knox Updated Branches: refs/heads/master 1fb503e9c -> bb2066662
KNOX-1504 - Upgrade eclipselink to 2.7.3 Signed-off-by: Kevin Risden <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/bb206666 Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/bb206666 Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/bb206666 Branch: refs/heads/master Commit: bb2066662948a960c9706483bd7171a50c72ca07 Parents: 1fb503e Author: Kevin Risden <[email protected]> Authored: Wed Oct 3 08:53:51 2018 -0400 Committer: Kevin Risden <[email protected]> Committed: Thu Oct 4 09:01:45 2018 -0400 ---------------------------------------------------------------------- gateway-applications/pom.xml | 21 ----------- gateway-server/pom.xml | 9 ++++- gateway-service-admin/pom.xml | 8 +++++ gateway-service-definitions/pom.xml | 8 +++++ gateway-service-test/pom.xml | 8 +++++ gateway-test/pom.xml | 10 ++++++ pom.xml | 60 +++++++++++++++++++------------- 7 files changed, 78 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/bb206666/gateway-applications/pom.xml ---------------------------------------------------------------------- diff --git a/gateway-applications/pom.xml b/gateway-applications/pom.xml index f0b5a33..8df92cf 100644 --- a/gateway-applications/pom.xml +++ b/gateway-applications/pom.xml @@ -28,25 +28,4 @@ <artifactId>gateway-applications</artifactId> <name>gateway-applications</name> <description>The applications delivered with Knox.</description> - - <dependencies> - <dependency> - <groupId>org.eclipse.persistence</groupId> - <artifactId>eclipselink</artifactId> - </dependency> - <dependency> - <groupId>org.apache.knox</groupId> - <artifactId>gateway-spi</artifactId> - </dependency> - <dependency> - <groupId>org.apache.knox</groupId> - <artifactId>gateway-test-utils</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - </dependencies> </project> http://git-wip-us.apache.org/repos/asf/knox/blob/bb206666/gateway-server/pom.xml ---------------------------------------------------------------------- diff --git a/gateway-server/pom.xml b/gateway-server/pom.xml index 4b07c1b..2f5b597 100644 --- a/gateway-server/pom.xml +++ b/gateway-server/pom.xml @@ -49,11 +49,18 @@ </build> <dependencies> - <dependency> <groupId>org.eclipse.persistence</groupId> <artifactId>eclipselink</artifactId> </dependency> + <dependency> + <groupId>javax.json</groupId> + <artifactId>javax.json-api</artifactId> + </dependency> + <dependency> + <groupId>org.glassfish</groupId> + <artifactId>javax.json</artifactId> + </dependency> <dependency> <groupId>${gateway-group}</groupId> http://git-wip-us.apache.org/repos/asf/knox/blob/bb206666/gateway-service-admin/pom.xml ---------------------------------------------------------------------- diff --git a/gateway-service-admin/pom.xml b/gateway-service-admin/pom.xml index 005ea4b..4e9d5be 100644 --- a/gateway-service-admin/pom.xml +++ b/gateway-service-admin/pom.xml @@ -50,6 +50,14 @@ <groupId>org.eclipse.persistence</groupId> <artifactId>eclipselink</artifactId> </dependency> + <dependency> + <groupId>javax.json</groupId> + <artifactId>javax.json-api</artifactId> + </dependency> + <dependency> + <groupId>org.glassfish</groupId> + <artifactId>javax.json</artifactId> + </dependency> <dependency> <groupId>commons-io</groupId> http://git-wip-us.apache.org/repos/asf/knox/blob/bb206666/gateway-service-definitions/pom.xml ---------------------------------------------------------------------- diff --git a/gateway-service-definitions/pom.xml b/gateway-service-definitions/pom.xml index a1af6d0..dd63138 100644 --- a/gateway-service-definitions/pom.xml +++ b/gateway-service-definitions/pom.xml @@ -35,6 +35,14 @@ <artifactId>eclipselink</artifactId> </dependency> <dependency> + <groupId>javax.json</groupId> + <artifactId>javax.json-api</artifactId> + </dependency> + <dependency> + <groupId>org.glassfish</groupId> + <artifactId>javax.json</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/bb206666/gateway-service-test/pom.xml ---------------------------------------------------------------------- diff --git a/gateway-service-test/pom.xml b/gateway-service-test/pom.xml index 0c83259..4c9ee3c 100644 --- a/gateway-service-test/pom.xml +++ b/gateway-service-test/pom.xml @@ -46,6 +46,14 @@ <groupId>org.eclipse.persistence</groupId> <artifactId>eclipselink</artifactId> </dependency> + <dependency> + <groupId>javax.json</groupId> + <artifactId>javax.json-api</artifactId> + </dependency> + <dependency> + <groupId>org.glassfish</groupId> + <artifactId>javax.json</artifactId> + </dependency> <dependency> <groupId>org.apache.commons</groupId> http://git-wip-us.apache.org/repos/asf/knox/blob/bb206666/gateway-test/pom.xml ---------------------------------------------------------------------- diff --git a/gateway-test/pom.xml b/gateway-test/pom.xml index cf6642f..9280495 100644 --- a/gateway-test/pom.xml +++ b/gateway-test/pom.xml @@ -273,6 +273,16 @@ <artifactId>javax.servlet-api</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>javax.json</groupId> + <artifactId>javax.json-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.glassfish</groupId> + <artifactId>javax.json</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>org.apache.directory.server</groupId> http://git-wip-us.apache.org/repos/asf/knox/blob/bb206666/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b977917..f3477f0 100644 --- a/pom.xml +++ b/pom.xml @@ -159,7 +159,7 @@ <curator.version>4.0.1</curator.version> <curator-test.version>2.12.0</curator-test.version> <easymock.version>3.6</easymock.version> - <eclipselink.version>2.5.2</eclipselink.version> + <eclipselink.version>2.7.3</eclipselink.version> <ehcache.version>2.5.0</ehcache.version> <findsecbugs-plugin.version>1.8.0</findsecbugs-plugin.version> <forbiddenapis.version>2.6</forbiddenapis.version> @@ -173,6 +173,7 @@ <jackson.version>2.9.5</jackson.version> <jansi.version>1.17.1</jansi.version> <javax.annotation-api.version>1.2</javax.annotation-api.version> + <javax.json.version>1.1.2</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> @@ -925,17 +926,38 @@ <artifactId>jetty-servlets</artifactId> <version>${jetty.version}</version> </dependency> + + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + <version>${javax.annotation-api.version}</version> + </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> <version>${javax.servlet-api.version}</version> </dependency> + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>javax.ws.rs-api</artifactId> + <version>${javax.ws.rs-api.version}</version> + </dependency> <dependency> <groupId>org.eclipse.persistence</groupId> <artifactId>eclipselink</artifactId> <version>${eclipselink.version}</version> </dependency> + <dependency> + <groupId>javax.json</groupId> + <artifactId>javax.json-api</artifactId> + <version>${javax.json.version}</version> + </dependency> + <dependency> + <groupId>org.glassfish</groupId> + <artifactId>javax.json</artifactId> + <version>${javax.json.version}</version> + </dependency> <dependency> <groupId>com.thetransactioncompany</groupId> @@ -963,16 +985,19 @@ <artifactId>groovy-json</artifactId> <version>${groovy.version}</version> </dependency> + <dependency> <groupId>org.fusesource.jansi</groupId> <artifactId>jansi</artifactId> <version>${jansi.version}</version> </dependency> + <dependency> <groupId>jline</groupId> <artifactId>jline</artifactId> <version>${jline.version}</version> </dependency> + <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> @@ -983,6 +1008,7 @@ <artifactId>httpcore</artifactId> <version>${httpcore.version}</version> </dependency> + <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> @@ -1294,13 +1320,12 @@ </dependency> <dependency> <groupId>org.apache.shiro</groupId> - <artifactId>shiro-web</artifactId> + <artifactId>shiro-ehcache</artifactId> <version>${shiro.version}</version> </dependency> - <dependency> <groupId>org.apache.shiro</groupId> - <artifactId>shiro-ehcache</artifactId> + <artifactId>shiro-web</artifactId> <version>${shiro.version}</version> </dependency> @@ -1361,6 +1386,7 @@ <artifactId>gateway-demo-ldap-launcher</artifactId> <version>${gateway-version}</version> </dependency> + <dependency> <groupId>net.lingala.zip4j</groupId> <artifactId>zip4j</artifactId> @@ -1390,6 +1416,12 @@ <!-- Websocket support --> <dependency> + <groupId>javax.websocket</groupId> + <artifactId>javax.websocket-api</artifactId> + <version>${javax.websocket-api.version}</version> + </dependency> + + <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-api</artifactId> <version>${jetty.version}</version> @@ -1399,7 +1431,6 @@ <artifactId>websocket-server</artifactId> <version>${jetty.version}</version> </dependency> - <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-servlet</artifactId> @@ -1407,29 +1438,10 @@ </dependency> <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> - <version>${javax.annotation-api.version}</version> - </dependency> - - <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> - <version>${javax.ws.rs-api.version}</version> - </dependency> - - <dependency> - <groupId>javax.websocket</groupId> - <artifactId>javax.websocket-api</artifactId> - <version>${javax.websocket-api.version}</version> - </dependency> - - <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>javax-websocket-server-impl</artifactId> <version>${jetty.version}</version> </dependency> - <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>javax-websocket-client-impl</artifactId>
