Author: ptahchiev
Date: Mon Mar 31 11:57:22 2008
New Revision: 643100
URL: http://svn.apache.org/viewvc?rev=643100&view=rev
Log:
changes in the master pom.xml file to generate the Xref and Javadoc reports,
and also to include the proper L&N files in the produced artifacts.
Modified:
jakarta/cactus/trunk/pom.xml
Modified: jakarta/cactus/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/pom.xml?rev=643100&r1=643099&r2=643100&view=diff
==============================================================================
--- jakarta/cactus/trunk/pom.xml (original)
+++ jakarta/cactus/trunk/pom.xml Mon Mar 31 11:57:22 2008
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project>
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cactus</groupId>
<artifactId>cactus</artifactId>
@@ -25,6 +25,7 @@
<version>1.8.0-SNAPSHOT</version>
<packaging>pom</packaging>
<url>http://jakarta.apache.org/cactus/</url>
+ <inceptionYear>2001</inceptionYear>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
@@ -38,12 +39,11 @@
</organization>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/cactus/trunk/</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/jakarta/cactus/trunk/</developerConnection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/jakarta/cactus/trunk/</developerConnection>
</scm>
- <inceptionYear>2001</inceptionYear>
<prerequisites>
<!-- It may work with previous versions of Maven but this
hasn't been tested so for safety
- we require Maven 2.0.4 -->
+ we require Maven 2.0.4 -->
<maven>2.0.4</maven>
</prerequisites>
<!-- THESE DEPENDENCIES ARE LISTED HERE SO THAT THE ASSEMBLY PLUGIN CAN
PRODUCE THE LIB FOLDER IN THE ASSEMBLIES-->
@@ -153,9 +153,9 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.4</version>
+ <version>3.8.2</version>
</dependency>
- <dependency> <!-- used by httpunit -->
+ <dependency>
<groupId>nekohtml</groupId>
<artifactId>nekohtml</artifactId>
<version>1.9.6</version>
@@ -191,21 +191,21 @@
<artifactId>cargo</artifactId>
<version>0.9</version>
</dependency>
- <dependency>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-core-uberjar</artifactId>
- <version>0.9</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-ant</artifactId>
- <version>0.9</version>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-junit</artifactId>
- <version>1.6.5</version>
- </dependency>
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
+ <version>0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-ant</artifactId>
+ <version>0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ <version>1.6.5</version>
+ </dependency>
<dependency>
<groupId>checkstyle</groupId>
<artifactId>checkstyle</artifactId>
@@ -229,12 +229,12 @@
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>2.0.2</version>
+ <version>3.1</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>httpunit</groupId>
@@ -271,14 +271,14 @@
<version>1.2.8</version>
</dependency>
<dependency>
- <groupId>jmock</groupId>
- <artifactId>jmock</artifactId>
- <version>1.2.0</version>
- </dependency>
+ <groupId>jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <version>1.2.0</version>
+ </dependency>
<dependency> <!-- used by httpunit -->
<groupId>nekohtml</groupId>
<artifactId>nekohtml</artifactId>
- <version>0.9.1</version>
+ <version>1.9.6</version>
<exclusions>
<exclusion>
<groupId>xerces</groupId>
@@ -298,7 +298,7 @@
<id>apache.snapshots</id>
<name>Apache Development Snapshot Repository</name>
<url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
- </snapshotRepository>
+ </snapshotRepository>
<site>
<id>cactus-site</id>
<name>Cactus Deployment site</name>
@@ -313,170 +313,71 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.3</version>
<configuration>
<aggregate>true</aggregate>
-
<destDir>../../../cactus-site/src/site/resources/api-docs</destDir>
- </configuration>
+
<reportOutputDirectory>cactus-site/src/site/resources</reportOutputDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+
<destDir>cactus-site/src/site/resources/xref</destDir>
+ <linkJavadoc>true</linkJavadoc>
+
<javadocDir>cactus-site/src/site/resources/apidocs</javadocDir>
+ </configuration>
+ </plugin>
+ </plugins>
+</reporting>
- </plugin>
- <!--plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin-->
- </plugins>
- </reporting>
-
- <ciManagement>
- <system>gump</system>
- <notifiers>
- <notifier>
- <type>mail</type>
- <configuration>
- <address>[EMAIL
PROTECTED]</address>
- </configuration>
- </notifier>
- </notifiers>
- </ciManagement>
+<ciManagement>
+ <system>gump</system>
+ <notifiers>
+ <notifier>
+ <type>mail</type>
+ <configuration>
+ <address>[EMAIL PROTECTED]</address>
+ </configuration>
+ </notifier>
+ </notifiers>
+</ciManagement>
- <properties>
- <maven.compile.source>1.4</maven.compile.source>
- <maven.compile.target>1.4</maven.compile.target>
- </properties>
-
- <build>
- <pluginManagement>
- <plugins>
- <!-- Apply checkstyle rules and fail the build
in case of errors. The checkstyle config
- files are taken from the build-tools JAR module
-->
- <plugin>
-
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-checkstyle-plugin</artifactId>
- <dependencies>
- <dependency>
+<properties>
+ <maven.compile.source>1.4</maven.compile.source>
+ <maven.compile.target>1.4</maven.compile.target>
+</properties>
+
+<build>
+ <pluginManagement>
+ <plugins>
+ <!-- Apply checkstyle rules and fail the build in case
of errors. The checkstyle config
+ files are taken from the build-tools
JAR module -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <dependencies>
+ <dependency>
<groupId>org.apache.cactus</groupId>
<artifactId>cactus.build.tools</artifactId>
<version>1.8.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
- <configuration>
-
<consoleOutput>true</consoleOutput>
-
<configLocation>build-tools/checkstyle.xml</configLocation>
-
<headerLocation>build-tools/checkstyle.license</headerLocation>
- </configuration>
- <executions>
- <execution>
- <goals>
-
<goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <executions>
- <execution>
- <goals>
-
<goal>process</goal>
- </goals>
- <configuration>
-
<resourceBundles>
-
<resourceBundle>org.apache:apache-jar-resource-bundle:1.2</resourceBundle>
-
</resourceBundles>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
-
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-clover-plugin</artifactId>
- <configuration>
-
<targetPercentage>0%</targetPercentage>
- </configuration>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
-
<goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
-
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-release-plugin</artifactId>
- <configuration>
-
<tagBase>file:////home/peter/tags/</tagBase>
- </configuration>
- </plugin>
- <plugin>
-
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
- </plugin>
- <plugin>
-
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.1</version>
- </plugin>
- <plugin>
-
<artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-6</version>
- </plugin>
- <plugin>
-
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-compiler-plugin</artifactId>
- <configuration>
-
<source>${maven.compile.source}</source>
-
<target>${maven.compile.target}</target>
- </configuration>
- </plugin>
- <plugin>
-
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
-
<Specification-Title>${project.name}</Specification-Title>
-
<Specification-Version>${project.version}</Specification-Version>
-
<Specification-Vendor>${project.organization.name}</Specification-Vendor>
-
<Implementation-Title>${project.name}</Implementation-Title>
-
<Implementation-Version>${project.version}</Implementation-Version>
-
<Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
-
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
-
<X-Compile-Source-JDK>${maven.compile.source}</X-Compile-Source-JDK>
-
<X-Compile-Target-JDK>${maven.compile.target}</X-Compile-Target-JDK>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <plugin>
-
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-1</version>
- <configuration>
- <descriptors>
-
<descriptor>cactus-src-assembly.xml</descriptor>
-
<descriptor>cactus-bin-assembly.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- <plugin>
-
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-7</version>
- <configuration>
- <!-- This element will be
overriden by children -->
-
<tagBase>https://svn.apache.org/repos/asf/jakarta/cactus/tags/</tagBase>
-
<useReleaseProfile>false</useReleaseProfile>
- <goals>deploy</goals>
- <arguments>-Prelease</arguments>
- </configuration>
- </plugin>
- <plugin>
-
<artifactId>maven-source-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <consoleOutput>true</consoleOutput>
+
<configLocation>build-tools/checkstyle.xml</configLocation>
+
<headerLocation>build-tools/checkstyle.license</headerLocation>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
-
<artifactId>maven-remote-resources-plugin</artifactId>
<executions>
<execution>
<goals>
@@ -484,23 +385,115 @@
</goals>
<configuration>
<resourceBundles>
-
<resourceBundle>org.apache:apache-jar-resource-bundle:1.3</resourceBundle>
+
<resourceBundle>org.apache:apache-jar-resource-bundle:1.2</resourceBundle>
</resourceBundles>
- <!--properties>
-
<addLicense>true</addLicense>
- </properties-->
</configuration>
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clover-plugin</artifactId>
+ <configuration>
+ <targetPercentage>0%</targetPercentage>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.0-beta-6</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>${maven.compile.source}</source>
+ <target>${maven.compile.target}</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+
<Specification-Title>${project.name}</Specification-Title>
+
<Specification-Version>${project.version}</Specification-Version>
+
<Specification-Vendor>${project.organization.name}</Specification-Vendor>
+
<Implementation-Title>${project.name}</Implementation-Title>
+
<Implementation-Version>${project.version}</Implementation-Version>
+
<Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+
<X-Compile-Source-JDK>${maven.compile.source}</X-Compile-Source-JDK>
+
<X-Compile-Target-JDK>${maven.compile.target}</X-Compile-Target-JDK>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-2</version>
+ <configuration>
+ <descriptors>
+
<descriptor>cactus-src-assembly.xml</descriptor>
+
<descriptor>cactus-bin-assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-7</version>
+ <configuration>
+ <!-- This element will be overriden by
children -->
+
<tagBase>https://svn.apache.org/repos/asf/jakarta/cactus/tags/</tagBase>
+
<useReleaseProfile>false</useReleaseProfile>
+ <goals>deploy</goals>
+ <arguments>-Prelease</arguments>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
</plugins>
- </build>
- <modules>
- <module>build-tools</module>
- <module>framework</module>
- <module>integration</module>
- <module>samples</module>
- <module>cactus-site</module>
- <module>cactus-maven-skin</module>
- </modules>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.0-beta-2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+
<resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+</build>
+<modules>
+ <module>build-tools</module>
+ <module>framework</module>
+ <module>integration</module>
+ <module>samples</module>
+ <module>cactus-site</module>
+ <module>cactus-maven-skin</module>
+</modules>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
