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 2016/01/02 17:32:38 UTC
[2/4] isis git commit: ISIS-1287: fixing dependency on jetty-all,
to use uber jar
ISIS-1287: fixing dependency on jetty-all, to use uber jar
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/282ae0ef
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/282ae0ef
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/282ae0ef
Branch: refs/heads/master
Commit: 282ae0efd82e1161ef709c94c756b01c56048b69
Parents: ab0dc9a
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat Jan 2 08:16:48 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat Jan 2 08:16:48 2016 +0000
----------------------------------------------------------------------
core/pom.xml | 15 ++++++++++++---
core/webserver/pom.xml | 1 +
2 files changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/282ae0ef/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index e28435f..bf15417 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -120,7 +120,7 @@
<log4jdbc-remix.version>0.2.7</log4jdbc-remix.version>
<resteasy-jaxrs.version>3.0.11.Final</resteasy-jaxrs.version>
- <jetty.version>9.2.11.v20150529</jetty.version>
+ <jetty.version>9.3.6.v20151106</jetty.version>
<wicket.version>6.20.0</wicket.version>
<wicketstuff.version>6.20.0</wicketstuff.version>
@@ -333,6 +333,14 @@
<repositories>
<repository>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <id>central</id>
+ <name>Central Repository</name>
+ <url>https://repo.maven.apache.org/maven2</url>
+ </repository>
+ <repository>
<id>Apache Repository</id>
<url>https://repository.apache.org/</url>
<snapshots>
@@ -858,8 +866,8 @@
<!-- Runtime: jetty -->
<plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
<version>${jetty.version}</version>
<configuration>
<webAppConfig>
@@ -1741,6 +1749,7 @@ ${license.additional-notes}
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all</artifactId>
<version>${jetty.version}</version>
+ <classifier>uber</classifier>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty.orbit</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/282ae0ef/core/webserver/pom.xml
----------------------------------------------------------------------
diff --git a/core/webserver/pom.xml b/core/webserver/pom.xml
index 4f222fe..206c0d1 100644
--- a/core/webserver/pom.xml
+++ b/core/webserver/pom.xml
@@ -37,6 +37,7 @@
<dependency>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all</artifactId>
+ <classifier>uber</classifier>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>