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

Update plugins in ITs and cleanups #492

Merged
merged 1 commit into from
Jun 6, 2023
Merged

Update plugins in ITs and cleanups #492

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: 2 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@
<version.httpcomponents.httpclient>4.5.14</version.httpcomponents.httpclient>
<version.httpcomponents.httpcore>4.4.16</version.httpcomponents.httpcore>

<build-helper-maven-plugin.version>3.4.0</build-helper-maven-plugin.version>

<!-- license configuration -->
<license.useMissingFile>true</license.useMissingFile>
<license.failOnMissing>true</license.failOnMissing>
Expand Down
10 changes: 5 additions & 5 deletions src/it/ISSUE-135/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<groupId>org.codehaus.mojo.license.test</groupId>
<artifactId>test-ISSUE-135</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
<name>License Test :: ISSUE-135</name>
<packaging>jar</packaging>

Expand All @@ -28,7 +28,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<version>@maven-compiler-plugin.version@</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
Expand All @@ -42,7 +42,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version>
<version>@build-helper-maven-plugin.version@</version>
<executions>
<execution>
<id>add-generated-source-directory</id>
Expand All @@ -61,7 +61,7 @@

<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.1.0</version>
<version>@maven-resources-plugin.version@</version>

<executions>
<execution>
Expand Down Expand Up @@ -89,7 +89,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>

<executions>
<execution>
Expand Down
6 changes: 3 additions & 3 deletions src/it/ISSUE-145-2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>org.codehaus.mojo.license.test</groupId>
<artifactId>test-ISSUE-145-2</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
<name>License Test :: ISSUE-145-2</name>
<packaging>pom</packaging>

Expand Down Expand Up @@ -40,7 +40,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<version>@maven-compiler-plugin.version@</version>
</plugin>
</plugins>

Expand All @@ -49,7 +49,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
<executions>
<execution>
<id>aggregate-add-third-party</id>
Expand Down
4 changes: 2 additions & 2 deletions src/it/ISSUE-145-2/submodule1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.codehaus.mojo.license.test</groupId>
<artifactId>test-ISSUE-145-2</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand All @@ -17,7 +17,7 @@
<dependency>
<groupId>org.codehaus.mojo.license.test</groupId>
<artifactId>test-ISSUE-145-2-submodule2</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions src/it/ISSUE-145-2/submodule2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.codehaus.mojo.license.test</groupId>
<artifactId>test-ISSUE-145-2</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -15,7 +15,7 @@
<dependency>
<groupId>org.codehaus.mojo.license.test</groupId>
<artifactId>test-ISSUE-145-2-submodule3</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
</dependency>
</dependencies>
</project>
4 changes: 2 additions & 2 deletions src/it/ISSUE-145-2/submodule3/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.codehaus.mojo.license.test</groupId>
<artifactId>test-ISSUE-145-2</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -28,7 +28,7 @@
<dependency>
<groupId>org.codehaus.mojo.license.test</groupId>
<artifactId>test-ISSUE-145-2-submodule4</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion src/it/ISSUE-145-2/submodule4/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.codehaus.mojo.license.test</groupId>
<artifactId>test-ISSUE-145-2</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
6 changes: 3 additions & 3 deletions src/it/ISSUE-145/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>org.codehaus.mojo.license.test</groupId>
<artifactId>test-ISSUE-145</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
<name>License Test :: ISSUE-145</name>
<packaging>pom</packaging>

Expand Down Expand Up @@ -38,7 +38,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<version>@maven-compiler-plugin.version@</version>
</plugin>
</plugins>

Expand All @@ -47,7 +47,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
<executions>
<execution>
<id>aggregate-add-third-party</id>
Expand Down
4 changes: 2 additions & 2 deletions src/it/ISSUE-145/submodule1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.codehaus.mojo.license.test</groupId>
<artifactId>test-ISSUE-145</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand All @@ -17,7 +17,7 @@
<dependency>
<groupId>org.codehaus.mojo.license.test</groupId>
<artifactId>test-ISSUE-145-submodule2</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion src/it/ISSUE-145/submodule2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.codehaus.mojo.license.test</groupId>
<artifactId>test-ISSUE-145</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
4 changes: 2 additions & 2 deletions src/it/ISSUE-154/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<groupId>org.codehaus.mojo.license.test</groupId>
<artifactId>test-ISSUE-154</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>

