preparing for 1.0.0.M1 release

spring-attic · Apr 1, 2011 · 74572ce · 74572ce
1 parent 7c0588b
commit 74572ce
Show file tree

Hide file tree

Showing 12 changed files with 87 additions and 64 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-jdbc-dist</artifactId>
 	<name>Spring Data JDBC Extensions Support Distribution</name>
-	<version>1.0.0.BUILD-SNAPSHOT</version>
+	<version>1.0.0.M1</version>
 	<packaging>pom</packaging>
 	<modules>
 		<module>spring-data-jdbc-parent</module>
@@ -55,8 +55,8 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<!-- dist.* properties are used by the antrun tasks below -->
 		<dist.id>spring-data-jdbc</dist.id>
-		<dist.name>Spring Data JDBC Extensions Support</dist.name>
-		<dist.key>DATASQL</dist.key>
+		<dist.name>Spring Data</dist.name>
+		<dist.key>DATAJDBC</dist.key>
 		<dist.version>${project.version}</dist.version>
 		<dist.releaseType>snapshot</dist.releaseType>
 		<dist.finalName>${dist.id}-${dist.version}</dist.finalName>
@@ -111,7 +111,7 @@
 				<!-- available only in the springframework maven repository. see <repositories> section below -->
 				<groupId>org.springframework.build.aws</groupId>
 				<artifactId>org.springframework.build.aws.maven</artifactId>
-				<version>2.0.0.RELEASE</version>
+				<version>3.1.0.RELEASE</version>
 			</extension>
 		</extensions>
 		<plugins>

diff --git a/spring-data-jdbc-core/pom.xml b/spring-data-jdbc-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-jdbc-parent</artifactId>
-		<version>1.0.0.BUILD-SNAPSHOT</version>
+		<version>1.0.0.M1</version>
 		<relativePath>../spring-data-jdbc-parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>spring-data-jdbc-core</artifactId>
@@ -28,9 +28,9 @@
 
 		<!--  Spring Retry -->
 		<dependency>
-			<groupId>org.springframework</groupId>
+			<groupId>org.springframework.retry</groupId>
 			<artifactId>spring-retry</artifactId>
-			<version>1.0.0.BUILD-SNAPSHOT</version>
+			<version>1.0.0.RC2</version>
 		</dependency>
 
 		<!--  Spring Data -->

diff --git a/spring-data-jdbc-parent/pom.xml b/spring-data-jdbc-parent/pom.xml
@@ -6,7 +6,7 @@
 	<artifactId>spring-data-jdbc-parent</artifactId>
 	<name>Spring Data JDBC Extensions Support Parent</name>
 	<url>http://www.springsource.org/spring-data</url>
-	<version>1.0.0.BUILD-SNAPSHOT</version>
+	<version>1.0.0.M1</version>
 	<packaging>pom</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -15,8 +15,8 @@
 		<log4j.version>1.2.15</log4j.version>
 		<org.mockito.version>1.8.4</org.mockito.version>
 		<org.slf4j.version>1.5.10</org.slf4j.version>
-		<org.springframework.version>3.0.4.RELEASE</org.springframework.version>
-		<data.commons.version>1.0.0.BUILD-SNAPSHOT</data.commons.version>
+		<org.springframework.version>3.0.5.RELEASE</org.springframework.version>
+		<data.commons.version>1.0.0.M6</data.commons.version>
 	</properties>
 	<profiles>
 		<profile>
@@ -247,7 +247,7 @@
 				-->
 				<groupId>org.springframework.build.aws</groupId>
 				<artifactId>org.springframework.build.aws.maven</artifactId>
-				<version>2.0.0.RELEASE</version>
+				<version>3.1.0.RELEASE</version>
 			</extension>
 		</extensions>
 		<resources>

diff --git a/spring-data-oracle-test/pom.xml b/spring-data-oracle-test/pom.xml
@@ -4,14 +4,14 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-jdbc-parent</artifactId>
-		<version>1.0.0.BUILD-SNAPSHOT</version>
+		<version>1.0.0.M1</version>
 		<relativePath>../spring-data-jdbc-parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>spring-data-oracle-test</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Data Support for Oracle Database Integration Tests</name>
 	<properties>
-		<aspectj.version>1.6.10.BUILD-SNAPSHOT</aspectj.version>
+		<aspectj.version>1.6.11.RELEASE</aspectj.version>
 	</properties>
 	<dependencies>
 

diff --git a/spring-data-oracle/pom.xml b/spring-data-oracle/pom.xml
@@ -4,14 +4,14 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-jdbc-parent</artifactId>
-		<version>1.0.0.BUILD-SNAPSHOT</version>
+		<version>1.0.0.M1</version>
 		<relativePath>../spring-data-jdbc-parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>spring-data-oracle</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Data JDBC Extensions Support for Oracle Database</name>
 	<properties>
