ROO-2630: Upgrade db versions and maven plugins in Roo and Roo wrappi…

…ng poms
spring-attic · Aug 9, 2011 · cf323a1 · cf323a1
1 parent fced1a6
commit cf323a1
Show file tree

Hide file tree

Showing 23 changed files with 81 additions and 32 deletions.
diff --git a/aopalliance/pom.xml b/aopalliance/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.roo</groupId>
 		<artifactId>wrapping</artifactId>
-		<version>1.1.3.RELEASE</version>
+		<version>1.1.5.RELEASE</version>
 	</parent>
     <groupId>org.springframework.roo.wrapping</groupId>
 	<artifactId>${project.groupId}.${pkgArtifactId}</artifactId>

diff --git a/bcpg-jdk15/pom.xml b/bcpg-jdk15/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.roo</groupId>
 		<artifactId>wrapping</artifactId>
-		<version>1.1.3.RELEASE</version>
+		<version>1.1.5.RELEASE</version>
 	</parent>
     <groupId>org.springframework.roo.wrapping</groupId>
 	<artifactId>${project.groupId}.${pkgArtifactId}</artifactId>

diff --git a/bcprov-jdk15/pom.xml b/bcprov-jdk15/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.roo</groupId>
 		<artifactId>wrapping</artifactId>
-		<version>1.1.3.RELEASE</version>
+		<version>1.1.5.RELEASE</version>
 	</parent>
     <groupId>org.springframework.roo.wrapping</groupId>
 	<artifactId>${project.groupId}.${pkgArtifactId}</artifactId>

diff --git a/cloud-foundry-api/pom.xml b/cloud-foundry-api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.roo</groupId>
 		<artifactId>wrapping</artifactId>
-		<version>1.1.3.RELEASE</version>
+		<version>1.1.5.RELEASE</version>
 	</parent>
     <groupId>org.springframework.roo.wrapping</groupId>
 	<artifactId>${pom.groupId}.cloud-foundry-api</artifactId>

diff --git a/db2express/pom.xml b/db2express/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.springframework.roo</groupId>
         <artifactId>wrapping</artifactId>
-        <version>1.1.3.RELEASE</version>
+        <version>1.1.5.RELEASE</version>
     </parent>
     <groupId>org.springframework.roo.wrapping</groupId>
     <artifactId>${project.groupId}.${pkgArtifactId}</artifactId>

diff --git a/derby-client/pom.xml b/derby-client/pom.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.roo</groupId>
+		<artifactId>wrapping</artifactId>
+		<version>1.1.5.RELEASE</version>
+	</parent>
+    <groupId>org.springframework.roo.wrapping</groupId>
+	<artifactId>${project.groupId}.${pkgArtifactId}</artifactId>
+    <version>${osgiVersion}</version>
+	<packaging>bundle</packaging>
+	<name>Spring Roo - Wrapping - ${pkgArtifactId}</name>
+    <description>Derby Client #jdbcdriver driverclass:org.apache.derby.jdbc.ClientDriver. This bundle wraps the standard Maven artifact: ${pkgArtifactId}-${pkgVersion}.</description>
+
+    <properties>
+        <pkgArtifactId>derbyclient</pkgArtifactId>
+        <pkgVersion>10.8.1.2</pkgVersion>
+        <osgiVersion>${pkgVersion}.0001</osgiVersion>
+        <pkgVendor>Apache Derby</pkgVendor>
+        <pkgDocUrl>http://db.apache.org/derby/</pkgDocUrl>
+        <pkgLicense>http://db.apache.org/derby/license.html</pkgLicense> 
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>10.8.1.2</version>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Import-Package>com.ibm.jvm.*;resolution:=optional,org.apache.xml.utils.*;resolution:=optional,org.apache.xalan.*;resolution:=optional,org.apache.xpath.*;resolution:=optional,org.apache.derby.impl.drda.*;resolution:=optional,*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/derby/pom.xml b/derby/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.roo</groupId>
 		<artifactId>wrapping</artifactId>
-		<version>1.1.4.RELEASE</version>
+		<version>1.1.5.RELEASE</version>
 	</parent>
     <groupId>org.springframework.roo.wrapping</groupId>
 	<artifactId>${project.groupId}.${pkgArtifactId}</artifactId>

