From 85aec417e584cdfc761357f6e15af4f80ade62ff Mon Sep 17 00:00:00 2001
From: prabathabey <prabathabey@git.com>
Date: Wed, 8 Jul 2015 23:23:45 +0530
Subject: [PATCH] Setting target version of maven compiler plugin to 1.7

---
 .../extension/FaultMessageBodyWriter.java     |  8 +-------
 pom.xml                                       | 20 +++++++++----------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/components/oauth-extensions/dynamic-client-manager/src/main/java/org/wso2/carbon/identity/oauth/extension/FaultMessageBodyWriter.java b/components/oauth-extensions/dynamic-client-manager/src/main/java/org/wso2/carbon/identity/oauth/extension/FaultMessageBodyWriter.java
index 6311b4c80d..ff43d4aad9 100644
--- a/components/oauth-extensions/dynamic-client-manager/src/main/java/org/wso2/carbon/identity/oauth/extension/FaultMessageBodyWriter.java
+++ b/components/oauth-extensions/dynamic-client-manager/src/main/java/org/wso2/carbon/identity/oauth/extension/FaultMessageBodyWriter.java
@@ -55,17 +55,11 @@ public class FaultMessageBodyWriter implements MessageBodyWriter<FaultResponse>
     public void writeTo(FaultResponse faultResponse, Class<?> aClass, Type type, Annotation[] annotations,
                         MediaType mediaType, MultivaluedMap<String, Object> stringObjectMultivaluedMap,
                         OutputStream outputStream) throws IOException, WebApplicationException {
-        OutputStreamWriter writer = null;
-        try {
-            writer = new OutputStreamWriter(outputStream, UTF_8);
+        try (OutputStreamWriter writer = new OutputStreamWriter(outputStream, UTF_8)) {
             JsonObject response = new JsonObject();
             response.addProperty("error", faultResponse.getCode().getValue());
             response.addProperty("error_description", faultResponse.getDescription());
             getGson().toJson(response, type, writer);
-        } finally {
-            if (writer != null) {
-                writer.close();
-            }
         }
     }
 
diff --git a/pom.xml b/pom.xml
index b4fc802f87..f31068a457 100644
--- a/pom.xml
+++ b/pom.xml
@@ -945,16 +945,16 @@
                     </execution>
                 </executions>
             </plugin>
-            <!--<plugin>-->
-            <!--<groupId>org.apache.maven.plugins</groupId>-->
-            <!--<artifactId>maven-compiler-plugin</artifactId>-->
-            <!--<version>2.3.1</version>-->
-            <!--<configuration>-->
-            <!--<encoding>UTF-8</encoding>-->
-            <!--<source>1.6</source>-->
-            <!--<target>1.6</target>-->
-            <!--</configuration>-->
-            <!--</plugin>-->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3.1</version>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>