From f58b93833fcea0366df38eb9cc19971c50d003d8 Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Fri, 26 Jul 2019 10:53:07 -0500
Subject: [PATCH] Updating version files
---
doc/sphinx/source/conf.py | 4 ++--
etc/dm.deploy.conf | 2 +-
src/java/DmWebPortal/nbproject/private/private.xml | 7 ++++++-
src/python/dm/__init__.py | 2 +-
4 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/doc/sphinx/source/conf.py b/doc/sphinx/source/conf.py
index 93fe78a2..00c8360c 100644
--- a/doc/sphinx/source/conf.py
+++ b/doc/sphinx/source/conf.py
@@ -57,9 +57,9 @@ author = u'APS/SDM'
# built documents.
#
# The short X.Y version.
-version = "dev"
+version = "3.0.0"
# The full version, including alpha/beta/rc tags.
-release = "dev"
+release = "3.0.0"
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/etc/dm.deploy.conf b/etc/dm.deploy.conf
index bc57fe63..f59fc735 100644
--- a/etc/dm.deploy.conf
+++ b/etc/dm.deploy.conf
@@ -14,5 +14,5 @@ DM_DAQ_WEB_SERVICE_URL=https://DM_HOSTNAME:33336
DM_CAT_WEB_SERVICE_URL=https://DM_HOSTNAME:44436
DM_PROC_WEB_SERVICE_URL=https://DM_HOSTNAME:55536
DM_APS_DB_WEB_SERVICE_URL=https://DM_HOSTNAME:11236
-DM_SOFTWARE_VERSION=dev
+DM_SOFTWARE_VERSION=3.0.0
diff --git a/src/java/DmWebPortal/nbproject/private/private.xml b/src/java/DmWebPortal/nbproject/private/private.xml
index 6807a2ba..e4ed63de 100644
--- a/src/java/DmWebPortal/nbproject/private/private.xml
+++ b/src/java/DmWebPortal/nbproject/private/private.xml
@@ -2,6 +2,11 @@
<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
<editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
<open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
- <group/>
+ <group>
+ <file>file:/local/sveseli/DM/dm-sv/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/ExperimentStationController.java</file>
+ <file>file:/local/sveseli/DM/dm-sv/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/StorageController.java</file>
+ <file>file:/local/sveseli/DM/dm-sv/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/DmEntityController.java</file>
+ <file>file:/local/sveseli/DM/dm-sv/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/ExperimentTypeController.java</file>
+ </group>
</open-files>
</project-private>
diff --git a/src/python/dm/__init__.py b/src/python/dm/__init__.py
index db502d91..48f377b1 100644
--- a/src/python/dm/__init__.py
+++ b/src/python/dm/__init__.py
@@ -40,5 +40,5 @@ from dm.aps_db_web_service.api.bssApsDbApi import BssApsDbApi
from dm.aps_db_web_service.api.esafApsDbApi import EsafApsDbApi
from dm.aps_db_web_service.api.serviceMonitorApsDbApi import ServiceMonitorApsDbApi
-__version__ = "dev"
+__version__ = "3.0.0"
--
GitLab