You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ks...@apache.org on 2016/02/03 22:45:14 UTC

[1/2] servicemix git commit: SM-2854: Doclint for Javadoc fails on JDK 8

Repository: servicemix
Updated Branches:
  refs/heads/master 0f6cfe423 -> 87e4e7282


SM-2854: Doclint for Javadoc fails on JDK 8


Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/08e27abd
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/08e27abd
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/08e27abd

Branch: refs/heads/master
Commit: 08e27abde6ce00afa390d213216a588842d6b7f0
Parents: 0f6cfe4
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Wed Feb 3 22:43:20 2016 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Wed Feb 3 22:43:20 2016 +0100

----------------------------------------------------------------------
 pom.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix/blob/08e27abd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4daf517..f2282b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -532,12 +532,24 @@
                                 <goals>
                                     <goal>jar</goal>
                                 </goals>
+                                <configuration>
+                                    <additionalparam>${javadoc.opts}</additionalparam>
+                                </configuration>
                             </execution>
                         </executions>
                     </plugin>
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>doclint-java8-disable</id>
+            <activation>
+                <jdk>[1.8,)</jdk>
+            </activation>
+            <properties>
+                <javadoc.opts>-Xdoclint:none</javadoc.opts>
+            </properties>
+        </profile>
     </profiles>
 
 </project>


[2/2] servicemix git commit: Profile 'setup.eclipse' corrected

Posted by ks...@apache.org.
Profile 'setup.eclipse' corrected


Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/87e4e728
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/87e4e728
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/87e4e728

Branch: refs/heads/master
Commit: 87e4e728221be29359a83e838afb80f7e04a29f4
Parents: 08e27ab
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Wed Feb 3 22:44:48 2016 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Wed Feb 3 22:44:48 2016 +0100

----------------------------------------------------------------------
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix/blob/87e4e728/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f2282b3..577c861 100644
--- a/pom.xml
+++ b/pom.xml
@@ -477,7 +477,7 @@
         <profile>
             <id>setup.eclipse</id>
             <modules>
-                <module>assembly</module>
+                <module>assemblies</module>
             </modules>
             <properties>
                 <eclipse.workspace.dir>${basedir}/../workspace</eclipse.workspace.dir>