You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2018/09/18 10:18:15 UTC

[isis] branch v2 updated: ISIS-1988: remove references to isis-core-wrapper from pom files

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/v2 by this push:
     new 288db7e  ISIS-1988: remove references to isis-core-wrapper from pom files
288db7e is described below

commit 288db7e6acb22ba4d11fe0a72f406abe4ca2a8c7
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Sep 18 12:18:08 2018 +0200

    ISIS-1988: remove references to isis-core-wrapper from pom files
    
    Task-Url: https://issues.apache.org/jira/browse/ISIS-1988
---
 core/integtestsupport/pom.xml                      |  5 --
 core/plugins/jdo-datanucleus-4/pom.xml             | 14 -----
 core/plugins/jdo-datanucleus-5/pom.xml             | 14 -----
 core/pom.xml                                       | 60 ----------------------
 core/specsupport/pom.xml                           |  7 +--
 example/application/simpleapp/application/pom.xml  |  5 --
 .../archetype-resources/application/pom.xml        |  5 --
 7 files changed, 2 insertions(+), 108 deletions(-)

diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index 1a380c2..0703dad 100644
--- a/core/integtestsupport/pom.xml
+++ b/core/integtestsupport/pom.xml
@@ -92,11 +92,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-core-wrapper</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
         </dependency>
diff --git a/core/plugins/jdo-datanucleus-4/pom.xml b/core/plugins/jdo-datanucleus-4/pom.xml
index ca44847..fb9192b 100644
--- a/core/plugins/jdo-datanucleus-4/pom.xml
+++ b/core/plugins/jdo-datanucleus-4/pom.xml
@@ -113,13 +113,6 @@
 			<scope>compile</scope>
 		</dependency>
 		
-		<!-- Core Wrapper -->
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-core-wrapper</artifactId>
-			<scope>compile</scope>
-		</dependency>
-		
 		<!-- TESTING -->
 		
         <dependency>
@@ -142,13 +135,6 @@
             <scope>test</scope>
         </dependency>
         
-        <dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-core-wrapper</artifactId>
-			<type>test-jar</type>
-			<scope>test</scope>
-		</dependency>
-        
 	</dependencies>
 
 	<profiles>
diff --git a/core/plugins/jdo-datanucleus-5/pom.xml b/core/plugins/jdo-datanucleus-5/pom.xml
index 6b7895a..1b1e7bf 100644
--- a/core/plugins/jdo-datanucleus-5/pom.xml
+++ b/core/plugins/jdo-datanucleus-5/pom.xml
@@ -112,13 +112,6 @@
 			<scope>compile</scope>
 		</dependency>
 		
-		<!-- Core Wrapper -->
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-core-wrapper</artifactId>
-			<scope>compile</scope>
-		</dependency>
-		
 		<!-- TESTING -->
 		
         <dependency>
@@ -140,13 +133,6 @@
             <artifactId>isis-core-unittestsupport</artifactId>
             <scope>test</scope>
         </dependency>
-        
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-core-wrapper</artifactId>
-			<type>test-jar</type>
-			<scope>test</scope>
-		</dependency>
 
 	</dependencies>
 
diff --git a/core/pom.xml b/core/pom.xml
index 437394c..c954fae 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1204,22 +1204,6 @@ ${license.additional-notes}
                 <scope>test</scope>
             </dependency>
 	        
-	        <!-- applib-legacy -->
-	        <dependency>
-                <groupId>org.apache.isis.core</groupId>
-                <artifactId>isis-core-applib-legacy</artifactId>
-                <version>${revision}</version>
-                <type>jar</type>
-                <scope>compile</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.isis.core</groupId>
-                <artifactId>isis-core-applib-legacy</artifactId>
-                <version>${revision}</version>
-                <type>test-jar</type>
-                <scope>test</scope>
-            </dependency>
-            
             <!-- provides @Nullable -->
             <dependency>
                 <groupId>com.google.code.findbugs</groupId>
@@ -1275,22 +1259,6 @@ ${license.additional-notes}
                 <scope>test</scope>
             </dependency>
             
-            <!-- metamodel legacy -->
-            <dependency>
-                <groupId>org.apache.isis.core</groupId>
-                <artifactId>isis-core-metamodel-legacy</artifactId>
-                <version>${revision}</version>
-                <type>jar</type>
-                <scope>compile</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.isis.core</groupId>
-                <artifactId>isis-core-metamodel-legacy</artifactId>
-                <version>${revision}</version>
-                <type>test-jar</type>
-                <scope>test</scope>
-            </dependency>
-
             <!-- runtime -->
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
@@ -1305,34 +1273,6 @@ ${license.additional-notes}
                 <scope>test</scope>
             </dependency>
             
-            <!-- runtime legacy -->
-            <dependency>
-                <groupId>org.apache.isis.core</groupId>
-                <artifactId>isis-core-runtime-legacy</artifactId>
-                <version>${revision}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.isis.core</groupId>
-                <artifactId>isis-core-runtime-legacy</artifactId>
-                <version>${revision}</version>
-                <type>test-jar</type>
-                <scope>test</scope>
-            </dependency>
-            
-            <!-- wrapper -->
-            <dependency>
-                <groupId>org.apache.isis.core</groupId>
-                <artifactId>isis-core-wrapper</artifactId>
-                <version>${isis.version}</version>
-            </dependency>
-			<dependency>
-                <groupId>org.apache.isis.core</groupId>
-                <artifactId>isis-core-wrapper</artifactId>
-                <version>${revision}</version>
-                <type>test-jar</type>
-                <scope>test</scope>
-            </dependency>
-
             <!-- webserver -->
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
diff --git a/core/specsupport/pom.xml b/core/specsupport/pom.xml
index 0fc2608..d7a7771 100644
--- a/core/specsupport/pom.xml
+++ b/core/specsupport/pom.xml
@@ -34,13 +34,10 @@
 
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-core-applib</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-core-wrapper</artifactId>
+            <artifactId>isis-core-runtime</artifactId>
         </dependency>
 
+
         <!-- JUPITER -->
         <dependency>
             <!-- JUnit API for writing tests and extensions -->
diff --git a/example/application/simpleapp/application/pom.xml b/example/application/simpleapp/application/pom.xml
index 164f0c5..3a58e4f 100644
--- a/example/application/simpleapp/application/pom.xml
+++ b/example/application/simpleapp/application/pom.xml
@@ -103,11 +103,6 @@
             <artifactId>simpleapp-module-simple</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-core-wrapper</artifactId>
-        </dependency>
-
         <!-- test -->
         <dependency>
             <groupId>${project.groupId}</groupId>
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/pom.xml
index 040a36f..8fe71e6 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/pom.xml
@@ -98,11 +98,6 @@
             <artifactId>${rootArtifactId}-module-simple</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-core-wrapper</artifactId>
-        </dependency>
-
         <!-- test -->
         <dependency>
             <groupId>${project.groupId}</groupId>