Skip to content

Commit

Permalink
hack changes for release
Browse files Browse the repository at this point in the history 
Signed-off-by: Scott Marlow <[email protected]>
  • Loading branch information
@scottmarlow
scottmarlow committed Feb 5, 2025
1 parent d098023 commit 4d84654
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 55 deletions.
53 changes: 5 additions & 48 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>common</artifactId>
<version>${jakarta.tck.tools.version}</version>
<version>${project.version}</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -561,6 +561,10 @@
</dependencyManagement>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>common</artifactId>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down Expand Up @@ -716,53 +720,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>2.36.0</version>
<configuration>
<pom>
<includes>
<include>pom.xml</include>
</includes>
<sortPom>
<nrOfIndentSpace>4</nrOfIndentSpace>
<!-- default see https://github.com/Ekryd/sortpom/wiki/PredefinedSortOrderProfiles -->
<predefinedSortOrder>recommended_2008_06</predefinedSortOrder>
<!-- Sort properties -->
<sortProperties>true</sortProperties>
<!-- Sort plugin executions -->
<sortExecutions>true</sortExecutions>
</sortPom>
</pom>
</configuration>
<executions>
<execution>
<id>check-spotless-poms</id>
<goals>
<goal>check</goal>
</goals>
<phase>validate</phase>
<configuration>
<!-- Skip the check if the release profile is active -->
<skip>${release}</skip>
<pom combine.children="append">
<sortPom combine.children="append">
<nrOfIndentSpace>4</nrOfIndentSpace>
<!-- default see https://github.com/Ekryd/sortpom/wiki/PredefinedSortOrderProfiles -->
<predefinedSortOrder>recommended_2008_06</predefinedSortOrder>
<!-- Sort properties -->
<sortProperties>true</sortProperties>
<!-- Sort modules -->
<sortModules>true</sortModules>
<!-- Sort plugin executions -->
<sortExecutions>true</sortExecutions>
</sortPom>
</pom>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down
1 change: 1 addition & 0 deletions tcks/apis/persistence/persistence-inside-container/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>common</artifactId>
<version>11.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>jakarta.tck</groupId>
Expand Down
1 change: 1 addition & 0 deletions tsharness/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>common</artifactId>
<version>11.0.0-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
7 changes: 0 additions & 7 deletions user_guides/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,13 +159,6 @@
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>

0 comments on commit 4d84654

Please sign in to comment.