浏览代码

build enhancements

Jason Rivard 6 年之前
父节点
当前提交
4507f21cb0
共有 5 个文件被更改,包括 25 次插入17 次删除
  1. 0 2
      build/checkstyle.xml
  2. 2 2
      client/package.json
  3. 2 2
      client/pom.xml
  4. 6 5
      docker/pom.xml
  5. 15 6
      pom.xml

+ 0 - 2
build/checkstyle.xml

@@ -29,8 +29,6 @@
 
 
 <module name="Checker">
 <module name="Checker">
 
 
-    <property name="cacheFile" value="target/checkstyle.cache"/>
-
     <module name="SuppressionFilter">
     <module name="SuppressionFilter">
         <property name="file" value="${basedir}/build/checkstyle-suppression.xml" />
         <property name="file" value="${basedir}/build/checkstyle-suppression.xml" />
     </module>
     </module>

+ 2 - 2
client/package.json

@@ -45,7 +45,7 @@
         "imports-loader": "0.8.0",
         "imports-loader": "0.8.0",
         "jasmine": "3.2.0",
         "jasmine": "3.2.0",
         "jasmine-core": "3.2.1",
         "jasmine-core": "3.2.1",
-        "jshint": "2.9.5",
+        "jshint": "^2.10.2",
         "jshint-loader": "0.8.4",
         "jshint-loader": "0.8.4",
         "json-loader": "0.5.7",
         "json-loader": "0.5.7",
         "karma": "3.1.1",
         "karma": "3.1.1",
@@ -58,7 +58,7 @@
         "karma-webpack": "3.0.5",
         "karma-webpack": "3.0.5",
         "moment": "2.21.0",
         "moment": "2.21.0",
         "ngtemplate-loader": "2.0.1",
         "ngtemplate-loader": "2.0.1",
-        "node-sass": "4.7.2",
+        "node-sass": "^4.12.0",
         "phantomjs": "2.1.7",
         "phantomjs": "2.1.7",
         "phantomjs-prebuilt": "2.1.16",
         "phantomjs-prebuilt": "2.1.16",
         "postcss-loader": "2.1.1",
         "postcss-loader": "2.1.1",

+ 2 - 2
client/pom.xml

@@ -81,8 +81,8 @@
                 <artifactId>frontend-maven-plugin</artifactId>
                 <artifactId>frontend-maven-plugin</artifactId>
                 <version>1.7.6</version>
                 <version>1.7.6</version>
                 <configuration>
                 <configuration>
-                    <nodeVersion>v8.9.4</nodeVersion>
-                    <npmVersion>5.6.0</npmVersion>
+                    <nodeVersion>v10.16.0</nodeVersion>
+                    <npmVersion>6.9.0</npmVersion>
                     <installDirectory>.node</installDirectory>
                     <installDirectory>.node</installDirectory>
                 </configuration>
                 </configuration>
                 <executions>
                 <executions>

+ 6 - 5
docker/pom.xml

@@ -34,7 +34,7 @@
             <plugin>
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>jib-maven-plugin</artifactId>
                 <artifactId>jib-maven-plugin</artifactId>
-                <version>1.2.0</version>
+                <version>1.3.0</version>
                 <executions>
                 <executions>
                     <execution>
                     <execution>
                         <id>make-docker-image</id>
                         <id>make-docker-image</id>
@@ -44,7 +44,6 @@
                         </goals>
                         </goals>
                         <configuration>
                         <configuration>
                             <skip>${skipDocker}</skip>
                             <skip>${skipDocker}</skip>
-                            <jib.console>plain</jib.console>
                             <from>
                             <from>
                                 <image>adoptopenjdk/openjdk11:jre</image>
                                 <image>adoptopenjdk/openjdk11:jre</image>
                             </from>
                             </from>
@@ -61,8 +60,10 @@
                                     <volume>/config</volume>
                                     <volume>/config</volume>
                                 </volumes>
                                 </volumes>
                             </container>
                             </container>
-                            <extraDirectory>
-                                <path>${project.basedir}/src/main/image-files</path>
+                            <extraDirectories>
+                                <paths>
+                                    <path>${project.basedir}/src/main/image-files</path>
+                                </paths>
                                 <permissions>
                                 <permissions>
                                     <permission>
                                     <permission>
                                         <file>/app/startup.sh</file>
                                         <file>/app/startup.sh</file>
@@ -73,7 +74,7 @@
                                         <mode>755</mode>
                                         <mode>755</mode>
                                     </permission>
                                     </permission>
                                 </permissions>
                                 </permissions>
-                            </extraDirectory>
+                            </extraDirectories>
                         </configuration>
                         </configuration>
                     </execution>
                     </execution>
                 </executions>
                 </executions>

+ 15 - 6
pom.xml

