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 2019/01/29 07:48:16 UTC

[isis] branch 2033-IoC updated: ISIS-2033: simpleapp: adds new module 'module-spring'

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

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


The following commit(s) were added to refs/heads/2033-IoC by this push:
     new 6000cae  ISIS-2033: simpleapp: adds new module 'module-spring'
6000cae is described below

commit 6000cae3012fcf869918789d1de1a38ba456b676
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Jan 29 08:48:09 2019 +0100

    ISIS-2033: simpleapp: adds new module 'module-spring'
    
    Task-Url: https://issues.apache.org/jira/browse/ISIS-2033
---
 example/application/simpleapp/module-simple/pom.xml               | 2 +-
 example/application/simpleapp/module-spring/.gitignore            | 8 ++++++++
 .../simpleapp/{module-simple => module-spring}/pom.xml            | 6 +++---
 example/application/simpleapp/pom.xml                             | 1 +
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/example/application/simpleapp/module-simple/pom.xml b/example/application/simpleapp/module-simple/pom.xml
index 1a34da1..018248c 100644
--- a/example/application/simpleapp/module-simple/pom.xml
+++ b/example/application/simpleapp/module-simple/pom.xml
@@ -148,7 +148,7 @@
 
     	<dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-core-plugins-jaxrs-resteasy-3</artifactId>
+            <artifactId>isis-core-plugins-jaxrs-resteasy-4</artifactId>
         </dependency>
 
         <!-- TESTS -->
diff --git a/example/application/simpleapp/module-spring/.gitignore b/example/application/simpleapp/module-spring/.gitignore
new file mode 100644
index 0000000..85cb54f
--- /dev/null
+++ b/example/application/simpleapp/module-spring/.gitignore
@@ -0,0 +1,8 @@
+.gradle
+translations.pot
+*.jar
+gradle/wrapper
+!gradle-wrapper.jar
+/.apt_generated/
+/.factorypath
+/.apt_generated_tests/
diff --git a/example/application/simpleapp/module-simple/pom.xml b/example/application/simpleapp/module-spring/pom.xml
similarity index 97%
copy from example/application/simpleapp/module-simple/pom.xml
copy to example/application/simpleapp/module-spring/pom.xml
index 1a34da1..03034a9 100644
--- a/example/application/simpleapp/module-simple/pom.xml
+++ b/example/application/simpleapp/module-spring/pom.xml
@@ -26,8 +26,8 @@
         <version>${revision}</version>
     </parent>
 
-    <artifactId>simpleapp-module-simple</artifactId>
-    <name>Apache Isis App - SimpleApp Simple Module</name>
+    <artifactId>simpleapp-module-spring</artifactId>
+    <name>Apache Isis App - SimpleApp Spring (Data) Module</name>
 
     <properties>
         <isis-maven-plugin.validate.appManifest>
@@ -148,7 +148,7 @@
 
     	<dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-core-plugins-jaxrs-resteasy-3</artifactId>
+            <artifactId>isis-core-plugins-jaxrs-resteasy-4</artifactId>
         </dependency>
 
         <!-- TESTS -->
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index 632dc40..f7f439b 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -177,6 +177,7 @@
         <module>module-simple</module>
         <module>application</module>
         <module>webapp</module>
+        <module>module-spring</module>
     </modules>
 
     <profiles>