You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by jt...@apache.org on 2019/10/28 11:37:14 UTC
[netbeans-html4j] branch master updated: Build on JDK13
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git
The following commit(s) were added to refs/heads/master by this push:
new 53b2fca Build on JDK13
53b2fca is described below
commit 53b2fca303c1d24fb1b66a851eb46b92ee6c701e
Author: Jaroslav Tulach <ja...@apidesign.org>
AuthorDate: Mon Oct 28 12:37:08 2019 +0100
Build on JDK13
---
browser/pom.xml | 15 ---------------
generic/pom.xml | 17 -----------------
pom.xml | 14 ++++++++++++--
renderer/pom.xml | 15 ---------------
webkit/pom.xml | 16 ----------------
5 files changed, 12 insertions(+), 65 deletions(-)
diff --git a/browser/pom.xml b/browser/pom.xml
index f053eab..d2bb424 100644
--- a/browser/pom.xml
+++ b/browser/pom.xml
@@ -57,21 +57,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <skip>false</skip>
- </configuration>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.18.1</version>
</plugin>
diff --git a/generic/pom.xml b/generic/pom.xml
index b59de10..0008110 100644
--- a/generic/pom.xml
+++ b/generic/pom.xml
@@ -75,8 +75,6 @@
<compilerArguments>
<Aversion>${project.version}</Aversion>
</compilerArguments>
- <source>1.6</source>
- <target>1.6</target>
<testSource>1.8</testSource>
<testTarget>1.8</testTarget>
</configuration>
@@ -89,21 +87,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <subpackages>org.netbeans.html.presenters.spi</subpackages>
- </configuration>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.netbeans.html</groupId>
<artifactId>html4j-maven-plugin</artifactId>
<executions>
diff --git a/pom.xml b/pom.xml
index 34c21b5..256f18e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,6 +33,7 @@
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <javac.source>1.6</javac.source>
<netbeans.version>RELEASE110</netbeans.version>
<grizzly.version>2.3.8</grizzly.version>
<license>COPYING</license>
@@ -278,8 +279,8 @@ org.netbeans.html.boot.impl:org.netbeans.html.boot.fx:org.netbeans.html.context.
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>${javac.source}</source>
+ <target>${javac.source}</target>
<testSource>1.8</testSource>
<testTarget>1.8</testTarget>
</configuration>
@@ -557,5 +558,14 @@ org.netbeans.html.boot.impl:org.netbeans.html.boot.fx:org.netbeans.html.context.
<jfxrt.jar>${java.home}/lib/jfxrt.jar</jfxrt.jar>
</properties>
</profile>
+ <profile>
+ <id>jdk13</id>
+ <activation>
+ <jdk>13</jdk>
+ </activation>
+ <properties>
+ <javac.source>1.7</javac.source>
+ </properties>
+ </profile>
</profiles>
</project>
diff --git a/renderer/pom.xml b/renderer/pom.xml
index cb534b8..87f1a0f 100644
--- a/renderer/pom.xml
+++ b/renderer/pom.xml
@@ -47,21 +47,6 @@
</instructions>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <skip>false</skip>
- </configuration>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
<dependencies>
diff --git a/webkit/pom.xml b/webkit/pom.xml
index 83fcb33..de2c0c1 100644
--- a/webkit/pom.xml
+++ b/webkit/pom.xml
@@ -54,22 +54,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <skip>false</skip>
- <subpackages>org.netbeans.html.presenters.webkit</subpackages>
- </configuration>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.18.1</version>
<configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists