diff --git a/pom.xml b/pom.xml index 0dfe462..d1d4952 100755 --- a/pom.xml +++ b/pom.xml @@ -13,6 +13,12 @@ + + src/main/java + + org/xerial/snappy/VERSION + + src/main/resources @@ -23,7 +29,6 @@ ${basedir} META-INF/maven/${project.groupId}/${project.artifactId} - VERSION LICENSE* diff --git a/src/main/java/org/xerial/snappy/LoadSnappy.java b/src/main/java/org/xerial/snappy/LoadSnappy.java index d8bb1fa..b09d73b 100755 --- a/src/main/java/org/xerial/snappy/LoadSnappy.java +++ b/src/main/java/org/xerial/snappy/LoadSnappy.java @@ -96,7 +96,6 @@ public class LoadSnappy String targetFolder) { String nativeLibraryFilePath = libFolderForCurrentOS + "/" + libraryFileName; final String prefix = "snappy-" + getVersion() + "-"; - String extractedLibFileName = prefix + libraryFileName; File extractedLibFile = new File(targetFolder, extractedLibFileName); @@ -226,7 +225,7 @@ public class LoadSnappy URL versionFile = LoadSnappy.class.getResource("/META-INF/maven/org.xerial.snappy/snappy-java/pom.properties"); if (versionFile == null) - versionFile = LoadSnappy.class.getResource("/META-INF/maven/org.xerial.snappy/snappy-java/VERSION"); + versionFile = LoadSnappy.class.getResource("/org/xerial/snappy/VERSION"); String version = "unknown"; try { @@ -234,6 +233,8 @@ public class LoadSnappy Properties versionData = new Properties(); versionData.load(versionFile.openStream()); version = versionData.getProperty("version", version); + if (version.equals("unknown")) + version = versionData.getProperty("VERSION", version); version = version.trim().replaceAll("[^0-9\\.]", ""); } }