TRUNK-3644 Corrected getting OpenMRS version

rkorytkowski · rkorytkowski · commit 68d9064008a8 · 2014-01-23T22:13:02.000+01:00
diff --git a/api/src/main/java/org/openmrs/util/OpenmrsConstants.java b/api/src/main/java/org/openmrs/util/OpenmrsConstants.java
@@ -170,7 +170,7 @@ private static String getVersion() {
 		// Load the file
 		try {
 			props.load(url.openStream());
-			return props.getProperty("openmrs.version.short"); // this will return something like "1.9.0.423f6f-SNAPSHOT" in dev environments
+			return props.getProperty("openmrs.version"); // this will return something like "1.9.0-SNAPSHOT" in dev environments
 		}
 		catch (IOException e) {
 			log.error("Unable to get pom.properties file into Properties object");
diff --git a/api/src/main/resources/openmrs.properties b/api/src/main/resources/openmrs.properties
@@ -1 +1,2 @@
+openmrs.version=${openmrs.version}
 openmrs.version.short=${openmrs.version.short}
diff --git a/pom.xml b/pom.xml
@@ -1017,7 +1017,8 @@
 		<openmrs.version.long>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion} ${parsedVersion.qualifier} Build ${revisionNumber}</openmrs.version.long>
 		<openmrs.version.short>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.${revisionNumber}-${parsedVersion.qualifier}</openmrs.version.short>
 		<openmrs.version.shortnumericonly>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.${revisionNumber}</openmrs.version.shortnumericonly>
-
+		<openmrs.version>${project.version}</openmrs.version>
+		
 		<springVersion>3.0.5.RELEASE</springVersion>
 		<customArgLineForTesting />
 	</properties>

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ private static String getVersion() {`
`170`	`170`	`// Load the file`
`171`	`171`	`try {`
`172`	`172`	`props.load(url.openStream());`
`173`		`- return props.getProperty("openmrs.version.short"); // this will return something like "1.9.0.423f6f-SNAPSHOT" in dev environments`
	`173`	`+ return props.getProperty("openmrs.version"); // this will return something like "1.9.0-SNAPSHOT" in dev environments`
`174`	`174`	`}`
`175`	`175`	`catch (IOException e) {`
`176`	`176`	`log.error("Unable to get pom.properties file into Properties object");`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
	`1`	`+openmrs.version=${openmrs.version}`
`1`	`2`	`openmrs.version.short=${openmrs.version.short}`