-		<aspectj.version>1.6.10.BUILD-SNAPSHOT</aspectj.version>
+		<aspectj.version>1.6.11.RELEASE</aspectj.version>
 	</properties>
 	<dependencies>
 

diff --git a/src/docbkx/oracle-connection.xml b/src/docbkx/oracle-connection.xml
@@ -62,13 +62,13 @@
       <programlisting>&lt;beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:orcl="http://www.springsource.com/schema/data/orcl"
+       xmlns:orcl="http://www.springframework.org/schema/data/orcl"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
        http://www.springframework.org/schema/context
        http://www.springframework.org/schema/context/spring-context-3.0.xsd
-       http://www.springsource.com/schema/data/orcl
-       http://www.springsource.com/schema/data/orcl/spring-data-orcl-1.0.xsd"&gt;
+       http://www.springframework.org/schema/data/orcl
+       http://www.springframework.org/schema/data/orcl/spring-data-orcl-1.0.xsd"&gt;
 
     <emphasis role="bold">&lt;orcl:pooling-datasource id="dataSource" 
         properties-location="classpath:orcl.properties"&gt;

diff --git a/src/docbkx/oracle-datasource.xml b/src/docbkx/oracle-datasource.xml
@@ -114,13 +114,13 @@
       <programlisting>&lt;beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:context="http://www.springframework.org/schema/context"
-       <emphasis role="bold">xmlns:orcl="http://www.springsource.com/schema/data/orcl"</emphasis>
+       <emphasis role="bold">xmlns:orcl="http://www.springframework.org/schema/data/orcl"</emphasis>
        xsi:schemaLocation="http://www.springframework.org/schema/beans
        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
        http://www.springframework.org/schema/context
        http://www.springframework.org/schema/context/spring-context-3.0.xsd
-       <emphasis role="bold">http://www.springsource.com/schema/data/orcl
-       http://www.springsource.com/schema/data/orcl/spring-data-orcl-1.0.xsd"&gt;</emphasis>
+       <emphasis role="bold">http://www.springframework.org/schema/data/orcl
+       http://www.springframework.org/schema/data/orcl/spring-data-orcl-1.0.xsd"&gt;</emphasis>
 
     <emphasis role="bold">&lt;orcl:pooling-datasource id="dataSource"
         url="${jdbc.url}" username="${jdbc.username}" password="${jdbc.password}"/&gt;</emphasis>
@@ -195,13 +195,13 @@ password=spring</programlisting>
       <programlisting>&lt;beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:orcl="http://www.springsource.com/schema/data/orcl"
+       xmlns:orcl="http://www.springframework.org/schema/data/orcl"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
        http://www.springframework.org/schema/context
        http://www.springframework.org/schema/context/spring-context-3.0.xsd
-       http://www.springsource.com/schema/data/orcl
-       http://www.springsource.com/schema/data/orcl/spring-data-orcl-1.0.xsd"&gt;
+       http://www.springframework.org/schema/data/orcl
+       http://www.springframework.org/schema/data/orcl/spring-data-orcl-1.0.xsd"&gt;
 
     <emphasis role="bold">&lt;orcl:pooling-datasource id="dataSource" 
         properties-location="classpath:orcl.properties"/&gt;</emphasis>
@@ -232,13 +232,13 @@ password=spring</programlisting>
       <programlisting>&lt;beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:orcl="http://www.springsource.com/schema/data/orcl"
+       xmlns:orcl="http://www.springframework.org/schema/data/orcl"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
        http://www.springframework.org/schema/context
        http://www.springframework.org/schema/context/spring-context-3.0.xsd
-       http://www.springsource.com/schema/data/orcl
-       http://www.springsource.com/schema/data/orcl/spring-data-orcl-1.0.xsd"&gt;
+       http://www.springframework.org/schema/data/orcl
+       http://www.springframework.org/schema/data/orcl/spring-data-orcl-1.0.xsd"&gt;
 
     <emphasis role="bold">&lt;orcl:pooling-datasource id="dataSource"/&gt;</emphasis>
 
@@ -301,13 +301,13 @@ conn.processEscapes=false</programlisting>
         <programlisting>&lt;beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:orcl="http://www.springsource.com/schema/data/orcl"
+       xmlns:orcl="http://www.springframework.org/schema/data/orcl"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
        http://www.springframework.org/schema/context
        http://www.springframework.org/schema/context/spring-context-3.0.xsd
