Author: niallp
Date: Wed Nov 14 19:12:34 2007
New Revision: 595193
URL: http://svn.apache.org/viewvc?rev=595193&view=rev
Log:
Update m2 build - add assembly descriptors and get chain site generation working
Added:
commons/proper/chain/trunk/src/assembly/
commons/proper/chain/trunk/src/assembly/bin.xml (with props)
commons/proper/chain/trunk/src/assembly/src.xml (with props)
commons/proper/chain/trunk/src/site/
commons/proper/chain/trunk/src/site/resources/
commons/proper/chain/trunk/src/site/resources/images/
- copied from r595138, commons/proper/chain/trunk/xdocs/images/
Modified:
commons/proper/chain/trunk/checkstyle.xml
commons/proper/chain/trunk/pom.xml
Modified: commons/proper/chain/trunk/checkstyle.xml
URL:
http://svn.apache.org/viewvc/commons/proper/chain/trunk/checkstyle.xml?rev=595193&r1=595192&r2=595193&view=diff
==============================================================================
--- commons/proper/chain/trunk/checkstyle.xml (original)
+++ commons/proper/chain/trunk/checkstyle.xml Wed Nov 14 19:12:34 2007
@@ -45,7 +45,7 @@
<!-- Checks that are different from the sun coding conventions ones
-->
<!-- **************************************************************
-->
<module name="Header">
- <property name="headerFile"
value="${basedir}/license-header.txt"/>
+ <property name="headerFile" value="license-header.txt"/>
<property name="ignoreLines" value="2"/>
</module>
<property name="tabWidth" value="4"/>
Modified: commons/proper/chain/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/chain/trunk/pom.xml?rev=595193&r1=595192&r2=595193&view=diff
==============================================================================
--- commons/proper/chain/trunk/pom.xml (original)
+++ commons/proper/chain/trunk/pom.xml Wed Nov 14 19:12:34 2007
@@ -21,7 +21,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-chain</groupId>
@@ -83,8 +83,8 @@
</scm>
<properties>
- <maven.compile.source>1.4</maven.compile.source>
- <maven.compile.target>1.4</maven.compile.target>
+ <maven.compile.source>1.3</maven.compile.source>
+ <maven.compile.target>1.3</maven.compile.target>
</properties>
<build>
@@ -112,8 +112,8 @@
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- <descriptor>src/main/assembly/src.xml</descriptor>
+ <descriptor>src/assembly/bin.xml</descriptor>
+ <descriptor>src/assembly/src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
@@ -177,11 +177,6 @@
<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>
<xmlPath>${basedir}/xdocs/changes.xml</xmlPath>
@@ -203,16 +198,6 @@
<configLocation>checkstyle.xml</configLocation>
<enableRulesSummary>false</enableRulesSummary>
</configuration>
- </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>
Added: commons/proper/chain/trunk/src/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/assembly/bin.xml?rev=595193&view=auto
==============================================================================
--- commons/proper/chain/trunk/src/assembly/bin.xml (added)
+++ commons/proper/chain/trunk/src/assembly/bin.xml Wed Nov 14 19:12:34 2007
@@ -0,0 +1,44 @@
+<!--
+ 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.
+-->
+<assembly>
+ <id>bin</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <includeSiteDirectory>false</includeSiteDirectory>
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ <include>RELEASE-NOTES.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target/site/apidocs</directory>
+ <outputDirectory>apidocs</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: commons/proper/chain/trunk/src/assembly/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/chain/trunk/src/assembly/bin.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: commons/proper/chain/trunk/src/assembly/src.xml
URL:
http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/assembly/src.xml?rev=595193&view=auto
==============================================================================
--- commons/proper/chain/trunk/src/assembly/src.xml (added)
+++ commons/proper/chain/trunk/src/assembly/src.xml Wed Nov 14 19:12:34 2007
@@ -0,0 +1,47 @@
+<!--
+ 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.
+-->
+<assembly>
+ <id>src</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <baseDirectory>${artifactId}-${version}-src</baseDirectory>
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>build.properties.sample</include>
+ <include>build.xml</include>
+ <include>checkstyle.xml</include>
+ <include>LICENSE.txt</include>
+ <include>license-header.txt</include>
+ <include>maven.xml</include>
+ <include>NOTICE.txt</include>
+ <include>pom.xml</include>
+ <include>project.properties</include>
+ <include>project.xml</include>
+ <include>RELEASE-NOTES.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src</directory>
+ </fileSet>
+ <fileSet>
+ <directory>xdocs</directory>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: commons/proper/chain/trunk/src/assembly/src.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/chain/trunk/src/assembly/src.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
