Skip to content
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

Fixed the failed release build #1194

Merged
merged 1 commit into from
Nov 30, 2024
Merged

Fixed the failed release build #1194

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
5 changes: 2 additions & 3 deletions ...src/it-repo/dummy-aggregate-child-333.pom → ...c/it-repo/dummy-aggregate-child-1.0.1.pom
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@
<parent>
<groupId>localhost</groupId>
<artifactId>dummy-aggregate-parent</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.0.1</version>
</parent>

<groupId>localhost</groupId>
<artifactId>dummy-aggregate-child</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.0.1</version>
<packaging>pom</packaging>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion ...rc/it-repo/dummy-aggregate-parent-333.pom → .../it-repo/dummy-aggregate-parent-1.0.1.pom
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>localhost</groupId>
<artifactId>dummy-aggregate-parent</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.0.1</version>
<packaging>pom</packaging>

<properties>
Expand Down
3 changes: 0 additions & 3 deletions ...ns-maven-plugin/src/it/it-dependency-updates-aggregate-report-issue-333/child-one/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,8 @@
<version>1.0</version>
</parent>

<groupId>localhost</groupId>
<artifactId>it-dependency-updates-aggregate-report-333-child-one</artifactId>
<version>1.0</version>
<packaging>jar</packaging>
<url>http://localhost/</url>

<dependencies>
<dependency>
Expand Down
3 changes: 0 additions & 3 deletions ...ns-maven-plugin/src/it/it-dependency-updates-aggregate-report-issue-333/child-two/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@
<version>1.0</version>
</parent>

<groupId>localhost</groupId>
<artifactId>it-dependency-updates-aggregate-report-333-child-two</artifactId>
<version>1.0</version>
<packaging>jar</packaging>
<url>http://localhost/</url>

</project>
2 changes: 1 addition & 1 deletion ...s-maven-plugin/src/it/it-dependency-updates-aggregate-report-issue-333/invoker.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
invoker.goals=site
invoker.goals = ${project.groupId}:${project.artifactId}:${project.version}:dependency-updates-aggregate-report
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it will work with site plugin?
Or only as direct report call?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it does. The only difference is the location of the generated files (site vs reports).

43 changes: 5 additions & 38 deletions versions-maven-plugin/src/it/it-dependency-updates-aggregate-report-issue-333/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,17 @@
<parent>
<groupId>localhost</groupId>
<artifactId>dummy-aggregate-child</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.0.1</version>
</parent>

<groupId>localhost</groupId>
<artifactId>it-dependency-updates-aggregate-report-333</artifactId>
<version>1.0</version>
<packaging>pom</packaging>
<url>http://localhost/</url>

<modules>
<module>child-one</module>
<module>child-two</module>
</modules>

<dependencyManagement>
<dependencies>
Expand All @@ -30,39 +32,4 @@
</dependencies>
</dependencyManagement>

<build>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>@sitePluginVersion@</version>
</plugin>
</plugins>
</pluginManagement>
</build>


<reporting>
<plugins>
<plugin>
<groupId>@project.groupId@</groupId>
<artifactId>@project.artifactId@</artifactId>
<version>@project.version@</version>
<inherited>false</inherited>
<reportSets>
<reportSet>
<reports>
<report>dependency-updates-aggregate-report</report>
</reports>
</reportSet>
</reportSets>
</plugin>
</plugins>
</reporting>

<modules>
<module>child-one</module>
<module>child-two</module>
</modules>

</project>
14 changes: 7 additions & 7 deletions versions-maven-plugin/src/it/it-dependency-updates-aggregate-report-issue-333/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
output = new File( basedir, 'target/site/dependency-updates-aggregate-report.html' ).text
def output = new File( basedir, 'target/reports/dependency-updates-aggregate-report.html' ).text
.replaceAll( '<[^>]+>', ' ' )
.replaceAll( '&[^;]+;', ' ' )
.replaceAll( '\\s+', ' ' )

// Dependency management
assert !( output =~ 'This project does not declare any dependencies in a dependencyManagement section.' )
assert ( output =~ 'localhost dummy-api 1.1 jar' )
assert ( output =~ 'localhost dummy-impl 1.1 jar' )
assert ( output =~ 'test.bigversion dummy-lib 2.0.0.0 jar' )
assert output =~ 'localhost dummy-api 1.1 jar'
assert output =~ 'localhost dummy-impl 1.1 jar'
assert output =~ 'test.bigversion dummy-lib 2.0.0.0 jar'

