Skip to content
Permalink
Browse files

Fix JPMS module setup (fixes #1315) (#1402)

* Fix JPMS module setup (fixes #1315)

* Re-added cause to AssertionErrors
  • Loading branch information...
pietvandongen authored and inder123 committed Oct 18, 2018
1 parent 27c9335 commit 5bbc768fa6cd3e8a3a7bebf52b0ac1e4c6e0bd12
@@ -1,8 +1,7 @@
language: java

jdk:
- openjdk7
- oraclejdk8
- oraclejdk9

install: mvn -f gson install -DskipTests=true
script: mvn -f gson test
@@ -2,7 +2,7 @@ apply plugin: 'java'
apply plugin: 'maven'

group = 'com.google.code.gson'
version = '2.8.4-SNAPSHOT'
version = '2.8.6-SNAPSHOT'

sourceCompatibility = 1.6
targetCompatibility = 1.6
@@ -34,7 +34,7 @@
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
<version>3.1.0</version>
<version>4.0.0</version>
<executions>
<execution>
<goals>
@@ -705,7 +705,9 @@ public void toJson(Object src, Type typeOfSrc, JsonWriter writer) throws JsonIOE
} catch (IOException e) {
throw new JsonIOException(e);
} catch (AssertionError e) {
throw new AssertionError("AssertionError (GSON " + GsonBuildConfig.VERSION + "): " + e.getMessage(), e);
AssertionError error = new AssertionError("AssertionError (GSON " + GsonBuildConfig.VERSION + "): " + e.getMessage());
error.initCause(e);
throw error;
} finally {
writer.setLenient(oldLenient);
writer.setHtmlSafe(oldHtmlSafe);
@@ -783,7 +785,9 @@ public void toJson(JsonElement jsonElement, JsonWriter writer) throws JsonIOExce
} catch (IOException e) {
throw new JsonIOException(e);
} catch (AssertionError e) {
throw new AssertionError("AssertionError (GSON " + GsonBuildConfig.VERSION + "): " + e.getMessage(), e);
AssertionError error = new AssertionError("AssertionError (GSON " + GsonBuildConfig.VERSION + "): " + e.getMessage());
error.initCause(e);
throw error;
} finally {
writer.setLenient(oldLenient);
writer.setHtmlSafe(oldHtmlSafe);
@@ -941,7 +945,9 @@ private static void assertFullConsumption(Object obj, JsonReader reader) {
// TODO(inder): Figure out whether it is indeed right to rethrow this as JsonSyntaxException
throw new JsonSyntaxException(e);
} catch (AssertionError e) {
throw new AssertionError("AssertionError (GSON " + GsonBuildConfig.VERSION + "): " + e.getMessage(), e);
AssertionError error = new AssertionError("AssertionError (GSON " + GsonBuildConfig.VERSION + "): " + e.getMessage());
error.initCause(e);
throw error;
} finally {
reader.setLenient(oldLenient);
}
File renamed without changes.
27 pom.xml
@@ -63,13 +63,28 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version>
<version>3.8.0</version>
<executions>
<execution>
<id>default-compile</id>
<configuration>
<release>9</release>
</configuration>
</execution>
<execution>
<id>base-compile</id>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<excludes>
<exclude>module-info.java</exclude>
</excludes>
</configuration>
</execution>
</executions>
<configuration>
<excludes>
<exclude>**/module-info.java</exclude>
</excludes>
<source>${java.version}</source>
<target>${java.version}</target>
<release>6</release>
</configuration>
</plugin>
<plugin>

0 comments on commit 5bbc768

Please sign in to comment.
You can’t perform that action at this time.