diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml index cf4ae1bcb..fc1ccc676 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -103,4 +103,23 @@ + + + + src/main/resources + true + + **/ebean-maven-version.txt + + + + src/main/resources + false + + **/ebean-maven-version.txt + + + + + diff --git a/ebean-api/src/main/java/io/ebean/EbeanVersion.java b/ebean-api/src/main/java/io/ebean/EbeanVersion.java index c4e63efff..ec976a74e 100644 --- a/ebean-api/src/main/java/io/ebean/EbeanVersion.java +++ b/ebean-api/src/main/java/io/ebean/EbeanVersion.java @@ -3,8 +3,7 @@ package io.ebean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.io.InputStream; +import java.io.*; import java.util.Properties; /** @@ -29,9 +28,11 @@ public final class EbeanVersion { private static void readVersion() { try { - try (InputStream in = ClassLoader.getSystemResourceAsStream("META-INF/maven/io.ebean/ebean-api/pom.properties")) { + try (InputStream in = ClassLoader.getSystemResourceAsStream("META-INF/ebean-maven-version.txt")) { if (in != null) { - version = readVersion(in); + try (LineNumberReader reader = new LineNumberReader(new InputStreamReader(in))) { + version = reader.readLine(); + } } } log.info("ebean version: {}", version); @@ -88,7 +89,7 @@ public final class EbeanVersion { } /** - * Returns the ebean version (read from /META-INF/maven/io.ebean/ebean/pom.properties) + * Returns the ebean version (read from META-INF/ebean-maven-version.txt) */ public static String getVersion() { return version; diff --git a/ebean-api/src/main/resources/META-INF/ebean-maven-version.txt b/ebean-api/src/main/resources/META-INF/ebean-maven-version.txt new file mode 100644 index 000000000..ad96e7cf9 --- /dev/null +++ b/ebean-api/src/main/resources/META-INF/ebean-maven-version.txt @@ -0,0 +1 @@ +${project.version} diff --git a/pom.xml b/pom.xml index 246f69351..4e2418885 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.avaje java11-oss - 3.8 + 3.9 io.ebean