-       http://www.springsource.com/schema/data/orcl
-       http://www.springsource.com/schema/data/orcl/spring-data-orcl-1.0.xsd"&gt;
+       http://www.springframework.org/schema/data/orcl
+       http://www.springframework.org/schema/data/orcl/spring-data-orcl-1.0.xsd"&gt;
 
     <emphasis role="bold">&lt;orcl:pooling-datasource id="dataSource" 
         connection-properties-prefix="conn"
@@ -350,13 +350,13 @@ cache.InitialLimit=10</programlisting>
         <programlisting>&lt;beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:orcl="http://www.springsource.com/schema/data/orcl"
+       xmlns:orcl="http://www.springframework.org/schema/data/orcl"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
        http://www.springframework.org/schema/context
        http://www.springframework.org/schema/context/spring-context-3.0.xsd
-       http://www.springsource.com/schema/data/orcl
-       http://www.springsource.com/schema/data/orcl/spring-data-orcl-1.0.xsd"&gt;
+       http://www.springframework.org/schema/data/orcl
+       http://www.springframework.org/schema/data/orcl/spring-data-orcl-1.0.xsd"&gt;
 
     <emphasis role="bold">&lt;orcl:pooling-datasource id="dataSource" 
         connection-properties-prefix="conn"
@@ -397,13 +397,13 @@ cache.InitialLimit=10</programlisting>
         <programlisting>&lt;beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:orcl="http://www.springsource.com/schema/data/orcl"
+       xmlns:orcl="http://www.springframework.org/schema/data/orcl"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
        http://www.springframework.org/schema/context
        http://www.springframework.org/schema/context/spring-context-3.0.xsd
-       http://www.springsource.com/schema/data/orcl
-       http://www.springsource.com/schema/data/orcl/spring-data-orcl-1.0.xsd"&gt;
+       http://www.springframework.org/schema/data/orcl
+       http://www.springframework.org/schema/data/orcl/spring-data-orcl-1.0.xsd"&gt;
 
     <emphasis role="bold">&lt;orcl:pooling-datasource id="dataSource" 
         properties-location="classpath:orcl.properties"&gt;
@@ -444,13 +444,13 @@ cache.InitialLimit=10</programlisting>
         <programlisting>&lt;beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:orcl="http://www.springsource.com/schema/data/orcl"
+       xmlns:orcl="http://www.springframework.org/schema/data/orcl"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
        http://www.springframework.org/schema/context
        http://www.springframework.org/schema/context/spring-context-3.0.xsd
-       http://www.springsource.com/schema/data/orcl
-       http://www.springsource.com/schema/data/orcl/spring-data-orcl-1.0.xsd"&gt;
+       http://www.springframework.org/schema/data/orcl
+       http://www.springframework.org/schema/data/orcl/spring-data-orcl-1.0.xsd"&gt;
 
     <emphasis role="bold">&lt;orcl:pooling-datasource id="dataSource" 
         properties-location="classpath:orcl.properties"&gt;
@@ -500,13 +500,13 @@ cache.InitialLimit=10</programlisting>
         <programlisting>&lt;beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:orcl="http://www.springsource.com/schema/data/orcl"
+       xmlns:orcl="http://www.springframework.org/schema/data/orcl"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
        http://www.springframework.org/schema/context
        http://www.springframework.org/schema/context/spring-context-3.0.xsd
-       http://www.springsource.com/schema/data/orcl
-       http://www.springsource.com/schema/data/orcl/spring-data-orcl-1.0.xsd"&gt;
+       http://www.springframework.org/schema/data/orcl
+       http://www.springframework.org/schema/data/orcl/spring-data-orcl-1.0.xsd"&gt;
 
     <emphasis role="bold">&lt;orcl:pooling-datasource id="dataSource" 
         properties-location="classpath:orcl.properties"&gt;

diff --git a/src/docbkx/oracle-failover.xml b/src/docbkx/oracle-failover.xml
@@ -54,13 +54,13 @@ password=spring</programlisting>
       <programlisting>&lt;beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:orcl="http://www.springsource.com/schema/data/orcl"
+       xmlns:orcl="http://www.springframework.org/schema/data/orcl"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
        http://www.springframework.org/schema/context
        http://www.springframework.org/schema/context/spring-context-3.0.xsd
-       http://www.springsource.com/schema/data/orcl
-       http://www.springsource.com/schema/data/orcl/spring-data-orcl-1.0.xsd"&gt;
+       http://www.springframework.org/schema/data/orcl
+       http://www.springframework.org/schema/data/orcl/spring-data-orcl-1.0.xsd"&gt;
 
     <emphasis role="bold">&lt;orcl:pooling-datasource id="racDataSource"
         url="jdbc:oracle:thin:@(description=(address_list=(address=(host=rac1)(protocol=tcp)(port=1521))(address=(..."
