Johannes/gson-comments
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
* Fix JPMS module setup (fixes #1315)

* Re-added cause to AssertionErrors
This commit is contained in:
Piet van Dongen 2018-10-18 17:49:08 +02:00 committed by inder123
parent 27c9335275
commit 5bbc768fa6
6 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -1,8 +1,7 @@
language: java
jdk:
- openjdk7
- oraclejdk8
- oraclejdk9
install: mvn -f gson install -DskipTests=true
script: mvn -f gson test

2
gson/build.gradle
View File

@ -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

2
gson/pom.xml
View File

@ -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>

12
gson/src/main/java/com/google/gson/Gson.java
View File

@ -705,7 +705,9 @@ public final class Gson {
} 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 final class Gson {
} 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 @@ public final class Gson {
// 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);
}

0
gson/src/main/java/com.google.gson/module-info.java → gson/src/main/java/module-info.java
View File

27
pom.xml
View File

@ -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>