Merge pull request #66 from utPLSQL/feature/outsource_version_info_to_file

pesse · web-flow · commit f2746dc28cd5 · 2018-12-14T00:07:38.000+01:00
Put version info in separate textfile and read from that
diff --git a/pom.xml b/pom.xml
@@ -134,41 +134,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>com.google.code.maven-replacer-plugin</groupId>
-        <artifactId>replacer</artifactId>
-        <version>1.5.3</version>
-        <executions>
-          <execution>
-            <id>replace-version-number</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>replace</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <basedir>${project.basedir}/src/main/java</basedir>
-          <includes>
-            <include>**/JavaApiVersionInfo.java</include>
-          </includes>
-          <preserveDir>true</preserveDir>
-          <replacements>
-            <replacement>
-              <token>MAVEN_PROJECT_NAME = ".*"</token>
-              <value>MAVEN_PROJECT_NAME = "${project.name}"</value>
-            </replacement>
-            <replacement>
-              <token>MAVEN_PROJECT_VERSION = ".*"</token>
-              <value>MAVEN_PROJECT_VERSION = "${project.version}"</value>
-            </replacement>
-            <replacement>
-              <token>BUILD_NO = ".*"</token>
-              <value>BUILD_NO = "${travisBuildNumber}"</value>
-            </replacement>
-          </replacements>
-        </configuration>
-      </plugin>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
         <version>2.6</version>
@@ -220,6 +185,22 @@
         </dependencies>
       </plugin>
     </plugins>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+        <includes>
+          <include>**/utplsql-api.version</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>false</filtering>
+        <excludes>
+          <exclude>**/utplsql-api.version</exclude>
+        </excludes>
+      </resource>
+    </resources>
   </build>
 
   <profiles>
diff --git a/src/main/java/org/utplsql/api/JavaApiVersionInfo.java b/src/main/java/org/utplsql/api/JavaApiVersionInfo.java
@@ -1,5 +1,13 @@
 package org.utplsql.api;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URISyntaxException;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
 /** This class is getting updated automatically by the build process.
  * Please do not update its constants manually cause they will be overwritten.
  *
@@ -9,13 +17,23 @@ public class JavaApiVersionInfo {
 
     private JavaApiVersionInfo() { }
 
-    private static final String BUILD_NO = "123";
+
     private static final String MAVEN_PROJECT_NAME = "utPLSQL-java-api";
-    private static final String MAVEN_PROJECT_VERSION = "3.1.2-SNAPSHOT";
+    private static String MAVEN_PROJECT_VERSION = "unknown";
 
-    public static String getVersion() {
-        return MAVEN_PROJECT_VERSION + "." + BUILD_NO;
+    static {
+        try {
+            MAVEN_PROJECT_VERSION = Files.readAllLines(
+                    Paths.get(JavaApiVersionInfo.class.getClassLoader().getResource("utplsql-api.version").toURI())
+                    , Charset.defaultCharset())
+                    .get(0);
+        }
+        catch ( IOException | URISyntaxException e ) {
+            System.out.println("WARNING: Could not get Version information!");
+        }
     }
+
+    public static String getVersion() { return MAVEN_PROJECT_VERSION; }
     public static String getInfo() { return MAVEN_PROJECT_NAME + " " + getVersion(); }
 
 }
diff --git a/src/main/resources/utplsql-api.version b/src/main/resources/utplsql-api.version
@@ -0,0 +1 @@
+${project.version}.${travisBuildNumber}
diff --git a/src/test/java/org/utplsql/api/JavaApiVersionTest.java b/src/test/java/org/utplsql/api/JavaApiVersionTest.java
@@ -0,0 +1,13 @@
+package org.utplsql.api;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class JavaApiVersionTest {
+
+    @Test
+    void getJavaApiVersion() {
+        assertTrue(JavaApiVersionInfo.getVersion().startsWith("3.1"));
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+${project.version}.${travisBuildNumber}`