Changeset 5336 for CMDIValidator

Timestamp:

06/06/14 20:30:01 (10 years ago)

Author:

Oliver Schonefeld

Message:

• use a different approach for getting the version number
• bump version

Location:

CMDIValidator/trunk

Files:

• cmdi-validator-core/pom.xml (modified) (2 diffs)
• cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/Version.java (modified) (1 diff)
• cmdi-validator-tool/pom.xml (modified) (1 diff)
• pom.xml (modified) (1 diff)

CMDIValidator/trunk/cmdi-validator-core/pom.xml

@@ -6 +6 @@
         <groupId>eu.clarin.cmdi</groupId>
         <artifactId>cmdi-validator</artifactId>
-        <version>0.0.3-SNAPSHOT</version>
+        <version>0.0.4-SNAPSHOT</version>
     </parent>
     <artifactId>cmdi-validator-core</artifactId>
@@ -130 +130 @@
     
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>                   
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+
             <!--
             <plugin>

CMDIValidator/trunk/cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/Version.java

@@ -1 +1 @@
 package eu.clarin.cmdi.validator;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.Properties;
 
 
 public final class Version {
-    private static final String VERSION_PROPERTIES_URL = "/version.properties";
-    private static final String PROP_VERSION           = "version";
-    private static final String PROP_TIMESTAMP         = "timestamp";
-    private static final Version INSTANCE;
-    private final String version;
-    private final String timestamp;
-
 
     private Version() {
-        String version = null;
-        String timestamp = null;
-
-        final URL url = Version.class.getResource(VERSION_PROPERTIES_URL);
-        if (url != null) {
-            try {
-                Properties props = new Properties();
-                props.load(url.openStream());
-                version   = props.getProperty(PROP_VERSION);
-                timestamp = props.getProperty(PROP_TIMESTAMP);
-            } catch (IOException e) {
-                /* IGNORE */
-            }
-        }
-        if ((version == null) || version.isEmpty() || version.contains("$")) {
-            version = "[UNKNOWN]";
-        }
-        if ((timestamp == null) || timestamp.isEmpty() ||
-                timestamp.contains("$")) {
-            timestamp = "[UNKNOWN]";
-        }
-
-        this.version   = version;
-        this.timestamp = timestamp;
     }
 
 
     public static String getVersion() {
-        return INSTANCE.version;
-    }
-
-
-    public static String getTimestamp() {
-        return INSTANCE.timestamp;
-    }
-
-
-    static {
-        INSTANCE = new Version();
+        String version = Version.class.getPackage().getImplementationVersion();
+        return (version != null) ? version : "[UNKNOWN]";
     }
 

CMDIValidator/trunk/cmdi-validator-tool/pom.xml

@@ -6 +6 @@
         <groupId>eu.clarin.cmdi</groupId>
         <artifactId>cmdi-validator</artifactId>
-        <version>0.0.3-SNAPSHOT</version>
+        <version>0.0.4-SNAPSHOT</version>
     </parent>
     <artifactId>cmdi-validator-tool</artifactId>

CMDIValidator/trunk/pom.xml

@@ -5 +5 @@
     <groupId>eu.clarin.cmdi</groupId>
     <artifactId>cmdi-validator</artifactId>
-    <version>0.0.3-SNAPSHOT</version>
+    <version>0.0.4-SNAPSHOT</version>
     <packaging>pom</packaging>