Author: vsiveton
Date: Thu Jul 28 06:24:18 2011
New Revision: 1151741
URL: http://svn.apache.org/viewvc?rev=1151741&view=rev
Log:
JXR-54: Discuss about Forrestdoc and JXR
o updated dependencies
Modified:
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-ant/pom.xml
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/pom.xml
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-js/pom.xml
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/pom.xml
maven/sandbox/trunk/jxr/maven-jxr/pom.xml
Modified: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-ant/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-ant/pom.xml?rev=1151741&r1=1151740&r2=1151741&view=diff
==============================================================================
--- maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-ant/pom.xml (original)
+++ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-ant/pom.xml Thu Jul 28 06:24:18
2011
@@ -51,7 +51,6 @@ under the License.
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
- <version>2.7.0</version>
</dependency>
<!-- Plexus -->
Modified: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/pom.xml?rev=1151741&r1=1151740&r2=1151741&view=diff
==============================================================================
--- maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/pom.xml (original)
+++ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/pom.xml Thu Jul 28
06:24:18 2011
@@ -34,6 +34,11 @@ under the License.
<artifactId>maven-jxr-java</artifactId>
<name>Java source code documentation</name>
+ <properties>
+ <antlrArtifactId>antlrall</antlrArtifactId>
+ <antlrVersion>2.7.4</antlrVersion>
+ </properties>
+
<dependencies>
<!-- JXR Utils -->
<dependency>
@@ -58,21 +63,19 @@ under the License.
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.13</version>
</dependency>
<!-- Javadoc parser -->
<dependency>
<groupId>com.thoughtworks.qdox</groupId>
<artifactId>qdox</artifactId>
- <version>1.6.3</version>
+ <version>1.12</version>
</dependency>
<!-- XSLT -->
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
- <version>2.7.0</version>
</dependency>
<!-- Plexus -->
@@ -84,23 +87,23 @@ under the License.
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
-
- <!-- Doclet API -->
- <dependency>
- <groupId>com.sun</groupId>
- <artifactId>tools</artifactId>
- <version>1.5.0_11</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
</dependencies>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antlr-plugin</artifactId>
+ <version>2.0-beta-1</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antlr-plugin</artifactId>
- <version>2.0-beta-1</version>
<configuration>
<grammars>javaG.g</grammars>
</configuration>
@@ -116,11 +119,6 @@ under the License.
</plugins>
</build>
- <properties>
- <antlrArtifactId>antlrall</antlrArtifactId>
- <antlrVersion>2.7.4</antlrVersion>
- </properties>
-
<reporting>
<plugins>
<plugin>
@@ -128,11 +126,33 @@ under the License.
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<links>
- <link>http://java.sun.com/j2se/1.4.2/docs/api</link>
-
<link>http://java.sun.com/j2se/1.4.2/docs/tooldocs/javadoc/doclet/</link>
+ <link>http://download.oracle.com/javase/1.5.0/docs/api</link>
+
<link>http://download.oracle.com/javase/1.4.2/docs/tooldocs/javadoc/doclet</link>
</links>
</configuration>
</plugin>
</plugins>
</reporting>
+
+ <profiles>
+ <profile>
+ <id>default-tools.jar</id>
+ <activation>
+ <property>
+ <name>java.vendor</name>
+ <value>Sun Microsystems Inc.</value>
+ </property>
+ </activation>
+ <dependencies>
+ <!-- Doclet API -->
+ <dependency>
+ <groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
+ <version>1.5.0</version>
+ <scope>system</scope>
+ <systemPath>${java.home}/../lib/tools.jar</systemPath>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
Modified: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-js/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-js/pom.xml?rev=1151741&r1=1151740&r2=1151741&view=diff
==============================================================================
--- maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-js/pom.xml (original)
+++ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-js/pom.xml Thu Jul 28 06:24:18
2011
@@ -45,7 +45,6 @@ under the License.
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.13</version>
</dependency>
<!-- Plexus -->
Modified: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/pom.xml?rev=1151741&r1=1151740&r2=1151741&view=diff
==============================================================================
--- maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/pom.xml (original)
+++ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/pom.xml Thu Jul 28
06:24:18 2011
@@ -32,7 +32,7 @@ under the License.
</parent>
<artifactId>maven-jxr-utils</artifactId>
- <name>Utilities classes for source code documentation</name>
+ <name>Utilities for source code documentation</name>
<dependencies>
<dependency>
Modified: maven/sandbox/trunk/jxr/maven-jxr/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/pom.xml?rev=1151741&r1=1151740&r2=1151741&view=diff
==============================================================================
--- maven/sandbox/trunk/jxr/maven-jxr/pom.xml (original)
+++ maven/sandbox/trunk/jxr/maven-jxr/pom.xml Thu Jul 28 06:24:18 2011
@@ -27,7 +27,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>6</version>
+ <version>20</version>
<relativePath>../../../pom/maven/pom.xml</relativePath>
</parent>
@@ -48,11 +48,29 @@ under the License.
<module>maven-jxr-js</module>
</modules>
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/sandbox/trunk/jxr/maven-jxr</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/sandbox/trunk/jxr/maven-jxr</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr</url>
+ </scm>
+
+ <issueManagement>
+ <system>jira</system>
+ <url>http://jira.codehaus.org/browse/JXR</url>
+ </issueManagement>
+
+<!--
+ <ciManagement>
+ <system>Jenkins</system>
+ <url>https://builds.apache.org/hudson/job/maven-jxr/</url>
+ </ciManagement>
+-->
+
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>3.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -64,12 +82,28 @@ under the License.
<artifactId>maven-jxr-utils</artifactId>
<version>${projectVersion}</version>
</dependency>
+
<!-- Ant -->
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.7.0</version>
+ <version>1.8.2</version>
+ </dependency>
+
+ <!-- Logging -->
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
+ </dependency>
+
+ <!-- XSLT -->
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.1</version>
</dependency>
+
<!-- Plexus -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -79,21 +113,37 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.4.6</version>
+ <version>3.0</version>
</dependency>
</dependencies>
</dependencyManagement>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.9</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-maven-plugin</artifactId>
+ <version>1.3.5</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
<plugins>
<plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
- </plugin>
- <plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-maven-plugin</artifactId>
- <version>1.3.5</version>
<executions>
<execution>
<goals>
@@ -110,18 +160,13 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8</version>
<configuration>
<links>
- <link>http://java.sun.com/j2se/1.4.2/docs/api</link>
+ <link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
</links>
</configuration>
</plugin>
</plugins>
</reporting>
-
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/sandbox/trunk/jxr/maven-jxr</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/sandbox/trunk/jxr/maven-jxr</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr</url>
- </scm>
</project>
