You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2023/03/13 00:12:53 UTC
[maven-war-plugin] 01/01: [MWAR-457] Update plexus-utils to 3.0.24 - in its
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MWAR-457
in repository https://gitbox.apache.org/repos/asf/maven-war-plugin.git
commit 7ca2a975037a8d28a776927aa63b76027bdf6c90
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Mon Mar 13 01:02:13 2023 +0100
[MWAR-457] Update plexus-utils to 3.0.24 - in its
---
src/it/MWAR-133/pom.xml | 2 +-
src/it/MWAR-427_update-without-clean/pom.xml | 6 +++---
src/it/MWAR-427_update-without-clean/verify.groovy | 4 ++--
src/it/MWAR-441/pom.xml | 6 +++---
src/it/MWAR-441/verify.groovy | 4 ++--
src/it/scoped-dependency-same-artifact/pom.xml | 4 ++--
src/it/scoped-dependency-same-artifact/verify.bsh | 8 ++++----
src/it/simple-war-no-webxml/pom.xml | 2 +-
src/it/simple-war-no-webxml/verify.bsh | 4 ++--
src/it/simple-war-project/pom.xml | 2 +-
src/it/simple-war-project/verify.bsh | 2 +-
11 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/src/it/MWAR-133/pom.xml b/src/it/MWAR-133/pom.xml
index 99248bc..e48ecc7 100644
--- a/src/it/MWAR-133/pom.xml
+++ b/src/it/MWAR-133/pom.xml
@@ -52,7 +52,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.4.6</version>
+ <version>3.0.24</version>
</dependency>
</dependencies>
</project>
diff --git a/src/it/MWAR-427_update-without-clean/pom.xml b/src/it/MWAR-427_update-without-clean/pom.xml
index 07b1e17..5566393 100644
--- a/src/it/MWAR-427_update-without-clean/pom.xml
+++ b/src/it/MWAR-427_update-without-clean/pom.xml
@@ -44,12 +44,12 @@ under the License.
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>groovy-maven-plugin</artifactId>
- <version>2.0</version>
+ <version>2.1.1</version>
<configuration>
<source>
def fileToModify = new File(project.basedir, 'pom.xml')
processFileInplace(fileToModify) { text ->
- text.replaceAll(/1.4.6/,'1.4.5')
+ text.replaceAll(/3.0.24/,'3.0.23')
}
def processFileInplace(file, Closure processText) {
file.write(processText(file.text))
@@ -79,7 +79,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.4.6</version>
+ <version>3.0.24</version>
</dependency>
</dependencies>
diff --git a/src/it/MWAR-427_update-without-clean/verify.groovy b/src/it/MWAR-427_update-without-clean/verify.groovy
index ef9327d..cde566e 100644
--- a/src/it/MWAR-427_update-without-clean/verify.groovy
+++ b/src/it/MWAR-427_update-without-clean/verify.groovy
@@ -18,9 +18,9 @@
*/
def warFile = new java.util.jar.JarFile( new File(basedir,"target/mwar427-1.0-SNAPSHOT.war"), false)
-assert warFile.getEntry('WEB-INF/lib/plexus-utils-1.4.5.jar') != null
+assert warFile.getEntry('WEB-INF/lib/plexus-utils-3.0.23.jar') != null
assert warFile.getEntry('WEB-INF/lib/mwar427-1.0-SNAPSHOT.jar') != null
assert warFile.getEntry('index.html') != null
-assert warFile.getEntry('WEB-INF/lib/plexus-utils-1.4.6.jar') == null
+assert warFile.getEntry('WEB-INF/lib/plexus-utils-3.0.24.jar') == null
assert warFile.getEntry('root.html') != null // after MWAR-433, only WEB-INF/lib/ content is checked, other resources may be generated outside m-war-p
\ No newline at end of file
diff --git a/src/it/MWAR-441/pom.xml b/src/it/MWAR-441/pom.xml
index 261c77c..127c5db 100644
--- a/src/it/MWAR-441/pom.xml
+++ b/src/it/MWAR-441/pom.xml
@@ -45,12 +45,12 @@ under the License.
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>groovy-maven-plugin</artifactId>
- <version>2.0</version>
+ <version>2.1.1</version>
<configuration>
<source>
def fileToModify = new File(project.basedir, 'pom.xml')
processFileInplace(fileToModify) { text ->
- text.replaceAll(/1.4.6/,'1.4.5')
+ text.replaceAll(/3.0.24/,'3.0.23')
}
def processFileInplace(file, Closure processText) {
file.write(processText(file.text))
@@ -80,7 +80,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.4.6</version>
+ <version>3.0.24</version>
</dependency>
</dependencies>
diff --git a/src/it/MWAR-441/verify.groovy b/src/it/MWAR-441/verify.groovy
index f9cabc9..60fed72 100644
--- a/src/it/MWAR-441/verify.groovy
+++ b/src/it/MWAR-441/verify.groovy
@@ -18,9 +18,9 @@
*/
def warFile = new java.util.jar.JarFile( new File(basedir,"target/mwar427-1.0-SNAPSHOT.war"), false)
-assert warFile.getEntry('WEB-INF/lib/plexus-utils-1.4.5.jar') != null
+assert warFile.getEntry('WEB-INF/lib/plexus-utils-3.0.23.jar') != null
assert warFile.getEntry('WEB-INF/lib/mwar427-1.0-SNAPSHOT.jar') != null
assert warFile.getEntry('index.html') != null
-assert warFile.getEntry('WEB-INF/lib/plexus-utils-1.4.6.jar') == null
+assert warFile.getEntry('WEB-INF/lib/plexus-utils-3.0.24.jar') == null
assert warFile.getEntry('root.html') == null // after MWAR-441, this path is also removed as outdated (with the '/' config in the pom).
diff --git a/src/it/scoped-dependency-same-artifact/pom.xml b/src/it/scoped-dependency-same-artifact/pom.xml
index 8c882ba..ca657c1 100644
--- a/src/it/scoped-dependency-same-artifact/pom.xml
+++ b/src/it/scoped-dependency-same-artifact/pom.xml
@@ -41,13 +41,13 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.4.7</version>
+ <version>3.0.24</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<classifier>sources</classifier>
- <version>1.4.7</version>
+ <version>3.0.24</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/src/it/scoped-dependency-same-artifact/verify.bsh b/src/it/scoped-dependency-same-artifact/verify.bsh
index 057d788..73333ee 100644
--- a/src/it/scoped-dependency-same-artifact/verify.bsh
+++ b/src/it/scoped-dependency-same-artifact/verify.bsh
@@ -66,16 +66,16 @@ try
return false;
}
- File plexusUtilsDependency = new File( libDir, "plexus-utils-1.4.7.jar" );
+ File plexusUtilsDependency = new File( libDir, "plexus-utils-3.0.24.jar" );
if ( !plexusUtilsDependency.exists() || plexusUtilsDependency.isDirectory() )
{
- System.err.println( "plexus-utils-1.4.7.jar is missing or a directory." );
+ System.err.println( "plexus-utils-3.0.24.jar is missing or a directory." );
return false;
}
- File plexusUtilsSourceDependency = new File( libDir, "plexus-utils-1.4.7-sources.jar" );
+ File plexusUtilsSourceDependency = new File( libDir, "plexus-utils-3.0.24-sources.jar" );
if ( !plexusUtilsSourceDependency.exists() || plexusUtilsSourceDependency.isDirectory() )
{
- System.err.println( "plexus-utils-1.4.7-sources.jar is missing or a directory." );
+ System.err.println( "plexus-utils-3.0.24-sources.jar is missing or a directory." );
return false;
}
}
diff --git a/src/it/simple-war-no-webxml/pom.xml b/src/it/simple-war-no-webxml/pom.xml
index 31cc056..769e2c7 100644
--- a/src/it/simple-war-no-webxml/pom.xml
+++ b/src/it/simple-war-no-webxml/pom.xml
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.4.6</version>
+ <version>3.0.24</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/src/it/simple-war-no-webxml/verify.bsh b/src/it/simple-war-no-webxml/verify.bsh
index b163bbe..d40331e 100644
--- a/src/it/simple-war-no-webxml/verify.bsh
+++ b/src/it/simple-war-no-webxml/verify.bsh
@@ -66,10 +66,10 @@ try
return false;
}
- File plexusUtilsDependency = new File( libDir, "plexus-utils-1.4.6.jar" );
+ File plexusUtilsDependency = new File( libDir, "plexus-utils-3.0.24.jar" );
if ( !plexusUtilsDependency.exists() || plexusUtilsDependency.isDirectory() )
{
- System.err.println( "plexus-utils-1.4.6.jar is missing or a directory." );
+ System.err.println( "plexus-utils-3.0.24.jar is missing or a directory." );
return false;
}
}
diff --git a/src/it/simple-war-project/pom.xml b/src/it/simple-war-project/pom.xml
index a70c4e8..1911068 100644
--- a/src/it/simple-war-project/pom.xml
+++ b/src/it/simple-war-project/pom.xml
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.4.6</version>
+ <version>3.0.24</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/src/it/simple-war-project/verify.bsh b/src/it/simple-war-project/verify.bsh
index 7dc3d72..db51158 100644
--- a/src/it/simple-war-project/verify.bsh
+++ b/src/it/simple-war-project/verify.bsh
@@ -80,7 +80,7 @@ try
return false;
}
- File plexusUtilsDependency = new File( libDir, "plexus-utils-1.4.6.jar" );
+ File plexusUtilsDependency = new File( libDir, "plexus-utils-3.0.24.jar" );
if ( !plexusUtilsDependency.exists() || plexusUtilsDependency.isDirectory() )
{
System.err.println( "plexus-utils-1.4.6.jar is missing or a directory." );