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:56 UTC
[2/4] isis git commit: ISIS-1052: upgrading simpleapp to use
jetty-maven-plugin ...
ISIS-1052: upgrading simpleapp to use jetty-maven-plugin ...
... rather than the abandoned maven-jetty-plugin
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c2e7852e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c2e7852e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c2e7852e
Branch: refs/heads/master
Commit: c2e7852e0588b8895867ef723fbf4b32a5821d06
Parents: 5660414
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Aug 14 12:02:06 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Aug 14 12:02:06 2015 +0100
----------------------------------------------------------------------
example/application/simpleapp/pom.xml | 6 +++---
example/application/simpleapp/webapp/pom.xml | 5 ++---
2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/c2e7852e/example/application/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index 16cead4..b6da9a8 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -186,9 +186,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/c2e7852e/example/application/simpleapp/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/pom.xml b/example/application/simpleapp/webapp/pom.xml
index 4826684..6cfb656 100644
--- a/example/application/simpleapp/webapp/pom.xml
+++ b/example/application/simpleapp/webapp/pom.xml
@@ -40,8 +40,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 -->
@@ -176,7 +176,6 @@
<optional>true</optional>
</dependency>
-
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_3.0_spec</artifactId>