<name>License Test :: ISSUE-154</name>
<packaging>jar</packaging>
Expand Down Expand Up @@ -63,7 +63,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
<configuration>
<licenseUrlReplacements>
<licenseUrlReplacement>
Expand Down
4 changes: 2 additions & 2 deletions src/it/ISSUE-159/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<groupId>org.codehaus.mojo.license.test</groupId>
<artifactId>test-ISSUE-159</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>

<name>License Test :: ISSUE-159</name>

Expand Down Expand Up @@ -57,7 +57,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
<configuration>
<licenseMerges>
<licenseMerge>The Apache Software License, Version 2.0|The Apache Software License, Version 2.0
Expand Down
4 changes: 2 additions & 2 deletions src/it/ISSUE-166/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>org.codehaus.mojo.license.test</groupId>
<artifactId>ISSUE-166</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
<inceptionYear>2019</inceptionYear>

<name>Test ISSUE-166</name>
Expand Down Expand Up @@ -36,7 +36,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down
4 changes: 2 additions & 2 deletions src/it/ISSUE-174/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>org.codehaus.mojo.license.test</groupId>
<artifactId>ISSUE-174</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>

<name>Test ISSUE-174</name>
<url>http://www.mojohaus.org</url>
Expand Down Expand Up @@ -64,7 +64,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down
2 changes: 1 addition & 1 deletion src/it/ISSUE-195/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
<executions>
<execution>
<goals>
Expand Down
2 changes: 1 addition & 1 deletion src/it/ISSUE-197/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
</plugin>
</plugins>
</build>
Expand Down
2 changes: 1 addition & 1 deletion src/it/ISSUE-21/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down
2 changes: 1 addition & 1 deletion src/it/ISSUE-22/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down
4 changes: 2 additions & 2 deletions src/it/ISSUE-324/child1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.codehaus.mojo.license.test</groupId>
<artifactId>test-ISSUE-324</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
</parent>
<artifactId>test-ISSUE-324-child1</artifactId>
<packaging>jar</packaging>
Expand All @@ -28,7 +28,7 @@
<dependency>
<groupId>org.codehaus.mojo.license.test</groupId>
<artifactId>test-ISSUE-324-child2</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion src/it/ISSUE-324/child2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.codehaus.mojo.license.test</groupId>
<artifactId>test-ISSUE-324</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
</parent>
<artifactId>test-ISSUE-324-child2</artifactId>
<packaging>jar</packaging>
Expand Down
4 changes: 2 additions & 2 deletions src/it/ISSUE-324/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>org.codehaus.mojo.license.test</groupId>
<artifactId>test-ISSUE-324</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
<name>License Test :: ISSUE-324</name>
<packaging>pom</packaging>

Expand Down Expand Up @@ -32,7 +32,7 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<inherited>false</inherited>
<version>@pom.version@</version>
<version>@project.version@</version>
<configuration>
<excludedScopes>system,test</excludedScopes>
</configuration>
Expand Down
4 changes: 2 additions & 2 deletions src/it/ISSUE-345-2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<groupId>org.codehaus.mojo.license.test</groupId>
<artifactId>issue-345-2</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>

<name>License Test :: ISSUE-345-2</name>

Expand All @@ -45,7 +45,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
<configuration>
<licenseMerges>
<licenseMerge>Apache-2.0|The Apache Software License, Version 2.0</licenseMerge>
Expand Down
4 changes: 2 additions & 2 deletions src/it/ISSUE-345/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<groupId>org.codehaus.mojo.license.test</groupId>
<artifactId>issue-345</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>

<name>License Test :: ISSUE-345</name>

Expand All @@ -45,7 +45,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down
2 changes: 1 addition & 1 deletion src/it/ISSUE-38/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
<configuration>
<extraFiles>
<DockerFile>properties</DockerFile>
Expand Down
Loading