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 2015/08/14 13:25:58 UTC

[4/4] isis git commit: ISIS-1052: recreating simpleapp archetype

ISIS-1052: recreating simpleapp archetype


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

Branch: refs/heads/master
Commit: db8bad6c839575e85aadcc92bc5688cb2049153c
Parents: 8f46150
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Aug 14 12:25:14 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Aug 14 12:25:14 2015 +0100

----------------------------------------------------------------------
 .../simpleapp/src/main/resources/archetype-resources/pom.xml   | 6 +++---
 .../src/main/resources/archetype-resources/webapp/pom.xml      | 5 ++---
 .../src/test/resources/projects/basic/archetype.properties     | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/db8bad6c/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
index 7b122fc..8d93813 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
@@ -182,9 +182,9 @@
                 </plugin>
 
                 <plugin>
-                    <groupId>org.mortbay.jetty</groupId>
-                    <artifactId>maven-jetty-plugin</artifactId>
-                    <version>6.1.26</version>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-maven-plugin</artifactId>
+                    <version>9.3.2.v20150730</version>
                 </plugin>
 
                 <plugin>

http://git-wip-us.apache.org/repos/asf/isis/blob/db8bad6c/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml
index b265693..93a332c 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml
@@ -39,8 +39,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>maven-jetty-plugin</artifactId>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-maven-plugin</artifactId>
             </plugin>
 
             <!-- mvn package -->
@@ -167,7 +167,6 @@
             <optional>true</optional>
         </dependency>
 
-
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_3.0_spec</artifactId>

http://git-wip-us.apache.org/repos/asf/isis/blob/db8bad6c/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
index 91afb8b..72c89da 100644
--- a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
+++ b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
@@ -1,4 +1,4 @@
-#Tue Aug 11 23:02:09 BST 2015
+#Fri Aug 14 12:25:04 BST 2015
 package=it.pkg
 version=0.1-SNAPSHOT
 groupId=archetype.it