Centralize versions

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

diff --git a/demo/pom.xml b/demo/pom.xml
index e1d8544ab22743445d4b0f8f41d97f3e4d0a0a60..6feb43f5027b5358b2259a9b8c412343cd11eb68 100644 (file)
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -76,13 +76,11 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.osgiboot</artifactId>
-                       <version>${project.version}</version>
                </dependency>
                <!--  Server -->
                <dependency>
                        <groupId>org.argeo.slc.server</groupId>
                        <artifactId>bundles</artifactId>
-                       <version>${project.version}</version>
                        <type>pom</type>
                </dependency>
 
@@ -90,14 +88,10 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.equinox</artifactId>
-                       <version>${project.version}</version>
-                       <classifier>tests</classifier>
-                       <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.osgiboot</artifactId>
-                       <version>${project.version}</version>
                </dependency>
        </dependencies>
 

diff --git a/integration-tests/org.argeo.slc.it.webapp/pom.xml b/integration-tests/org.argeo.slc.it.webapp/pom.xml
index 8464e034bb2e938310e462973ee94bd21565ca7c..80846dba34bce096985c70813908eb1308501cee 100644 (file)
--- a/integration-tests/org.argeo.slc.it.webapp/pom.xml
+++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml
@@ -81,7 +81,6 @@
                <dependency>
                        <groupId>org.argeo.slc.server</groupId>
                        <artifactId>bundles</artifactId>
-                       <version>${project.version}</version>
                        <type>pom</type>
                </dependency>
                <dependency>

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index 33e4544642ea9f7fc8333e9d90e3b37aabcd06fe..9c09950adf4ebbb4358d2f935eae126f5ac73fe6 100644 (file)
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -256,17 +256,28 @@ limitations under the License.
                                <artifactId>org.argeo.slc.support.equinox</artifactId>
                                <version>${project.version}</version>
                        </dependency>
-                       <dependency>
-                               <groupId>org.argeo.slc.runtime</groupId>
+                       <!--
+                               <dependency> <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.ws.client</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
+                               <version>${project.version}</version> </dependency>
+                       -->
                        <dependency>
                                <groupId>org.argeo.slc</groupId>
                                <artifactId>org.argeo.slc.webapp</artifactId>
                                <version>${project.version}</version>
                                <type>war</type>
                        </dependency>
+                       <dependency>
+                               <groupId>org.argeo.slc.server</groupId>
+                               <artifactId>org.argeo.slc.ria</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.argeo.slc.server</groupId>
+                               <artifactId>bundles</artifactId>
+                               <version>${project.version}</version>
+                               <type>pom</type>
+                       </dependency>
 
                        <!-- SLC dubious -->
                        <dependency>

diff --git a/runtime/org.argeo.slc.osgiboot/pom.xml b/runtime/org.argeo.slc.osgiboot/pom.xml
index d7c2afbbd76a0fbfd9d406562b270607257a2ff4..610948418db5b50afddb69a245a606707b3ec8d8 100644 (file)
--- a/runtime/org.argeo.slc.osgiboot/pom.xml
+++ b/runtime/org.argeo.slc.osgiboot/pom.xml
@@ -53,7 +53,6 @@
                                <configuration>
                                        <instructions>
                                                <Bundle-Activator>org.argeo.slc.osgiboot.Activator</Bundle-Activator>
-                                               <Private-Package>org.argeo.slc.osgiboot.internal.*</Private-Package>
                                        </instructions>
                                </configuration>
                        </plugin>

diff --git a/runtime/org.argeo.slc.support.hibernate/pom.xml b/runtime/org.argeo.slc.support.hibernate/pom.xml
index 4c06b0ccd45158bd84341c2b10ee2041b8d1eb05..c78ae0b2b3f269d3335de545760ac63fa4a2e710 100644 (file)
--- a/runtime/org.argeo.slc.support.hibernate/pom.xml
+++ b/runtime/org.argeo.slc.support.hibernate/pom.xml
@@ -86,7 +86,6 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.castor</artifactId>
-                       <version>${project.version}</version>
                        <scope>test</scope>
                </dependency>
 

diff --git a/server/org.argeo.slc.siteserver/pom.xml b/server/org.argeo.slc.siteserver/pom.xml
index 587c6e6902d4bdd93abf4e6c6bb39db8eb36d4cf..5046eaa8ce2f5fd5a0488902d834fe11c19a3897 100644 (file)
--- a/server/org.argeo.slc.siteserver/pom.xml
+++ b/server/org.argeo.slc.siteserver/pom.xml
@@ -23,7 +23,6 @@
                <dependency>
                        <groupId>org.argeo.slc.server</groupId>
                        <artifactId>org.argeo.slc.ria</artifactId>
-                       <version>${project.version}</version>
                </dependency>