Repository: syncope Updated Branches: refs/heads/2_0_X ef1d815da -> 389c78d41 refs/heads/master e2a17b0f9 -> 7006d43de
Removing unused cxf-rt-databinding-jaxb Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/e8861f0d Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/e8861f0d Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/e8861f0d Branch: refs/heads/2_0_X Commit: e8861f0da6f1963439f361cf0fd40d1f7b589735 Parents: ef1d815 Author: Francesco Chicchiriccò <[email protected]> Authored: Fri Oct 7 16:37:32 2016 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Fri Oct 7 16:37:32 2016 +0200 ---------------------------------------------------------------------- client/lib/pom.xml | 9 --------- common/lib/pom.xml | 13 ++++++++----- .../META-INF/MANIFEST.MF | 6 +----- .../build.properties | 4 ---- pom.xml | 15 ++++++++++----- 5 files changed, 19 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/e8861f0d/client/lib/pom.xml ---------------------------------------------------------------------- diff --git a/client/lib/pom.xml b/client/lib/pom.xml index e8dc061..17e6bc6 100644 --- a/client/lib/pom.xml +++ b/client/lib/pom.xml @@ -39,18 +39,9 @@ under the License. <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> - </dependency> - - <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-client</artifactId> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-databinding-jaxb</artifactId> - </dependency> <dependency> <groupId>com.fasterxml.jackson.datatype</groupId> http://git-wip-us.apache.org/repos/asf/syncope/blob/e8861f0d/common/lib/pom.xml ---------------------------------------------------------------------- diff --git a/common/lib/pom.xml b/common/lib/pom.xml index d9b88bb..6744ebb 100644 --- a/common/lib/pom.xml +++ b/common/lib/pom.xml @@ -39,6 +39,14 @@ under the License. <dependencies> <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>javax.ws.rs</groupId> <artifactId>javax.ws.rs-api</artifactId> </dependency> @@ -77,11 +85,6 @@ under the License. <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-databinding-jaxb</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/syncope/blob/e8861f0d/ide/eclipse/bundles/org.apache.syncope.ide.eclipse.plugin/META-INF/MANIFEST.MF ---------------------------------------------------------------------- diff --git a/ide/eclipse/bundles/org.apache.syncope.ide.eclipse.plugin/META-INF/MANIFEST.MF b/ide/eclipse/bundles/org.apache.syncope.ide.eclipse.plugin/META-INF/MANIFEST.MF index 62a392c..4be1800 100644 --- a/ide/eclipse/bundles/org.apache.syncope.ide.eclipse.plugin/META-INF/MANIFEST.MF +++ b/ide/eclipse/bundles/org.apache.syncope.ide.eclipse.plugin/META-INF/MANIFEST.MF @@ -12,17 +12,14 @@ Require-Bundle: org.eclipse.ui, org.eclipse.wst.sse.ui;bundle-version="1.3.401" Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ActivationPolicy: lazy -Bundle-ClassPath: lib/asm.jar, - lib/commons-codec.jar, +Bundle-ClassPath: lib/commons-codec.jar, lib/commons-collections4.jar, lib/commons-lang3.jar, lib/cxf-core.jar, - lib/cxf-rt-databinding-jaxb.jar, lib/cxf-rt-frontend-jaxrs.jar, lib/cxf-rt-rs-client.jar, lib/cxf-rt-rs-extension-search.jar, lib/cxf-rt-transports-http.jar, - lib/cxf-rt-wsdl.jar, lib/jackson-annotations.jar, lib/jackson-core.jar, lib/jackson-databind.jar, @@ -43,7 +40,6 @@ Bundle-ClassPath: lib/asm.jar, lib/syncope-common-rest-api.jar, lib/validation-api.jar, lib/woodstox-core-asl.jar, - lib/wsdl4j.jar, lib/xmlschema-core.jar, lib/jsoup.jar, . http://git-wip-us.apache.org/repos/asf/syncope/blob/e8861f0d/ide/eclipse/bundles/org.apache.syncope.ide.eclipse.plugin/build.properties ---------------------------------------------------------------------- diff --git a/ide/eclipse/bundles/org.apache.syncope.ide.eclipse.plugin/build.properties b/ide/eclipse/bundles/org.apache.syncope.ide.eclipse.plugin/build.properties index de5f479..6d6ac1f 100644 --- a/ide/eclipse/bundles/org.apache.syncope.ide.eclipse.plugin/build.properties +++ b/ide/eclipse/bundles/org.apache.syncope.ide.eclipse.plugin/build.properties @@ -23,17 +23,14 @@ bin.includes = plugin.xml,\ META-INF/,\ .,\ src/main/resources/icons/,\ - lib/asm.jar,\ lib/commons-codec.jar,\ lib/commons-collections4.jar,\ lib/commons-lang3.jar,\ lib/cxf-core.jar,\ - lib/cxf-rt-databinding-jaxb.jar,\ lib/cxf-rt-frontend-jaxrs.jar,\ lib/cxf-rt-rs-client.jar,\ lib/cxf-rt-rs-extension-search.jar,\ lib/cxf-rt-transports-http.jar,\ - lib/cxf-rt-wsdl.jar,\ lib/jackson-annotations.jar,\ lib/jackson-core.jar,\ lib/jackson-databind.jar,\ @@ -54,6 +51,5 @@ bin.includes = plugin.xml,\ lib/syncope-common-rest-api.jar,\ lib/validation-api.jar,\ lib/woodstox-core-asl.jar,\ - lib/wsdl4j.jar,\ lib/xmlschema-core.jar,\ lib/jsoup.jar http://git-wip-us.apache.org/repos/asf/syncope/blob/e8861f0d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7d87dba..aa7b6e2 100644 --- a/pom.xml +++ b/pom.xml @@ -484,6 +484,16 @@ under the License. <dependencies> <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-core</artifactId> + <version>2.2.11</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <version>2.2.11</version> + </dependency> + <dependency> <groupId>javax.validation</groupId> <artifactId>validation-api</artifactId> <version>1.1.0.Final</version> @@ -550,11 +560,6 @@ under the License. </dependency> <dependency> <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-databinding-jaxb</artifactId> - <version>${cxf.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-client</artifactId> <version>${cxf.version}</version> </dependency>
