Skip to content

Commit 9d49cec

Browse files
gotsongotson
committed
move spotless plugin to dedicated profile
1 parent 0d965c2 commit 9d49cec

2 files changed

Lines changed: 60 additions & 31 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ jobs:
4343
java-package: jdk
4444
cache: 'maven'
4545
- name: spotless:check
46-
run: mvn --batch-mode --no-transfer-progress spotless:check
46+
run: mvn -Pspotless --batch-mode --no-transfer-progress spotless:check
4747

4848
test:
4949
name: test ${{ matrix.os }} jdk${{ matrix.java }}
5050
strategy:
5151
fail-fast: false
5252
matrix:
5353
os: [ ubuntu-latest ]
54-
java: [ 17, 21, 25 ]
54+
java: [ 11, 21, 25 ]
5555
include:
5656
- os: windows-latest
5757
java: 25
@@ -234,7 +234,7 @@ jobs:
234234
# The Sonatype maven plugin will decide the right destination depending on whether the project is SNAPSHOT or not
235235
- name: Publish to Apache Maven Central
236236
if: github.event_name == 'push' || inputs.push_maven
237-
run: mvn --batch-mode --no-transfer-progress deploy -P release -DskipTests -Dspotless.check.skip -Dgpg.signer=bc
237+
run: mvn --batch-mode --no-transfer-progress deploy -P release -DskipTests -Dgpg.signer=bc
238238
env:
239239
MAVEN_CENTRAL_USERNAME: ${{ secrets.SONATYPE_USERNAME }} # must be the same env variable name as (1)
240240
MAVEN_CENTRAL_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} # must be the same env variable name as (2)

‎pom.xml‎

Lines changed: 57 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -101,40 +101,69 @@
101101
<version>3.2.5</version>
102102
</requireMavenVersion>
103103
<requireJavaVersion>
104-
<version>17</version>
104+
<version>11</version>
105105
</requireJavaVersion>
106106
</rules>
107107
</configuration>
108108
</execution>
109109
</executions>
110110
</plugin>
111111
</plugins>
112-
113-
<pluginManagement>
114-
<plugins>
115-
<plugin>
116-
<groupId>com.diffplug.spotless</groupId>
117-
<artifactId>spotless-maven-plugin</artifactId>
118-
<version>3.3.0</version>
119-
<configuration>
120-
<skip>true</skip>
121-
<java>
122-
<toggleOffOn/>
123-
<googleJavaFormat>
124-
<version>1.11.0</version>
125-
<style>AOSP</style>
126-
</googleJavaFormat>
127-
</java>
128-
</configuration>
129-
<executions>
130-
<execution>
131-
<goals>
132-
<goal>check</goal>
133-
</goals>
134-
</execution>
135-
</executions>
136-
</plugin>
137-
</plugins>
138-
</pluginManagement>
139112
</build>
113+
114+
<profiles>
115+
<profile>
116+
<id>spotless</id>
117+
<build>
118+
<plugins>
119+
<plugin>
120+
<groupId>org.apache.maven.plugins</groupId>
121+
<artifactId>maven-enforcer-plugin</artifactId>
122+
<version>3.6.2</version>
123+
<executions>
124+
<execution>
125+
<id>enforce-maven</id>
126+
<goals>
127+
<goal>enforce</goal>
128+
</goals>
129+
<configuration>
130+
<rules>
131+
<requireJavaVersion>
132+
<version>17</version>
133+
</requireJavaVersion>
134+
</rules>
135+
</configuration>
136+
</execution>
137+
</executions>
138+
</plugin>
139+
</plugins>
140+
<pluginManagement>
141+
<plugins>
142+
<plugin>
143+
<groupId>com.diffplug.spotless</groupId>
144+
<artifactId>spotless-maven-plugin</artifactId>
145+
<version>3.3.0</version>
146+
<configuration>
147+
<skip>true</skip>
148+
<java>
149+
<toggleOffOn/>
150+
<googleJavaFormat>
151+
<version>1.11.0</version>
152+
<style>AOSP</style>
153+
</googleJavaFormat>
154+
</java>
155+
</configuration>
156+
<executions>
157+
<execution>
158+
<goals>
159+
<goal>check</goal>
160+
</goals>
161+
</execution>
162+
</executions>
163+
</plugin>
164+
</plugins>
165+
</pluginManagement>
166+
</build>
167+
</profile>
168+
</profiles>
140169
</project>

0 commit comments

Comments
 (0)