* Fix JPMS module setup (fixes #1315) * Re-added cause to AssertionErrors
This commit is contained in:
parent
27c9335275
commit
5bbc768fa6
@ -1,8 +1,7 @@
|
|||||||
language: java
|
language: java
|
||||||
|
|
||||||
jdk:
|
jdk:
|
||||||
- openjdk7
|
- oraclejdk9
|
||||||
- oraclejdk8
|
|
||||||
|
|
||||||
install: mvn -f gson install -DskipTests=true
|
install: mvn -f gson install -DskipTests=true
|
||||||
script: mvn -f gson test
|
script: mvn -f gson test
|
||||||
|
@ -2,7 +2,7 @@ apply plugin: 'java'
|
|||||||
apply plugin: 'maven'
|
apply plugin: 'maven'
|
||||||
|
|
||||||
group = 'com.google.code.gson'
|
group = 'com.google.code.gson'
|
||||||
version = '2.8.4-SNAPSHOT'
|
version = '2.8.6-SNAPSHOT'
|
||||||
|
|
||||||
sourceCompatibility = 1.6
|
sourceCompatibility = 1.6
|
||||||
targetCompatibility = 1.6
|
targetCompatibility = 1.6
|
||||||
|
@ -34,7 +34,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>biz.aQute.bnd</groupId>
|
<groupId>biz.aQute.bnd</groupId>
|
||||||
<artifactId>bnd-maven-plugin</artifactId>
|
<artifactId>bnd-maven-plugin</artifactId>
|
||||||
<version>3.1.0</version>
|
<version>4.0.0</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<goals>
|
<goals>
|
||||||
|
@ -705,7 +705,9 @@ public final class Gson {
|
|||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
throw new JsonIOException(e);
|
throw new JsonIOException(e);
|
||||||
} catch (AssertionError 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 {
|
} finally {
|
||||||
writer.setLenient(oldLenient);
|
writer.setLenient(oldLenient);
|
||||||
writer.setHtmlSafe(oldHtmlSafe);
|
writer.setHtmlSafe(oldHtmlSafe);
|
||||||
@ -783,7 +785,9 @@ public final class Gson {
|
|||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
throw new JsonIOException(e);
|
throw new JsonIOException(e);
|
||||||
} catch (AssertionError 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 {
|
} finally {
|
||||||
writer.setLenient(oldLenient);
|
writer.setLenient(oldLenient);
|
||||||
writer.setHtmlSafe(oldHtmlSafe);
|
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
|
// TODO(inder): Figure out whether it is indeed right to rethrow this as JsonSyntaxException
|
||||||
throw new JsonSyntaxException(e);
|
throw new JsonSyntaxException(e);
|
||||||
} catch (AssertionError 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 {
|
} finally {
|
||||||
reader.setLenient(oldLenient);
|
reader.setLenient(oldLenient);
|
||||||
}
|
}
|
||||||
|
27
pom.xml
27
pom.xml
@ -63,13 +63,28 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<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>
|
<configuration>
|
||||||
<excludes>
|
<release>6</release>
|
||||||
<exclude>**/module-info.java</exclude>
|
|
||||||
</excludes>
|
|
||||||
<source>${java.version}</source>
|
|
||||||
<target>${java.version}</target>
|
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
Loading…
Reference in New Issue
Block a user