// Dependencies
assert !( output =~ 'This project does not declare any dependencies.' )
assert ( output =~ 'test.bigversion dummy-lib 3.0.0.0-SNAPSHOT compile jar' )
assert ( output =~ 'test.package module 0.0.2.19 compile jar' )
assert !(output =~ 'This project does not declare any dependencies.')
assert output =~ 'test.bigversion dummy-lib 3.0.0.0-SNAPSHOT compile jar'
assert output =~ 'test.package module 0.0.2.19 compile jar'
9 changes: 3 additions & 6 deletions versions-maven-plugin/src/it/it-plugin-updates-aggregate-report-issue-333/child-one/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,15 @@
<version>1.0</version>
</parent>

<groupId>localhost</groupId>
<artifactId>it-plugin-updates-aggregate-report-333-child-one</artifactId>
<version>1.0</version>
<packaging>jar</packaging>
<name>dependency-updates-report</name>
<url>http://localhost/</url>

<build>
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.2.0</version>
<groupId>localhost</groupId>
<artifactId>dummy-maven-plugin</artifactId>
<version>2.0</version>
</plugin>
</plugins>
</build>
Expand Down
7 changes: 3 additions & 4 deletions versions-maven-plugin/src/it/it-plugin-updates-aggregate-report-issue-333/child-two/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,15 @@
<version>1.0</version>
</parent>

<groupId>localhost</groupId>
<artifactId>it-plugin-updates-aggregate-report-333-child-two</artifactId>
<version>1.0</version>
<packaging>jar</packaging>
<url>http://localhost/</url>

<build>
<plugins>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<groupId>localhost</groupId>
<artifactId>dummy-maven-plugin</artifactId>
<version>3.0</version>
</plugin>
</plugins>
</build>
Expand Down
2 changes: 1 addition & 1 deletion versions-maven-plugin/src/it/it-plugin-updates-aggregate-report-issue-333/invoker.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
invoker.goals=site
invoker.goals = ${project.groupId}:${project.artifactId}:${project.version}:plugin-updates-aggregate-report
45 changes: 8 additions & 37 deletions versions-maven-plugin/src/it/it-plugin-updates-aggregate-report-issue-333/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,55 +2,26 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>localhost</groupId>
<artifactId>dummy-aggregate-child</artifactId>
<version>1.0.1-SNAPSHOT</version>
</parent>

<groupId>localhost</groupId>
<artifactId>it-plugin-updates-aggregate-report-333</artifactId>
<version>1.0</version>
<packaging>pom</packaging>
<url>http://localhost/</url>

<modules>
<module>child-one</module>
<module>child-two</module>
</modules>

<build>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>@sitePluginVersion@</version>
<groupId>localhost</groupId>
<artifactId>dummy-maven-plugin</artifactId>
<version>1.0</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.1.0</version>
</plugin>
</plugins>
</build>

<reporting>
<plugins>
<plugin>
<groupId>@project.groupId@</groupId>
<artifactId>@project.artifactId@</artifactId>
<version>@project.version@</version>
<inherited>false</inherited>
<reportSets>
<reportSet>
<reports>
<report>plugin-updates-aggregate-report</report>
</reports>
</reportSet>
</reportSets>
</plugin>
</plugins>
</reporting>

<modules>
<module>child-one</module>
<module>child-two</module>
</modules>
</project>
12 changes: 6 additions & 6 deletions versions-maven-plugin/src/it/it-plugin-updates-aggregate-report-issue-333/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
output = new File( basedir, 'target/site/plugin-updates-aggregate-report.html' ).text
def output = new File( basedir, 'target/reports/plugin-updates-aggregate-report.html' ).text
.replaceAll( '<[^>]+>', ' ' )
.replaceAll( '&[^;]+;', ' ' )
.replaceAll( '\\s+', ' ' )

