You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by bh...@apache.org on 2019/07/25 07:40:39 UTC

[incubator-dlab] branch develop updated: DLAB-000 added meta info

This is an automated email from the ASF dual-hosted git repository.

bhliva pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git


The following commit(s) were added to refs/heads/develop by this push:
     new 8cebe04  DLAB-000 added meta info
8cebe04 is described below

commit 8cebe0480be93c70c3f0400793204f1cbce9c8cb
Author: bhliva <bo...@epam.com>
AuthorDate: Thu Jul 25 10:40:16 2019 +0300

    DLAB-000 added meta info
---
 .../dlab/backendapi/service/impl/InfrastructureInfoServiceBase.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceBase.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceBase.java
index eaeab69..e760f25 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceBase.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceBase.java
@@ -33,6 +33,7 @@ import com.epam.dlab.dto.InfrastructureMetaInfoDTO;
 import com.epam.dlab.dto.base.edge.EdgeInfo;
 import com.epam.dlab.exceptions.DlabException;
 import com.google.inject.Inject;
+import com.jcabi.manifests.Manifests;
 import lombok.extern.slf4j.Slf4j;
 import org.bson.Document;
 
@@ -106,14 +107,13 @@ public abstract class InfrastructureInfoServiceBase<T> implements Infrastructure
 
 	@Override
 	public InfrastructureMetaInfoDTO getInfrastructureMetaInfo() {
-		/*final String branch = Manifests.read("GIT-Branch");
+		final String branch = Manifests.read("GIT-Branch");
 		return InfrastructureMetaInfoDTO.builder()
 				.branch(branch)
 				.commit(Manifests.read("GIT-Commit"))
 				.version(Manifests.read("DLab-Version"))
 				.releaseNotes(String.format(RELEASE_NOTES_FORMAT, branch))
-				.build();*/
-		return InfrastructureMetaInfoDTO.builder().build();
+				.build();
 	}
 
 	protected abstract Map<String, String> getSharedInfo(T sharedInfo);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org