diff --git a/firebird/pom.xml b/firebird/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.roo</groupId>
 		<artifactId>wrapping</artifactId>
-		<version>1.1.3.RELEASE</version>
+		<version>1.1.5.RELEASE</version>
 	</parent>
     <groupId>org.springframework.roo.wrapping</groupId>
 	<artifactId>${project.groupId}.${pkgArtifactId}</artifactId>

diff --git a/h2/pom.xml b/h2/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.roo</groupId>
 		<artifactId>wrapping</artifactId>
-		<version>1.1.4.RELEASE</version>
+		<version>1.1.5.RELEASE</version>
 	</parent>
     <groupId>org.springframework.roo.wrapping</groupId>
 	<artifactId>${project.groupId}.${pkgArtifactId}</artifactId>
@@ -15,8 +15,8 @@
 
     <properties>
         <pkgArtifactId>h2</pkgArtifactId>
-        <pkgVersion>1.3.155</pkgVersion>
-        <osgiVersion>${pkgVersion}.0020</osgiVersion>
+        <pkgVersion>1.3.158</pkgVersion>
+        <osgiVersion>${pkgVersion}.0030</osgiVersion>
         <pkgVendor>H2 Database Engine</pkgVendor>
         <pkgDocUrl>http://www.h2database.com</pkgDocUrl>
         <pkgLicense>http://www.h2database.com/html/license.html</pkgLicense> 
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>${pkgArtifactId}</artifactId>
-            <version>1.3.155</version>
+            <version>1.3.158</version>
             <optional>true</optional>
         </dependency>
     </dependencies>

diff --git a/hapax/pom.xml b/hapax/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.roo</groupId>
 		<artifactId>wrapping</artifactId>
-		<version>1.1.3.RELEASE</version>
+		<version>1.1.5.RELEASE</version>
 	</parent>
     <groupId>org.springframework.roo.wrapping</groupId>
 	<artifactId>${project.groupId}.${pkgArtifactId}</artifactId>

diff --git a/inflector/pom.xml b/inflector/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.roo</groupId>
 		<artifactId>wrapping</artifactId>
-		<version>1.1.3.RELEASE</version>
+		<version>1.1.5.RELEASE</version>
 	</parent>
     <groupId>org.springframework.roo.wrapping</groupId>
 	<artifactId>${project.groupId}.${pkgArtifactId}</artifactId>

diff --git a/javaparser/pom.xml b/javaparser/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.roo</groupId>
 		<artifactId>wrapping</artifactId>
-		<version>1.1.3.RELEASE</version>
+		<version>1.1.5.RELEASE</version>
 	</parent>
     <groupId>org.springframework.roo.wrapping</groupId>
 	<artifactId>${project.groupId}.${pkgArtifactId}</artifactId>

diff --git a/jgit/pom.xml b/jgit/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.roo</groupId>
 		<artifactId>wrapping</artifactId>
-		<version>1.1.3.RELEASE</version>
+		<version>1.1.5.RELEASE</version>
 	</parent>
     <groupId>org.springframework.roo.wrapping</groupId>
 	<artifactId>${project.groupId}.${pkgArtifactId}</artifactId>

diff --git a/jline/pom.xml b/jline/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.roo</groupId>
 		<artifactId>wrapping</artifactId>
-		<version>1.1.3.RELEASE</version>
+		<version>1.1.5.RELEASE</version>
 	</parent>
     <groupId>org.springframework.roo.wrapping</groupId>
 	<artifactId>${project.groupId}.${pkgArtifactId}</artifactId>

diff --git a/jsch/pom.xml b/jsch/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.roo</groupId>
 		<artifactId>wrapping</artifactId>
-		<version>1.1.3.RELEASE</version>
+		<version>1.1.5.RELEASE</version>
 	</parent>
     <groupId>org.springframework.roo.wrapping</groupId>
 	<artifactId>${project.groupId}.${pkgArtifactId}</artifactId>

diff --git a/json-simple/pom.xml b/json-simple/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.roo</groupId>
 		<artifactId>wrapping</artifactId>
-		<version>1.1.3.RELEASE</version>
+		<version>1.1.5.RELEASE</version>
 	</parent>
     <groupId>org.springframework.roo.wrapping</groupId>
 	<artifactId>${project.groupId}.${pkgArtifactId}</artifactId>

