You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by fm...@apache.org on 2020/01/25 22:27:48 UTC
svn commit: r1873164 [3/3] - in /chemistry/opencmis/trunk:
chemistry-opencmis-client/chemistry-opencmis-client-bindings/
chemistry-opencmis-client/chemistry-opencmis-client-impl/
chemistry-opencmis-server/chemistry-opencmis-server-bindings-war/src/main...
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml?rev=1873164&r1=1873163&r2=1873164&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml Sat Jan 25 22:27:47 2020
@@ -53,11 +53,39 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${cxf.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jacorb</groupId>
+ <artifactId>jacorb-omgapi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.spec.javax.rmi</groupId>
+ <artifactId>jboss-rmi-api_1.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<version>${cxf.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jacorb</groupId>
+ <artifactId>jacorb-omgapi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.spec.javax.rmi</groupId>
+ <artifactId>jboss-rmi-api_1.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- server-support is not a *runtime* dependency but it's added for commodity in the WAR -->
<dependency>
@@ -68,7 +96,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
- <version>1.6</version>
+ <version>1.8</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/webapp/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/webapp/META-INF/LICENSE?rev=1873164&r1=1873163&r2=1873164&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/webapp/META-INF/LICENSE (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/webapp/META-INF/LICENSE Sat Jan 25 22:27:47 2020
@@ -210,7 +210,7 @@ Please see also THRID-PARTY-LICENSES.
License: MIT License (http://www.opensource.org/licenses/mit-license.php)
-Copyright (c) 2004-2013 QOS.ch
+Copyright (c) 2004-2019 QOS.ch
All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/webapp/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/webapp/META-INF/LICENSE?rev=1873164&r1=1873163&r2=1873164&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/webapp/META-INF/LICENSE (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/webapp/META-INF/LICENSE Sat Jan 25 22:27:47 2020
@@ -210,7 +210,7 @@ Please see also THRID-PARTY-LICENSES.
License: MIT License (http://www.opensource.org/licenses/mit-license.php)
-Copyright (c) 2004-2013 QOS.ch
+Copyright (c) 2004-2019 QOS.ch
All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining
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=1873164&r1=1873163&r2=1873164&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 Sat Jan 25 22:27:47 2020
@@ -210,23 +210,41 @@
<!-- CXF -->
<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-frontend-jaxws</artifactId>
<version>${cxf.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jacorb</groupId>
+ <artifactId>jacorb-omgapi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.spec.javax.rmi</groupId>
+ <artifactId>jboss-rmi-api_1.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-policy</artifactId>
- <version>${cxf.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jacorb</groupId>
+ <artifactId>jacorb-omgapi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.spec.javax.rmi</groupId>
+ <artifactId>jboss-rmi-api_1.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
Modified: chemistry/opencmis/trunk/src/main/appended-resources/supplemental-models.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/src/main/appended-resources/supplemental-models.xml?rev=1873164&r1=1873163&r2=1873164&view=diff
==============================================================================
--- chemistry/opencmis/trunk/src/main/appended-resources/supplemental-models.xml (original)
+++ chemistry/opencmis/trunk/src/main/appended-resources/supplemental-models.xml Sat Jan 25 22:27:47 2020
@@ -2,251 +2,19 @@
<supplementalDataModels>
<supplement>
<project>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
- <version>2.1</version>
- <name>JAX-WS (JSR-224) API</name>
- <url>https://jax-ws.dev.java.net/</url>
- <organization>
- <name>Sun Microsystems, Inc</name>
- <url>http://www.sun.com/</url>
- </organization>
- <licenses>
- <license>
- <name>Dual license consisting of the CDDL v1.0 and GPL v2</name>
- <url>https://glassfish.dev.java.net/public/CDDL+GPL.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.1.11</version>
- <name>Sun JAXB Reference Implementation Runtime</name>
- <url>https://jaxb.dev.java.net/</url>
- <organization>
- <name>Sun Microsystems, Inc</name>
- <url>http://www.sun.com/</url>
- </organization>
- <licenses>
- <license>
- <name>Dual license consisting of the CDDL v1.0 and GPL v2</name>
- <url>https://glassfish.dev.java.net/public/CDDL+GPL.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>com.sun.xml.messaging.saaj</groupId>
- <artifactId>saaj-impl</artifactId>
- <version>1.3.3</version>
- <name>Sun SAAJ Standard Implementation</name>
- <url>https://saaj.dev.java.net/</url>
- <organization>
- <name>Sun Microsystems, Inc</name>
- <url>http://www.sun.com/</url>
- </organization>
- <licenses>
- <license>
- <name>Dual license consisting of the CDDL v1.0 and GPL v2</name>
- <url>https://glassfish.dev.java.net/public/CDDL+GPL.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>javax.xml.soap</groupId>
- <artifactId>saaj-api</artifactId>
- <version>1.3</version>
- <name>SAAJ API</name>
- <url>https://saaj.dev.java.net/</url>
- <organization>
- <name>Sun Microsystems, Inc</name>
- <url>http://www.sun.com/</url>
- </organization>
- <licenses>
- <license>
- <name>Dual license consisting of the CDDL v1.0 and GPL v2</name>
- <url>https://glassfish.dev.java.net/public/CDDL+GPL.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>com.sun.xml.stream.buffer</groupId>
- <artifactId>streambuffer</artifactId>
- <version>0.9</version>
- <name>XML Stream Buffer Project</name>
- <url>https://xmlstreambuffer.dev.java.net/</url>
- <organization>
- <name>Sun Microsystems, Inc</name>
- <url>http://www.sun.com/</url>
- </organization>
- <licenses>
- <license>
- <name>Dual license consisting of the CDDL v1.0 and GPL v2</name>
- <url>https://glassfish.dev.java.net/public/CDDL+GPL.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.1</version>
- <name>Java Architecture for XML Binding</name>
- <url>https://jaxb.dev.java.net/</url>
- <organization>
- <name>Sun Microsystems, Inc</name>
- <url>http://www.sun.com/</url>
- </organization>
- <licenses>
- <license>
- <name>Common Development And Distribution License (CDDL) Version 1.0</name>
- <url>http://www.sun.com/cddl/cddl.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.1</version>
- <name>JavaBeans(TM) Activation Framework Specification</name>
- <url>http://www.oracle.com/technetwork/java/jaf11-139815.html</url>
- <organization>
- <name>Sun Microsystems, Inc</name>
- <url>http://www.sun.com/</url>
- </organization>
- <licenses>
- <license>
- <name>Common Development And Distribution License (CDDL) Version 1.0</name>
- <url>http://www.sun.com/cddl/cddl.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- <version>1.1</version>
- <name>JSR-250 Common Annotations for the Java(TM) Platform</name>
- <url>http://jcp.org/aboutJava/communityprocess/final/jsr250/index.html</url>
- <organization>
- <name>Sun Microsystems, Inc</name>
- <url>http://www.sun.com/</url>
- </organization>
- <licenses>
- <license>
- <name>Common Development And Distribution License (CDDL) Version 1.0</name>
- <url>http://www.sun.com/cddl/cddl.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- <version>1.0-MR1</version>
- <name>Web Services Metadata for Java</name>
- <url>http://jcp.org/en/jsr/summary?id=181</url>
- <organization>
- <name>Sun Microsystems, Inc</name>
- <url>http://www.sun.com/</url>
- </organization>
- <licenses>
- <license>
- <name>Dual license consisting of the CDDL v1.0 and GPL v2</name>
- <url>https://glassfish.dev.java.net/public/CDDL+GPL.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>com.sun.org.apache.xml.internal</groupId>
- <artifactId>resolver</artifactId>
- <version>20050927</version>
- <name>XML Resolver library</name>
- <organization>
- <name>Sun Microsystems, Inc</name>
- <url>http://www.sun.com/</url>
- </organization>
- <licenses>
- <license>
- <name>Apache 2</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0</version>
- <name>Streaming API for XML</name>
- <url>http://stax.codehaus.org</url>
- <organization>
- <name>BEA Systems</name>
- </organization>
- <licenses>
- <license>
- <name>Dual license consisting of the CDDL v1.0 and GPL v2</name>
- <url>https://glassfish.dev.java.net/public/CDDL+GPL.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>org.jvnet.staxex</groupId>
- <artifactId>stax-ex</artifactId>
- <version>1.2</version>
- <name>StAX-Ex Project</name>
- <organization>
- <name>Java.net</name>
- <url>http://dev.java.net</url>
- </organization>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>org.jvnet</groupId>
- <artifactId>mimepull</artifactId>
- <version>1.3</version>
- <url>https://mimepull.dev.java.net</url>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0.1</version>
- <organization>
- <name>Codehaus</name>
- <url>http://codehaus.org</url>
- </organization>
- </project>
- </supplement>
- <supplement>
- <project>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
<version>2.7.7</version>
<organization>
<name>ANTLR</name>
- <url>http://www.antlr.org/</url>
+ <url>https://www.antlr.org/</url>
</organization>
+ <licenses>
+ <license>
+ <name>BSD licence</name>
+ <url>https://www.antlr.org/license.html</url>
+ </license>
+ </licenses>
</project>
</supplement>
<supplement>
@@ -256,12 +24,12 @@
<version>3.2</version>
<organization>
<name>ANTLR</name>
- <url>http://www.antlr.org/</url>
+ <url>https://www.antlr.org/</url>
</organization>
<licenses>
<license>
<name>BSD licence</name>
- <url>http://antlr.org/license.html</url>
+ <url>https://www.antlr.org/license.html</url>
</license>
</licenses>
</project>
@@ -273,19 +41,14 @@
<version>3.2</version>
<organization>
<name>ANTLR</name>
- <url>http://www.antlr.org/</url>
- </organization>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>net.sf.jopt-simple</groupId>
- <artifactId>jopt-simple</artifactId>
- <version>3.2</version>
- <organization>
- <name>Sourceforge</name>
- <url>http://www.sourceforge.net/</url>
+ <url>https://www.antlr.org/</url>
</organization>
+ <licenses>
+ <license>
+ <name>BSD licence</name>
+ <url>https://www.antlr.org/license.html</url>
+ </license>
+ </licenses>
</project>
</supplement>
</supplementalDataModels>