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

Cleanups ITs #100

Merged
merged 1 commit into from
May 12, 2024
Merged

Cleanups ITs #100

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
6 changes: 0 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,12 +134,6 @@
<profiles>
<profile>
<id>run-its</id>
<activation>
<property>
<name>skipTests</name>
<value>!true</value>
</property>
</activation>
<build>
<plugins>
<plugin>
Expand Down
7 changes: 1 addition & 6 deletions src/it/check-fails/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@

<artifactId>pom-check-fails</artifactId>
<groupId>org.codehaus.mojo.tidy.its</groupId>
<parent>
<groupId>org.codehaus</groupId>
<artifactId>codehaus-parent</artifactId>
<version>4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<version>1.0-SNAPSHOT</version>

Expand All @@ -18,7 +13,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>tidy-maven-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
<executions>
<execution>
<id>validate</id>
Expand Down
8 changes: 1 addition & 7 deletions src/it/check-separate-fails/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.codehaus</groupId>
<artifactId>codehaus-parent</artifactId>
<version>4</version>
</parent>

<groupId>org.codehaus.mojo.tidy.its</groupId>
<artifactId>pom-check-separate-fails</artifactId>
<version>1.0-SNAPSHOT</version>
Expand All @@ -19,7 +13,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>tidy-maven-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
<executions>
<execution>
<id>validate</id>
Expand Down
1 change: 0 additions & 1 deletion src/it/check-separate-succeeds/invoker.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
invoker.goals = verify
invoker.buildResult = success
7 changes: 1 addition & 6 deletions src/it/check-separate-succeeds/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@

<artifactId>pom-check-fails</artifactId>
<groupId>org.codehaus.mojo.tidy.its</groupId>
<parent>
<groupId>org.codehaus</groupId>
<artifactId>codehaus-parent</artifactId>
<version>4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<version>1.0-SNAPSHOT</version>

Expand All @@ -18,7 +13,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>tidy-maven-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
<executions>
<execution>
<id>validate</id>
Expand Down
6 changes: 0 additions & 6 deletions src/it/check-separate-succeeds/valid-pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.codehaus</groupId>
<artifactId>codehaus-parent</artifactId>
<version>4</version>
</parent>

<groupId>org.codehaus.mojo.tidy.its</groupId>
<artifactId>pom-check-succeeds</artifactId>
<version>1.0-SNAPSHOT</version>
Expand Down
1 change: 0 additions & 1 deletion src/it/check-succeeds/invoker.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
invoker.goals = verify
invoker.buildResult = success
8 changes: 1 addition & 7 deletions src/it/check-succeeds/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.codehaus</groupId>
<artifactId>codehaus-parent</artifactId>
<version>4</version>
</parent>

<groupId>org.codehaus.mojo.tidy.its</groupId>
<artifactId>pom-check-succeeds</artifactId>
<version>1.0-SNAPSHOT</version>
Expand All @@ -19,7 +13,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>tidy-maven-plugin</artifactId>
<version>@pom.version@</version>
<version>@project.version@</version>
<executions>
<execution>
<id>validate</id>
Expand Down
1 change: 0 additions & 1 deletion src/it/pom/invoker.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
invoker.goals = org.codehaus.mojo:tidy-maven-plugin:${project.version}:pom
invoker.buildResult = success
6 changes: 0 additions & 6 deletions src/it/pom/pom-expected.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.codehaus</groupId>
<artifactId>codehaus-parent</artifactId>
<version>4</version>
</parent>

<groupId>org.codehaus.mojo.tidy.its</groupId>
<artifactId>pom-space-indent</artifactId>
<version>1.0-SNAPSHOT</version>
Expand Down
5 changes: 0 additions & 5 deletions src/it/pom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@

<artifactId>pom-space-indent</artifactId>
<groupId>org.codehaus.mojo.tidy.its</groupId>
<parent>
<groupId>org.codehaus</groupId>
<artifactId>codehaus-parent</artifactId>
<version>4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<version>1.0-SNAPSHOT</version>
<description>Test of tidy:pom on a pom with all elements.</description>
Expand Down
1 change: 0 additions & 1 deletion src/it/separate-pom/invoker.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
invoker.goals = org.codehaus.mojo:tidy-maven-plugin:${project.version}:pom -Dtidy.pomFile=separate-pom.xml
invoker.buildResult = success
5 changes: 0 additions & 5 deletions src/it/separate-pom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@

<artifactId>pom-space-indent</artifactId>
<groupId>org.codehaus.mojo.tidy.its</groupId>
<parent>
<groupId>org.codehaus</groupId>
<artifactId>codehaus-parent</artifactId>
<version>4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<version>1.0-SNAPSHOT</version>
<description>Test of tidy:pom on a separate pom with all elements.</description>
Expand Down
6 changes: 0 additions & 6 deletions src/it/separate-pom/separate-pom-expected.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.codehaus</groupId>
<artifactId>codehaus-parent</artifactId>
<version>4</version>
</parent>

<groupId>org.codehaus.mojo.tidy.its</groupId>
<artifactId>pom-space-indent</artifactId>
<version>1.0-SNAPSHOT</version>
Expand Down
5 changes: 0 additions & 5 deletions src/it/separate-pom/separate-pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@

<artifactId>pom-space-indent</artifactId>
<groupId>org.codehaus.mojo.tidy.its</groupId>
<parent>
<groupId>org.codehaus</groupId>
<artifactId>codehaus-parent</artifactId>
<version>4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<version>1.0-SNAPSHOT</version>
<description>Test of tidy:pom on a separate pom with all elements.</description>
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/codehaus/mojo/tidy/task/PomTidyFixesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

import static org.junit.jupiter.api.Assertions.assertEquals;

public class PomTidyFixesTest {
class PomTidyFixesTest {

protected static final String PATH = "fixes/order-and-indent-start-element-of-scope/";

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/codehaus/mojo/tidy/task/PomTidyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

import static org.junit.jupiter.api.Assertions.assertEquals;

public class PomTidyTest {
class PomTidyTest {

@ParameterizedTest(name = "{0}")
@ValueSource(
Expand Down