You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dp...@apache.org on 2019/02/22 14:18:41 UTC
[ignite] branch master updated: IGNITE-11189: Java 11 local build
supported, profile Java9+ can be activated to build using newer JDKs
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 48be973 IGNITE-11189: Java 11 local build supported, profile Java9+ can be activated to build using newer JDKs
48be973 is described below
commit 48be97351c4904dffad23af5331aeda408969a15
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Fri Feb 22 17:17:21 2019 +0300
IGNITE-11189: Java 11 local build supported, profile Java9+ can be activated to build using newer JDKs
---
.../vector/impl/DelegatingNamedVector.java | 2 +-
modules/tools/pom.xml | 53 ++++++++++++++++++
.../ignite/tools/javadoc/IgniteLinkTaglet.java | 65 ++++++----------------
.../ignite/tools/javadoc/IgniteLinkTaglet.java | 0
parent/pom.xml | 14 ++++-
5 files changed, 82 insertions(+), 52 deletions(-)
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/impl/DelegatingNamedVector.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/impl/DelegatingNamedVector.java
index afc5f09..4c9a27f 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/impl/DelegatingNamedVector.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/vector/impl/DelegatingNamedVector.java
@@ -23,7 +23,7 @@ import java.util.Objects;
import java.util.Set;
import org.apache.ignite.ml.math.primitives.vector.NamedVector;
import org.apache.ignite.ml.math.primitives.vector.Vector;
-import org.omg.CORBA.NamedValue;
+
/**
* Delegating named vector that delegates all operations to underlying vector and adds implementation of
diff --git a/modules/tools/pom.xml b/modules/tools/pom.xml
index 0e5a10b..8f0acc6 100644
--- a/modules/tools/pom.xml
+++ b/modules/tools/pom.xml
@@ -34,6 +34,59 @@
<version>2.8.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
+
+
+ <profiles>
+ <profile>
+ <id>java-9+</id>
+ <activation>
+ <jdk>[1.9,)</jdk>
+ </activation>
+ <properties>
+ <src.javaspecific.dir>src/main/java11</src.javaspecific.dir>
+ </properties>
+ </profile>
+
+ <profile>
+ <id>java-8</id>
+ <activation>
+ <jdk>1.8</jdk>
+ </activation>
+ <properties>
+ <src.javaspecific.dir>src/main/java8</src.javaspecific.dir>
+ </properties>
+ </profile>
+ </profiles>
+
+
+ <build>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>3.0.0</version>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${src.javaspecific.dir}</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+
+
+
<dependencies>
<dependency>
<groupId>org.jodd</groupId>
diff --git a/modules/tools/src/main/java/org/apache/ignite/tools/javadoc/IgniteLinkTaglet.java b/modules/tools/src/main/java11/org/apache/ignite/tools/javadoc/IgniteLinkTaglet.java
similarity index 73%
copy from modules/tools/src/main/java/org/apache/ignite/tools/javadoc/IgniteLinkTaglet.java
copy to modules/tools/src/main/java11/org/apache/ignite/tools/javadoc/IgniteLinkTaglet.java
index a018b5d..ef5683c 100644
--- a/modules/tools/src/main/java/org/apache/ignite/tools/javadoc/IgniteLinkTaglet.java
+++ b/modules/tools/src/main/java11/org/apache/ignite/tools/javadoc/IgniteLinkTaglet.java
@@ -18,9 +18,15 @@
package org.apache.ignite.tools.javadoc;
import com.sun.javadoc.Tag;
-import com.sun.tools.doclets.Taglet;
+import com.sun.source.doctree.DocTree;
import java.io.File;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
import java.util.Map;
+import java.util.Set;
+import javax.lang.model.element.Element;
+import jdk.javadoc.doclet.Taglet;
/**
* Represents {@ignitelink Class} tag. This tag can
@@ -38,46 +44,20 @@ public class IgniteLinkTaglet implements Taglet {
return NAME;
}
- /**
- * @return true since this tag can be used in a field doc comment.
- */
- @Override public boolean inField() {
- return true;
- }
+ @Override public String toString(List<? extends DocTree> tags, Element element) {
+ StringBuilder sb = new StringBuilder();
- /**
- * @return true since this tag can be used in a constructor doc comment.
- */
- @Override public boolean inConstructor() {
- return true;
- }
+ for (Iterator<? extends DocTree> iter = tags.iterator(); iter.hasNext(); ) {
+ DocTree next = iter.next();
- /**
- * @return true since this tag can be used in a method doc comment.
- */
- @Override public boolean inMethod() {
- return true;
- }
-
- /**
- * @return true since this tag can be used in an overview doc comment.
- */
- @Override public boolean inOverview() {
- return true;
- }
+ sb.append(""); //todo IGNITE-11393 Implement toString for Java 9+
+ }
- /**
- * @return true since this tag can be used in a package doc comment.
- */
- @Override public boolean inPackage() {
- return true;
+ return sb.toString();
}
- /**
- * @return true since this.
- */
- @Override public boolean inType() {
- return true;
+ @Override public Set<Location> getAllowedLocations() {
+ return new HashSet<>();
}
/**
@@ -116,7 +96,7 @@ public class IgniteLinkTaglet implements Taglet {
*
* @param tag <code>Tag</code> representation of this custom tag.
*/
- @Override public String toString(Tag tag) {
+ public String toString(Tag tag) {
if (tag.text() == null || tag.text().isEmpty())
return "";
@@ -150,15 +130,4 @@ public class IgniteLinkTaglet implements Taglet {
(tokens.length > 1 ? ("#" + tokens[1].replace("[]", "...")) : "") +
"\"><code>" + simpleClsName + (tokens.length > 1 ? ("." + tokens[1]) : "") + "</code></a>";
}
-
- /**
- * This method should not be called since arrays of inline tags do not
- * exist. Method {@link #toString(Tag)} should be used to convert this
- * inline tag to a string.
- *
- * @param tags the array of <code>Tag</code>s representing of this custom tag.
- */
- @Override public String toString(Tag[] tags) {
- return null;
- }
}
\ No newline at end of file
diff --git a/modules/tools/src/main/java/org/apache/ignite/tools/javadoc/IgniteLinkTaglet.java b/modules/tools/src/main/java8/org/apache/ignite/tools/javadoc/IgniteLinkTaglet.java
similarity index 100%
rename from modules/tools/src/main/java/org/apache/ignite/tools/javadoc/IgniteLinkTaglet.java
rename to modules/tools/src/main/java8/org/apache/ignite/tools/javadoc/IgniteLinkTaglet.java
diff --git a/parent/pom.xml b/parent/pom.xml
index 380fc2e..1a4399e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1024,13 +1024,13 @@
</profile>
<profile>
- <id>java-9</id>
+ <id>java-9+</id>
<activation>
<jdk>[1.9,)</jdk>
</activation>
<properties>
- <maven.compiler.source>9</maven.compiler.source>
- <maven.compiler.target>9</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>11</maven.compiler.target>
<scala.library.version>2.12.6</scala.library.version>
</properties>
<dependencies/>
@@ -1053,6 +1053,14 @@
</compilerArgs>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED --add-exports=java.base/sun.nio.ch=ALL-UNNAMED --add-exports=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED --add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED --add-exports=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED --illegal-access=permit</argLine>
+ </configuration>
+ </plugin>
</plugins>
</build>