#486 make MP Config Compilable with Java 11 - address comments

Signed-off-by: Emily Jiang <emijiang6@googlemail.com>
eclipse · Jan 20, 2020 · 566b28f · 566b28f
1 parent b213968
commit 566b28f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -31,7 +31,7 @@
 
         <links>https://osgi.org/javadoc/r6/annotation/</links>
 
-        <checkstyle.version>3.1.0</checkstyle.version>
+        <checkstyle.version>2.17</checkstyle.version>
         <checkstyle.methodNameFormat>^_?[a-z][a-zA-Z0-9]*$</checkstyle.methodNameFormat>
     </properties>
 
@@ -191,6 +191,7 @@
             <plugin>
                 <groupId>org.eclipse.microprofile.maven</groupId>
                 <artifactId>microprofile-maven-build-extension</artifactId>
+                <version>1.0</version>
                 <extensions>true</extensions>
             </plugin>
 

diff --git a/tck/src/main/java/org/eclipse/microprofile/config/tck/ConfigProviderTest.java b/tck/src/main/java/org/eclipse/microprofile/config/tck/ConfigProviderTest.java
@@ -155,15 +155,13 @@ public void testInjectedConfigSerializable() {
         ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
         try (ObjectOutputStream out = new ObjectOutputStream(byteArrayOutputStream)) {
             out.writeObject(config);
-        } 
-        catch (IOException ex) {
+        } catch (IOException ex) {
             Assert.fail("Injected config should be serializable, but could not serialize it", ex);
         }
         Object readObject = null;
         try (ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(byteArrayOutputStream.toByteArray()))) {
             readObject = in.readObject();
-        } 
-        catch (IOException | ClassNotFoundException ex) {
+        } catch (IOException | ClassNotFoundException ex) {
             Assert.fail("Injected config should be serializable, but could not deserialize a previously serialized instance", ex);
         }
         MatcherAssert.assertThat("Deserialized object", readObject, CoreMatchers.instanceOf(Config.class));

diff --git a/tck/src/main/java/org/eclipse/microprofile/config/tck/ConverterTest.java b/tck/src/main/java/org/eclipse/microprofile/config/tck/ConverterTest.java
@@ -431,15 +431,13 @@ public void testConverterSerialization() {
         ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
         try (ObjectOutputStream out = new ObjectOutputStream(byteArrayOutputStream)) {
             out.writeObject(original);
-        } 
-        catch (IOException ex) {
+        } catch (IOException ex) {
             Assert.fail("Converter instance should be serializable, but could not serialize it", ex);
         }
         Object readObject = null;
         try (ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(byteArrayOutputStream.toByteArray()))) {
             readObject = in.readObject();
-        } 
-        catch (IOException | ClassNotFoundException ex) {
+        } catch (IOException | ClassNotFoundException ex) {
             Assert.fail("Converter instance should be serializable, but could not deserialize a previously serialized instance", ex);
         }
         assertEquals("Converted values to be equal", original.convert("Donald").getName(),