Check style only on Travis CI (#287)

* Check style only on Travis CI * Update pom.xml * Update pom.xml * update indent
microsoft · Aug 7, 2019 · 08127a0 · 08127a0
1 parent 5860855
commit 08127a0
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,7 @@ os:
 
 script: 
   - ./mvnw clean verify
+  - ./mvnw checkstyle:check
 
 cache:
   directories:

diff --git a/check_style.xml b/check_style.xml
@@ -20,7 +20,7 @@
 
     <property name="fileExtensions" value="java, properties, xml"/>
     <module name="RegexpHeader">
-        <property name="headerFile" value="${basedir}/microsoft.header"/>
+        <property name="headerFile" value="microsoft.header"/>
     </module>
     <!-- Checks for whitespace                              
      See http://checkstyle.sf.net/config_whitespace.html -->
@@ -289,4 +289,4 @@
         <module name="SimplifyBooleanExpression"/>
         <module name="SimplifyBooleanReturn"/>
     </module>
-</module>
+</module>
diff --git a/pom.xml b/pom.xml
@@ -12,6 +12,7 @@
         <base.name>Java Debug Server for Visual Studio Code</base.name>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <tycho-version>1.2.0</tycho-version>
+        <checkstyleDir>${basedir}</checkstyleDir>
     </properties>
 
     <licenses>
@@ -113,15 +114,6 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
                     <version>2.17</version>
-                    <executions>
-                        <execution>
-                            <id>validate</id>
-                            <phase>validate</phase>
-                            <goals>
-                                <goal>check</goal>
-                            </goals>
-                        </execution>
-                    </executions>
                     <dependencies>
                         <dependency>
                             <groupId>com.puppycrawl.tools</groupId>
@@ -135,8 +127,7 @@
                         </dependency>
                     </dependencies>
                     <configuration>
-                        <configLocation>${project.parent.basedir}/check_style.xml</configLocation>
-                        <propertyExpansion>basedir=${project.parent.basedir}</propertyExpansion>
+                        <configLocation>${checkstyleDir}/check_style.xml</configLocation>
                         <failOnViolation>true</failOnViolation>
                     </configuration>
                 </plugin>
@@ -148,6 +139,19 @@
             </plugins>
         </pluginManagement>
     </build>
+    <profiles>
+        <profile>
+            <id>activate-in-module</id>
+            <activation>
+                <file>
+                    <exists>${basedir}/../check_style.xml</exists>
+                </file>
+            </activation>
+            <properties>
+                <checkstyleDir>${basedir}/..</checkstyleDir>
+            </properties>
+        </profile>
+    </profiles>
     <repositories>
         <repository>
             <id>photon</id>