Revert to Java 6.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1592838 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/manipulator/manipulator/pom.xml b/ipojo/manipulator/manipulator/pom.xml
index 4bb1bbb..c435f81 100644
--- a/ipojo/manipulator/manipulator/pom.xml
+++ b/ipojo/manipulator/manipulator/pom.xml
@@ -131,8 +131,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
diff --git a/ipojo/manipulator/manipulator/src/test/java/test/frames/CryptoServiceSingleton.java b/ipojo/manipulator/manipulator/src/test/java/test/frames/CryptoServiceSingleton.java
index 8db36a8..62823fa 100644
--- a/ipojo/manipulator/manipulator/src/test/java/test/frames/CryptoServiceSingleton.java
+++ b/ipojo/manipulator/manipulator/src/test/java/test/frames/CryptoServiceSingleton.java
@@ -88,7 +88,11 @@
KeySpec spec = new PBEKeySpec(privateKey.toCharArray(), raw, iterationCount, keySize);
SecretKeyFactory factory = SecretKeyFactory.getInstance(PBKDF_2_WITH_HMAC_SHA_1);
return new SecretKeySpec(factory.generateSecret(spec).getEncoded(), AES_ECB_ALGORITHM);
- } catch (DecoderException | NoSuchAlgorithmException | InvalidKeySpecException e) {
+ } catch (DecoderException e) {
+ throw new IllegalStateException(e);
+ } catch ( NoSuchAlgorithmException e) {
+ throw new IllegalStateException(e);
+ } catch (InvalidKeySpecException e) {
throw new IllegalStateException(e);
}
}
@@ -172,8 +176,7 @@
Cipher cipher = Cipher.getInstance(AES_CBC_ALGORITHM);
cipher.init(encryptMode, generatedKey, new IvParameterSpec(raw));
return cipher.doFinal(message);
- } catch (NoSuchAlgorithmException | NoSuchPaddingException | DecoderException | InvalidKeyException |
- InvalidAlgorithmParameterException | IllegalBlockSizeException | BadPaddingException e) {
+ } catch (Exception e) {
throw new IllegalStateException(e);
}
}
@@ -266,8 +269,7 @@
Cipher cipher = Cipher.getInstance(AES_ECB_ALGORITHM);
cipher.init(Cipher.ENCRYPT_MODE, skeySpec);
return Hex.encodeHexString(cipher.doFinal(value.getBytes(UTF_8)));
- } catch (NoSuchAlgorithmException | NoSuchPaddingException |
- InvalidKeyException | BadPaddingException | IllegalBlockSizeException e) {
+ } catch (Exception e) {
throw new IllegalStateException(e);
}
}
@@ -298,8 +300,7 @@
Cipher cipher = Cipher.getInstance(AES_ECB_ALGORITHM);
cipher.init(Cipher.DECRYPT_MODE, skeySpec);
return new String(cipher.doFinal(Hex.decodeHex(value.toCharArray())), UTF_8);
- } catch (NoSuchAlgorithmException | NoSuchPaddingException |
- InvalidKeyException | BadPaddingException | IllegalBlockSizeException | DecoderException e) {
+ } catch (Exception e) {
throw new IllegalStateException(e);
}
}