You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by an...@apache.org on 2014/07/09 11:53:52 UTC
[07/10] git commit: Fix interior version conflicts - maven-war-plugin
Fix interior version conflicts - maven-war-plugin
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/b0a5d2ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/b0a5d2ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/b0a5d2ca
Branch: refs/heads/master
Commit: b0a5d2ca67401b87f6ca393e5da4c223a2f5fdd3
Parents: 342a00d
Author: Richard Downer <ri...@apache.org>
Authored: Mon Jul 7 15:14:49 2014 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Mon Jul 7 15:14:49 2014 +0100
----------------------------------------------------------------------
pom.xml | 1 +
usage/camp/pom.xml | 2 +-
usage/jsgui/pom.xml | 1 -
usage/rest-server/pom.xml | 2 +-
4 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b0a5d2ca/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 35d7bce..2c63f54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,6 +127,7 @@
<commons-compress.version>1.4</commons-compress.version>
<qpid.version>0.20</qpid.version>
<mongodb.version>2.11.4</mongodb.version>
+ <maven-war-plugin.version>2.4</maven-war-plugin.version>
<includedTestGroups />
<excludedTestGroups>Integration,Acceptance,Live,WIP</excludedTestGroups>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b0a5d2ca/usage/camp/pom.xml
----------------------------------------------------------------------
diff --git a/usage/camp/pom.xml b/usage/camp/pom.xml
index f529283..14fa737 100644
--- a/usage/camp/pom.xml
+++ b/usage/camp/pom.xml
@@ -86,7 +86,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.2</version>
+ <version>${maven-war-plugin.version}</version>
<executions>
<execution>
<id>make-skinny-war</id>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b0a5d2ca/usage/jsgui/pom.xml
----------------------------------------------------------------------
diff --git a/usage/jsgui/pom.xml b/usage/jsgui/pom.xml
index 0d8a688..b750a50 100644
--- a/usage/jsgui/pom.xml
+++ b/usage/jsgui/pom.xml
@@ -28,7 +28,6 @@
-->
<requirejs-maven-plugin.version>2.0.0</requirejs-maven-plugin.version>
- <maven-war-plugin.version>2.4</maven-war-plugin.version>
<maven-antrun-plugin.version>1.7</maven-antrun-plugin.version>
<project.build.webapp>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b0a5d2ca/usage/rest-server/pom.xml
----------------------------------------------------------------------
diff --git a/usage/rest-server/pom.xml b/usage/rest-server/pom.xml
index a702dec..331faaf 100644
--- a/usage/rest-server/pom.xml
+++ b/usage/rest-server/pom.xml
@@ -149,7 +149,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.2</version>
+ <version>${maven-war-plugin.version}</version>
<executions>
<execution>
<id>make-skinny-war</id>