You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2010/05/05 19:51:09 UTC
svn commit: r941401 - in /geronimo/components/txmanager/trunk: LICENSE
LICENSE.txt NOTICE NOTICE.txt geronimo-connector/pom.xml
geronimo-transaction/pom.xml pom.xml
Author: djencks
Date: Wed May 5 17:51:09 2010
New Revision: 941401
URL: http://svn.apache.org/viewvc?rev=941401&view=rev
Log:
rename legal files to more recent convention, fix copyright date range, work on pom dependencies and package versions
Added:
geronimo/components/txmanager/trunk/LICENSE (props changed)
- copied unchanged from r941386, geronimo/components/txmanager/trunk/LICENSE.txt
geronimo/components/txmanager/trunk/NOTICE (contents, props changed)
- copied, changed from r941386, geronimo/components/txmanager/trunk/NOTICE.txt
Removed:
geronimo/components/txmanager/trunk/LICENSE.txt
geronimo/components/txmanager/trunk/NOTICE.txt
Modified:
geronimo/components/txmanager/trunk/geronimo-connector/pom.xml
geronimo/components/txmanager/trunk/geronimo-transaction/pom.xml
geronimo/components/txmanager/trunk/pom.xml
Propchange: geronimo/components/txmanager/trunk/LICENSE
------------------------------------------------------------------------------
svn:eol-style = native
Copied: geronimo/components/txmanager/trunk/NOTICE (from r941386, geronimo/components/txmanager/trunk/NOTICE.txt)
URL: http://svn.apache.org/viewvc/geronimo/components/txmanager/trunk/NOTICE?p2=geronimo/components/txmanager/trunk/NOTICE&p1=geronimo/components/txmanager/trunk/NOTICE.txt&r1=941386&r2=941401&rev=941401&view=diff
==============================================================================
--- geronimo/components/txmanager/trunk/NOTICE.txt (original)
+++ geronimo/components/txmanager/trunk/NOTICE Wed May 5 17:51:09 2010
@@ -1,5 +1,5 @@
Apache Geronimo
-Copyright 2003-2009 The Apache Software Foundation
+Copyright 2003-2010 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Propchange: geronimo/components/txmanager/trunk/NOTICE
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/components/txmanager/trunk/geronimo-connector/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/components/txmanager/trunk/geronimo-connector/pom.xml?rev=941401&r1=941400&r2=941401&view=diff
==============================================================================
--- geronimo/components/txmanager/trunk/geronimo-connector/pom.xml (original)
+++ geronimo/components/txmanager/trunk/geronimo-connector/pom.xml Wed May 5 17:51:09 2010
@@ -88,7 +88,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Export-Package>org.apache.geronimo.connector*;version=2.2</Export-Package>
+ <Export-Package>org.apache.geronimo.connector*;version=3.0</Export-Package>
</instructions>
</configuration>
</plugin>
Modified: geronimo/components/txmanager/trunk/geronimo-transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/components/txmanager/trunk/geronimo-transaction/pom.xml?rev=941401&r1=941400&r2=941401&view=diff
==============================================================================
--- geronimo/components/txmanager/trunk/geronimo-transaction/pom.xml (original)
+++ geronimo/components/txmanager/trunk/geronimo-transaction/pom.xml Wed May 5 17:51:09 2010
@@ -80,8 +80,12 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Export-Package>org.apache.geronimo.transaction*;version=2.2</Export-Package>
- <Import-Package>org.objectweb.howl*;resolution:=optional,javax.resource.spi;version="1.5",*</Import-Package>
+ <Export-Package>org.apache.geronimo.transaction*;version=3.0</Export-Package>
+ <Import-Package>
+ org.objectweb.howl*;resolution:=optional,
+ javax.resource.spi;version="1.5",
+ *
+ </Import-Package>
</instructions>
</configuration>
</plugin>
Modified: geronimo/components/txmanager/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/components/txmanager/trunk/pom.xml?rev=941401&r1=941400&r2=941401&view=diff
==============================================================================
--- geronimo/components/txmanager/trunk/pom.xml (original)
+++ geronimo/components/txmanager/trunk/pom.xml Wed May 5 17:51:09 2010
@@ -26,6 +26,7 @@
<groupId>org.apache.geronimo.genesis</groupId>
<artifactId>genesis-java5-flava</artifactId>
<version>2.0</version>
+ <relativePath/>
</parent>
<groupId>org.apache.geronimo.components</groupId>
@@ -49,7 +50,7 @@
<dependencyManagement>
<dependencies>
- <!-- INTERNAL -->
+ <!-- internal -->
<dependency>
<groupId>org.apache.geronimo.components</groupId>
@@ -61,11 +62,13 @@
<artifactId>geronimo-connector</artifactId>
<version>${version}</version>
</dependency>
+
<!-- external -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.5.5</version>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -91,6 +94,7 @@
<groupId>org.objectweb.howl</groupId>
<artifactId>howl</artifactId>
<version>1.0.1-1</version>
+ <scope>provided</scope>
</dependency>
<dependency>