Author: fmui
Date: Tue Dec 15 09:28:11 2015
New Revision: 1720098
URL: http://svn.apache.org/viewvc?rev=1720098&view=rev
Log:
CMIS-962: removed Axis2 and JAX-WS RI support
Removed:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/Axis2PortProvider.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/SunRIPortProvider.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/assembly/client-with-axis2-dependencies-assembly.xml
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/assembly/client-with-ri-dependencies-assembly.xml
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/tube/
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/resources/META-INF/services/
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-axis2-assembly.xml
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-ri-assembly.xml
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-axis2.bat
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-axis2.sh
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-ri.bat
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-ri.sh
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/pom.xml
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/CmisWebServicesSpi.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/pom.xml
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/pom.xml
chemistry/opencmis/trunk/chemistry-opencmis-osgi/chemistry-opencmis-osgi-client/pom.xml
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/pom.xml
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-assembly.xml
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-mac-assembly.xml
chemistry/opencmis/trunk/pom.xml
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/pom.xml
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/pom.xml?rev=1720098&r1=1720097&r2=1720098&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/pom.xml
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/pom.xml
Tue Dec 15 09:28:11 2015
@@ -69,7 +69,6 @@
<copy todir="${gendir}">
<fileset dir="${commons-impl}/${sourcefiles}">
<include name="**/*.java" />
-
<exclude name="**/tube/**" />
<exclude name="**/jaxb/**" />
<exclude name="**/webservices/**" />
<exclude name="**/impl/WSConverter.*" />
@@ -144,6 +143,7 @@
<phase>package</phase>
<configuration>
<attach>true</attach>
+ <tarLongFileMode>posix</tarLongFileMode>
<descriptors>
<descriptor>
src/main/assembly/assembly.xml
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml?rev=1720098&r1=1720097&r2=1720098&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml
Tue Dec 15 09:28:11 2015
@@ -73,14 +73,12 @@
<instructions>
<Export-Package>
org.apache.chemistry.opencmis.client.bindings;version=${project.version},
-
org.apache.chemistry.opencmis.client.bindings.spi.*;version=${project.version}
+
org.apache.chemistry.opencmis.client.bindings.spi.*;version=${project.version},
+ !org.apache.chemistry.opencmis.commons.impl.json.*,
+ !org.apache.chemistry.opencmis.commons.impl.jaxb.*,
+ !org.apache.http.*,
+ !org.apache.cxf.*
</Export-Package>
- <Import-Package>
-
com.sun.xml.ws.*;version="[2.1.7,3.0)";resolution:=optional,
- org.apache.http.*;resolution:=optional,
- org.apache.axis2.*;resolution:=optional,
- *
- </Import-Package>
<Bundle-DocURL>${project.url}</Bundle-DocURL>
</instructions>
</configuration>
@@ -110,7 +108,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
- <scope>test</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@@ -128,46 +126,6 @@
<artifactId>cxf-rt-transports-http</artifactId>
<version>${cxf.version}</version>
</dependency>
- <dependency>
- <groupId>org.jvnet.mimepull</groupId>
- <artifactId>mimepull</artifactId>
- <version>${mimepull.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-rt</artifactId>
- <version>${jaxws-rt.version}</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion> <!-- included in Java 6 and above -->
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- <exclusion> <!-- included in Java 6 and above -->
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jvnet</groupId>
- <artifactId>mimepull</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-jaxws</artifactId>
- <version>${axis2.version}</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
</project>
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/CmisWebServicesSpi.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/CmisWebServicesSpi.java?rev=1720098&r1=1720097&r2=1720098&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/CmisWebServicesSpi.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/CmisWebServicesSpi.java
Tue Dec 15 09:28:11 2015
@@ -90,11 +90,11 @@ public class CmisWebServicesSpi implemen
throw new CmisRuntimeException(
"JRE JAX-WS implementation not supported anymore.
Please use Apache CXF.");
} else if (providerPackage.startsWith("com.sun.xml.ws.spi")) {
- portProvider = new SunRIPortProvider();
+ throw new CmisRuntimeException("JAX-WS RI not supported
anymore. Please use Apache CXF.");
} else if (providerPackage.startsWith("org.apache.cxf.jaxws"))
{
portProvider = new CXFPortProvider();
} else if
(providerPackage.startsWith("org.apache.axis2.jaxws.spi")) {
- portProvider = new Axis2PortProvider();
+ throw new CmisRuntimeException("Axis2 not supported
anymore. Please use Apache CXF.");
} else {
throw new CmisRuntimeException("Could not detect JAX-WS
implementation! Use session parameter "
+ SessionParameter.WEBSERVICES_JAXWS_IMPL + " to
specify one.");
@@ -103,13 +103,13 @@ public class CmisWebServicesSpi implemen
throw new CmisRuntimeException(
"JRE JAX-WS implementation not supported anymore.
Please use Apache CXF.");
} else if (JAXWS_IMPL_RI.equals(jaxwsImpl)) {
- portProvider = new SunRIPortProvider();
+ throw new CmisRuntimeException("JAX-WS RI not supported
anymore. Please use Apache CXF.");
} else if (JAXWS_IMPL_CXF.equals(jaxwsImpl)) {
portProvider = new CXFPortProvider();
} else if (JAXWS_IMPL_WEBSPHERE.equals(jaxwsImpl)) {
portProvider = new WebSpherePortProvider();
} else if (JAXWS_IMPL_AXIS2.equals(jaxwsImpl)) {
- portProvider = new Axis2PortProvider();
+ throw new CmisRuntimeException("Axis2 not supported anymore.
Please use Apache CXF.");
} else {
throw new CmisRuntimeException("Unknown JAX-WS implementation
specified!");
}
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/pom.xml
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/pom.xml?rev=1720098&r1=1720097&r2=1720098&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/pom.xml
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/pom.xml
Tue Dec 15 09:28:11 2015
@@ -57,9 +57,9 @@
<execution>
<id>bundle-manifest</id>
<phase>process-classes</phase>
- <goals>
+ <goals>
<goal>manifest</goal>
- </goals>
+ </goals>
</execution>
</executions>
<configuration>
@@ -83,8 +83,6 @@
<attach>true</attach>
<descriptors>
<descriptor>src/main/assembly/client-with-dependencies-assembly.xml</descriptor>
-
<descriptor>src/main/assembly/client-with-ri-dependencies-assembly.xml</descriptor>
-
<descriptor>src/main/assembly/client-with-axis2-dependencies-assembly.xml</descriptor>
</descriptors>
</configuration>
</execution>
@@ -136,48 +134,6 @@
<artifactId>cxf-rt-ws-policy</artifactId>
<version>${cxf.version}</version>
</dependency>
- <!-- Sun RI -->
- <dependency>
- <groupId>org.jvnet.mimepull</groupId>
- <artifactId>mimepull</artifactId>
- <version>${mimepull.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-rt</artifactId>
- <version>${jaxws-rt.version}</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion> <!-- included in Java 6 and above -->
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- <exclusion> <!-- included in Java 6 and above -->
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jvnet</groupId>
- <artifactId>mimepull</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <!-- Axis2 -->
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-jaxws</artifactId>
- <version>${axis2.version}</version>
- <scope>provided</scope>
- </dependency>
<!-- Test -->
<dependency>
<groupId>log4j</groupId>
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/pom.xml
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/pom.xml?rev=1720098&r1=1720097&r2=1720098&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/pom.xml
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/pom.xml
Tue Dec 15 09:28:11 2015
@@ -55,40 +55,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.jvnet.mimepull</groupId>
- <artifactId>mimepull</artifactId>
- <version>${mimepull.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-rt</artifactId>
- <version>${jaxws-rt.version}</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion> <!-- included in Java 6 and above -->
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- <exclusion> <!-- included in Java 6 and above -->
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jvnet</groupId>
- <artifactId>mimepull</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
<build>
@@ -168,7 +134,6 @@
</Export-Package>
<Import-Package>
org.apache.chemistry.opencmis.commons.*,
-
com.sun.xml.ws.*;version="[2.1.7,3.0)";resolution:=optional,
*
</Import-Package>
<Bundle-DocURL>${project.url}</Bundle-DocURL>
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-osgi/chemistry-opencmis-osgi-client/pom.xml
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-osgi/chemistry-opencmis-osgi-client/pom.xml?rev=1720098&r1=1720097&r2=1720098&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-osgi/chemistry-opencmis-osgi-client/pom.xml
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-osgi/chemistry-opencmis-osgi-client/pom.xml
Tue Dec 15 09:28:11 2015
@@ -56,11 +56,8 @@
<Import-Package>
org.slf4j;resolution:=optional,
org.slf4j.impl;resolution:=optional,
-
com.sun.xml.ws.*;version="[2.1.7,3.0)";resolution:=optional,
- com.sun.xml.internal.*;resolution:=optional,
org.apache.cxf.*;resolution:=optional,
org.apache.http.*;resolution:=optional,
- org.apache.axis2.*;resolution:=optional,
*
</Import-Package>
<_exportcontents>
@@ -69,7 +66,7 @@
org.apache.chemistry.opencmis.client.bindings;version=${project.version},
org.apache.chemistry.opencmis.client.bindings.spi.*;version=${project.version},
org.apache.chemistry.opencmis.commons.impl.*;version=${project.version};-noimport:=true,
-
org.apache.chemistry.opencmis.commons.*;version=${project.version};-noimport:=true,
+
org.apache.chemistry.opencmis.commons.*;version=${project.version};-noimport:=true
</_exportcontents>
<Bundle-DocURL>${project.url}</Bundle-DocURL>
<Bundle-Activator>org.apache.chemistry.opencmis.client.osgi.Activator</Bundle-Activator>
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/pom.xml
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/pom.xml?rev=1720098&r1=1720097&r2=1720098&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/pom.xml
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/pom.xml
Tue Dec 15 09:28:11 2015
@@ -172,8 +172,6 @@
<attach>true</attach>
<descriptors>
<descriptor>src/main/assembly/workbench-assembly.xml</descriptor>
-
<descriptor>src/main/assembly/workbench-ri-assembly.xml</descriptor>
-
<descriptor>src/main/assembly/workbench-axis2-assembly.xml</descriptor>
</descriptors>
</configuration>
</execution>
@@ -270,42 +268,12 @@
<artifactId>javase</artifactId>
<version>3.2.0</version>
</dependency>
- <!-- Sun RI -->
+ <!-- CXF -->
<dependency>
- <groupId>org.jvnet.mimepull</groupId>
- <artifactId>mimepull</artifactId>
- <version>${mimepull.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-rt</artifactId>
- <version>${jaxws-rt.version}</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion> <!-- included in Java 6 and above -->
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- <exclusion> <!-- included in Java 6 and above -->
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jvnet</groupId>
- <artifactId>mimepull</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-databinding-jaxb</artifactId>
+ <version>${cxf.version}</version>
</dependency>
- <!-- CXF -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
@@ -321,31 +289,6 @@
<artifactId>cxf-rt-ws-policy</artifactId>
<version>${cxf.version}</version>
</dependency>
- <!-- Axis2 -->
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-jaxws</artifactId>
- <version>${axis2.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-adb</artifactId>
- <version>${axis2.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-transport-local</artifactId>
- <version>${axis2.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-mtompolicy</artifactId>
- <version>${axis2.version}</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
@@ -376,7 +319,7 @@
<descriptors>
<descriptor>
src/main/assembly/workbench-assembly.xml
- </descriptor>
+ </descriptor>
</descriptors>
</configuration>
</execution>
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-assembly.xml
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-assembly.xml?rev=1720098&r1=1720097&r2=1720098&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-assembly.xml
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-assembly.xml
Tue Dec 15 09:28:11 2015
@@ -83,9 +83,6 @@
<useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
<exclude>org.codehaus.woodstox:wstx-asl:*</exclude>
- <exclude>com.sun.xml.ws:jaxws-rt</exclude>
- <exclude>org.jvnet.mimepull:mimepull</exclude>
- <exclude>org.apache.axis2:*</exclude>
</excludes>
</dependencySet>
</dependencySets>
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-mac-assembly.xml
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-mac-assembly.xml?rev=1720098&r1=1720097&r2=1720098&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-mac-assembly.xml
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-mac-assembly.xml
Tue Dec 15 09:28:11 2015
@@ -35,10 +35,24 @@
<fileSet>
<directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
<outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>LICENSE</exclude>
+ <exclude>NOTICE</exclude>
+ </excludes>
</fileSet>
</fileSets>
<files>
<file>
+ <source>src/main/assembly/workbench-assembly-license.txt</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>LICENSE</destName>
+ </file>
+ <file>
+ <source>src/main/assembly/workbench-assembly-notice.txt</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>NOTICE</destName>
+ </file>
+ <file>
<source>target/start/workbench.sh</source>
<outputDirectory>/Contents/Resources</outputDirectory>
<lineEnding>unix</lineEnding>
@@ -79,8 +93,6 @@
<useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
<exclude>org.codehaus.woodstox:wstx-asl:*</exclude>
- <exclude>com.sun.xml.ws:jaxws-rt</exclude>
- <exclude>org.apache.axis2:*</exclude>
</excludes>
</dependencySet>
</dependencySets>
Modified: chemistry/opencmis/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/pom.xml?rev=1720098&r1=1720097&r2=1720098&view=diff
==============================================================================
--- chemistry/opencmis/trunk/pom.xml (original)
+++ chemistry/opencmis/trunk/pom.xml Tue Dec 15 09:28:11 2015
@@ -228,7 +228,7 @@
<woodstox.version>4.4.1</woodstox.version>
<osgi.version>5.0.0</osgi.version>
- <felix.plugin.version>2.3.7</felix.plugin.version>
+ <felix.plugin.version>3.0.1</felix.plugin.version>
<junit.version>4.11</junit.version>
<surefire.version>2.18.1</surefire.version>
<failsafe.version>2.18.1</failsafe.version>
@@ -236,10 +236,7 @@
<slf4j.version>1.7.5</slf4j.version>
<log4j.version>1.2.17</log4j.version>
<apacheclient.version>4.2.6</apacheclient.version>
- <jaxws-rt.version>2.1.7</jaxws-rt.version>
<cxf.version>3.0.7</cxf.version>
- <axis2.version>1.6.2</axis2.version>
- <mimepull.version>1.9.4</mimepull.version>
<spring.version>4.1.7.RELEASE</spring.version>
</properties>
@@ -259,7 +256,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
+ <version>2.6</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
