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.

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

Build improvements - one profile for ITs #525

Merged
merged 1 commit into from
Oct 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
69 changes: 2 additions & 67 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -321,11 +321,6 @@
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.4.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
Expand Down Expand Up @@ -502,81 +497,21 @@
<id>all-integration-test</id>
<goals>
<goal>install</goal>
<goal>run</goal>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
<configuration>
<skipInvocation />
<extraArtifacts>
<extraArtifact>${project.groupId}:${project.artifactId}:${project.version}:license.properties:test-third-party</extraArtifact>
</extraArtifacts>
<pomExcludes>
<pomExclude>MLICENSE-4/pom.xml</pomExclude>
<pomExclude>download-licenses-proxy/pom.xml</pomExclude>
<!-- failed test on GH use remote resources -->
<pomExclude>download-licenses-basic/pom.xml</pomExclude>
<pomExclude>download-licenses-force/pom.xml</pomExclude>
</pomExcludes>
</configuration>
</execution>
<!-- as this it is run in offline, then execute it after the previous its... -->
<execution>
<id>integration-test-offline</id>
<goals>
<goal>run</goal>
</goals>
<configuration>
<pomIncludes>
<pomInclude>MLICENSE-4/pom.xml</pomInclude>
</pomIncludes>
<cloneProjectsTo>${project.build.directory}/it-offline</cloneProjectsTo>
</configuration>
</execution>
<execution>
<id>integration-test-proxy</id>
<goals>
<goal>run</goal>
</goals>
<configuration>
<settingsFile>src/it/settings-proxy.xml</settingsFile>
<pomIncludes>
<pomInclude>download-licenses-proxy/pom.xml</pomInclude>
</pomIncludes>
<cloneProjectsTo>${project.build.directory}/it-proxy</cloneProjectsTo>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>

<profile>
<id>run-one-it</id>
<build>
<defaultGoal>verify</defaultGoal>
<plugins>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
<configuration>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
<settingsFile>src/it/settings.xml</settingsFile>
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
</configuration>
<dependencies />
<executions>
<execution>
<id>one-integration-test</id>
<goals>
<goal>install</goal>
<goal>run</goal>
</goals>
<configuration>
<streamLogs>true</streamLogs>
<pomIncludes>
<pomInclude>${itName}/pom.xml</pomInclude>
</pomIncludes>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
Expand Down
2 changes: 1 addition & 1 deletion src/it/ISSUE-145/submodule1/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.1</version>
<version>3.5.1</version>
<executions>
<execution>
<phase>package</phase>
Expand Down
4 changes: 3 additions & 1 deletion src/it/MLICENSE-4/invoker.properties
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
invoker.goals=clean license:download-licenses -o
invoker.goals=clean license:download-licenses -o
# execute as the last one
invoker.ordinal = -100
3 changes: 3 additions & 0 deletions src/it/add-third-party-no-encoding/invoker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,6 @@
###
invoker.goals=clean ${project.groupId}:${project.artifactId}:${project.version}:add-third-party
invoker.failureBehavior=fail-fast

# Maven 4 add default encoding
invoker.maven.version = !4.0.0+
1 change: 1 addition & 0 deletions src/it/download-licenses-proxy/invoker.properties
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
invoker.goals = license:download-licenses
invoker.settingsFile = src/it/settings-proxy.xml