diff --git a/jtds/pom.xml b/jtds/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.roo</groupId>
 		<artifactId>wrapping</artifactId>
-		<version>1.1.3.RELEASE</version>
+		<version>1.1.5.RELEASE</version>
 	</parent>
     <groupId>org.springframework.roo.wrapping</groupId>
 	<artifactId>${project.groupId}.${pkgArtifactId}</artifactId>

diff --git a/jtopen/pom.xml b/jtopen/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.roo</groupId>
 		<artifactId>wrapping</artifactId>
-		<version>1.1.3.RELEASE</version>
+		<version>1.1.5.RELEASE</version>
 	</parent>
     <groupId>org.springframework.roo.wrapping</groupId>
 	<artifactId>${project.groupId}.${pkgArtifactId}</artifactId>

diff --git a/mysql/pom.xml b/mysql/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.roo</groupId>
 		<artifactId>wrapping</artifactId>
-		<version>1.1.3.RELEASE</version>
+		<version>1.1.5.RELEASE</version>
 	</parent>
     <groupId>org.springframework.roo.wrapping</groupId>
 	<artifactId>${project.groupId}.${pkgArtifactId}</artifactId>
@@ -15,8 +15,8 @@
 
     <properties>
         <pkgArtifactId>mysql-connector-java</pkgArtifactId>
-        <pkgVersion>5.1.13</pkgVersion>
-        <osgiVersion>${pkgVersion}.0010</osgiVersion>
+        <pkgVersion>5.1.17</pkgVersion>
+        <osgiVersion>${pkgVersion}.0020</osgiVersion>
         <pkgVendor>MySQL</pkgVendor>
         <pkgDocUrl>http://www.mysql.com/</pkgDocUrl>
         <pkgLicense>http://www.mysql.com/about/legal/licensing/oem/</pkgLicense> <!-- Based on GPL license -->

diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
 <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">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.springframework.roo</groupId>
-    <version>1.1.4.RELEASE</version>
+    <version>1.1.5.RELEASE</version>
     <artifactId>wrapping</artifactId>
     <packaging>pom</packaging>
     <name>Spring Roo - Wrapping</name>
@@ -51,7 +51,7 @@
         <plugin>
             <groupId>org.apache.felix</groupId>
             <artifactId>maven-bundle-plugin</artifactId>
-            <version>2.3.4</version>
+            <version>2.3.5</version>
             <extensions>true</extensions>
             <configuration>
                 <instructions>
@@ -66,7 +66,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
-                <version>1.2</version>
+                <version>1.3</version>
                 <configuration>
                     <useAgent>true</useAgent>
                 </configuration>
@@ -93,15 +93,15 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>2.4.3</version>
+                <version>2.5</version>
                 <configuration>
                     <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.8</version>
+                <version>2.9</version>
                 <configuration>
                     <printSummary>false</printSummary>
                 </configuration>
@@ -133,7 +133,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.0</version>
+                <version>1.0.1</version>
                 <configuration>
                     <rules>
                         <DependencyConvergence />

diff --git a/postgresql/pom.xml b/postgresql/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.roo</groupId>
 		<artifactId>wrapping</artifactId>
-		<version>1.1.4.RELEASE</version>
+		<version>1.1.5.RELEASE</version>
 	</parent>
     <groupId>org.springframework.roo.wrapping</groupId>
 	<artifactId>${project.groupId}.${pkgArtifactId}-jdbc3</artifactId>

diff --git a/protobuf-full/pom.xml b/protobuf-full/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.roo</groupId>
 		<artifactId>wrapping</artifactId>
-		<version>1.1.4.RELEASE</version>
+		<version>1.1.5.RELEASE</version>
 	</parent>
     <groupId>org.springframework.roo.wrapping</groupId>
 	<artifactId>${project.groupId}.${pkgArtifactId}</artifactId>

diff --git a/protobuf-lite/pom.xml b/protobuf-lite/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.roo</groupId>
 		<artifactId>wrapping</artifactId>
-		<version>1.1.3.RELEASE</version>
+		<version>1.1.5.RELEASE</version>
 	</parent>
     <groupId>org.springframework.roo.wrapping</groupId>
 	<artifactId>${project.groupId}.${pkgArtifactId}-lite</artifactId>