Mercurial > hg > thermostat

changeset 2581:f08b3097e2a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backed out changeset 5758d3fea16d Latest JDK 9 java (b154+) binaries don't accept -addmods flags any more. Remove the work-around again as it does not seem to be needed. Reviewed-by: neugens Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2017-February/022127.html PR2157
author Severin Gehwolf <sgehwolf@redhat.com>
date Wed, 08 Feb 2017 11:01:53 +0100
parents 5f2695feaa06
children 4283ab91985b
files pom.xml
diffstat 1 files changed, 1 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/pom.xml	Fri Feb 03 15:49:50 2017 +0100
+++ b/pom.xml	Wed Feb 08 11:01:53 2017 +0100
@@ -157,23 +157,6 @@
               <excludedGroups>com.redhat.thermostat.annotations.internal.CacioTest</excludedGroups>
             </configuration>
           </plugin>
-          <!-- Our annotations processor for platform uses google-gson which in turn
-               uses classes from java.sql. However with jigsaw the annotations processor
-               starts out with the jdk.compiler module and does not seem to have java.sql
-               in its resolution path. The result is that we get NoClassDefFoundError
-               on java.sql classes provided by the JDK when processing platform annotations.
-               See also: https://bugs.openjdk.java.net/browse/JDK-8152842
-               -->
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <configuration>
-              <compilerArgs>
-                <arg>-J-addmods</arg>
-                <arg>-Jjava.sql</arg>
-              </compilerArgs>
-            </configuration>
-          </plugin>
         </plugins>
       </build>
     </profile>
@@ -410,7 +393,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.5.1</version>
+          <version>2.3.2</version>
           <configuration>
             <fork>true</fork>
             <meminitial>128m</meminitial>