Remove dependency to deploy

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

diff --git a/demo/pom.xml b/demo/pom.xml
index 4f4a8088cdff954ed43823b2cc0f229b4f6df953..475b720c53451d811076f1d92e827d967fd15ebc 100644 (file)
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -77,12 +77,6 @@
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.osgiboot</artifactId>
                </dependency>
-               <!--  Server -->
-               <dependency>
-                       <groupId>org.argeo.slc.server</groupId>
-                       <artifactId>deploy</artifactId>
-                       <type>pom</type>
-               </dependency>
 
                <!--  TESTS -->
                <dependency>
@@ -129,6 +123,14 @@
                                        </plugin>
                                </plugins>
                        </build>
+                       <dependencies>
+                               <!--  Server -->
+                               <dependency>
+                                       <groupId>org.argeo.slc.server</groupId>
+                                       <artifactId>deploy</artifactId>
+                                       <type>pom</type>
+                               </dependency>
+                       </dependencies>
                </profile>
                <profile>
                        <id>agent</id>

diff --git a/demo/src/test/java/org/argeo/slc/demo/StartStopDemoTest.java b/demo/src/test/java/org/argeo/slc/demo/StartStopDemoTest.java
index ed41d7d98403ebcc017419a7381fd38a7be7f38d..6115c779276336b5c7ee4ee12e4ed88904e43a21 100644 (file)
--- a/demo/src/test/java/org/argeo/slc/demo/StartStopDemoTest.java
+++ b/demo/src/test/java/org/argeo/slc/demo/StartStopDemoTest.java
@@ -20,8 +20,8 @@ public class StartStopDemoTest extends AbstractOsgiRuntimeTestCase {
                                                .getProperty("java.class.path")));
                osgiBoot.installUrls(osgiBoot.getBundlesUrls(OsgiBoot.DEFAULT_BASE_URL,
                                "site;in=*"));
-               osgiBoot.installUrls(osgiBoot.getBundlesUrls(OsgiBoot.DEFAULT_BASE_URL,
-                               "../server/org.argeo.slc.siteserver/bundles;in=*"));
+//             osgiBoot.installUrls(osgiBoot.getBundlesUrls(OsgiBoot.DEFAULT_BASE_URL,
+//                             "../server/org.argeo.slc.siteserver/bundles;in=*"));
        }
 
        protected List<String> getBundlesToStart() {

diff --git a/integration-tests/org.argeo.slc.it.webapp/pom.xml b/integration-tests/org.argeo.slc.it.webapp/pom.xml
index e31674babeb93187710b23529c7856804c5908da..4a34d3a5be816af2e1a82488e47b2c91dd6c75ea 100644 (file)
--- a/integration-tests/org.argeo.slc.it.webapp/pom.xml
+++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml
@@ -2,10 +2,10 @@
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
-               <groupId>org.argeo.slc.it</groupId>
-               <artifactId>argeo-slc-it</artifactId>
+               <groupId>org.argeo.slc.server</groupId>
+               <artifactId>deploy</artifactId>
                <version>0.11.3-SNAPSHOT</version>
-               <relativePath>..</relativePath>
+               <relativePath>../../server/org.argeo.slc.siteserver</relativePath>
        </parent>
        <artifactId>org.argeo.slc.it.webapp</artifactId>
        <packaging>jar</packaging>
@@ -81,17 +81,11 @@
        </build>
        <dependencies>
                <!--  Server -->
-               <dependency>
-                       <groupId>org.argeo.slc.server</groupId>
-                       <artifactId>deploy</artifactId>
-                       <type>pom</type>
-               </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.equinox</artifactId>
                </dependency>
 
-
                <!-- TEST -->
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>