@@ -172,12 +172,12 @@
                     <dependency>
                     <dependency>
                         <groupId>com.puppycrawl.tools</groupId>
                         <groupId>com.puppycrawl.tools</groupId>
                         <artifactId>checkstyle</artifactId>
                         <artifactId>checkstyle</artifactId>
-                        <version>8.21</version>
+                        <version>8.22</version>
                     </dependency>
                     </dependency>
                 </dependencies>
                 </dependencies>
                 <executions>
                 <executions>
                     <execution>
                     <execution>
-                        <id>checkstyle</id>
+                        <id>checkstyle-base</id>
                         <phase>validate</phase>
                         <phase>validate</phase>
                         <configuration>
                         <configuration>
                             <propertyExpansion>basedir=${project.root.basedir}</propertyExpansion>
                             <propertyExpansion>basedir=${project.root.basedir}</propertyExpansion>
@@ -191,6 +191,9 @@
                                 <directory>src/main</directory>
                                 <directory>src/main</directory>
                                 <directory>src/test</directory>
                                 <directory>src/test</directory>
                             </sourceDirectories>
                             </sourceDirectories>
+                            <cacheFile>${project.build.directory}/checkstyle/base/checkstyle-cachefile</cacheFile>
+                            <outputFile>${project.build.directory}/checkstyle/base/checkstyle-result.xml</outputFile>
+                            <rulesFiles>${project.build.directory}/checkstyle/base/checkstyle-rules.xml</rulesFiles>
                         </configuration>
                         </configuration>
                         <goals>
                         <goals>
                             <goal>check</goal>
                             <goal>check</goal>
@@ -211,6 +214,9 @@
                                 <directory>src</directory>
                                 <directory>src</directory>
                                 <directory>src/test</directory>
                                 <directory>src/test</directory>
                             </sourceDirectories>
                             </sourceDirectories>
+                            <cacheFile>${project.build.directory}/checkstyle/header/checkstyle-cachefile</cacheFile>
+                            <outputFile>${project.build.directory}/checkstyle/header/checkstyle-result.xml</outputFile>
+                            <rulesFiles>${project.build.directory}/checkstyle/header/checkstyle-rules.xml</rulesFiles>
                         </configuration>
                         </configuration>
                         <goals>
                         <goals>
                             <goal>check</goal>
                             <goal>check</goal>
@@ -232,6 +238,9 @@
                                 <directory>src/test</directory>
                                 <directory>src/test</directory>
                                 <directory>src/main/webapp</directory>
                                 <directory>src/main/webapp</directory>
                             </sourceDirectories>
                             </sourceDirectories>
+                            <cacheFile>${project.build.directory}/checkstyle/jsp/checkstyle-cachefile</cacheFile>
+                            <outputFile>${project.build.directory}/checkstyle/jsp/checkstyle-result.xml</outputFile>
+                            <rulesFiles>${project.build.directory}/checkstyle/jsp/checkstyle-rules.xml</rulesFiles>
                         </configuration>
                         </configuration>
                         <goals>
                         <goals>
                             <goal>check</goal>
                             <goal>check</goal>
@@ -242,12 +251,12 @@
             <plugin>
             <plugin>
                 <groupId>com.github.spotbugs</groupId>
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs-maven-plugin</artifactId>
                 <artifactId>spotbugs-maven-plugin</artifactId>
-                <version>3.1.11</version>
+                <version>3.1.12</version>
                 <dependencies>
                 <dependencies>
                     <dependency>
                     <dependency>
                         <groupId>com.github.spotbugs</groupId>
                         <groupId>com.github.spotbugs</groupId>
                         <artifactId>spotbugs</artifactId>
                         <artifactId>spotbugs</artifactId>
-                        <version>4.0.0-beta2</version>
+                        <version>4.0.0-beta3</version>
                     </dependency>
                     </dependency>
                 </dependencies>
                 </dependencies>
                 <configuration>
                 <configuration>
@@ -268,7 +277,7 @@
             <plugin> <!-- checks owsp vulnerability database -->
             <plugin> <!-- checks owsp vulnerability database -->
                 <groupId>org.owasp</groupId>
                 <groupId>org.owasp</groupId>
                 <artifactId>dependency-check-maven</artifactId>
                 <artifactId>dependency-check-maven</artifactId>
-                <version>5.0.0-M3</version>
+                <version>5.0.0</version>
                 <executions>
                 <executions>
                     <execution>
                     <execution>
                         <goals>
                         <goals>
@@ -291,7 +300,7 @@
         <dependency>
         <dependency>
             <groupId>com.github.spotbugs</groupId>
             <groupId>com.github.spotbugs</groupId>
             <artifactId>spotbugs-annotations</artifactId>
             <artifactId>spotbugs-annotations</artifactId>
-            <version>4.0.0-beta2</version>
+            <version>4.0.0-beta3</version>
             <scope>provided</scope>
             <scope>provided</scope>
         </dependency>
         </dependency>