Skip to content

[MWAR-457] Update plexus-utils to 3.0.24 - in its #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
slachiewicz merged 1 commit into from
Mar 13, 2023
Merged

[MWAR-457] Update plexus-utils to 3.0.24 - in its #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/it/MWAR-133/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
6 changes: 3 additions & 3 deletions src/it/MWAR-427_update-without-clean/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions src/it/MWAR-427_update-without-clean/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions src/it/MWAR-441/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions src/it/MWAR-441/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).
4 changes: 2 additions & 2 deletions src/it/scoped-dependency-same-artifact/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
8 changes: 4 additions & 4 deletions src/it/scoped-dependency-same-artifact/verify.bsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/it/simple-war-no-webxml/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
4 changes: 2 additions & 2 deletions src/it/simple-war-no-webxml/verify.bsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/it/simple-war-project/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion src/it/simple-war-project/verify.bsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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." );
Expand Down