Upgrading to JSON-P 1.1, checkstyle 2.17

Signed-off-by: Dmitry Kornilov <dmitry.kornilov@oracle.com>
javaee · Jun 7, 2017 · fef1f9e · fef1f9e
1 parent 657bbfc
commit fef1f9e
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 333 deletions.
diff --git a/api/etc/config/checkstyle.xml b/api/etc/config/checkstyle.xml
diff --git a/api/etc/config/copyright-exclude b/api/etc/config/copyright-exclude
diff --git a/api/etc/config/copyright.txt b/api/etc/config/copyright.txt
diff --git a/api/pom.xml b/api/pom.xml
@@ -477,7 +477,7 @@
                     <artifactId>glassfish-copyright-maven-plugin</artifactId>
                     <version>1.40</version>
                     <configuration>
-                        <excludeFile>${project.build.directory}/../etc/config/copyright-exclude</excludeFile>
+                        <excludeFile>${basedir}/../etc/config/copyright-exclude</excludeFile>
                         <!--svn|mercurial|git - defaults to svn-->
                         <scm>git</scm>
                         <!-- turn on/off debugging -->
@@ -490,7 +490,7 @@
                         <update>false</update>
                         <!-- check that year is correct -->
                         <ignoreYear>false</ignoreYear>
-                        <templateFile>${project.build.directory}/../etc/config/copyright.txt</templateFile>
+                        <templateFile>${basedir}/../etc/config/copyright.txt</templateFile>
                     </configuration>
                     <executions>
                         <execution>
@@ -504,12 +504,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>2.15</version>
+                    <version>2.17</version>
                     <dependencies>
                         <dependency>
                             <groupId>com.puppycrawl.tools</groupId>
                             <artifactId>checkstyle</artifactId>
-                            <version>6.2</version>
+                            <version>6.11.2</version>
                         </dependency>
                     </dependencies>
                     <configuration>
@@ -624,7 +624,7 @@
         <non.final>true</non.final>
         <skip.release.tests>false</skip.release.tests>
         <spec.version>${last.final.spec.version}</spec.version>
-        <javax.json.version>1.1.0-M2</javax.json.version>
+        <javax.json.version>1.1</javax.json.version>
     </properties>
 
     <reporting>

diff --git a/etc/config/checkstyle.xml b/etc/config/checkstyle.xml
@@ -188,7 +188,7 @@
                 LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD,
                 MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, SL,
                 SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN,
-                TYPE_EXTENSION_AND, GENERIC_START, GENERIC_END" /> <!-- RCURLY removed -->
+                TYPE_EXTENSION_AND" /> <!-- RCURLY removed -->
         </module>
 
 

diff --git a/etc/config/copyright-exclude b/etc/config/copyright-exclude
@@ -27,3 +27,6 @@
 /META-INF/services/
 /README
 spec-license.html
+copyright-exclude
+api/etc/config/copyright.txt
+nb-configuration.xml