You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2018/04/06 20:52:28 UTC

[juneau] branch master updated: Fix javadoc generation when building using Java 8.

This is an automated email from the ASF dual-hosted git repository.

jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git


The following commit(s) were added to refs/heads/master by this push:
     new e0f328b  Fix javadoc generation when building using Java 8.
e0f328b is described below

commit e0f328b51ad99912b8a30ba339360cdce895d871
Author: JamesBognar <ja...@apache.org>
AuthorDate: Fri Apr 6 13:51:53 2018 -0700

    Fix javadoc generation when building using Java 8.
---
 .../.settings => .settings}/org.eclipse.core.resources.prefs        | 0
 .../juneau-config/.settings/org.eclipse.core.resources.prefs        | 1 +
 juneau-core/juneau-dto/.classpath                                   | 6 +++++-
 juneau-core/juneau-dto/.settings/org.eclipse.core.resources.prefs   | 1 +
 juneau-examples/juneau-examples-rest/.classpath                     | 6 +++++-
 juneau-microservice/juneau-microservice-server/.classpath           | 6 +++++-
 .../.settings/org.eclipse.core.resources.prefs                      | 1 +
 .../juneau-microservice-test/.settings/org.eclipse.jdt.core.prefs   | 1 +
 pom.xml                                                             | 2 +-
 9 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/juneau-core/juneau-config/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
similarity index 100%
copy from juneau-core/juneau-config/.settings/org.eclipse.core.resources.prefs
copy to .settings/org.eclipse.core.resources.prefs
diff --git a/juneau-core/juneau-config/.settings/org.eclipse.core.resources.prefs b/juneau-core/juneau-config/.settings/org.eclipse.core.resources.prefs
index 99f26c0..e9441bb 100644
--- a/juneau-core/juneau-config/.settings/org.eclipse.core.resources.prefs
+++ b/juneau-core/juneau-config/.settings/org.eclipse.core.resources.prefs
@@ -1,2 +1,3 @@
 eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
 encoding/<project>=UTF-8
diff --git a/juneau-core/juneau-dto/.classpath b/juneau-core/juneau-dto/.classpath
index 5a77437..7201cc3 100644
--- a/juneau-core/juneau-dto/.classpath
+++ b/juneau-core/juneau-dto/.classpath
@@ -6,7 +6,11 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
diff --git a/juneau-core/juneau-dto/.settings/org.eclipse.core.resources.prefs b/juneau-core/juneau-dto/.settings/org.eclipse.core.resources.prefs
index e9441bb..abdea9a 100644
--- a/juneau-core/juneau-dto/.settings/org.eclipse.core.resources.prefs
+++ b/juneau-core/juneau-dto/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,4 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
 encoding/<project>=UTF-8
diff --git a/juneau-examples/juneau-examples-rest/.classpath b/juneau-examples/juneau-examples-rest/.classpath
index 2670f35..458e40d 100644
--- a/juneau-examples/juneau-examples-rest/.classpath
+++ b/juneau-examples/juneau-examples-rest/.classpath
@@ -23,6 +23,10 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/juneau-microservice/juneau-microservice-server/.classpath b/juneau-microservice/juneau-microservice-server/.classpath
index c15778c..d496ea1 100644
--- a/juneau-microservice/juneau-microservice-server/.classpath
+++ b/juneau-microservice/juneau-microservice-server/.classpath
@@ -12,7 +12,11 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
diff --git a/juneau-microservice/juneau-microservice-server/.settings/org.eclipse.core.resources.prefs b/juneau-microservice/juneau-microservice-server/.settings/org.eclipse.core.resources.prefs
index f9fe345..839d647 100644
--- a/juneau-microservice/juneau-microservice-server/.settings/org.eclipse.core.resources.prefs
+++ b/juneau-microservice/juneau-microservice-server/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,5 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
 encoding//src/test/java=UTF-8
 encoding/<project>=UTF-8
diff --git a/juneau-microservice/juneau-microservice-test/.settings/org.eclipse.jdt.core.prefs b/juneau-microservice/juneau-microservice-test/.settings/org.eclipse.jdt.core.prefs
index 4427c6b..4b04196 100644
--- a/juneau-microservice/juneau-microservice-test/.settings/org.eclipse.jdt.core.prefs
+++ b/juneau-microservice/juneau-microservice-test/.settings/org.eclipse.jdt.core.prefs
@@ -9,6 +9,7 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
diff --git a/pom.xml b/pom.xml
index 03e4809..e936f79 100644
--- a/pom.xml
+++ b/pom.xml
@@ -174,7 +174,7 @@
 						<overview>${basedir}/juneau-doc/src/main/javadoc/overview.html</overview>
 						<stylesheetfile>${basedir}/juneau-doc/src/main/javadoc/javadoc.css</stylesheetfile>
 						<use>false</use>
-						<additionalparam>-sourcetab 3 -notimestamp -Xdoclint:none</additionalparam>
+						<additionalparam>-sourcetab 3 -notimestamp -Xdoclint:none --allow-script-in-comments</additionalparam>
 						<verbose>false</verbose>
 						<excludePackageNames>*proto*:*samples*:*examples*:*test*</excludePackageNames>
 						<linksource>true</linksource>

-- 
To stop receiving notification emails like this one, please contact
jamesbognar@apache.org.