Author: fmui
Date: Mon Oct 2 10:40:40 2017
New Revision: 1810331
URL: http://svn.apache.org/viewvc?rev=1810331&view=rev
Log:
updated CXF to 3.1.x; changed build JDK to >= 9
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml
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-server/chemistry-opencmis-server-archetype/src/main/resources/archetype-resources/pom.xml
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/pom.xml
chemistry/opencmis/trunk/pom.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=1810331&r1=1810330&r2=1810331&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
Mon Oct 2 10:40:40 2017
@@ -74,6 +74,7 @@
<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.cache.*;version=${project.version},
!org.apache.chemistry.opencmis.commons.impl.json.*,
!org.apache.chemistry.opencmis.commons.impl.jaxb.*,
!org.apache.http.*,
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=1810331&r1=1810330&r2=1810331&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
Mon Oct 2 10:40:40 2017
@@ -150,31 +150,6 @@
</dependencies>
<profiles>
- <profile>
- <!--
- call mvn test
-Dorg.apache.chemistry.opencmis.client.runtime.suite.config.path=myServer.properties
to
- run test using profile parameters
- -->
- <activation>
- <property>
-
<name>org.apache.chemistry.opencmis.client.runtime.test.config.path</name>
- </property>
- </activation>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
-
<argLine>-Dorg.apache.chemistry.opencmis.client.runtime.test.config.path=${org.apache.chemistry.opencmis.client.runtime.test.config.path}</argLine>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
-
<!--
Extending the default -Papache-release profile used *only*
during releases
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=1810331&r1=1810330&r2=1810331&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
Mon Oct 2 10:40:40 2017
@@ -103,6 +103,8 @@
<goal>wsdl2java</goal>
</goals>
<configuration>
+ <fork>always</fork>
+ <additionalJvmArgs>--add-modules java.se.ee
--add-opens=java.xml.bind/com.sun.xml.internal.bind.v2.runtime=ALL-UNNAMED
--add-opens java.xml.bind/javax.xml.bind=ALL-UNNAMED
--add-opens=jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED
--add-opens=java.xml/com.sun.org.apache.xerces.internal.impl.xs=ALL-UNNAMED
--add-opens=java.xml.bind/com.sun.xml.internal.bind.marshaller=ALL-UNNAMED
--add-opens java.xml.ws/javax.xml.ws.wsaddressing=ALL-UNNAMED --add-opens
java.base/java.security=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED
--add-opens java.base/java.lang=ALL-UNNAMED --add-opens
java.base/java.util=ALL-UNNAMED --add-opens
java.base/java.util.concurrent=ALL-UNNAMED</additionalJvmArgs>
<sourceRoot>${project.basedir}/target/generated</sourceRoot>
<wsdlOptions>
<wsdlOption>
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-archetype/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-archetype/src/main/resources/archetype-resources/pom.xml?rev=1810331&r1=1810330&r2=1810331&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-archetype/src/main/resources/archetype-resources/pom.xml
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-archetype/src/main/resources/archetype-resources/pom.xml
Mon Oct 2 10:40:40 2017
@@ -49,6 +49,16 @@
</archive>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.7.0</version>
+ <configuration>
+ <!-- requires at least Java 7 -->
+ <target>1.7</target>
+ <source>1.7</source>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
</plugins>
</build>
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=1810331&r1=1810330&r2=1810331&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
Mon Oct 2 10:40:40 2017
@@ -91,8 +91,8 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.9.0</version>
+ <artifactId>mockito-core</artifactId>
+ <version>2.10.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/pom.xml
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/pom.xml?rev=1810331&r1=1810330&r2=1810331&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/pom.xml
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/pom.xml
Mon Oct 2 10:40:40 2017
@@ -35,7 +35,8 @@
<properties>
<parentBasedir>../../</parentBasedir>
- <tomcat.version>7.0.75</tomcat.version>
+ <tomcat.version>8.5.21</tomcat.version>
+ <tomcat.juli.version>8.5.2</tomcat.juli.version>
<overlay.groupId />
<overlay.artifactId />
<factory.class />
@@ -48,7 +49,6 @@
<default.versionableDocumentType>VersionableType</default.versionableDocumentType>
<test.versionable>true</test.versionable>
<test.notVersionable>true</test.notVersionable>
- <argLine>-Xmx512m -ea:org.apache.chemistry</argLine>
</properties>
@@ -92,7 +92,7 @@
<reuseForks>true</reuseForks>
<forkCount>1</forkCount>
<forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
- <argLine>-Xmx2048m</argLine>
+ <argLine>-ea:org.apache.chemistry --add-modules
java.xml.ws</argLine>
<systemPropertyVariables>
<systemProperty>
<name>org.apache.chemistry.opencmis.session.repository.id</name>
@@ -166,7 +166,7 @@
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-logging-juli</artifactId>
- <version>${tomcat.version}</version>
+ <version>${tomcat.juli.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: chemistry/opencmis/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/pom.xml?rev=1810331&r1=1810330&r2=1810331&view=diff
==============================================================================
--- chemistry/opencmis/trunk/pom.xml (original)
+++ chemistry/opencmis/trunk/pom.xml Mon Oct 2 10:40:40 2017
@@ -158,7 +158,7 @@
<slf4j.version>1.7.25</slf4j.version>
<log4j.version>2.6.1</log4j.version>
<apacheclient.version>4.2.6</apacheclient.version>
- <cxf.version>3.0.14</cxf.version>
+ <cxf.version>3.1.13</cxf.version>
<okhttp.version>3.8.1</okhttp.version>
</properties>
@@ -174,6 +174,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
+ <configuration>
+ <argLine>--add-modules java.xml.ws</argLine>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -183,7 +186,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.6</version>
+ <version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -318,6 +321,7 @@
<plugin>
<inherited>true</inherited>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>3.7.0</version>
<configuration>
<target>${maven.compile.target}</target>
<source>${maven.compile.source}</source>
@@ -409,6 +413,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
+ <version>3.0.0-M1</version>
<executions>
<execution>
<id>enforce-versions</id>
@@ -418,10 +423,10 @@
<configuration>
<rules>
<requireJavaVersion>
- <version>[1.8.0,)</version>
+ <version>[9,)</version>
</requireJavaVersion>
<requireMavenVersion>
- <version>[3.0,)</version>
+ <version>[3.5,)</version>
</requireMavenVersion>
</rules>
</configuration>
