Author: niallp
Date: Fri Nov 16 00:58:25 2007
New Revision: 595597
URL: http://svn.apache.org/viewvc?rev=595597&view=rev
Log:
Update m2 build
Added:
commons/proper/pool/trunk/LICENSE-header.txt (with props)
commons/proper/pool/trunk/src/assembly/
commons/proper/pool/trunk/src/assembly/bin.xml (with props)
commons/proper/pool/trunk/src/assembly/src.xml (with props)
commons/proper/pool/trunk/src/site/
commons/proper/pool/trunk/src/site/resources/
commons/proper/pool/trunk/src/site/resources/images/
- copied from r595528, commons/proper/pool/trunk/xdocs/images/
commons/proper/pool/trunk/src/site/site.xml (with props)
Modified:
commons/proper/pool/trunk/checkstyle.xml
commons/proper/pool/trunk/pom.xml
Added: commons/proper/pool/trunk/LICENSE-header.txt
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/LICENSE-header.txt?rev=595597&view=auto
==============================================================================
--- commons/proper/pool/trunk/LICENSE-header.txt (added)
+++ commons/proper/pool/trunk/LICENSE-header.txt Fri Nov 16 00:58:25 2007
@@ -0,0 +1,16 @@
+/*
+ * 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.
+ */
Propchange: commons/proper/pool/trunk/LICENSE-header.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/pool/trunk/LICENSE-header.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: commons/proper/pool/trunk/checkstyle.xml
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/checkstyle.xml?rev=595597&r1=595596&r2=595597&view=diff
==============================================================================
--- commons/proper/pool/trunk/checkstyle.xml (original)
+++ commons/proper/pool/trunk/checkstyle.xml Fri Nov 16 00:58:25 2007
@@ -45,7 +45,7 @@
<!-- Checks that are different from the sun coding conventions ones -->
<!-- ************************************************************** -->
<module name="Header">
- <property name="headerFile" value="${basedir}/LICENSE.txt"/>
+ <property name="headerFile" value="LICENSE-header.txt"/>
<property name="ignoreLines" value="2,3,4,10"/>
</module>
<property name="tabWidth" value="4"/>
Modified: commons/proper/pool/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/pom.xml?rev=595597&r1=595596&r2=595597&view=diff
==============================================================================
--- commons/proper/pool/trunk/pom.xml (original)
+++ commons/proper/pool/trunk/pom.xml Fri Nov 16 00:58:25 2007
@@ -22,7 +22,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-pool</groupId>
@@ -118,6 +118,11 @@
</dependency>
</dependencies>
+ <properties>
+ <maven.compile.source>1.4</maven.compile.source>
+ <maven.compile.target>1.4</maven.compile.target>
+ </properties>
+
<build>
<sourceDirectory>src/java</sourceDirectory>
<testSourceDirectory>src/test</testSourceDirectory>
@@ -134,14 +139,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.4</source>
- <target>1.4</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
@@ -191,7 +188,45 @@
-->
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/bin.xml</descriptor>
+ <descriptor>src/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </plugin>
</plugins>
</build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <configuration>
+ <xmlPath>${basedir}/xdocs/changes.xml</xmlPath>
+ <issueLinkTemplate>%URL%/%ISSUE%</issueLinkTemplate>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>changes-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <configLocation>checkstyle.xml</configLocation>
+ <enableRulesSummary>false</enableRulesSummary>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
Added: commons/proper/pool/trunk/src/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/assembly/bin.xml?rev=595597&view=auto
==============================================================================
--- commons/proper/pool/trunk/src/assembly/bin.xml (added)
+++ commons/proper/pool/trunk/src/assembly/bin.xml Fri Nov 16 00:58:25 2007
@@ -0,0 +1,43 @@
+<!--
+ 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>
+ </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/pool/trunk/src/assembly/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/pool/trunk/src/assembly/bin.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: commons/proper/pool/trunk/src/assembly/src.xml
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/assembly/src.xml?rev=595597&view=auto
==============================================================================
--- commons/proper/pool/trunk/src/assembly/src.xml (added)
+++ commons/proper/pool/trunk/src/assembly/src.xml Fri Nov 16 00:58:25 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>README.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src</directory>
+ </fileSet>
+ <fileSet>
+ <directory>xdocs</directory>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: commons/proper/pool/trunk/src/assembly/src.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/pool/trunk/src/assembly/src.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: commons/proper/pool/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/site/site.xml?rev=595597&view=auto
==============================================================================
--- commons/proper/pool/trunk/src/site/site.xml (added)
+++ commons/proper/pool/trunk/src/site/site.xml Fri Nov 16 00:58:25 2007
@@ -0,0 +1,47 @@
+<?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="Pool">
+ <bannerRight>
+ <name>Commons Pool</name>
+ <src>/images/pool-logo-white.png</src>
+ <href>/index.html</href>
+ </bannerRight>
+
+ <body>
+ <menu name="Pool">
+ <item name="Overview" href="/index.html"/>
+ <item name="Javadoc (1.2 release)"
href="http://commons.apache.org/pool/api-1.2/index.html"/>
+ <item name="Javadoc (1.3 release)"
href="http://commons.apache.org/pool/api-1.3/index.html"/>
+ <item name="Developers Guide"
href="/guide/index.html" collapse="true">
+ <item name="Class Diagrams"
href="/guide/classdiagrams.html"/>
+ <item name="Sequence Diagrams"
href="/guide/sequencediagrams.html"/>
+ </item>
+ <item name="Examples" href="/examples.html"/>
+ <item name="Downloads" href="/downloads.html"/>
+ <item name="Wiki"
href="http://wiki.apache.org/commons/Pool"/>
+ </menu>
+
+ <menu name="Development">
+ <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>
+ </body>
+
+</project>
Propchange: commons/proper/pool/trunk/src/site/site.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/pool/trunk/src/site/site.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
