You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ni...@apache.org on 2007/11/16 03:58:16 UTC
svn commit: r595528 - in /commons/proper/digester/trunk: pom.xml
src/assembly/bin.xml src/assembly/src.xml src/site/ src/site/resources/
src/site/resources/images/ src/site/site.xml
Author: niallp
Date: Thu Nov 15 18:58:08 2007
New Revision: 595528
URL: http://svn.apache.org/viewvc?rev=595528&view=rev
Log:
Update m2 build
Added:
commons/proper/digester/trunk/src/site/
commons/proper/digester/trunk/src/site/resources/
commons/proper/digester/trunk/src/site/resources/images/
- copied from r595139, commons/proper/digester/trunk/xdocs/images/
commons/proper/digester/trunk/src/site/site.xml (with props)
Modified:
commons/proper/digester/trunk/pom.xml
commons/proper/digester/trunk/src/assembly/bin.xml
commons/proper/digester/trunk/src/assembly/src.xml
Modified: commons/proper/digester/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/pom.xml?rev=595528&r1=595527&r2=595528&view=diff
==============================================================================
--- commons/proper/digester/trunk/pom.xml (original)
+++ commons/proper/digester/trunk/pom.xml Thu Nov 15 18:58:08 2007
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>commons-digester</groupId>
@@ -178,7 +178,6 @@
<testSourceDirectory>src/test</testSourceDirectory>
<resources>
-<!--
<resource>
<directory>.</directory>
<targetPath>META-INF</targetPath>
@@ -187,7 +186,6 @@
<include>LICENSE.txt</include>
</includes>
</resource>
--->
<resource>
<directory>src/java</directory>
<filtering>false</filtering>
@@ -226,20 +224,6 @@
</plugin>
<plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>src/conf/MANIFEST.MF</manifestFile>
- <manifestEntries>
- <Specification-Version>${project.version}</Specification-Version>
- <X-Compile-Source-JDK>1.3</X-Compile-Source-JDK>
- <X-Compile-Target-JDK>1.3</X-Compile-Target-JDK>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
-
- <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
@@ -281,10 +265,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
<configuration>
<issueLinkTemplate>%URL%/../%ISSUE%</issueLinkTemplate>
@@ -304,27 +284,6 @@
<configuration>
<configLocation>checkstyle.xml</configLocation>
</configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <moduleExcludes>
- <xdoc>**/navigation.xml</xdoc>
- </moduleExcludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jdepend-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: commons/proper/digester/trunk/src/assembly/bin.xml
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/assembly/bin.xml?rev=595528&r1=595527&r2=595528&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/assembly/bin.xml (original)
+++ commons/proper/digester/trunk/src/assembly/bin.xml Thu Nov 15 18:58:08 2007
@@ -15,13 +15,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<!--
-TODO:
- 1. Make source and binary distros unpack in separate directories
- (*-src for source distro is conventional in our distros)
--->
-
<assembly>
<id></id>
<formats>
@@ -34,7 +27,7 @@
<includes>
<include>LICENSE*</include>
<include>NOTICE*</include>
- <include>pom.xml</include>
+ <include>RELEASE-NOTES.txt</include>
</includes>
</fileSet>
<fileSet>
Modified: commons/proper/digester/trunk/src/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/assembly/src.xml?rev=595528&r1=595527&r2=595528&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/assembly/src.xml (original)
+++ commons/proper/digester/trunk/src/assembly/src.xml Thu Nov 15 18:58:08 2007
@@ -21,6 +21,7 @@
<format>tar.gz</format>
<format>zip</format>
</formats>
+ <baseDirectory>${artifactId}-${version}-src</baseDirectory>
<fileSets>
<fileSet>
<includes>
Added: commons/proper/digester/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/site/site.xml?rev=595528&view=auto
==============================================================================
--- commons/proper/digester/trunk/src/site/site.xml (added)
+++ commons/proper/digester/trunk/src/site/site.xml Thu Nov 15 18:58:08 2007
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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 name="Digester">
+ <bannerRight>
+ <name>Commons Digester</name>
+ <src>/images/logo.png</src>
+ <href>/index.html</href>
+ </bannerRight>
+
+ <body>
+
+ <menu name="Digester">
+ <item name="Overview" href="/index.html"/>
+ <item name="Mailing Lists" href="/mail-lists.html"/>
+ <item name="Issue Tracking" href="/issue-tracking.html"/>
+ <item name="Source Repository" href="/source-repository.html"/>
+ <item name="Javadoc (SVN latest)" href="apidocs/index.html"/>
+ </menu>
+
+ <!--
+ - Note that the links in these menu options require manual installation of the
+ - appropriate dirs on the website; maven won't set this up.
+ -->
+ <menu name="Release 1.8 (Current)">
+ <item name="Guide" href="http://commons.apache.org/digester/commons-digester-1.8/docs/api/org/apache/commons/digester/package-summary.html#doc.Description"/>
+ <item name="Javadoc" href="http://commons.apache.org/digester/commons-digester-1.8/docs/api"/>
+ <item name="Release Notes" href="http://commons.apache.org/digester/commons-digester-1.8/RELEASE-NOTES.txt"/>
+ </menu>
+ <menu name="Release 1.7">
+ <item name="Guide" href="http://commons.apache.org/digester/commons-digester-1.7/docs/api/org/apache/commons/digester/package-summary.html#doc.Description"/>
+ <item name="Javadoc" href="http://commons.apache.org/digester/commons-digester-1.7/docs/api"/>
+ <item name="Release Notes" href="http://commons.apache.org/digester/commons-digester-1.7/RELEASE-NOTES.txt"/>
+ </menu>
+ <menu name="Release 1.6">
+ <item name="Guide" href="http://commons.apache.org/digester/commons-digester-1.6/docs/api/org/apache/commons/digester/package-summary.html#doc.Description"/>
+ <item name="Javadoc" href="http://commons.apache.org/digester/commons-digester-1.6/docs/api"/>
+ <item name="Release Notes" href="http://commons.apache.org/digester/commons-digester-1.6/RELEASE-NOTES.txt"/>
+ </menu>
+
+ </body>
+
+</project>
Propchange: commons/proper/digester/trunk/src/site/site.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/digester/trunk/src/site/site.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL