You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sj...@apache.org on 2015/11/23 23:55:52 UTC
[1/2] incubator-brooklyn git commit: BROOKLYN-197 Add jetty-schemas
to launcher deps
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master 4ebe7379b -> 3f44d56a0
BROOKLYN-197 Add jetty-schemas to launcher deps
Without this, Jetty will try to download XML schemas for the documents
it processes. This means that Brooklyn requires a working connection to
the public Internet. With this dependency, Jetty can discover the
schemas it requires without an Internet connection.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/dc0a6429
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/dc0a6429
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/dc0a6429
Branch: refs/heads/master
Commit: dc0a642927c06726259baa9fada07bb4dbdcf0fa
Parents: 4ebe737
Author: Richard Downer <ri...@apache.org>
Authored: Mon Nov 23 21:33:27 2015 +0000
Committer: Richard Downer <ri...@apache.org>
Committed: Mon Nov 23 21:33:27 2015 +0000
----------------------------------------------------------------------
parent/pom.xml | 5 +++++
pom.xml | 1 +
usage/launcher/pom.xml | 4 ++++
3 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/dc0a6429/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 4cd0f06..b126418 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -168,6 +168,11 @@
<version>${jetty.version}</version>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-schemas</artifactId>
+ <version>${jetty-schemas.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<version>${jackson.version}</version>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/dc0a6429/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 26898e4..09ded9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,6 +121,7 @@
<felix.framework.version>4.4.0</felix.framework.version>
<reflections.version>0.9.9-RC1</reflections.version>
<jetty.version>9.2.13.v20150730</jetty.version>
+ <jetty-schemas.version>3.1.M0</jetty-schemas.version>
<airline.version>0.6</airline.version>
<mockwebserver.version>20121111</mockwebserver.version>
<freemarker.version>2.3.22</freemarker.version>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/dc0a6429/usage/launcher/pom.xml
----------------------------------------------------------------------
diff --git a/usage/launcher/pom.xml b/usage/launcher/pom.xml
index 1c63f21..b5045e7 100644
--- a/usage/launcher/pom.xml
+++ b/usage/launcher/pom.xml
@@ -117,6 +117,10 @@
<artifactId>jetty-webapp</artifactId>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-schemas</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
[2/2] incubator-brooklyn git commit: This closes #1056
Posted by sj...@apache.org.
This closes #1056
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/3f44d56a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/3f44d56a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/3f44d56a
Branch: refs/heads/master
Commit: 3f44d56a0bbaf7ec64d993894f839fbe639a263d
Parents: 4ebe737 dc0a642
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Mon Nov 23 22:54:55 2015 +0000
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Mon Nov 23 22:54:55 2015 +0000
----------------------------------------------------------------------
parent/pom.xml | 5 +++++
pom.xml | 1 +
usage/launcher/pom.xml | 4 ++++
3 files changed, 10 insertions(+)
----------------------------------------------------------------------