Author: niallp
Date: Wed Jul 11 16:32:14 2007
New Revision: 555436
URL: http://svn.apache.org/viewvc?view=rev&rev=555436
Log:
Update the m2 build
Added:
jakarta/commons/proper/beanutils/trunk/optional/bean-collections/pom.xml
(with props)
jakarta/commons/proper/beanutils/trunk/src/main/
jakarta/commons/proper/beanutils/trunk/src/main/assembly/
jakarta/commons/proper/beanutils/trunk/src/main/assembly/bin.xml (with
props)
jakarta/commons/proper/beanutils/trunk/src/main/assembly/src.xml (with
props)
jakarta/commons/proper/beanutils/trunk/src/site/
jakarta/commons/proper/beanutils/trunk/src/site/resources/
jakarta/commons/proper/beanutils/trunk/src/site/resources/images/
jakarta/commons/proper/beanutils/trunk/src/site/resources/images/logo.png
- copied unchanged from r555183,
jakarta/commons/proper/beanutils/trunk/xdocs/images/logo.png
Removed:
jakarta/commons/proper/beanutils/trunk/xdocs/images/
Modified:
jakarta/commons/proper/beanutils/trunk/maven.xml
jakarta/commons/proper/beanutils/trunk/pom.xml
Modified: jakarta/commons/proper/beanutils/trunk/maven.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/maven.xml?view=diff&rev=555436&r1=555435&r2=555436
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/maven.xml (original)
+++ jakarta/commons/proper/beanutils/trunk/maven.xml Wed Jul 11 16:32:14 2007
@@ -19,6 +19,13 @@
xmlns:ant="jelly:ant"
xmlns:j="jelly:core"
xmlns:util="jelly:util">
+
+
+ <preGoal name="site">
+ <copy todir="${maven.build.dir}/docs/images">
+ <fileset dir="${basedir}/src/site/resources/images"/>
+ </copy>
+ </preGoal>
<!-- ================================================================== -->
<!-- Copy into the binary distribution -->
Added: jakarta/commons/proper/beanutils/trunk/optional/bean-collections/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/optional/bean-collections/pom.xml?view=auto&rev=555436
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/optional/bean-collections/pom.xml
(added)
+++ jakarta/commons/proper/beanutils/trunk/optional/bean-collections/pom.xml
Wed Jul 11 16:32:14 2007
@@ -0,0 +1,109 @@
+<?xml version="1.0"?>
+<!--
+ 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";>
+ <parent>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-parent</artifactId>
+ <version>3</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-bean-collections</artifactId>
+ <version>1.8.0-SNAPSHOT</version>
+ <name>BeanUtils Bean Collections</name>
+ <inceptionYear>2000</inceptionYear>
+ <description>Extensions of commons collections focussing on collections of
beans</description>
+ <url>http://jakarta.apache.org/commons/beanutils/</url>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://issues.apache.org/jira/browse/BEANUTILS</url>
+ </issueManagement>
+
+ <scm>
+
<connection>scm:svn:https://svn.apache.org/repos/asf/jakarta/commons/proper/beanutils/trunk/</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/jakarta/commons/proper/beanutils/trunk/</developerConnection>
+
<url>http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/</url>
+ </scm>
+
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.8.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <artifactId>commons-collections-testframework</artifactId>
+ <groupId>commons-collections</groupId>
+ <version>3.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ <includes>
+ <include>**/*TestCase.java</include>
+ <include>**/*Test.java</include>
+ <include>**/TestBeanMap.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <properties>
+ <maven.compile.source>1.3</maven.compile.source>
+ <maven.compile.target>1.3</maven.compile.target>
+ </properties>
+
+</project>
Propchange:
jakarta/commons/proper/beanutils/trunk/optional/bean-collections/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
jakarta/commons/proper/beanutils/trunk/optional/bean-collections/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: jakarta/commons/proper/beanutils/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/pom.xml?view=diff&rev=555436&r1=555435&r2=555436
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/pom.xml (original)
+++ jakarta/commons/proper/beanutils/trunk/pom.xml Wed Jul 11 16:32:14 2007
@@ -41,9 +41,9 @@
</issueManagement>
<scm>
-
<connection>scm:svn:scm:svn:https://svn.apache.org/repos/asf/jakarta/commons/proper/beanutils/trunk</connection>
-
<developerConnection>scm:svn:scm:svn:https://svn.apache.org/repos/asf/jakarta/commons/proper/beanutils/trunk</developerConnection>
-
<url>http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk</url>
+
<connection>scm:svn:https://svn.apache.org/repos/asf/jakarta/commons/proper/beanutils/trunk/</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/jakarta/commons/proper/beanutils/trunk/</developerConnection>
+
<url>http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/</url>
</scm>
<developers>
@@ -151,31 +151,23 @@
</dependencies>
<build>
- <sourceDirectory>src/java</sourceDirectory>
- <testSourceDirectory>src/test</testSourceDirectory>
- <resources>
- <resource>
- <directory>.</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- </includes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>${pom.build.testSourceDirectory}</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </testResource>
- </testResources>
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <forkMode>pertest</forkMode>
<includes>
<include>**/*TestCase.java</include>
</includes>
@@ -187,7 +179,22 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </plugin>
</plugins>
</build>
+
+ <properties>
+ <maven.compile.source>1.3</maven.compile.source>
+ <maven.compile.target>1.3</maven.compile.target>
+ </properties>
</project>
Added: jakarta/commons/proper/beanutils/trunk/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/main/assembly/bin.xml?view=auto&rev=555436
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/src/main/assembly/bin.xml (added)
+++ jakarta/commons/proper/beanutils/trunk/src/main/assembly/bin.xml Wed Jul 11
16:32:14 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: jakarta/commons/proper/beanutils/trunk/src/main/assembly/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/commons/proper/beanutils/trunk/src/main/assembly/bin.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: jakarta/commons/proper/beanutils/trunk/src/main/assembly/src.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/main/assembly/src.xml?view=auto&rev=555436
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/src/main/assembly/src.xml (added)
+++ jakarta/commons/proper/beanutils/trunk/src/main/assembly/src.xml Wed Jul 11
16:32:14 2007
@@ -0,0 +1,58 @@
+<!--
+ 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>${project.build.finalName}-src</baseDirectory>
+ -->
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>build.properties.sample</include>
+ <include>build.xml</include>
+ <include>doap_beanutils.rdf</include>
+ <include>LICENSE.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>
+ <include>RELEASE-NOTES.txt</include>
+
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>optional</directory>
+ <excludes>
+ <exclude>build.properties</exclude>
+ <exclude>target</exclude>
+ <exclude>dist</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>src</directory>
+ </fileSet>
+ <fileSet>
+ <directory>xdocs</directory>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: jakarta/commons/proper/beanutils/trunk/src/main/assembly/src.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/commons/proper/beanutils/trunk/src/main/assembly/src.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
