Repository: atlas
Updated Branches:
  refs/heads/branch-1.0 4eb412051 -> 70088b3c2


ATLAS-2857:Fix Atlas release version in /api/atlas/version API.


Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/70088b3c
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/70088b3c
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/70088b3c

Branch: refs/heads/branch-1.0
Commit: 70088b3c289b2e9cd19ad9830bc377d810171a97
Parents: 4eb4120
Author: nixonrodrigues <ni...@apache.org>
Authored: Tue Sep 4 15:55:24 2018 +0530
Committer: nixonrodrigues <ni...@apache.org>
Committed: Wed Sep 5 12:23:52 2018 +0530

----------------------------------------------------------------------
 .../main/java/org/apache/atlas/web/resources/AdminResource.java    | 1 +
 webapp/src/main/resources/atlas-buildinfo.properties               | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/atlas/blob/70088b3c/webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java
----------------------------------------------------------------------
diff --git 
a/webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java 
b/webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java
index 45a9bfd..c957bc8 100755
--- a/webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java
+++ b/webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java
@@ -187,6 +187,7 @@ public class AdminResource {
 
                 Map<String, Object> response = new HashMap<String, Object>();
                 response.put("Version", 
configProperties.getString("build.version", "UNKNOWN"));
+                
response.put("Revision",configProperties.getString("vc.revision", "UNKNOWN"));
                 response.put("Name", 
configProperties.getString("project.name", "apache-atlas"));
                 response.put("Description", 
configProperties.getString("project.description",
                         "Metadata Management and Data Governance Platform over 
Hadoop"));

http://git-wip-us.apache.org/repos/asf/atlas/blob/70088b3c/webapp/src/main/resources/atlas-buildinfo.properties
----------------------------------------------------------------------
diff --git a/webapp/src/main/resources/atlas-buildinfo.properties 
b/webapp/src/main/resources/atlas-buildinfo.properties
index f179d53..2404f8f 100755
--- a/webapp/src/main/resources/atlas-buildinfo.properties
+++ b/webapp/src/main/resources/atlas-buildinfo.properties
@@ -22,7 +22,7 @@ project.description=${pom.parent.description}
 build.user=${user.name}
 build.epoch=${timestamp}
 project.version=${pom.version}
-build.version=${pom.version}-r${buildNumber}
+build.version=${pom.version}
 vc.revision=${buildNumber}
 vc.source.url=${scm.connection}
 ######################

Reply via email to