You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2014/06/24 16:16:30 UTC
[1/2] git commit: bump maven-war-plugin version (old version was fine
here but new version needed in downstream projects), along with the parameter
which fixes the second copy overwriting the files changed by the replacer
plugin (for war plugin v 2.1+);
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master 5ac32d3e6 -> 32e80df61
bump maven-war-plugin version (old version was fine here but new version needed in downstream projects),
along with the parameter which fixes the second copy overwriting the files changed by the replacer plugin (for war plugin v 2.1+);
confirmed the resulting WAR is identical apart from the pom changes
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/1211af21
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/1211af21
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/1211af21
Branch: refs/heads/master
Commit: 1211af21256036a8d455417c5171a581c29110ed
Parents: f598857
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Jun 18 11:42:38 2014 -0700
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Jun 18 11:42:38 2014 -0700
----------------------------------------------------------------------
usage/jsgui/pom.xml | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1211af21/usage/jsgui/pom.xml
----------------------------------------------------------------------
diff --git a/usage/jsgui/pom.xml b/usage/jsgui/pom.xml
index f5e6422..0d8a688 100644
--- a/usage/jsgui/pom.xml
+++ b/usage/jsgui/pom.xml
@@ -28,8 +28,7 @@
-->
<requirejs-maven-plugin.version>2.0.0</requirejs-maven-plugin.version>
- <!-- The maven-war-plugin 2.1+ and the replacer plugin don't work well together. -->
- <maven-war-plugin.version>2.0.2</maven-war-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>
@@ -162,6 +161,14 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>${maven-war-plugin.version}</version>
+ <configuration>
+ <useCache>true</useCache> <!-- to prevent replaced files being overwritten -->
+ </configuration>
+ </plugin>
</plugins>
</build>
[2/2] git commit: This closes #11
Posted by al...@apache.org.
This closes #11
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/32e80df6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/32e80df6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/32e80df6
Branch: refs/heads/master
Commit: 32e80df618a00e509e22535e6752a8740222ba29
Parents: 5ac32d3 1211af2
Author: Aled Sage <al...@gmail.com>
Authored: Tue Jun 24 15:14:22 2014 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Jun 24 15:14:22 2014 +0100
----------------------------------------------------------------------
usage/jsgui/pom.xml | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------