You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2018/04/27 14:58:41 UTC
cayenne git commit: CAY-2408 Cayenne JDK 10 compatibility
Repository: cayenne
Updated Branches:
refs/heads/master f589fc12a -> 319e58970
CAY-2408 Cayenne JDK 10 compatibility
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/319e5897
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/319e5897
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/319e5897
Branch: refs/heads/master
Commit: 319e589709f5378b41d7d3a4ec683bdf0f3c8276
Parents: f589fc1
Author: Nikita Timofeev <st...@gmail.com>
Authored: Fri Apr 27 17:58:10 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Fri Apr 27 17:58:10 2018 +0300
----------------------------------------------------------------------
RELEASE-NOTES.txt | 1 +
.../cayenne/asciidoc/CayennePostProcessor.java | 7 +++--
docs/asciidoc/pom.xml | 9 ++++--
pom.xml | 32 +++++++++++++++-----
4 files changed, 38 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/319e5897/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index f8b777f..9d1d3aa 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -49,6 +49,7 @@ CAY-2392 Modeler: Unable to remove DataNode
CAY-2397 Modeler: Unable to set enum:value as Entity qualifier
CAY-2401 Modeler: NPE in ObjEntity sync action
CAY-2405 Broken prefetch of entity with inheritance and attribute with custom java type
+CAY-2408 Cayenne JDK 10 compatibility
CAY-2411 Wrong resolution of ExtendedType with ValueObjectType for inherited class
CAY-2418 Modeler: unable to edit entity selected via Search
CAY-2419 Modeler: Not changing highlight on selecting search results within one entity
http://git-wip-us.apache.org/repos/asf/cayenne/blob/319e5897/docs/asciidoc/cayenne-asciidoc-extension/src/main/java/org/apache/cayenne/asciidoc/CayennePostProcessor.java
----------------------------------------------------------------------
diff --git a/docs/asciidoc/cayenne-asciidoc-extension/src/main/java/org/apache/cayenne/asciidoc/CayennePostProcessor.java b/docs/asciidoc/cayenne-asciidoc-extension/src/main/java/org/apache/cayenne/asciidoc/CayennePostProcessor.java
index 6c87cd8..5be212d 100644
--- a/docs/asciidoc/cayenne-asciidoc-extension/src/main/java/org/apache/cayenne/asciidoc/CayennePostProcessor.java
+++ b/docs/asciidoc/cayenne-asciidoc-extension/src/main/java/org/apache/cayenne/asciidoc/CayennePostProcessor.java
@@ -30,7 +30,6 @@ import java.util.Map;
import org.asciidoctor.Options;
import org.asciidoctor.ast.Document;
-import org.asciidoctor.ast.DocumentRuby;
import org.asciidoctor.extension.Postprocessor;
import org.jsoup.Jsoup;
@@ -59,10 +58,14 @@ public class CayennePostProcessor extends Postprocessor {
private static final String POSITION_BODY = "body";
private static final String POSITION_BOTTOM = "bottom";
- public CayennePostProcessor(DocumentRuby documentRuby) {
+ public CayennePostProcessor() {
super();
}
+ public CayennePostProcessor(Map<String, Object> config) {
+ super(config);
+ }
+
public String process(Document document, String output) {
output = extractTableOfContents(document, output);
output = fixupDom(document, output);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/319e5897/docs/asciidoc/pom.xml
----------------------------------------------------------------------
diff --git a/docs/asciidoc/pom.xml b/docs/asciidoc/pom.xml
index 7b95da5..6ede61d 100644
--- a/docs/asciidoc/pom.xml
+++ b/docs/asciidoc/pom.xml
@@ -44,10 +44,10 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <asciidoctorj.version>1.5.6</asciidoctorj.version>
+ <asciidoctorj.version>1.6.0-alpha.6</asciidoctorj.version>
<asciidoctor.maven.plugin.version>1.5.6</asciidoctor.maven.plugin.version>
<asciidoctorj.pdf.version>1.5.0-alpha.16</asciidoctorj.pdf.version>
- <jruby.version>9.1.14.0</jruby.version>
+ <jruby.version>9.1.17.0</jruby.version>
<cayenne.major.version>4.1</cayenne.major.version>
</properties>
@@ -112,6 +112,11 @@
<artifactId>jruby-complete</artifactId>
<version>${jruby.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.asciidoctor</groupId>
+ <artifactId>asciidoctorj</artifactId>
+ <version>${asciidoctorj.version}</version>
+ </dependency>
</dependencies>
</plugin>
<!-- Move images to proper path for site -->
http://git-wip-us.apache.org/repos/asf/cayenne/blob/319e5897/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c6ad426..c2dfe54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -425,7 +425,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>2.8.9</version>
+ <version>2.18.3</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -766,7 +766,7 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.20.1</version>
+ <version>2.21.0</version>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -775,7 +775,7 @@
</plugin>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.20.1</version>
+ <version>2.21.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -798,11 +798,19 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.0.0-M1</version>
+ <version>3.0.0</version>
<configuration>
<!-- Java 8 is too strict about Javadoc omissions -->
- <additionalparam>${javadoc.doclint.none}</additionalparam>
+ <doclint>${javadoc.doclint}</doclint>
+ <additionalOptions>${javadoc.additionalOptions}</additionalOptions>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.7</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -822,7 +830,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.20.1</version>
+ <version>2.21.0</version>
<executions>
<execution>
<id>integration-test</id>
@@ -1636,7 +1644,17 @@
<jdk>[1.8,)</jdk>
</activation>
<properties>
- <javadoc.doclint.none>-Xdoclint:none</javadoc.doclint.none>
+ <javadoc.doclint>none</javadoc.doclint>
+ <javadoc.additionalOptions></javadoc.additionalOptions>
+ </properties>
+ </profile>
+ <profile>
+ <id>java9-javadoc-html5</id>
+ <activation>
+ <jdk>[9,)</jdk>
+ </activation>
+ <properties>
+ <javadoc.additionalOptions>-html5</javadoc.additionalOptions>
</properties>
</profile>
</profiles>