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 2017/10/10 16:51:10 UTC
[1/2] incubator-netbeans-html4j git commit: Using JDK1.8.0_141 flag
--allow-script-in-comments to let the Javadoc be generated on most modern
JDK8. Use mvn javadoc:aggregate -Djavadoc.allowjs= to generate the Javadoc on
older JDK8s
Repository: incubator-netbeans-html4j
Updated Branches:
refs/heads/master eed653ae3 -> f6e7bc795
Using JDK1.8.0_141 flag --allow-script-in-comments to let the Javadoc be generated on most modern JDK8. Use mvn javadoc:aggregate -Djavadoc.allowjs= to generate the Javadoc on older JDK8s
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans-html4j/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans-html4j/commit/64b319a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans-html4j/tree/64b319a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans-html4j/diff/64b319a3
Branch: refs/heads/master
Commit: 64b319a3f8d35914139851aff4c7ed50cdbf4a97
Parents: 40dfcca
Author: Jaroslav Tulach <ja...@oracle.com>
Authored: Tue Oct 10 18:50:11 2017 +0200
Committer: Jaroslav Tulach <ja...@oracle.com>
Committed: Tue Oct 10 18:50:11 2017 +0200
----------------------------------------------------------------------
pom.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans-html4j/blob/64b319a3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ffa3b26..ff95b9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,6 +39,7 @@
<publicPackages />
<bundleSymbolicName>${project.artifactId}</bundleSymbolicName>
<netbeans.compile.on.save>none</netbeans.compile.on.save>
+ <javadoc.allowjs>--allow-script-in-comments</javadoc.allowjs>
</properties>
<modules>
<module>json</module>
@@ -144,7 +145,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9</version>
+ <version>2.10.4</version>
<configuration>
<docfilessubdirs>true</docfilessubdirs>
<subpackages>${publicPackages}</subpackages>
@@ -189,7 +190,7 @@ org.netbeans.html.boot.impl:org.netbeans.html.boot.fx:org.netbeans.html.context.
<artifactId>codesnippet-doclet</artifactId>
<version>0.22</version>
</docletArtifact>
- <additionalparam>-snippetpath "${basedir}"</additionalparam>
+ <additionalparam>-snippetpath "${basedir}" ${javadoc.allowjs}</additionalparam>
</configuration>
</plugin>
<plugin>
[2/2] incubator-netbeans-html4j git commit: Merging both branches
together
Posted by jt...@apache.org.
Merging both branches together
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans-html4j/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans-html4j/commit/f6e7bc79
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans-html4j/tree/f6e7bc79
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans-html4j/diff/f6e7bc79
Branch: refs/heads/master
Commit: f6e7bc79554bb051a65ef1c69ce594b1908c5c79
Parents: 64b319a eed653a
Author: Jaroslav Tulach <ja...@oracle.com>
Authored: Tue Oct 10 18:50:49 2017 +0200
Committer: Jaroslav Tulach <ja...@oracle.com>
Committed: Tue Oct 10 18:50:49 2017 +0200
----------------------------------------------------------------------
.../java/org/netbeans/html/json/impl/JSON.java | 52 ++++++++++++++++++--
pom.xml | 39 ---------------
2 files changed, 49 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans-html4j/blob/f6e7bc79/pom.xml
----------------------------------------------------------------------