Skip to content

Commit

Permalink
Merge branch 'master' into ITs
Browse files Browse the repository at this point in the history
  • Loading branch information
jtnord authored May 11, 2023
2 parents 210884d + a6c6ae7 commit d65f4ba
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,12 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-utils</artifactId>
<version>3.3.4</version>
<version>3.4.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
<version>4.6.3</version>
<version>4.7.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Expand Down Expand Up @@ -234,7 +234,7 @@
<dependency>
<groupId>org.kohsuke.stapler</groupId>
<artifactId>stapler-groovy</artifactId>
<version>1781.v62372c33644e</version>
<version>1784.v56a_94d9727f2</version>
<exclusions>
<exclusion>
<groupId>jakarta.annotation</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -552,8 +552,8 @@ private Map<String, String> scanWar(File war) throws MojoExecutionException {
// handle any extra info in snapshots e.g. " (private-abcd1234-username)"
version = version.replaceFirst(" [(].+[)]$", "");
if (version.endsWith("-SNAPSHOT")) {
getLog().warn("War contains a SNAPSHOT of " + groupId + ":" + artifactId
+ " build will not be fully repeatable");
getLog().warn("WAR contains a SNAPSHOT of " + groupId + ":" + artifactId
+ "; build will not be fully repeatable");
}
String key = String.format("%s:%s", groupId, artifactId);
String self = String.format("%s:%s", project.getGroupId(), project.getArtifactId());
Expand Down

0 comments on commit d65f4ba

Please sign in to comment.