You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2005/08/12 21:22:57 UTC

svn commit: r232361 - in /geronimo/trunk: assemblies/j2ee-server/project.xml modules/assembly/maven.xml modules/derby-connector/project.xml modules/timer/project.xml sandbox/petstore/maven.xml sandbox/petstore/project.xml

Author: jboynes
Date: Fri Aug 12 12:22:51 2005
New Revision: 232361

URL: http://svn.apache.org/viewcvs?rev=232361&view=rev
Log:
hopefully catch all references to incubator-derby this time

Modified:
    geronimo/trunk/assemblies/j2ee-server/project.xml
    geronimo/trunk/modules/assembly/maven.xml
    geronimo/trunk/modules/derby-connector/project.xml
    geronimo/trunk/modules/timer/project.xml
    geronimo/trunk/sandbox/petstore/maven.xml
    geronimo/trunk/sandbox/petstore/project.xml

Modified: geronimo/trunk/assemblies/j2ee-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-server/project.xml?rev=232361&r1=232360&r2=232361&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-server/project.xml Fri Aug 12 12:22:51 2005
@@ -116,7 +116,7 @@
         </dependency>
 
         <dependency>
-            <groupId>incubator-derby</groupId>
+            <groupId>org.apache.derby</groupId>
             <artifactId>derby</artifactId>
             <version>${derby_version}</version>
             <properties>
@@ -125,7 +125,7 @@
         </dependency>
 
         <dependency>
-            <groupId>incubator-derby</groupId>
+            <groupId>org.apache.derby</groupId>
             <artifactId>derbynet</artifactId>
             <version>${derby_version}</version>
             <properties>

Modified: geronimo/trunk/modules/assembly/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/maven.xml?rev=232361&r1=232360&r2=232361&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/maven.xml (original)
+++ geronimo/trunk/modules/assembly/maven.xml Fri Aug 12 12:22:51 2005
@@ -601,7 +601,7 @@
         <ant:sql driver="org.apache.derby.jdbc.EmbeddedDriver" url="jdbc:derby:SystemDatabase;create=true" userid="" password="">
             <ant:fileset dir="src/sql"/>
             <ant:classpath>
-                <ant:pathelement location="${maven.repo.local}/incubator-derby/jars/derby-${derby_version}.jar"/>
+                <ant:pathelement location="${maven.repo.local}/org.apache.derby/jars/derby-${derby_version}.jar"/>
             </ant:classpath>
         </ant:sql>
     </goal>

Modified: geronimo/trunk/modules/derby-connector/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/derby-connector/project.xml?rev=232361&r1=232360&r2=232361&view=diff
==============================================================================
--- geronimo/trunk/modules/derby-connector/project.xml (original)
+++ geronimo/trunk/modules/derby-connector/project.xml Fri Aug 12 12:22:51 2005
@@ -43,12 +43,12 @@
     <dependencies>
 
         <dependency>
-            <groupId>incubator-derby</groupId>
+            <groupId>org.apache.derby</groupId>
             <artifactId>derby</artifactId>
             <version>${derby_version}</version>
         </dependency>
         <dependency>
-            <groupId>incubator-derby</groupId>
+            <groupId>org.apache.derby</groupId>
             <artifactId>derbynet</artifactId>
             <version>${derby_version}</version>
         </dependency>

Modified: geronimo/trunk/modules/timer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/timer/project.xml?rev=232361&r1=232360&r2=232361&view=diff
==============================================================================
--- geronimo/trunk/modules/timer/project.xml (original)
+++ geronimo/trunk/modules/timer/project.xml Fri Aug 12 12:22:51 2005
@@ -110,7 +110,7 @@
         </dependency>
 
         <dependency>
-            <groupId>incubator-derby</groupId>
+            <groupId>org.apache.derby</groupId>
             <artifactId>derby</artifactId>
             <version>${derby_version}</version>
         </dependency>

Modified: geronimo/trunk/sandbox/petstore/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/petstore/maven.xml?rev=232361&r1=232360&r2=232361&view=diff
==============================================================================
--- geronimo/trunk/sandbox/petstore/maven.xml (original)
+++ geronimo/trunk/sandbox/petstore/maven.xml Fri Aug 12 12:22:51 2005
@@ -133,7 +133,7 @@
             url="jdbc:derby:PetStoreDB;create=true" userid="" password="">
             <ant:fileset dir="src/sql"/>
             <ant:classpath>
-                <ant:pathelement location="${maven.repo.local}/incubator-derby/jars/derby-10.0.2.1.jar"/>
+                <ant:pathelement location="${maven.repo.local}/org.apache.derby/jars/derby-10.1.1.0.jar"/>
             </ant:classpath>
         </ant:sql>
     </goal>

Modified: geronimo/trunk/sandbox/petstore/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/petstore/project.xml?rev=232361&r1=232360&r2=232361&view=diff
==============================================================================
--- geronimo/trunk/sandbox/petstore/project.xml (original)
+++ geronimo/trunk/sandbox/petstore/project.xml Fri Aug 12 12:22:51 2005
@@ -35,9 +35,9 @@
       <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>incubator-derby</groupId>
+      <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
-      <version>10.0.2.1</version>
+      <version>10.1.1.0</version>
     </dependency>
   </dependencies>
   <build>



Re: svn commit: r232361 - in /geronimo/trunk: assemblies/j2ee-server/project.xml modules/assembly/maven.xml modules/derby-connector/project.xml modules/timer/project.xml sandbox/petstore/maven.xml sandbox/petstore/project.xml

Posted by Bruce Snyder <br...@gmail.com>.
On 8/12/05, jboynes@apache.org <jb...@apache.org> wrote:

> Author: jboynes
> Date: Fri Aug 12 12:22:51 2005
> New Revision: 232361
> 
> URL: http://svn.apache.org/viewcvs?rev=232361&view=rev
> Log:
> hopefully catch all references to incubator-derby this time
> 
> Modified:
>     geronimo/trunk/assemblies/j2ee-server/project.xml
>     geronimo/trunk/modules/assembly/maven.xml
>     geronimo/trunk/modules/derby-connector/project.xml
>     geronimo/trunk/modules/timer/project.xml
>     geronimo/trunk/sandbox/petstore/maven.xml
>     geronimo/trunk/sandbox/petstore/project.xml

You beat me to it! ;-) I was just changing these up. Thanks! 

Bruce 
-- 
perl -e 'print unpack("u30","D0G)U8V4\@4VYY9&5R\"F)R=6-E+G-N>61E<D\!G;6%I;\"YC;VT*"
);'

The Castor Project
http://www.castor.org/

Apache Geronimo
http://geronimo.apache.org/