updated dependencies and documentation
git-svn-id: https://svn.apache.org/repos/asf/chemistry/opencmis/trunk@1859862 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/README.txt b/README.txt
index b878b16..686bbf7 100644
--- a/README.txt
+++ b/README.txt
@@ -17,13 +17,13 @@
mvn clean install
-You need Maven 3 with Java 8 (or higher) for the build.
+You need Maven 3.5 (or higher) with Java 12 (or higher) for the build.
License (see also package specific LICENSE files)
=================================================
-Collective work: Copyright 2010-2017 The Apache Software Foundation.
+Collective work: Copyright 2010-2019 The Apache Software Foundation.
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
diff --git a/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/QueryStatement.java b/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/QueryStatement.java
index 233f152..5c777b9 100644
--- a/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/QueryStatement.java
+++ b/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/QueryStatement.java
@@ -142,7 +142,8 @@
* <p>
*
* Summary:
- * <table summary="Escaping Summary">
+ * <table class="chemistry-table">
+ * <caption>Escaping Summary</caption>
* <tr>
* <th>input</th>
* <th>first level escaping</th>
diff --git a/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/Session.java b/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/Session.java
index 90aeec1..9d39d42 100644
--- a/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/Session.java
+++ b/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/Session.java
@@ -61,9 +61,9 @@
* specification for a list of all operations and their exceptions. Note that
* some incompliant repositories might throw other exception than you expect.
* <p>
- * Refer to the <a href="http://docs.oasis-open.org/cmis/CMIS/v1.0/os/">CMIS 1.0
+ * Refer to the <a href="https://docs.oasis-open.org/cmis/CMIS/v1.0/os/">CMIS 1.0
* specification</a> or the
- * <a href="http://docs.oasis-open.org/cmis/CMIS/v1.0/os/">CMIS 1.1
+ * <a href="https://docs.oasis-open.org/cmis/CMIS/v1.0/os/">CMIS 1.1
* specification</a> for details about the domain model, terms, concepts, base
* types, properties, IDs and query names, query language, etc.
* </p>
diff --git a/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/package.html b/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/package.html
index 5445582..c380f12 100644
--- a/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/package.html
+++ b/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/package.html
@@ -29,7 +29,7 @@
<p>
This package provides interfaces and classes for accessing CMIS repositories
via an object oriented API.
-<br/>
+<br>
Interfaces in this package are implemented by the OpenCMIS runtime and must not be
implemented by applications.
The OpenCMIS client API depends on the OpenCMIS commons API.
@@ -47,11 +47,9 @@
<h2>Usage of the API</h2>
<p>
-See <a href="http://chemistry.apache.org/java/developing/guide.html">OpenCMIS Client API Developer's Guide</a>.
+See <a href="https://chemistry.apache.org/java/developing/guide.html">OpenCMIS Client API Developer's Guide</a>.
</p>
-<p>
@see org.apache.chemistry.opencmis.client.api.SessionFactory
@see org.apache.chemistry.opencmis.client.api.Session
-</p>
</body>
</html>
\ No newline at end of file
diff --git a/chemistry-opencmis-commons/chemistry-opencmis-commons-api/pom.xml b/chemistry-opencmis-commons/chemistry-opencmis-commons-api/pom.xml
index f10b05c..95b2dc6 100644
--- a/chemistry-opencmis-commons/chemistry-opencmis-commons-api/pom.xml
+++ b/chemistry-opencmis-commons/chemistry-opencmis-commons-api/pom.xml
@@ -42,7 +42,7 @@
<dependency>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
- <version>2.2.12</version>
+ <version>2.3.0</version>
</dependency>
</dependencies>
diff --git a/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/SessionParameter.java b/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/SessionParameter.java
index 70f567c..2def471 100644
--- a/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/SessionParameter.java
+++ b/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/SessionParameter.java
@@ -21,7 +21,8 @@
/**
* Session parameter constants.
*
- * <table border="2" rules="all" cellpadding="4" summary="Session Parameters">
+ * <table class="chemistry-table">
+ * <caption>Session Parameters</caption>
* <tr>
* <th>Constant</th>
* <th>Description</th>
diff --git a/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/MimeHelper.java b/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/MimeHelper.java
index 5b0293d..bc3d3cd 100644
--- a/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/MimeHelper.java
+++ b/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/MimeHelper.java
@@ -74,7 +74,7 @@
* <p>
* This implementation always uses UTF-8 and no language.
* <p>
- * See <a href="http://tools.ietf.org/html/rfc2231">RFC 2231</a> for
+ * See <a href="https://tools.ietf.org/html/rfc2231">RFC 2231</a> for
* details.
*
* @param value
@@ -113,7 +113,7 @@
* <p>
* This implementation always uses UTF-8 and no language.
* <p>
- * See <a href="http://tools.ietf.org/html/rfc2231">RFC 2231</a> for
+ * See <a href="https://tools.ietf.org/html/rfc2231">RFC 2231</a> for
* details.
*
* @param value
@@ -134,7 +134,7 @@
* Encodes the Content-Disposition header value according to RFC 2183 and
* RFC 2231.
* <p>
- * See <a href="http://tools.ietf.org/html/rfc2231">RFC 2231</a> for
+ * See <a href="https://tools.ietf.org/html/rfc2231">RFC 2231</a> for
* details.
*
* @param disposition
@@ -154,7 +154,7 @@
* Decodes a filename from the Content-Disposition header value according to
* RFC 2183 and RFC 2231.
* <p>
- * See <a href="http://tools.ietf.org/html/rfc2231">RFC 2231</a> for
+ * See <a href="https://tools.ietf.org/html/rfc2231">RFC 2231</a> for
* details.
*
* @param value
@@ -173,7 +173,7 @@
* <p>
* Does not deal with continuation lines.
* <p>
- * See <a href="http://tools.ietf.org/html/rfc2231">RFC 2231</a> for
+ * See <a href="https://tools.ietf.org/html/rfc2231">RFC 2231</a> for
* details.
*
* @param value
diff --git a/chemistry-opencmis-server/chemistry-opencmis-server-async/pom.xml b/chemistry-opencmis-server/chemistry-opencmis-server-async/pom.xml
index e66df85..ddfcf8a 100644
--- a/chemistry-opencmis-server/chemistry-opencmis-server-async/pom.xml
+++ b/chemistry-opencmis-server/chemistry-opencmis-server-async/pom.xml
@@ -47,7 +47,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
+ <version>3.1.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/chemistry-opencmis-server/chemistry-opencmis-server-bindings-war/src/main/webapp/index.html b/chemistry-opencmis-server/chemistry-opencmis-server-bindings-war/src/main/webapp/index.html
index 5d7a3c6..41559d3 100644
--- a/chemistry-opencmis-server/chemistry-opencmis-server-bindings-war/src/main/webapp/index.html
+++ b/chemistry-opencmis-server/chemistry-opencmis-server-bindings-war/src/main/webapp/index.html
@@ -29,27 +29,27 @@
<a href="http://chemistry.apache.org"><img alt="Apache Chemistry Logo" title="Apache Chemistry Logo" src="images/chemistry_logo_small.png" /></a>
<h1>Apache Chemistry OpenCMIS</h1>
-<br/>
+<br>
<h2>AtomPub binding</h2>
<div><a href="atom">AtomPub service document</a></div>
-<br/>
+<br>
<h2>Web Services binding</h2>
<div><a href="services/RepositoryService">Web Services overview</a></div>
-<br/>
+<br>
<h2>Browser binding</h2>
<div><a href="browser">Browser binding service URL</a></div>
-<br/>
+<br>
<h2>Web interface</h2>
<div><a href="web">OpenCMIS web interface</a></div>
-<br/>
+<br>
<h2>License</h2>
<a href="http://www.apache.org"><img alt="ASF Logo" title="ASF Logo" src="images/asf_logo.png" align="right"/></a>
<div>This software is licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache 2.0 License</a>.</div>
-<br/>
+<br>
</body>
</html>
\ No newline at end of file
diff --git a/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/pom.xml b/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/pom.xml
index 6fd6b4f..dfe7689 100644
--- a/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/pom.xml
+++ b/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/pom.xml
@@ -123,7 +123,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
+ <version>3.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/chemistry-opencmis-test/chemistry-opencmis-test-tck/pom.xml b/chemistry-opencmis-test/chemistry-opencmis-test-tck/pom.xml
index a426c22..a954a17 100644
--- a/chemistry-opencmis-test/chemistry-opencmis-test-tck/pom.xml
+++ b/chemistry-opencmis-test/chemistry-opencmis-test-tck/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.8.1</version>
+ <version>1.10.5</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/chemistry-opencmis-workbench/chemistry-opencmis-workbench/pom.xml b/chemistry-opencmis-workbench/chemistry-opencmis-workbench/pom.xml
index 63a36d1..340a526 100644
--- a/chemistry-opencmis-workbench/chemistry-opencmis-workbench/pom.xml
+++ b/chemistry-opencmis-workbench/chemistry-opencmis-workbench/pom.xml
@@ -189,7 +189,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
- <version>2.5.3</version>
+ <version>2.5.7</version>
<type>pom</type>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 3dfe30e..ddd8a4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,14 +152,14 @@
<osgi.version>6.0.0</osgi.version>
<felix.plugin.version>3.3.0</felix.plugin.version>
<junit.version>4.12</junit.version>
- <surefire.version>2.22.1</surefire.version>
- <failsafe.version>2.22.1</failsafe.version>
+ <surefire.version>2.22.2</surefire.version>
+ <failsafe.version>2.22.2</failsafe.version>
<jacoco.version>0.7.5.201505241946</jacoco.version>
<slf4j.version>1.7.25</slf4j.version>
- <log4j.version>2.11.1</log4j.version>
+ <log4j.version>2.11.2</log4j.version>
<apacheclient.version>4.2.6</apacheclient.version>
- <cxf.version>3.3.0</cxf.version>
- <okhttp.version>3.11.0</okhttp.version>
+ <cxf.version>3.3.2</cxf.version>
+ <okhttp.version>3.14.2</okhttp.version>
</properties>
<build>
@@ -215,7 +215,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-archetype-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -224,7 +224,7 @@
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
- <version>3.0.1</version>
+ <version>3.1.0</version>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
@@ -233,7 +233,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.4.1</version>
+ <version>3.0.0-M2</version>
</plugin>
</plugins>
</pluginManagement>
@@ -318,7 +318,7 @@
<plugin>
<inherited>true</inherited>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
+ <version>3.8.1</version>
<configuration>
<target>${maven.compile.target}</target>
<source>${maven.compile.source}</source>
@@ -371,7 +371,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.4</version>
+ <version>3.7.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -411,7 +411,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0-M2</version>
<executions>
<execution>
<id>enforce-versions</id>
@@ -421,7 +420,7 @@
<configuration>
<rules>
<requireJavaVersion>
- <version>[11,)</version>
+ <version>[12,)</version>
</requireJavaVersion>
<requireMavenVersion>
<version>[3.5,)</version>
@@ -434,7 +433,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.12</version>
+ <version>0.13</version>
<configuration>
<licenses>
<license implementation="org.apache.rat.analysis.license.FullTextMatchingLicense">
@@ -454,6 +453,8 @@
<!-- general -->
<exclude>**/*.log</exclude>
<exclude>**/*.json</exclude>
+ <exclude>**/.recommenders/**/*</exclude>
+ <exclude>**/.project</exclude>
<exclude>/src/main/resources/META-INF/services/**/*</exclude>
<exclude>/src/main/webapp/WEB-INF/classes/META-INF/**/*</exclude>
<!-- client -->
@@ -470,7 +471,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.0.1</version>
+ <version>3.1.0</version>
<configuration>
<tags>
<tag>
@@ -481,6 +482,8 @@
</tags>
<locale>en</locale>
<encoding>utf-8</encoding>
+ <source>8</source>
+ <doclint>accessibility,html,reference,syntax</doclint>
</configuration>
</plugin>
</plugins>
@@ -513,7 +516,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.14.1</version>
+ <version>2.22.2</version>
<configuration>
<aggregate>true</aggregate>
<reportsDirectories>
@@ -525,12 +528,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.2</version>
+ <version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.7</version>
+ <version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -621,6 +624,11 @@
</tags>
<locale>en</locale>
<encoding>utf-8</encoding>
+ <source>8</source>
+ <doclint>accessibility,html,reference,syntax</doclint>
+ <additionalOptions>
+ <additionalOption>--add-stylesheet ${parentBasedir}/src/main/javadoc/chemistry-javadoc.css</additionalOption>
+ </additionalOptions>
</configuration>
</plugin>
</plugins>
@@ -716,14 +724,5 @@
</plugins>
</build>
</profile>
- <profile>
- <id>disable-java8-doclint</id>
- <activation>
- <jdk>[1.8,)</jdk>
- </activation>
- <properties>
- <additionalparam>-Xdoclint:accessibility -Xdoclint:html -Xdoclint:reference -Xdoclint:syntax</additionalparam>
- </properties>
- </profile>
</profiles>
</project>
diff --git a/src/main/javadoc/chemistry-javadoc.css b/src/main/javadoc/chemistry-javadoc.css
new file mode 100644
index 0000000..3d735b3
--- /dev/null
+++ b/src/main/javadoc/chemistry-javadoc.css
@@ -0,0 +1,16 @@
+.chemistry-table {
+ border: 2px solid #000000;
+ padding: 4px;
+ border-collapse: collapse;
+}
+
+.chemistry-table th {
+ border: 1px solid #000000;
+ padding: 4px;
+ text-align: center;
+}
+
+.chemistry-table td {
+ border: 1px solid #999999;
+ padding: 4px;
+}
\ No newline at end of file
diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index c7cc14d..b9c910a 100644
--- a/src/site/apt/index.apt
+++ b/src/site/apt/index.apt
@@ -25,10 +25,10 @@
Chemistry OpenCMIS
- OpenCMIS is an open source implementation of the {{{http://chemistry.apache.org/project/cmis.html}OASIS CMIS specification}}
+ OpenCMIS is an open source implementation of the {{{https://chemistry.apache.org/project/cmis.html}OASIS CMIS specification}}
for Java.
- User and developer documentation for OpenCMIS is available in the main {{{http://chemistry.apache.org/java/opencmis.html}Chemistry website}}
+ User and developer documentation for OpenCMIS is available in the main {{{https://chemistry.apache.org/java/opencmis.html}Chemistry website}}
In this site you can find instead OpenCMIS developer information for this version (see top right corner) like:
diff --git a/src/site/site.xml b/src/site/site.xml
index 8c70a54..81f4523 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -37,7 +37,7 @@
<poweredBy>
<logo name="Maven" href="http://maven.apache.org/"
- img="http://maven.apache.org/images/logos/maven-feather.png"/>
+ img="https://maven.apache.org/images/logos/maven-feather.png"/>
</poweredBy>
@@ -54,7 +54,7 @@
<menu ref="reports" inherit="top" />
<menu name="Chemistry" inherit="top">
- <item name="Main Website" href="http://chemistry.apache.org" />
+ <item name="Main Website" href="https://chemistry.apache.org" />
</menu>
</body>
</project>
\ No newline at end of file
