Update dependencies

git-svn-id: https://svn.argeo.org/slc/trunk@3257 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/dep/org.argeo.slc.dep.agent/pom.xml b/dep/org.argeo.slc.dep.agent/pom.xml
index 067c5ead9afce171726e186cf9010d70a8c794a5..0b81e669293a397581c3bb5cbdd9abcd61f138b2 100644 (file)
--- a/dep/org.argeo.slc.dep.agent/pom.xml
+++ b/dep/org.argeo.slc.dep.agent/pom.xml
@@ -48,6 +48,33 @@
                        <artifactId>org.argeo.slc.lib.detached</artifactId>
                </dependency>
 
+               <!-- DB Drivers -->
+               <dependency>
+                       <groupId>org.hsqldb</groupId>
+                       <artifactId>com.springsource.org.hsqldb</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>net.sourceforge.jtds</groupId>
+                       <artifactId>com.springsource.net.sourceforge.jtds</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>com.mysql.jdbc</groupId>
+                       <artifactId>com.springsource.com.mysql.jdbc</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.postgresql</groupId>
+                       <artifactId>com.springsource.org.postgresql.jdbc3</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>com.oracle.jdbc</groupId>
+                       <artifactId>com.springsource.oracle.jdbc</artifactId>
+               </dependency>
+
+               <!--
+                       Languages <dependency> <groupId>org.codehaus.groovy</groupId>
+                       <artifactId>com.springsource.org.codehaus.groovy</artifactId>
+                       </dependency>
+               -->
                <!-- ASM -->
                <dependency>
                        <groupId>org.objectweb.asm</groupId>

diff --git a/dep/org.argeo.slc.dep.detached/p2.inf b/dep/org.argeo.slc.dep.detached/p2.inf
new file mode 100644 (file)
index 0000000..0423aa5
--- /dev/null
+++ b/dep/org.argeo.slc.dep.detached/p2.inf
@@ -0,0 +1,2 @@
+properties.1.name=org.eclipse.equinox.p2.type.category
+properties.1.value=true
\ No newline at end of file

diff --git a/dep/org.argeo.slc.dep.server/pom.xml b/dep/org.argeo.slc.dep.server/pom.xml
index ec90e19d829cdf3d82b710b1cdba59422c37f8ed..21f5e25812decfc2af86a99be163b6130d4fbd03 100644 (file)
--- a/dep/org.argeo.slc.dep.server/pom.xml
+++ b/dep/org.argeo.slc.dep.server/pom.xml
@@ -130,24 +130,6 @@
                        <artifactId>org.argeo.server.jackrabbit</artifactId>
                </dependency>
 
-               <!-- DB Drivers -->
-               <dependency>
-                       <groupId>org.hsqldb</groupId>
-                       <artifactId>com.springsource.org.hsqldb</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>net.sourceforge.jtds</groupId>
-                       <artifactId>com.springsource.net.sourceforge.jtds</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>com.mysql.jdbc</groupId>
-                       <artifactId>com.springsource.com.mysql.jdbc</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.postgresql</groupId>
-                       <artifactId>com.springsource.org.postgresql.jdbc3</artifactId>
-               </dependency>
-
                <!-- Required in JDK 1.5 -->
                <dependency>
                        <groupId>com.sun.xml</groupId>

diff --git a/pom.xml b/pom.xml
index a63ef2761ed0c0507a2f69a629c4e0187dbf7892..bf5ea34a335e68162104abc815e0bc2eb6da0683 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -13,12 +13,12 @@
        <version>0.12.1-SNAPSHOT</version>
        <properties>
                <developmentCycle>0.12</developmentCycle>
-               <version.argeo-distribution>1.0.2</version.argeo-distribution>
+               <version.argeo-distribution>1.0.3-SNAPSHOT</version.argeo-distribution>
                <version.argeo-ria>0.12.2</version.argeo-ria>
                <version.argeo-commons>0.1.2</version.argeo-commons>
                <version.equinox>3.5.1.R35x_v20090827</version.equinox>
                <version.maven-bundle-plugin>2.0.1</version.maven-bundle-plugin>
-               <version.maven-argeo-osgi>0.1.25</version.maven-argeo-osgi>
+               <version.maven-argeo-osgi>0.1.26-SNAPSHOT</version.maven-argeo-osgi>
                <version.maven-argeo-qooxdoo>0.8.3.0</version.maven-argeo-qooxdoo>
                <site.repoBase>file:///var/argeo/projects/SLC/www/site</site.repoBase>
                <site.urlBase>http://www.argeo.org/projects/slc/site</site.urlBase>
@@ -30,7 +30,8 @@
                <module>server</module>
                <module>demo</module>
                <module>integration-tests</module>
-               <module>archetypes</module>
+               <!-- <module>archetypes</module>-->
+               <module>dist</module>
        </modules>
        <url>${site.urlBase}/${developmentCycle}</url>
        <scm>