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/15 17:12:06 UTC

[7/15] git commit: ISIS-188: more fixes for wicket poms prior to trial release

ISIS-188: more fixes for wicket poms prior to trial release


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/7a3b827a
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/7a3b827a
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/7a3b827a

Branch: refs/heads/master
Commit: 7a3b827a089f54465224cb9b1a9a6608072b9a05
Parents: 788a400
Author: Dan Haywood <da...@apache.org>
Authored: Fri Dec 14 07:20:39 2012 +0000
Committer: Dan Haywood <da...@apache.org>
Committed: Sat Dec 15 06:56:01 2012 +0000

----------------------------------------------------------------------
 component/viewer/wicket/model/pom.xml |    1 +
 component/viewer/wicket/pom.xml       |   31 ++++-----------------------
 component/viewer/wicket/tck/pom.xml   |   15 +------------
 3 files changed, 7 insertions(+), 40 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/7a3b827a/component/viewer/wicket/model/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/pom.xml b/component/viewer/wicket/model/pom.xml
index b06fdc0..6585684 100644
--- a/component/viewer/wicket/model/pom.xml
+++ b/component/viewer/wicket/model/pom.xml
@@ -47,6 +47,7 @@
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
 			<artifactId>isis-core-metamodel</artifactId>
+			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>

http://git-wip-us.apache.org/repos/asf/isis/blob/7a3b827a/component/viewer/wicket/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/pom.xml b/component/viewer/wicket/pom.xml
index de377a9..13c3327 100644
--- a/component/viewer/wicket/pom.xml
+++ b/component/viewer/wicket/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>org.apache.isis.core</groupId>
 		<artifactId>isis</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.0.0</version>
 		<relativePath>../../../core/pom.xml</relativePath>
 	</parent>
 
@@ -137,37 +137,16 @@
 
 
 			<!-- isis core -->
-			<dependency>
-				<groupId>org.apache.isis.core</groupId>
-				<artifactId>isis-core-unittestsupport</artifactId>
-				<version>1.0.0-SNAPSHOT</version>
-				<scope>test</scope>
-			</dependency>
-
-			<dependency>
-				<groupId>org.apache.isis.core</groupId>
-				<artifactId>isis-core-runtime</artifactId>
-				<version>1.0.0-SNAPSHOT</version>
-			</dependency>
-
-			<!-- Apache Isis -->
-			<dependency>
-				<groupId>org.apache.isis.core</groupId>
-				<artifactId>isis-core-applib</artifactId>
-				<version>1.0.0-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.core</groupId>
-				<artifactId>isis-core-metamodel</artifactId>
-				<version>1.0.0-SNAPSHOT</version>
-			</dependency>
+			<!-- HACK: missing in isis core's pom -->
+			<!-- 
 			<dependency>
 				<groupId>org.apache.isis.core</groupId>
 				<artifactId>isis-core-metamodel</artifactId>
-				<version>1.0.0-SNAPSHOT</version>
+                <version>1.0.0</version>
 				<scope>test</scope>
 				<type>test-jar</type>
 			</dependency>
+			 -->
 
 
 			<!-- Wicket -->

http://git-wip-us.apache.org/repos/asf/isis/blob/7a3b827a/component/viewer/wicket/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/tck/pom.xml b/component/viewer/wicket/tck/pom.xml
index 50934b9..b3b49a1 100644
--- a/component/viewer/wicket/tck/pom.xml
+++ b/component/viewer/wicket/tck/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.isis.core</groupId>
         <artifactId>isis-core-tck</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0</version>
         <relativePath>../../../../core/tck/pom.xml</relativePath>
     </parent>
 
@@ -70,13 +70,11 @@
 		<dependency>
             <groupId>org.apache.isis.core</groupId>
 			<artifactId>isis-core-tck-dom</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
 		</dependency>
         
         <dependency>
             <groupId>org.apache.isis.core</groupId>
             <artifactId>isis-core-tck-fixture</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
         </dependency>
 
         <!-- isis viewer -->
@@ -113,17 +111,6 @@
             <optional>true</optional>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.isis.security</groupId>
-            <artifactId>isis-security-file</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.isis.objectstore</groupId>
-            <artifactId>isis-objectstore-xml</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-        </dependency>
-        
 	</dependencies>
 
 </project>