diff options
| author | Simon Brandhof <simon.brandhof@gmail.com> | 2012-04-03 16:12:52 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@gmail.com> | 2012-04-03 16:12:52 +0200 |
| commit | e7b778f1ff40234f3fd68cb0fc55ae50453330de (patch) | |
| tree | 6543e1a2e56c90f6cff8f701606bd1dee4338f49 | |
| parent | 4100ba3ff7617ea9ab5096787d90ed13376cc5f3 (diff) | |
| download | sonarqube-e7b778f1ff40234f3fd68cb0fc55ae50453330de.tar.gz sonarqube-e7b778f1ff40234f3fd68cb0fc55ae50453330de.zip | |
Fix compatibility with Java 5
| -rw-r--r-- | pom.xml | 10 | ||||
| -rw-r--r-- | sonar-plugin-api/src/main/java/org/sonar/api/config/AesCipher.java | 2 |
2 files changed, 7 insertions, 5 deletions
@@ -90,11 +90,11 @@ <sonar.skippedModules>sonar-gwt-api,sonar-core-gwt</sonar.skippedModules> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <maven.min.version>2.2.1</maven.min.version> - <jdk.min.version>1.6</jdk.min.version> + <jdk.min.version>1.5</jdk.min.version> <!-- To configure animal-sniffer to check API compat --> <animal-sniffer.signature.groupId>org.codehaus.mojo.signature</animal-sniffer.signature.groupId> - <animal-sniffer.signature.artifactId>java16</animal-sniffer.signature.artifactId> + <animal-sniffer.signature.artifactId>java15</animal-sniffer.signature.artifactId> <animal-sniffer.signature.version>1.0</animal-sniffer.signature.version> <version.animal-sniffer.plugin>1.7</version.animal-sniffer.plugin> <version.maven-license.plugin>1.9.0</version.maven-license.plugin> @@ -607,7 +607,8 @@ <dependency> <groupId>commons-dbcp</groupId> <artifactId>commons-dbcp</artifactId> - <version>1.4</version> + <!-- do not upgrade to version 1.4, not compatible with Java5 --> + <version>1.3</version> </dependency> <dependency> <!-- See SONAR-2512 --> @@ -767,7 +768,8 @@ <dependency> <groupId>postgresql</groupId> <artifactId>postgresql</artifactId> - <version>9.0-801.jdbc4</version> + <!-- do not upgrade to version 9.0-801.jdbc4, not compatible with Java 5 --> + <version>9.0-801.jdbc3</version> </dependency> <dependency> <groupId>net.sourceforge.jtds</groupId> diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/config/AesCipher.java b/sonar-plugin-api/src/main/java/org/sonar/api/config/AesCipher.java index 279c8f40d5c..5c3bfeaefae 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/config/AesCipher.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/config/AesCipher.java @@ -58,7 +58,7 @@ final class AesCipher extends Cipher { try { javax.crypto.Cipher cipher = javax.crypto.Cipher.getInstance(CRYPTO_KEY); cipher.init(javax.crypto.Cipher.ENCRYPT_MODE, loadSecretFile()); - return new String(Base64.encodeBase64(cipher.doFinal(clearText.getBytes(Charsets.UTF_8)))); + return new String(Base64.encodeBase64(cipher.doFinal(clearText.getBytes("UTF-8")))); } catch (Exception e) { throw Throwables.propagate(e); } |