Skip to content

Commit 7818b44

Browse files
committed
Merge remote-tracking branch 'origin/update-from-template' into develop
2 parents f15b6af + 80ca591 commit 7818b44

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

.gitattributes

+7
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,9 @@
11
# Auto detect text files and perform LF normalization
22
* text=auto
3+
4+
# Force sh files to have LF
5+
*.sh text eol=lf
6+
7+
# Force MVN Wrapper Linux files LF
8+
mvnw text eol=lf
9+
.mvn/wrapper/maven-wrapper.properties text eol=lf

chartjs-java-model-demo/pom.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,12 @@
9090
<dependency>
9191
<groupId>com.puppycrawl.tools</groupId>
9292
<artifactId>checkstyle</artifactId>
93-
<version>10.15.0</version>
93+
<version>10.16.0</version>
9494
</dependency>
9595
</dependencies>
9696
<configuration>
9797
<configLocation>../.config/checkstyle/checkstyle.xml</configLocation>
98+
<includeTestSourceDirectory>true</includeTestSourceDirectory>
9899
</configuration>
99100
<executions>
100101
<execution>

chartjs-java-model/pom.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -323,11 +323,12 @@
323323
<dependency>
324324
<groupId>com.puppycrawl.tools</groupId>
325325
<artifactId>checkstyle</artifactId>
326-
<version>10.15.0</version>
326+
<version>10.16.0</version>
327327
</dependency>
328328
</dependencies>
329329
<configuration>
330330
<configLocation>../.config/checkstyle/checkstyle.xml</configLocation>
331+
<includeTestSourceDirectory>true</includeTestSourceDirectory>
331332
</configuration>
332333
<executions>
333334
<execution>

0 commit comments

Comments
 (0)