You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2022/10/09 09:17:55 UTC
[maven-ear-plugin] branch master updated: [MEAR-304] Update dependencies used in IT tests
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-ear-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 39b8e0f [MEAR-304] Update dependencies used in IT tests
39b8e0f is described below
commit 39b8e0ffe3aecbcb2b82d91454a3a90ca5694f9c
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Sat Oct 8 14:31:06 2022 +0200
[MEAR-304] Update dependencies used in IT tests
---
pom.xml | 21 ++++++++++++++++-----
.../ear-module/pom.xml | 2 +-
src/it/MEAR-243-skinny-wars-provided/verify.bsh | 10 +++++-----
.../war-module-one/pom.xml | 2 +-
.../war-module-two/pom.xml | 2 +-
.../filenamemapping-usage-fail/ear-module/pom.xml | 2 +-
.../filenamemapping-usage-fail/war-module/pom.xml | 2 +-
src/it/non-skinny-wars/ear-module/pom.xml | 2 +-
src/it/non-skinny-wars/verify.bsh | 4 ++--
src/it/non-skinny-wars/war-module/pom.xml | 2 +-
src/it/packaging-excludes/pom.xml | 2 +-
src/it/packaging-excludes/verify.bsh | 2 +-
src/it/packaging-includes/pom.xml | 4 ++--
src/it/packaging-includes/verify.bsh | 4 ++--
.../ear-module/pom.xml | 2 +-
src/it/skinny-wars-filenamemapping-full/verify.bsh | 8 ++++----
.../war-module/pom.xml | 2 +-
.../ear-module/pom.xml | 2 +-
.../verify.bsh | 4 ++--
.../war-module/pom.xml | 2 +-
src/it/skinny-wars-javaee5/verify.bsh | 4 ++--
src/it/skinny-wars-javaee5/war-module3/pom.xml | 2 +-
src/it/skinny-wars-timestamp/ear-module/pom.xml | 2 +-
src/it/skinny-wars-timestamp/verify.bsh | 14 +++++++-------
src/it/skinny-wars-timestamp/war-module-one/pom.xml | 2 +-
src/it/skinny-wars/ear-module/pom.xml | 2 +-
src/it/skinny-wars/verify.bsh | 8 ++++----
src/it/skinny-wars/war-module/pom.xml | 2 +-
src/test/resources/projects/project-092/pom.xml | 2 +-
29 files changed, 65 insertions(+), 54 deletions(-)
diff --git a/pom.xml b/pom.xml
index d443482..8b73283 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,12 +84,16 @@
<mavenFilteringVersion>3.3.0</mavenFilteringVersion>
<mavenVersion>3.2.5</mavenVersion>
<javaVersion>8</javaVersion>
- <mavenWarPluginVersion>3.3.1</mavenWarPluginVersion>
- <mavenCompilerPluginVersion>2.5.1</mavenCompilerPluginVersion>
- <mavenEjbPluginVersion>3.1.0</mavenEjbPluginVersion>
+
+ <!-- plugins used in IT tests -->
+ <mavenWarPluginVersion>3.3.2</mavenWarPluginVersion>
+ <mavenCompilerPluginVersion>3.10.1</mavenCompilerPluginVersion>
+ <mavenEjbPluginVersion>3.2.1</mavenEjbPluginVersion>
+ <!-- m-rar-p from version 3.0.0 require Maven 3.3.9 -->
<mavenRarPluginVersion>2.4</mavenRarPluginVersion>
- <mavenJarPluginVersion>3.2.0</mavenJarPluginVersion>
+ <mavenJarPluginVersion>3.3.0</mavenJarPluginVersion>
<jbossPackagingPluginVersion>2.2</jbossPackagingPluginVersion>
+
<invoker.skip>false</invoker.skip>
<invoker.install.skip>${invoker.skip}</invoker.install.skip>
<invoker.it.skip>${invoker.skip}</invoker.it.skip>
@@ -171,7 +175,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.6</version>
+ <version>2.11.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -332,6 +336,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-common-artifact-filters</artifactId>
+ <version>3.3.2</version>
+ </dependency>
+ </dependencies>
<configuration>
<showDeprecation>true</showDeprecation>
<release>${javaVersion}</release>
diff --git a/src/it/MEAR-243-skinny-wars-provided/ear-module/pom.xml b/src/it/MEAR-243-skinny-wars-provided/ear-module/pom.xml
index cbf39cf..2c9e079 100644
--- a/src/it/MEAR-243-skinny-wars-provided/ear-module/pom.xml
+++ b/src/it/MEAR-243-skinny-wars-provided/ear-module/pom.xml
@@ -31,7 +31,7 @@ under the License.
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/src/it/MEAR-243-skinny-wars-provided/verify.bsh b/src/it/MEAR-243-skinny-wars-provided/verify.bsh
index 6e7b874..36e40ef 100644
--- a/src/it/MEAR-243-skinny-wars-provided/verify.bsh
+++ b/src/it/MEAR-243-skinny-wars-provided/verify.bsh
@@ -95,13 +95,13 @@ assertJar( String fileName, String[] includedEntries, String[] excludedEntries,
String[] includedEntries = {
"WEB-INF/web.xml",
"META-INF/MANIFEST.MF",
- "WEB-INF/lib/commons-lang-2.5.jar"
+ "WEB-INF/lib/commons-lang-2.6.jar"
};
assertJar( "war-module-one/target/war-module-one-1.0.war", includedEntries, null, false, null );
String[] expectedClassPathElements = {
- "commons-lang-2.5.jar"
+ "commons-lang-2.6.jar"
};
assertJar( "war-module-two/target/war-module-two-1.0.war", includedEntries, null, true, expectedClassPathElements );
@@ -112,7 +112,7 @@ String[] includedEntries = {
};
String[] excludedEntries = {
- "WEB-INF/lib/commons-lang-2.5.jar"
+ "WEB-INF/lib/commons-lang-2.6.jar"
};
String[] expectedClassPathElements = {};
@@ -124,8 +124,8 @@ assertJar( "ear-module/target/ear-module-1.0/org.apache.maven.its.ear.skinnywars
includedEntries, excludedEntries, true, expectedClassPathElements );
String[] excludedEntries = {
- "commons-lang-2.5.jar",
- "lib/commons-lang-2.5.jar",
+ "commons-lang-2.6.jar",
+ "lib/commons-lang-2.6.jar",
};
assertJar( "ear-module/target/ear-module-1.0.ear", null, excludedEntries, false, null );
diff --git a/src/it/MEAR-243-skinny-wars-provided/war-module-one/pom.xml b/src/it/MEAR-243-skinny-wars-provided/war-module-one/pom.xml
index 1bb48a4..6062c8c 100644
--- a/src/it/MEAR-243-skinny-wars-provided/war-module-one/pom.xml
+++ b/src/it/MEAR-243-skinny-wars-provided/war-module-one/pom.xml
@@ -31,7 +31,7 @@ under the License.
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</dependency>
</dependencies>
diff --git a/src/it/MEAR-243-skinny-wars-provided/war-module-two/pom.xml b/src/it/MEAR-243-skinny-wars-provided/war-module-two/pom.xml
index 1c232d8..e2d0d68 100644
--- a/src/it/MEAR-243-skinny-wars-provided/war-module-two/pom.xml
+++ b/src/it/MEAR-243-skinny-wars-provided/war-module-two/pom.xml
@@ -31,7 +31,7 @@ under the License.
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</dependency>
</dependencies>
diff --git a/src/it/filenamemapping-usage-fail/ear-module/pom.xml b/src/it/filenamemapping-usage-fail/ear-module/pom.xml
index 0cfc8c5..4186391 100644
--- a/src/it/filenamemapping-usage-fail/ear-module/pom.xml
+++ b/src/it/filenamemapping-usage-fail/ear-module/pom.xml
@@ -31,7 +31,7 @@ under the License.
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.ear.skinnywars</groupId>
diff --git a/src/it/filenamemapping-usage-fail/war-module/pom.xml b/src/it/filenamemapping-usage-fail/war-module/pom.xml
index 9604026..eeac7cd 100644
--- a/src/it/filenamemapping-usage-fail/war-module/pom.xml
+++ b/src/it/filenamemapping-usage-fail/war-module/pom.xml
@@ -31,7 +31,7 @@ under the License.
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</dependency>
</dependencies>
diff --git a/src/it/non-skinny-wars/ear-module/pom.xml b/src/it/non-skinny-wars/ear-module/pom.xml
index 420d8bf..d626370 100644
--- a/src/it/non-skinny-wars/ear-module/pom.xml
+++ b/src/it/non-skinny-wars/ear-module/pom.xml
@@ -31,7 +31,7 @@ under the License.
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.ear.nonskinnywars</groupId>
diff --git a/src/it/non-skinny-wars/verify.bsh b/src/it/non-skinny-wars/verify.bsh
index 7aef070..bc1cc33 100644
--- a/src/it/non-skinny-wars/verify.bsh
+++ b/src/it/non-skinny-wars/verify.bsh
@@ -34,7 +34,7 @@ JarFile jar = new JarFile( jarFile );
String[] includedEntries = {
"WEB-INF/web.xml",
"META-INF/MANIFEST.MF",
- "WEB-INF/lib/commons-lang-2.5.jar"
+ "WEB-INF/lib/commons-lang-2.6.jar"
};
for ( String included : includedEntries )
{
@@ -60,7 +60,7 @@ JarFile jar = new JarFile( jarFile );
String[] includedEntries = {
"WEB-INF/web.xml",
"META-INF/MANIFEST.MF",
- "WEB-INF/lib/commons-lang-2.5.jar"
+ "WEB-INF/lib/commons-lang-2.6.jar"
};
for ( String included : includedEntries )
{
diff --git a/src/it/non-skinny-wars/war-module/pom.xml b/src/it/non-skinny-wars/war-module/pom.xml
index 58254c1..a45ab36 100644
--- a/src/it/non-skinny-wars/war-module/pom.xml
+++ b/src/it/non-skinny-wars/war-module/pom.xml
@@ -31,7 +31,7 @@ under the License.
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</dependency>
</dependencies>
diff --git a/src/it/packaging-excludes/pom.xml b/src/it/packaging-excludes/pom.xml
index 8f7419e..f68fa33 100644
--- a/src/it/packaging-excludes/pom.xml
+++ b/src/it/packaging-excludes/pom.xml
@@ -34,7 +34,7 @@ under the License.
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</dependency>
</dependencies>
diff --git a/src/it/packaging-excludes/verify.bsh b/src/it/packaging-excludes/verify.bsh
index 3efbc16..9412896 100644
--- a/src/it/packaging-excludes/verify.bsh
+++ b/src/it/packaging-excludes/verify.bsh
@@ -45,7 +45,7 @@ for ( String included : includedEntries )
}
String[] excludedEntries = {
- "commons-lang-2.5.jar"
+ "commons-lang-2.6.jar"
};
for ( String excluded : excludedEntries )
{
diff --git a/src/it/packaging-includes/pom.xml b/src/it/packaging-includes/pom.xml
index c37ae70..8e8cf00 100644
--- a/src/it/packaging-includes/pom.xml
+++ b/src/it/packaging-includes/pom.xml
@@ -34,12 +34,12 @@ under the License.
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.4</version>
+ <version>2.11.0</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</dependency>
</dependencies>
diff --git a/src/it/packaging-includes/verify.bsh b/src/it/packaging-includes/verify.bsh
index f8e2415..5df992a 100644
--- a/src/it/packaging-includes/verify.bsh
+++ b/src/it/packaging-includes/verify.bsh
@@ -32,7 +32,7 @@ if ( !jarFile.isFile() )
JarFile jar = new JarFile( jarFile );
String[] includedEntries = {
- "commons-lang-commons-lang-2.5.jar",
+ "commons-lang-commons-lang-2.6.jar",
"META-INF/application.xml",
"META-INF/MANIFEST.MF"
};
@@ -46,7 +46,7 @@ for ( String included : includedEntries )
}
String[] excludedEntries = {
- "commons-io-1.4.jar"
+ "commons-io-2.11.0.jar"
};
for ( String excluded : excludedEntries )
{
diff --git a/src/it/skinny-wars-filenamemapping-full/ear-module/pom.xml b/src/it/skinny-wars-filenamemapping-full/ear-module/pom.xml
index 03d7598..b562ad8 100644
--- a/src/it/skinny-wars-filenamemapping-full/ear-module/pom.xml
+++ b/src/it/skinny-wars-filenamemapping-full/ear-module/pom.xml
@@ -31,7 +31,7 @@ under the License.
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.ear.skinnywars</groupId>
diff --git a/src/it/skinny-wars-filenamemapping-full/verify.bsh b/src/it/skinny-wars-filenamemapping-full/verify.bsh
index 40e1278..a360881 100644
--- a/src/it/skinny-wars-filenamemapping-full/verify.bsh
+++ b/src/it/skinny-wars-filenamemapping-full/verify.bsh
@@ -46,13 +46,13 @@ for ( String included : includedEntries )
Manifest manifest = jar.getManifest();
String manifestClassPath = manifest.getMainAttributes().getValue("Class-Path");
-if ( !manifestClassPath.equals("lib/commons-lang-commons-lang-2.5.jar") )
+if ( !manifestClassPath.equals("lib/commons-lang-commons-lang-2.6.jar") )
{
- throw new IllegalStateException( "Missing entry in war MANIFEST.MF: lib/commons-lang-commons-lang-2.5.jar");
+ throw new IllegalStateException( "Missing entry in war MANIFEST.MF: lib/commons-lang-commons-lang-2.6.jar");
}
String[] excludedEntries = {
- "WEB-INF/lib/commons-lang-commons-lang-2.5.jar"
+ "WEB-INF/lib/commons-lang-commons-lang-2.6.jar"
};
for ( String excluded : excludedEntries )
{
@@ -78,7 +78,7 @@ JarFile jar = new JarFile( jarFile );
String[] includedEntries = {
"WEB-INF/web.xml",
"META-INF/MANIFEST.MF",
- "WEB-INF/lib/commons-lang-2.5.jar"
+ "WEB-INF/lib/commons-lang-2.6.jar"
};
for ( String included : includedEntries )
{
diff --git a/src/it/skinny-wars-filenamemapping-full/war-module/pom.xml b/src/it/skinny-wars-filenamemapping-full/war-module/pom.xml
index 9604026..eeac7cd 100644
--- a/src/it/skinny-wars-filenamemapping-full/war-module/pom.xml
+++ b/src/it/skinny-wars-filenamemapping-full/war-module/pom.xml
@@ -31,7 +31,7 @@ under the License.
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</dependency>
</dependencies>
diff --git a/src/it/skinny-wars-filenamemapping-no-version/ear-module/pom.xml b/src/it/skinny-wars-filenamemapping-no-version/ear-module/pom.xml
index 474fcf1..de2b779 100644
--- a/src/it/skinny-wars-filenamemapping-no-version/ear-module/pom.xml
+++ b/src/it/skinny-wars-filenamemapping-no-version/ear-module/pom.xml
@@ -31,7 +31,7 @@ under the License.
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.ear.skinnywars</groupId>
diff --git a/src/it/skinny-wars-filenamemapping-no-version/verify.bsh b/src/it/skinny-wars-filenamemapping-no-version/verify.bsh
index 9eec674..98bb3a3 100644
--- a/src/it/skinny-wars-filenamemapping-no-version/verify.bsh
+++ b/src/it/skinny-wars-filenamemapping-no-version/verify.bsh
@@ -52,7 +52,7 @@ if ( !manifestClassPath.equals("lib/commons-lang.jar") )
}
String[] excludedEntries = {
- "WEB-INF/lib/commons-lang-2.5.jar"
+ "WEB-INF/lib/commons-lang-2.6.jar"
};
for ( String excluded : excludedEntries )
{
@@ -78,7 +78,7 @@ JarFile jar = new JarFile( jarFile );
String[] includedEntries = {
"WEB-INF/web.xml",
"META-INF/MANIFEST.MF",
- "WEB-INF/lib/commons-lang-2.5.jar"
+ "WEB-INF/lib/commons-lang-2.6.jar"
};
for ( String included : includedEntries )
{
diff --git a/src/it/skinny-wars-filenamemapping-no-version/war-module/pom.xml b/src/it/skinny-wars-filenamemapping-no-version/war-module/pom.xml
index 9604026..eeac7cd 100644
--- a/src/it/skinny-wars-filenamemapping-no-version/war-module/pom.xml
+++ b/src/it/skinny-wars-filenamemapping-no-version/war-module/pom.xml
@@ -31,7 +31,7 @@ under the License.
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</dependency>
</dependencies>
diff --git a/src/it/skinny-wars-javaee5/verify.bsh b/src/it/skinny-wars-javaee5/verify.bsh
index 45c2419..e3d903b 100644
--- a/src/it/skinny-wars-javaee5/verify.bsh
+++ b/src/it/skinny-wars-javaee5/verify.bsh
@@ -110,7 +110,7 @@ assertJar( "war-module2/target/war-module2-1.0.war", includedEntries, excludedEn
String[] warModule3IncludedEntries = {
"WEB-INF/web.xml",
"META-INF/MANIFEST.MF",
- "WEB-INF/lib/commons-io-2.6.jar"
+ "WEB-INF/lib/commons-io-2.11.0.jar"
};
String[] warModuleExcludedEntries = {
@@ -118,7 +118,7 @@ String[] warModuleExcludedEntries = {
"WEB-INF/lib/commons-collections4-4.2.jar"
};
-String[] warModule3ExpectedClassPathElements = { "commons-io-2.6.jar" };
+String[] warModule3ExpectedClassPathElements = { "commons-io-2.11.0.jar" };
assertJar( "war-module3/target/war-module3-1.0.war", warModule3IncludedEntries, warModuleExcludedEntries, true,
warModule3ExpectedClassPathElements );
diff --git a/src/it/skinny-wars-javaee5/war-module3/pom.xml b/src/it/skinny-wars-javaee5/war-module3/pom.xml
index 71dc670..0ca66e3 100644
--- a/src/it/skinny-wars-javaee5/war-module3/pom.xml
+++ b/src/it/skinny-wars-javaee5/war-module3/pom.xml
@@ -31,7 +31,7 @@ under the License.
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.6</version>
+ <version>2.11.0</version>
</dependency>
</dependencies>
diff --git a/src/it/skinny-wars-timestamp/ear-module/pom.xml b/src/it/skinny-wars-timestamp/ear-module/pom.xml
index f279c71..7f2a9d3 100644
--- a/src/it/skinny-wars-timestamp/ear-module/pom.xml
+++ b/src/it/skinny-wars-timestamp/ear-module/pom.xml
@@ -31,7 +31,7 @@ under the License.
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</dependency>
<dependency>
<groupId>eartest</groupId>
diff --git a/src/it/skinny-wars-timestamp/verify.bsh b/src/it/skinny-wars-timestamp/verify.bsh
index 3b9307d..7db3a81 100644
--- a/src/it/skinny-wars-timestamp/verify.bsh
+++ b/src/it/skinny-wars-timestamp/verify.bsh
@@ -94,34 +94,34 @@ File warOneFile = new File( basedir, "war-module-one/target/war-module-one-1.0.w
assertFileExists( warOneFile );
assertIncludes( warOneFile, new String[] { "WEB-INF/web.xml",
"META-INF/MANIFEST.MF",
- "WEB-INF/lib/commons-lang-2.5.jar",
+ "WEB-INF/lib/commons-lang-2.6.jar",
"WEB-INF/lib/jar-sample-one-1.0-20150825.210557-91.jar" } );
-assertManifestClassPath( warOneFile, "commons-lang-2.5.jar jar-sample-one-1.0-20150825.210557-91.jar" );
+assertManifestClassPath( warOneFile, "commons-lang-2.6.jar jar-sample-one-1.0-20150825.210557-91.jar" );
File warTwoFile = new File( basedir, "war-module-two/target/war-module-two-1.0.war" );
assertFileExists( warTwoFile );
assertIncludes( warTwoFile, new String[] { "WEB-INF/web.xml",
"META-INF/MANIFEST.MF",
"WEB-INF/lib/jar-sample-one-1.0-SNAPSHOT.jar" } );
-assertExcludes( warTwoFile, new String[] { "WEB-INF/lib/commons-lang-2.5.jar" } );
+assertExcludes( warTwoFile, new String[] { "WEB-INF/lib/commons-lang-2.6.jar" } );
assertManifestClassPath( warTwoFile, "jar-sample-one-1.0-SNAPSHOT.jar" );
File warModuleOneFile = new File( basedir, "ear-module/target/ear-module-1.0/org.apache.maven.its.ear.skinnywars-war-module-one-1.0.war" );
assertFileExists( warModuleOneFile );
assertIncludes( warModuleOneFile, new String[] { "WEB-INF/web.xml",
"META-INF/MANIFEST.MF" } );
-assertExcludes( warModuleOneFile, new String[] { "WEB-INF/lib/commons-lang-2.5.jar",
+assertExcludes( warModuleOneFile, new String[] { "WEB-INF/lib/commons-lang-2.6.jar",
"WEB-INF/lib/jar-sample-one-1.0-SNAPSHOT.jar",
"WEB-INF/lib/jar-sample-one-1.0-20150825.210557-91.jar" } );
-assertManifestClassPath( warModuleOneFile, "commons-lang-commons-lang-2.5.jar eartest-jar-sample-one-1.0-20150825.210557-91.jar" );
+assertManifestClassPath( warModuleOneFile, "commons-lang-commons-lang-2.6.jar eartest-jar-sample-one-1.0-20150825.210557-91.jar" );
File warModuleTwoFile = new File( basedir, "ear-module/target/ear-module-1.0/org.apache.maven.its.ear.skinnywars-war-module-two-1.0.war" );
assertFileExists( warModuleTwoFile );
assertIncludes( warModuleTwoFile, new String[] { "WEB-INF/web.xml",
"META-INF/MANIFEST.MF" } );
-assertExcludes( warModuleTwoFile, new String[] { "WEB-INF/lib/commons-lang-2.5.jar",
+assertExcludes( warModuleTwoFile, new String[] { "WEB-INF/lib/commons-lang-2.6.jar",
"WEB-INF/lib/jar-sample-one-1.0-SNAPSHOT.jar",
"WEB-INF/lib/jar-sample-one-1.0-20150825.210557-91.jar" } );
-assertManifestClassPath( warModuleTwoFile, "eartest-jar-sample-one-1.0-20150825.210557-91.jar commons-lang-commons-lang-2.5.jar" );
+assertManifestClassPath( warModuleTwoFile, "eartest-jar-sample-one-1.0-20150825.210557-91.jar commons-lang-commons-lang-2.6.jar" );
return true;
diff --git a/src/it/skinny-wars-timestamp/war-module-one/pom.xml b/src/it/skinny-wars-timestamp/war-module-one/pom.xml
index 553f3bc..7bea7ce 100644
--- a/src/it/skinny-wars-timestamp/war-module-one/pom.xml
+++ b/src/it/skinny-wars-timestamp/war-module-one/pom.xml
@@ -31,7 +31,7 @@ under the License.
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</dependency>
<dependency>
<groupId>eartest</groupId>
diff --git a/src/it/skinny-wars/ear-module/pom.xml b/src/it/skinny-wars/ear-module/pom.xml
index 6f9911a..d9d59c8 100644
--- a/src/it/skinny-wars/ear-module/pom.xml
+++ b/src/it/skinny-wars/ear-module/pom.xml
@@ -35,7 +35,7 @@ under the License.
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.ear.skinnywars</groupId>
diff --git a/src/it/skinny-wars/verify.bsh b/src/it/skinny-wars/verify.bsh
index 279331b..6a6c513 100644
--- a/src/it/skinny-wars/verify.bsh
+++ b/src/it/skinny-wars/verify.bsh
@@ -61,13 +61,13 @@ for ( String included : includedEntries )
Manifest manifest = jar.getManifest();
String manifestClassPath = manifest.getMainAttributes().getValue("Class-Path");
-if ( !manifestClassPath.equals("commons-lang-commons-lang-2.5.jar") )
+if ( !manifestClassPath.equals("commons-lang-commons-lang-2.6.jar") )
{
- throw new IllegalStateException( "Missing entry in war MANIFEST.MF: commons-lang-commons-lang-2.5.jar");
+ throw new IllegalStateException( "Missing entry in war MANIFEST.MF: commons-lang-commons-lang-2.6.jar");
}
String[] excludedEntries = {
- "WEB-INF/lib/commons-lang-commons-lang-2.5.jar"
+ "WEB-INF/lib/commons-lang-commons-lang-2.6.jar"
};
for ( String excluded : excludedEntries )
{
@@ -93,7 +93,7 @@ JarFile jar = new JarFile( jarFile );
String[] includedEntries = {
"WEB-INF/web.xml",
"META-INF/MANIFEST.MF",
- "WEB-INF/lib/commons-lang-2.5.jar"
+ "WEB-INF/lib/commons-lang-2.6.jar"
};
for ( String included : includedEntries )
{
diff --git a/src/it/skinny-wars/war-module/pom.xml b/src/it/skinny-wars/war-module/pom.xml
index 9604026..eeac7cd 100644
--- a/src/it/skinny-wars/war-module/pom.xml
+++ b/src/it/skinny-wars/war-module/pom.xml
@@ -31,7 +31,7 @@ under the License.
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</dependency>
</dependencies>
diff --git a/src/test/resources/projects/project-092/pom.xml b/src/test/resources/projects/project-092/pom.xml
index 9dc5f28..c98333e 100644
--- a/src/test/resources/projects/project-092/pom.xml
+++ b/src/test/resources/projects/project-092/pom.xml
@@ -43,7 +43,7 @@ under the License.
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</dependency>
<dependency>
<groupId>eartest</groupId>