You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2013/06/24 12:32:32 UTC
svn commit: r1495984 - /incubator/marmotta/site/trunk/pom.xml
Author: wikier
Date: Mon Jun 24 10:32:32 2013
New Revision: 1495984
URL: http://svn.apache.org/r1495984
Log:
updated marmotta site to generate the javadoc with the version 2.10-SNAPSHOT of the maven plugin, in order to try to fix the critial security issue
Modified:
incubator/marmotta/site/trunk/pom.xml
Modified: incubator/marmotta/site/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/marmotta/site/trunk/pom.xml?rev=1495984&r1=1495983&r2=1495984&view=diff
==============================================================================
--- incubator/marmotta/site/trunk/pom.xml (original)
+++ incubator/marmotta/site/trunk/pom.xml Mon Jun 24 10:32:32 2013
@@ -172,13 +172,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9</version>
+ <version>2.10-SNAPSHOT</version>
<configuration>
<stylesheet>maven</stylesheet>
</configuration>
-
</plugin>
-
</plugins>
</pluginManagement>
</build>
@@ -188,15 +186,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9</version>
-
<configuration>
<includeDependencySources>true</includeDependencySources>
<includeTransitiveDependencySources>false</includeTransitiveDependencySources>
</configuration>
-
<reportSets>
- <!--
+ <!--
<reportSet>
<id>ldclient-api</id>
<configuration>
@@ -222,7 +217,6 @@
<report>javadoc</report>
</reports>
</reportSet>
-
<reportSet>
<id>ldcache-api</id>
<configuration>
@@ -366,48 +360,42 @@
<report>javadoc</report>
</reports>
</reportSet>
- -->
-
- <!-- <reportSet>
- <id>java-api</id>
- <configuration>
- <name>Java API</name>
- <description>Aggregated Java API documentation</description>
- <destDir>apidocs</destDir>
- <encoding>UTF-8</encoding>
- <detectLinks>true</detectLinks>
- <stylesheetfile>content/resources/css/fluido-doc.css</stylesheetfile>
- <groups>
- <group>
- <title>LDClient</title>
- <packages>org.apache.marmotta.ldclient.*</packages>
- </group>
- <group>
- <title>LDCache</title>
- <packages>org.apache.marmotta.ldcache.*</packages>
- </group>
- <group>
- <title>LDPath</title>
- <packages>org.apache.marmotta.ldpath.*</packages>
- </group>
- <group>
- <title>KiWi Triple Store</title>
- <packages>org.apache.marmotta.kiwi.*</packages>
- </group>
- </groups>
- <dependencySourceIncludes>
- <dependencySourceInclude>org.apache.marmotta:*</dependencySourceInclude>
- </dependencySourceIncludes>
- <header><![CDATA[<img src="{@docRoot}/../images/Marmotta_Logo_64.png"/>]]></header>
- </configuration>
- <reports>
- <report>javadoc</report>
- </reports>
- </reportSet>
- -->
-
- <!-- configure how the REST API documentation will be produced -->
- <!--
+ <reportSet>
+ <id>java-api</id>
+ <configuration>
+ <name>Java API</name>
+ <description>Aggregated Java API documentation</description>
+ <destDir>apidocs</destDir>
+ <encoding>UTF-8</encoding>
+ <detectLinks>true</detectLinks>
+ <stylesheetfile>content/resources/css/fluido-doc.css</stylesheetfile>
+ <groups>
+ <group>
+ <title>LDClient</title>
+ <packages>org.apache.marmotta.ldclient.*</packages>
+ </group>
+ <group>
+ <title>LDCache</title>
+ <packages>org.apache.marmotta.ldcache.*</packages>
+ </group>
+ <group>
+ <title>LDPath</title>
+ <packages>org.apache.marmotta.ldpath.*</packages>
+ </group>
+ <group>
+ <title>KiWi Triple Store</title>
+ <packages>org.apache.marmotta.kiwi.*</packages>
+ </group>
+ </groups>
+ <dependencySourceIncludes>
+ <dependencySourceInclude>org.apache.marmotta:*</dependencySourceInclude>
+ </dependencySourceIncludes>
+ <header><![CDATA[<img src="{@docRoot}/../images/Marmotta_Logo_64.png"/>]]></header>
+ </configuration>
+ <reports>
+ <report>javadoc</report>
+ </reports>
+ </reportSet>
<reportSet>
<id>rest-api</id>
<configuration>
@@ -477,7 +465,6 @@
</reports>
</reportSet>
-->
-
</reportSets>
</plugin>
</plugins>
@@ -562,7 +549,8 @@
<id>rpalmieri</id>
<name>Raffaele Palmieri</name>
<email>rpalmieri[at]apache[dot]org</email>
- <organization>Eustema Spa, The Apache Software Foundation</organization>
+ <url>http://rafpalmieri.blogspot.it</url>
+ <organization>Eustema, The Apache Software Foundation</organization>
<roles>
<role>Committer</role>
<role>PPMC Member</role>
@@ -572,6 +560,7 @@
<id>ansell</id>
<name>Peter Ansell</name>
<email>ansell[at]apache[dot]org</email>
+ <url>http://github.com/ansell</url>
<organization>University of Queensland, The Apache Software Foundation</organization>
<roles>
<role>Committer</role>
@@ -667,7 +656,6 @@
</mailingList>
</mailingLists>
-
<dependencies>
<dependency>
<groupId>org.apache.marmotta</groupId>