You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/10/21 13:26:27 UTC
git commit: #TOMEE-1423 - Prevent duplicate jars
Repository: tomee
Updated Branches:
refs/heads/develop a2a4d9247 -> c53f36662
#TOMEE-1423 - Prevent duplicate jars
Using SNAPSHOT rather than timestamp
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/c53f3666
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/c53f3666
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/c53f3666
Branch: refs/heads/develop
Commit: c53f366620ee9ff387388ef1f6395fe2f97dc03e
Parents: a2a4d92
Author: AndyGee <an...@gmx.de>
Authored: Tue Oct 21 13:25:57 2014 +0200
Committer: AndyGee <an...@gmx.de>
Committed: Tue Oct 21 13:25:57 2014 +0200
----------------------------------------------------------------------
.../org/apache/tomee/webaccess/test/units/ScriptingTest.groovy | 4 ++--
tomee/tomee-webapp/pom.xml | 1 -
tomee/tomee-webapp/src/main/assembly/war.xml | 1 +
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/c53f3666/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/ScriptingTest.groovy
----------------------------------------------------------------------
diff --git a/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/ScriptingTest.groovy b/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/ScriptingTest.groovy
index 18070cd..2a737b6 100644
--- a/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/ScriptingTest.groovy
+++ b/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/ScriptingTest.groovy
@@ -64,8 +64,8 @@ class ScriptingTest {
)
)
Assert.assertEquals(
- 'Hi there!',
- json.output as String
+ 'Hi there!'.trim(),
+ (json.output as String).trim()
)
def result = Utilities.post(deploymentURL, client, 'rest/scripting',
new BasicNameValuePair('engine', 'js'),
http://git-wip-us.apache.org/repos/asf/tomee/blob/c53f3666/tomee/tomee-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-webapp/pom.xml b/tomee/tomee-webapp/pom.xml
index 83292ff..038f6fb 100644
--- a/tomee/tomee-webapp/pom.xml
+++ b/tomee/tomee-webapp/pom.xml
@@ -39,7 +39,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
<executions>
<execution>
<id>unpack</id>
http://git-wip-us.apache.org/repos/asf/tomee/blob/c53f3666/tomee/tomee-webapp/src/main/assembly/war.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-webapp/src/main/assembly/war.xml b/tomee/tomee-webapp/src/main/assembly/war.xml
index ce93ce0..314d6b7 100644
--- a/tomee/tomee-webapp/src/main/assembly/war.xml
+++ b/tomee/tomee-webapp/src/main/assembly/war.xml
@@ -81,6 +81,7 @@
<dependencySets>
<dependencySet>
<outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}.${artifact.extension}</outputFileNameMapping>
<scope>runtime</scope>
<excludes>
<exclude>*:pom</exclude>