You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by sd...@apache.org on 2016/07/22 07:00:44 UTC
[16/50] commons-crypto git commit: CRYPTO-103
NativeCodeLoader.getVersion() is not needed
CRYPTO-103 NativeCodeLoader.getVersion() is not needed
Project: http://git-wip-us.apache.org/repos/asf/commons-crypto/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-crypto/commit/fd2b9347
Tree: http://git-wip-us.apache.org/repos/asf/commons-crypto/tree/fd2b9347
Diff: http://git-wip-us.apache.org/repos/asf/commons-crypto/diff/fd2b9347
Branch: refs/heads/CRYPTO-1.0.0
Commit: fd2b93472cc8438c17874635e674d1cf1a84864e
Parents: 211498e
Author: Sebb <se...@apache.org>
Authored: Sat Jul 9 13:20:42 2016 +0100
Committer: Sebb <se...@apache.org>
Committed: Sat Jul 9 13:20:42 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/commons/crypto/Crypto.java | 9 ------
.../apache/commons/crypto/NativeCodeLoader.java | 29 ++------------------
.../commons/crypto/NativeCodeLoaderTest.java | 6 ----
3 files changed, 2 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/fd2b9347/src/main/java/org/apache/commons/crypto/Crypto.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/crypto/Crypto.java b/src/main/java/org/apache/commons/crypto/Crypto.java
index 85e2186..e7aa101 100644
--- a/src/main/java/org/apache/commons/crypto/Crypto.java
+++ b/src/main/java/org/apache/commons/crypto/Crypto.java
@@ -46,15 +46,6 @@ public final class Crypto {
+ "lib.tempdir";
/**
- * Gets the currently active version of Apache Commons Crypto.
- *
- * @return the version
- */
- public static String getVersion() {
- return NativeCodeLoader.getVersion();
- }
-
- /**
* Checks whether the native code has been successfully loaded for the platform.
*
* @return true if the native code has been loaded successfully.
http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/fd2b9347/src/main/java/org/apache/commons/crypto/NativeCodeLoader.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/crypto/NativeCodeLoader.java b/src/main/java/org/apache/commons/crypto/NativeCodeLoader.java
index 4d4dbcb..4b5a765 100644
--- a/src/main/java/org/apache/commons/crypto/NativeCodeLoader.java
+++ b/src/main/java/org/apache/commons/crypto/NativeCodeLoader.java
@@ -149,8 +149,8 @@ final class NativeCodeLoader {
// loaders
// can read the libcommons-crypto multiple times.
String uuid = UUID.randomUUID().toString();
- String extractedLibFileName = String.format("commons-crypto-%s-%s-%s",
- getVersion(), uuid, libraryFileName);
+ String extractedLibFileName = String.format("commons-crypto-%s-%s",
+ uuid, libraryFileName);
File extractedLibFile = new File(targetFolder, extractedLibFileName);
InputStream reader = null;
@@ -215,31 +215,6 @@ final class NativeCodeLoader {
}
/**
- * Gets the version by reading pom.properties embedded in jar. This version
- * data is used as a suffix of a dll file extracted from the jar.
- *
- * @return the version string
- */
- static String getVersion() {
- URL versionFile = NativeCodeLoader.class
- .getResource("/META-INF/maven/org.apache.commons.crypto/commons-crypto/pom.properties");
- String version = "unknown";
- if (versionFile != null) {
- Properties versionData = new Properties();
- try {
- versionData.load(versionFile.openStream());
- version = versionData.getProperty("version", version);
- if (version.equals("unknown")) {
- version = versionData.getProperty("VERSION", version);
- }
- version = version.trim().replaceAll("[^0-9M\\.]", "");
- } catch (IOException e) { // NOPMD
- }
- }
- return version;
- }
-
- /**
* Checks whether in1 and in2 is equal.
*
* @param in1 the input1.
http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/fd2b9347/src/test/java/org/apache/commons/crypto/NativeCodeLoaderTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/crypto/NativeCodeLoaderTest.java b/src/test/java/org/apache/commons/crypto/NativeCodeLoaderTest.java
index ff871de..02b60de 100644
--- a/src/test/java/org/apache/commons/crypto/NativeCodeLoaderTest.java
+++ b/src/test/java/org/apache/commons/crypto/NativeCodeLoaderTest.java
@@ -39,12 +39,6 @@ public class NativeCodeLoaderTest {
System.out.println("** WARN: Native (JNI) code was not loaded: "
+ NativeCodeLoader.getLoadingError());
}
- assertNotNull(NativeCodeLoader.getVersion());
- }
-
- @Test
- public void testGetVersion() {
- assertNotNull(NativeCodeLoader.getVersion());
}
@Test