Author: hboutemy
Date: Fri Oct 6 00:21:33 2017
New Revision: 1811279
URL: http://svn.apache.org/viewvc?rev=1811279&view=rev
Log:
[MEAR-171] fixed IT
Modified:
maven/plugins/trunk/maven-ear-plugin/pom.xml
maven/plugins/trunk/maven-ear-plugin/src/it/settings.xml
maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/verify.bsh
Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/pom.xml?rev=1811279&r1=1811278&r2=1811279&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/pom.xml Fri Oct 6 00:21:33 2017
@@ -252,8 +252,6 @@
<configuration>
<!-- NOTE: Must be synced with the repo path used by
AbstractEarPluginIT -->
<localRepositoryPath>${localRepositoryPath}</localRepositoryPath>
- <settingsFile>src/it/settings.xml</settingsFile>
- <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
<goals>
<goal>clean</goal>
<goal>package</goal>
Modified: maven/plugins/trunk/maven-ear-plugin/src/it/settings.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/it/settings.xml?rev=1811279&r1=1811278&r2=1811279&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/it/settings.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/it/settings.xml Fri Oct 6
00:21:33 2017
@@ -37,6 +37,16 @@ under the License.
<enabled>true</enabled>
</snapshots>
</repository>
+ <repository>
+ <id>local.snapshot</id>
+ <url>file://@localSnapshotRepositoryPath@</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
</repositories>
<pluginRepositories>
<pluginRepository>
Modified:
maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/verify.bsh?rev=1811279&r1=1811278&r2=1811279&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/verify.bsh
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/verify.bsh
Fri Oct 6 00:21:33 2017
@@ -46,9 +46,10 @@ for ( String included : includedEntries
Manifest manifest = jar.getManifest();
String manifestClassPath = manifest.getMainAttributes().getValue("Class-Path");
-if ( !manifestClassPath.equals("commons-lang-2.5.jar
jar-sample-one-1.0-SNAPSHOT.jar") )
+System.out.println( "manifestClassPath: " + manifestClassPath );
+if ( !manifestClassPath.equals("commons-lang-commons-lang-2.5.jar
eartest-jar-sample-one-1.0-20150825.210557-91.jar") )
{
- throw new IllegalStateException( "Missing entry in war MANIFEST.MF:
commons-lang-2.5.jar jar-sample-one-1.0-SNAPSHOT.jar");
+ throw new IllegalStateException( "Missing entry in war MANIFEST.MF:
commons-lang-commons-lang-2.5.jar
eartest-jar-sample-one-1.0-20150825.210557-91.jar");
}
String[] excludedEntries = {
