Skip to content

Commit 5d23494

Browse files
committed
Merge branch 'update-from-template'
2 parents 267a558 + e99f23c commit 5d23494

File tree

3 files changed

+60
-17
lines changed

3 files changed

+60
-17
lines changed

pom.xml

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,30 +29,16 @@
2929

3030
<profiles>
3131
<profile>
32+
<!-- Disable checkstyle in root module as there is nothing to check -->
3233
<id>checkstyle</id>
3334
<build>
3435
<plugins>
3536
<plugin>
3637
<groupId>org.apache.maven.plugins</groupId>
3738
<artifactId>maven-checkstyle-plugin</artifactId>
38-
<version>3.3.1</version>
39-
<dependencies>
40-
<dependency>
41-
<groupId>com.puppycrawl.tools</groupId>
42-
<artifactId>checkstyle</artifactId>
43-
<version>10.12.7</version>
44-
</dependency>
45-
</dependencies>
4639
<configuration>
47-
<configLocation>.config/checkstyle/checkstyle.xml</configLocation>
40+
<skip>true</skip>
4841
</configuration>
49-
<executions>
50-
<execution>
51-
<goals>
52-
<goal>check</goal>
53-
</goals>
54-
</execution>
55-
</executions>
5642
</plugin>
5743
</plugins>
5844
</build>

vaadin-addon-template-demo/pom.xml

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,34 @@
172172
</plugins>
173173
</build>
174174
</profile>
175+
<profile>
176+
<id>checkstyle</id>
177+
<build>
178+
<plugins>
179+
<plugin>
180+
<groupId>org.apache.maven.plugins</groupId>
181+
<artifactId>maven-checkstyle-plugin</artifactId>
182+
<version>3.3.1</version>
183+
<dependencies>
184+
<dependency>
185+
<groupId>com.puppycrawl.tools</groupId>
186+
<artifactId>checkstyle</artifactId>
187+
<version>10.12.7</version>
188+
</dependency>
189+
</dependencies>
190+
<configuration>
191+
<configLocation>../.config/checkstyle/checkstyle.xml</configLocation>
192+
</configuration>
193+
<executions>
194+
<execution>
195+
<goals>
196+
<goal>check</goal>
197+
</goals>
198+
</execution>
199+
</executions>
200+
</plugin>
201+
</plugins>
202+
</build>
203+
</profile>
175204
</profiles>
176-
177205
</project>

vaadin-addon-template/pom.xml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,5 +265,34 @@
265265
</plugins>
266266
</build>
267267
</profile>
268+
<profile>
269+
<id>checkstyle</id>
270+
<build>
271+
<plugins>
272+
<plugin>
273+
<groupId>org.apache.maven.plugins</groupId>
274+
<artifactId>maven-checkstyle-plugin</artifactId>
275+
<version>3.3.1</version>
276+
<dependencies>
277+
<dependency>
278+
<groupId>com.puppycrawl.tools</groupId>
279+
<artifactId>checkstyle</artifactId>
280+
<version>10.12.7</version>
281+
</dependency>
282+
</dependencies>
283+
<configuration>
284+
<configLocation>../.config/checkstyle/checkstyle.xml</configLocation>
285+
</configuration>
286+
<executions>
287+
<execution>
288+
<goals>
289+
<goal>check</goal>
290+
</goals>
291+
</execution>
292+
</executions>
293+
</plugin>
294+
</plugins>
295+
</build>
296+
</profile>
268297
</profiles>
269298
</project>

0 commit comments

Comments
 (0)