You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2012/12/05 22:40:22 UTC
[2/2] ISIS-188: removing intermediate parents
http://git-wip-us.apache.org/repos/asf/isis/blob/f1b9c6cc/framework/viewer/junit/pom.xml
----------------------------------------------------------------------
diff --git a/framework/viewer/junit/pom.xml b/framework/viewer/junit/pom.xml
index 78c1b60..087a241 100644
--- a/framework/viewer/junit/pom.xml
+++ b/framework/viewer/junit/pom.xml
@@ -21,9 +21,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis</groupId>
- <artifactId>viewer</artifactId>
+ <groupId>org.apache.isis</groupId>
+ <artifactId>isis</artifactId>
<version>0.3.1-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.isis.viewer</groupId>
@@ -36,7 +37,6 @@
<relativeUrl>viewer/junit/</relativeUrl>
<wrapper-progmodel.version>0.3.1-SNAPSHOT</wrapper-progmodel.version>
- <identity-bytecode.version>0.3.1-SNAPSHOT</identity-bytecode.version>
<docbkxGuideTitle>Apache Isis JUnit Support</docbkxGuideTitle>
<docbkxGuideSubTitle>Acceptance Testing using JUnit</docbkxGuideSubTitle>
@@ -81,67 +81,45 @@
</plugins>
</reporting>
- <dependencyManagement>
- <dependencies>
- <!-- TODO: remove this dependency -->
- <dependency>
- <groupId>org.apache.isis.runtimes</groupId>
- <artifactId>dflt</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <!-- TODO: remove this dependency -->
- <dependency>
- <groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
- <artifactId>identity</artifactId>
- <version>${identity-bytecode.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>wrapper-metamodel</artifactId>
- <version>${wrapper-progmodel.version}</version>
- </dependency>
-
- </dependencies>
- </dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.isis.progmodels</groupId>
<artifactId>wrapper-metamodel</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
<artifactId>dflt</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
<artifactId>dflt</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
- <artifactId>identity</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.runtimes.dflt.profilestores</groupId>
<artifactId>dflt</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.security</groupId>
<artifactId>dflt</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-metamodel</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-metamodel</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -149,6 +127,7 @@
<dependency>
<groupId>org.apache.isis.runtimes.dflt</groupId>
<artifactId>runtime</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/f1b9c6cc/framework/viewer/restfulobjects/pom.xml
----------------------------------------------------------------------
diff --git a/framework/viewer/restfulobjects/pom.xml b/framework/viewer/restfulobjects/pom.xml
index a5be7dc..c94f8a8 100644
--- a/framework/viewer/restfulobjects/pom.xml
+++ b/framework/viewer/restfulobjects/pom.xml
@@ -23,8 +23,9 @@
<parent>
<groupId>org.apache.isis</groupId>
- <artifactId>viewer</artifactId>
+ <artifactId>isis</artifactId>
<version>0.3.1-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.isis.viewer</groupId>
@@ -86,14 +87,32 @@
<dependencyManagement>
<dependencies>
- <!-- TODO: remove this dependency -->
- <dependency>
- <groupId>org.apache.isis.runtimes</groupId>
- <artifactId>dflt</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis</groupId>
+ <artifactId>applib</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-metamodel</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.runtimes.dflt</groupId>
+ <artifactId>runtime</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-unittestsupport</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
<!-- RestfulObjects Viewer -->
<dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/f1b9c6cc/framework/viewer/restfulobjects/restfulobjects-viewer/pom.xml
----------------------------------------------------------------------
diff --git a/framework/viewer/restfulobjects/restfulobjects-viewer/pom.xml b/framework/viewer/restfulobjects/restfulobjects-viewer/pom.xml
index bbef306..dc72c62 100644
--- a/framework/viewer/restfulobjects/restfulobjects-viewer/pom.xml
+++ b/framework/viewer/restfulobjects/restfulobjects-viewer/pom.xml
@@ -39,32 +39,32 @@
<url>http://incubator.apache.org/isis/${relativeUrl}</url>
<dependencies>
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>restfulobjects-applib</artifactId>
- </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-unittestsupport</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.isis</groupId>
<artifactId>applib</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-metamodel</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>org.apache.isis.runtimes.dflt</groupId>
- <artifactId>webapp</artifactId>
+ <artifactId>runtime</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.isis.viewer</groupId>
+ <artifactId>restfulobjects-applib</artifactId>
+ </dependency>
+
+
<!-- the javax:* equivalents of these are excluded in
dependencyManagement of resteasy-jaxrs, so
are required here -->
http://git-wip-us.apache.org/repos/asf/isis/blob/f1b9c6cc/framework/viewer/scimpi/pom.xml
----------------------------------------------------------------------
diff --git a/framework/viewer/scimpi/pom.xml b/framework/viewer/scimpi/pom.xml
index 5966b73..d8c8727 100644
--- a/framework/viewer/scimpi/pom.xml
+++ b/framework/viewer/scimpi/pom.xml
@@ -22,8 +22,9 @@
<parent>
<groupId>org.apache.isis</groupId>
- <artifactId>viewer</artifactId>
+ <artifactId>isis</artifactId>
<version>0.3.1-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.isis.viewer</groupId>
@@ -79,14 +80,18 @@
<dependencyManagement>
<dependencies>
- <!-- TODO: remove this dependency -->
- <dependency>
- <groupId>org.apache.isis.runtimes</groupId>
- <artifactId>dflt</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-metamodel</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.runtimes.dflt</groupId>
+ <artifactId>runtime</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f1b9c6cc/framework/viewer/wicket/pom.xml
----------------------------------------------------------------------
diff --git a/framework/viewer/wicket/pom.xml b/framework/viewer/wicket/pom.xml
index b91f847..5730377 100644
--- a/framework/viewer/wicket/pom.xml
+++ b/framework/viewer/wicket/pom.xml
@@ -23,8 +23,9 @@
<parent>
<groupId>org.apache.isis</groupId>
- <artifactId>viewer</artifactId>
+ <artifactId>isis</artifactId>
<version>0.3.1-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.isis.viewer</groupId>
@@ -69,14 +70,19 @@
<dependencyManagement>
<dependencies>
- <!-- TODO: remove this dependency -->
- <dependency>
- <groupId>org.apache.isis.runtimes</groupId>
- <artifactId>dflt</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-unittestsupport</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.runtimes.dflt</groupId>
+ <artifactId>runtime</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
+ </dependency>
<!-- Apache Isis Wicket Viewer -->
<dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/f1b9c6cc/framework/viewer/wicket/wicket-viewer/pom.xml
----------------------------------------------------------------------
diff --git a/framework/viewer/wicket/wicket-viewer/pom.xml b/framework/viewer/wicket/wicket-viewer/pom.xml
index 5ea7909..9e70aaa 100644
--- a/framework/viewer/wicket/wicket-viewer/pom.xml
+++ b/framework/viewer/wicket/wicket-viewer/pom.xml
@@ -75,11 +75,6 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt</groupId>
- <artifactId>webapp</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
<scope>provided</scope>