Bump jetty-server version, checkstyle version, update checkstyle conf…

…ig. (#672) Signed-off-by: Roman Grigoriadi <roman.grigoriadi@oracle.com>
eclipse-ee4j · May 27, 2019 · f6dfb47 · f6dfb47
1 parent 661919d
commit f6dfb47
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/etc/config/checkstyle-build.xml b/etc/config/checkstyle-build.xml
@@ -87,15 +87,8 @@
         </module>
 
         <module name="NeedBraces"/>
-        <module name="LeftCurly">
-            <property name="maxLineLength" value="130"/>
-        </module>
+        <module name="LeftCurly" />
         <module name="RightCurly"/>
-        <module name="RightCurly">
-            <property name="option" value="alone"/>
-            <property name="tokens"
-                      value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/>
-        </module>
 
         <module name="WhitespaceAround">
             <!-- Removed static initializer issues: RCURLY, SLIST -->

diff --git a/pom.xml b/pom.xml
@@ -195,6 +195,13 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
                 <version>3.0.0</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.puppycrawl.tools</groupId>
+                        <artifactId>checkstyle</artifactId>
+                        <version>8.18</version>
+                    </dependency>
+                </dependencies>
                 <executions>
                     <execution>
                         <phase>validate</phase>
@@ -441,7 +448,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.14</version>
+                <version>3.0.0</version>
                 <configuration>
                     <configLocation>etc/config/checkstyle.xml</configLocation>
                 </configuration>

diff --git a/tests/qa/lifecycle-test/pom.xml b/tests/qa/lifecycle-test/pom.xml
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>
-            <version>7.6.9.v20130131</version>
+            <version>9.4.18.v20190429</version>
         </dependency>
         <dependency>
             <groupId>com.sun.jersey</groupId>