@@ -147,15 +147,15 @@ password=spring</programlisting>
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:aop="http://www.springframework.org/schema/aop"
        xmlns:tx="http://www.springframework.org/schema/tx"
-       xmlns:orcl="http://www.springsource.com/schema/data/orcl"
+       xmlns:orcl="http://www.springframework.org/schema/data/orcl"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
        http://www.springframework.org/schema/aop
        http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
        http://www.springframework.org/schema/tx
        http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
-       http://www.springsource.com/schema/data/orcl
-       http://www.springsource.com/schema/data/orcl/spring-data-orcl-1.0.xsd"&gt;
+       http://www.springframework.org/schema/data/orcl
+       http://www.springframework.org/schema/data/orcl/spring-data-orcl-1.0.xsd"&gt;
 
     <emphasis role="bold">&lt;aop:config&gt;
         &lt;aop:advisor pointcut="execution(* *..PetStoreFacade.insertOrder(..))" 
@@ -226,15 +226,15 @@ password=spring</programlisting>
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:aop="http://www.springframework.org/schema/aop"
        xmlns:tx="http://www.springframework.org/schema/tx"
-       xmlns:orcl="http://www.springsource.com/schema/data/orcl"
+       xmlns:orcl="http://www.springframework.org/schema/data/orcl"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
        http://www.springframework.org/schema/aop
        http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
        http://www.springframework.org/schema/tx
        http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
-       http://www.springsource.com/schema/data/orcl
-       http://www.springsource.com/schema/data/orcl/spring-data-orcl-1.0.xsd"&gt;
+       http://www.springframework.org/schema/data/orcl
+       http://www.springframework.org/schema/data/orcl/spring-data-orcl-1.0.xsd"&gt;
 
     <emphasis role="bold">&lt;aop:config&gt;
         &lt;aop:advisor 

diff --git a/src/docbkx/oracle-streamsaq.xml b/src/docbkx/oracle-streamsaq.xml
@@ -118,13 +118,13 @@
       <programlisting>&lt;beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:context="http://www.springframework.org/schema/context"
-       <emphasis role="bold">xmlns:orcl="http://www.springsource.com/schema/data/orcl"</emphasis>
+       <emphasis role="bold">xmlns:orcl="http://www.springframework.org/schema/data/orcl"</emphasis>
        xsi:schemaLocation="http://www.springframework.org/schema/beans
        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
        http://www.springframework.org/schema/context
        http://www.springframework.org/schema/context/spring-context-3.0.xsd
-       <emphasis role="bold">http://www.springsource.com/schema/data/orcl
-       http://www.springsource.com/schema/data/orcl/spring-data-orcl-1.0.xsd"&gt;</emphasis>
+       <emphasis role="bold">http://www.springframework.org/schema/data/orcl
+       http://www.springframework.org/schema/data/orcl/spring-data-orcl-1.0.xsd"&gt;</emphasis>
 
 
     <emphasis role="bold">&lt;orcl:aq-jms-connection-factory id="connectionFactory" 
@@ -185,16 +185,16 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:tx="http://www.springframework.org/schema/tx"
        xmlns:context="http://www.springframework.org/schema/context"
-       <emphasis role="bold">xmlns:orcl="http://www.springsource.com/schema/data/orcl"
+       <emphasis role="bold">xmlns:orcl="http://www.springframework.org/schema/data/orcl"
        xmlns:jms="http://www.springframework.org/schema/jms"</emphasis>
        xsi:schemaLocation="http://www.springframework.org/schema/beans
        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
        http://www.springframework.org/schema/tx
        http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
        http://www.springframework.org/schema/context
        http://www.springframework.org/schema/context/spring-context-3.0.xsd
-       <emphasis role="bold">http://www.springsource.com/schema/data/orcl
-       http://www.springsource.com/schema/data/orcl/spring-data-orcl-1.0.xsd
+       <emphasis role="bold">http://www.springframework.org/schema/data/orcl
+       http://www.springframework.org/schema/data/orcl/spring-data-orcl-1.0.xsd
        http://www.springframework.org/schema/jms
        http://www.springframework.org/schema/jms/spring-jms-3.0.xsd</emphasis>"&gt;
 

diff --git a/src/docbkx/resources/xsl/fopdf.xsl b/src/docbkx/resources/xsl/fopdf.xsl
@@ -100,7 +100,7 @@
         <xsl:param name="gentext-key" select="''"/>
         <xsl:variable name="Version">
             <xsl:if test="//releaseinfo">
-                <xsl:text>Spring Data SQL (</xsl:text>
+                <xsl:text>Spring Data JDBC Extensions (</xsl:text>
                 <xsl:value-of select="//releaseinfo"/>
                 <xsl:text>)</xsl:text>
             </xsl:if>