// Plugin management
assert !( output =~ 'This project does not declare any plugins in a build/pluginManagement section.' )
assert ( output =~ 'org.apache.maven.plugins maven-clean-plugin 3.0.0' )
assert !(output =~ 'This project does not declare any plugins in a build/pluginManagement section.')
assert output =~ 'localhost dummy-maven-plugin 1.0'

// Plugins
assert !( output =~ 'This project does not declare any plugins in a build/plugins section.' )
assert ( output =~ 'org.apache.maven.plugins maven-clean-plugin 3.1.0' )
assert ( output =~ 'org.apache.maven.plugins maven-clean-plugin 3.2.0' )
assert !(output =~ 'This project does not declare any plugins in a build/plugins section.')
assert output =~ 'localhost dummy-maven-plugin 2.0'
assert output =~ 'localhost dummy-maven-plugin 3.0'
4 changes: 0 additions & 4 deletions ...ions-maven-plugin/src/it/it-property-updates-aggregate-report-issue-333/child-one/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,8 @@
<version>1.0</version>
</parent>

<groupId>localhost</groupId>
<artifactId>it-property-updates-aggregate-report-333-child-one</artifactId>
<version>1.0</version>
<packaging>jar</packaging>
<name>dependency-updates-report</name>
<url>http://localhost/</url>

<properties>
<version.dummy-lib>1.1.1.1</version.dummy-lib>
Expand Down
4 changes: 0 additions & 4 deletions ...ions-maven-plugin/src/it/it-property-updates-aggregate-report-issue-333/child-two/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,7 @@
<version>1.0</version>
</parent>

<groupId>localhost</groupId>
<artifactId>it-property-updates-aggregate-report-333-child-two</artifactId>
<version>1.0</version>
<packaging>jar</packaging>
<name>dependency-updates-report</name>
<url>http://localhost/</url>

</project>
2 changes: 1 addition & 1 deletion ...ons-maven-plugin/src/it/it-property-updates-aggregate-report-issue-333/invoker.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
invoker.goals=site
invoker.goals = ${project.groupId}:${project.artifactId}:${project.version}:property-updates-aggregate-report
44 changes: 5 additions & 39 deletions versions-maven-plugin/src/it/it-property-updates-aggregate-report-issue-333/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,60 +2,26 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>localhost</groupId>
<artifactId>dummy-aggregate-child</artifactId>
<version>1.0.1-SNAPSHOT</version>
</parent>

<groupId>localhost</groupId>
<artifactId>it-property-updates-aggregate-report-333</artifactId>
<version>1.0</version>
<packaging>pom</packaging>
<url>http://localhost/</url>

<properties>
<version.dummy-lib>2.12.0.0</version.dummy-lib>
</properties>

<build>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>@sitePluginVersion@</version>
</plugin>
</plugins>
</pluginManagement>
</build>
<modules>
<module>child-one</module>
<module>child-two</module>
</modules>

<dependencies>
<dependency>
<groupId>test.bigversion</groupId>
<artifactId>dummy-lib</artifactId>
<version>${version.dummy-lib}</version>
</dependency>
</dependencies>

<reporting>
<plugins>
<plugin>
<groupId>@project.groupId@</groupId>
<artifactId>@project.artifactId@</artifactId>
<version>@project.version@</version>
<inherited>false</inherited>
<reportSets>
<reportSet>
<reports>
<report>property-updates-aggregate-report</report>
</reports>
</reportSet>
</reportSets>
</plugin>
</plugins>
</reporting>

<modules>
<module>child-one</module>
<module>child-two</module>
</modules>
</project>
6 changes: 3 additions & 3 deletions versions-maven-plugin/src/it/it-property-updates-aggregate-report-issue-333/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
output = new File( basedir, 'target/site/property-updates-aggregate-report.html' ).text
def output = new File( basedir, 'target/reports/property-updates-aggregate-report.html' ).text
.replaceAll( '<[^>]+>', ' ' )
.replaceAll( '&[^;]+;', ' ' )
.replaceAll( '\\s+', ' ' )

assert ( output =~ '\\$\\{version.dummy-lib} 1.1.1.1' )
assert ( output =~ '\\$\\{version.dummy-lib} 2.12.0.0' )
assert output =~ '\\$\\{version.dummy-lib} 1.1.1.1'
assert output =~ '\\$\\{version.dummy-lib} 2.12.0.0'