Author: niallp
Date: Fri Nov 16 07:55:23 2007
New Revision: 595710
URL: http://svn.apache.org/viewvc?rev=595710&view=rev
Log:
Update m2 build
Added:
commons/proper/transaction/branches/TRANSACTION_2/src/assembly/
commons/proper/transaction/branches/TRANSACTION_2/src/assembly/bin.xml
(with props)
commons/proper/transaction/branches/TRANSACTION_2/src/assembly/src.xml
(with props)
commons/proper/transaction/branches/TRANSACTION_2/src/site/
commons/proper/transaction/branches/TRANSACTION_2/src/site/resources/
commons/proper/transaction/branches/TRANSACTION_2/src/site/resources/images/
- copied from r595702,
commons/proper/transaction/branches/TRANSACTION_2/xdocs/images/
commons/proper/transaction/branches/TRANSACTION_2/src/site/site.xml (with
props)
Modified:
commons/proper/transaction/branches/TRANSACTION_2/pom.xml
Modified: commons/proper/transaction/branches/TRANSACTION_2/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/transaction/branches/TRANSACTION_2/pom.xml?rev=595710&r1=595709&r2=595710&view=diff
==============================================================================
--- commons/proper/transaction/branches/TRANSACTION_2/pom.xml (original)
+++ commons/proper/transaction/branches/TRANSACTION_2/pom.xml Fri Nov 16
07:55:23 2007
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
- <version>3</version>
+ <version>5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>commons-transaction</groupId>
@@ -138,11 +138,16 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>junit-4.3.1</version>
+ <version>4.3.1</version>
<scope>test</scope>
</dependency>
</dependencies>
+ <properties>
+ <maven.compile.source>1.6</maven.compile.source>
+ <maven.compile.target>1.6</maven.compile.target>
+ </properties>
+
<build>
<sourceDirectory>src/java</sourceDirectory>
<testSourceDirectory>src/test</testSourceDirectory>
@@ -150,12 +155,24 @@
<resource>
<directory>.</directory>
<targetPath>META-INF</targetPath>
- <includes>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- </includes>
- </resource>
- </resources>
- </build>
+ <includes>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <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>
</project>
Added: commons/proper/transaction/branches/TRANSACTION_2/src/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/commons/proper/transaction/branches/TRANSACTION_2/src/assembly/bin.xml?rev=595710&view=auto
==============================================================================
--- commons/proper/transaction/branches/TRANSACTION_2/src/assembly/bin.xml
(added)
+++ commons/proper/transaction/branches/TRANSACTION_2/src/assembly/bin.xml Fri
Nov 16 07:55:23 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/transaction/branches/TRANSACTION_2/src/assembly/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
commons/proper/transaction/branches/TRANSACTION_2/src/assembly/bin.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: commons/proper/transaction/branches/TRANSACTION_2/src/assembly/src.xml
URL:
http://svn.apache.org/viewvc/commons/proper/transaction/branches/TRANSACTION_2/src/assembly/src.xml?rev=595710&view=auto
==============================================================================
--- commons/proper/transaction/branches/TRANSACTION_2/src/assembly/src.xml
(added)
+++ commons/proper/transaction/branches/TRANSACTION_2/src/assembly/src.xml Fri
Nov 16 07:55:23 2007
@@ -0,0 +1,45 @@
+<!--
+ 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>LICENSE.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/transaction/branches/TRANSACTION_2/src/assembly/src.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
commons/proper/transaction/branches/TRANSACTION_2/src/assembly/src.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: commons/proper/transaction/branches/TRANSACTION_2/src/site/site.xml
URL:
http://svn.apache.org/viewvc/commons/proper/transaction/branches/TRANSACTION_2/src/site/site.xml?rev=595710&view=auto
==============================================================================
--- commons/proper/transaction/branches/TRANSACTION_2/src/site/site.xml (added)
+++ commons/proper/transaction/branches/TRANSACTION_2/src/site/site.xml Fri Nov
16 07:55:23 2007
@@ -0,0 +1,39 @@
+<?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="Transaction">
+ <bannerRight>
+ <name>Commons Transaction</name>
+ <src>/images/logo.png</src>
+ <href>/index.html</href>
+ </bannerRight>
+
+ <body>
+ <menu name="Transaction">
+ <item name="Overview" href="/index.html"/>
+ <item name="Download"
href="http://commons.apache.org/downloads/download_transaction.cgi"/>
+ <item name="Releases" href="/releases.html"/>
+ <item name="Mailing Lists" href="/mail-lists.html"/>
+ <item name="Issue Tracking" href="/issue-tracking.html"/>
+ <item name="Javadoc (2.x)" href="/apidocs/index.html"/>
+ <item name="SVN Repository" href="/source-repository.html"/>
+ <item name="SVN repository (2.x)"
href="http://svn.apache.org/viewvc/commons/proper/transaction/branches/TRANSACTION_2/"/>
+ </menu>
+
+ </body>
+
+</project>
Propchange: commons/proper/transaction/branches/TRANSACTION_2/src/site/site.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/transaction/branches/TRANSACTION_2/src/site/site.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL