[SurveyForge-svn] SF.net SVN: surveyforge: [88] trunk

[<jg...@us...>]

Revision: 88
          http://svn.sourceforge.net/surveyforge/?rev=88&view=rev
Author:   jgongo
Date:     2006-10-24 08:30:30 -0700 (Tue, 24 Oct 2006)

Log Message:
-----------
Update of hibernate dependencies to 3.2.0.ga

Modified Paths:
--------------
    trunk/pom.xml
    trunk/surveyforge-db/pom.xml
    trunk/surveyforge-runner/pom.xml

Removed Paths:
-------------
    trunk/surveyforge-runner/src/main/resources/hibernate-entitymanager.jar
    trunk/surveyforge-runner/src/main/resources/javassist.jar
    trunk/surveyforge-runner/src/main/resources/jboss-archive-browsing.jar

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2006-10-24 15:28:17 UTC (rev 87)
+++ trunk/pom.xml	2006-10-24 15:30:30 UTC (rev 88)
@@ -90,7 +90,7 @@
       <extension>
         <groupId>org.apache.maven.wagon</groupId>
         <artifactId>wagon-ssh-external</artifactId>
-        <version>1.0-alpha-6</version>
+        <version>1.0-beta-1</version>
       </extension>
     </extensions>
     <pluginManagement>
@@ -111,7 +111,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>aspectj-maven-plugin</artifactId>
-          <!--<version>1.0-beta-1</version>-->
+          <version>1.0-beta-2</version>
           <configuration>
             <source>1.5</source>
             <target>1.5</target>
@@ -174,6 +174,18 @@
       <url>http://labs.openinput.com/maven/</url>
     </repository>
   </repositories>
+  <pluginRepositories>
+    <pluginRepository>
+      <id>Maven Snapshots</id>
+      <url>http://snapshots.maven.codehaus.org/maven2/</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+    </pluginRepository>
+  </pluginRepositories>
   <reporting>
     <plugins>
       <plugin>
@@ -290,25 +302,13 @@
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-annotations</artifactId>
-        <version>3.2.0.cr1</version>
-        <exclusions>
-          <exclusion>
-            <groupId>javax.persistence</groupId>
-            <artifactId>ejb</artifactId>
-          </exclusion>
-        </exclusions>
+        <version>3.2.0.ga</version>
       </dependency>
       <dependency>
-        <groupId>hibernate</groupId>
+        <groupId>org.hibernate</groupId>
         <artifactId>hibernate-entitymanager</artifactId>
-        <version>3.1beta1</version>
+        <version>3.2.0.ga</version>
         <scope>test</scope>
-        <exclusions>
-          <exclusion>
-            <groupId>javax.persistence</groupId>
-            <artifactId>ejb</artifactId>
-          </exclusion>
-        </exclusions>
       </dependency>
       <dependency>
         <groupId>postgresql</groupId>

Modified: trunk/surveyforge-db/pom.xml
===================================================================
--- trunk/surveyforge-db/pom.xml	2006-10-24 15:28:17 UTC (rev 87)
+++ trunk/surveyforge-db/pom.xml	2006-10-24 15:30:30 UTC (rev 88)
@@ -103,7 +103,7 @@
       <classifier>jdk15</classifier>
     </dependency>
     <dependency>
-      <groupId>hibernate</groupId>
+      <groupId>org.hibernate</groupId>
       <artifactId>hibernate-entitymanager</artifactId>
     </dependency>
   </dependencies>

Modified: trunk/surveyforge-runner/pom.xml
===================================================================
--- trunk/surveyforge-runner/pom.xml	2006-10-24 15:28:17 UTC (rev 87)
+++ trunk/surveyforge-runner/pom.xml	2006-10-24 15:30:30 UTC (rev 88)
@@ -65,12 +65,10 @@
       <groupId>javax.persistence</groupId>
       <artifactId>persistence-api</artifactId>
     </dependency>
-    <!-- 
     <dependency>
-      <groupId>hibernate</groupId>
+      <groupId>org.hibernate</groupId>
       <artifactId>hibernate-entitymanager</artifactId>
     </dependency>
-    -->
     <dependency>
       <groupId>postgresql</groupId>
       <artifactId>postgresql</artifactId>

Deleted: trunk/surveyforge-runner/src/main/resources/hibernate-entitymanager.jar
===================================================================
(Binary files differ)

Deleted: trunk/surveyforge-runner/src/main/resources/javassist.jar
===================================================================
(Binary files differ)

Deleted: trunk/surveyforge-runner/src/main/resources/jboss-archive-browsing.jar
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.