rename legal files to more recent convention, fix copyright date range, work on pom dependencies and package versions
git-svn-id: https://svn.apache.org/repos/asf/geronimo/components/txmanager/trunk@941401 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/LICENSE.txt b/LICENSE
similarity index 100%
rename from LICENSE.txt
rename to LICENSE
diff --git a/NOTICE.txt b/NOTICE
similarity index 69%
rename from NOTICE.txt
rename to NOTICE
index bb6397e..1bff2e3 100644
--- a/NOTICE.txt
+++ b/NOTICE
@@ -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/).
diff --git a/geronimo-connector/pom.xml b/geronimo-connector/pom.xml
index 8cd87fc..ceab6be 100644
--- a/geronimo-connector/pom.xml
+++ b/geronimo-connector/pom.xml
@@ -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>
diff --git a/geronimo-transaction/pom.xml b/geronimo-transaction/pom.xml
index c1718a7..0a7a2ed 100644
--- a/geronimo-transaction/pom.xml
+++ b/geronimo-transaction/pom.xml
@@ -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>
diff --git a/pom.xml b/pom.xml
index 74e7151..4eec859 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
