From 968cccd28e486b5d41f4d652fcb4924863889ad4 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 28 Feb 2018 14:05:43 +0100
Subject: update to next snapshot version

---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4b02d786f..8eadbff39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,14 +22,14 @@
 		-->
 		
 			<!-- Project Version -->			
-			<moa-id-version>3.3.2_postgresql</moa-id-version>
+			<moa-id-version>3.3.3-snapshot</moa-id-version>
 			
-			<moa-id-version-final>3.3.2_postgresql</moa-id-version-final>			
-			<moa-id-version-edu>3.3.2_postgresql</moa-id-version-edu>			
+			<moa-id-version-final>3.3.3-snapshot</moa-id-version-final>			
+			<moa-id-version-edu>3.3.3-snapshot</moa-id-version-edu>			
 			
 			<moa-id-proxy-version>2.0.1</moa-id-proxy-version>
 			
-			<configtool-version>2.4.1_postgresql</configtool-version>
+			<configtool-version>2.4.2-snapshot</configtool-version>
 			<demo-oa-version>2.0.6</demo-oa-version>
 			
 			<moa-id-module-elga_mandate_client>1.3</moa-id-module-elga_mandate_client>
-- 
cgit v1.2.3


From 3ebfc186aff324aa103ec96e8180894a78625fc7 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 28 Feb 2018 14:06:05 +0100
Subject: remove workaround for unofficial release

---
 .../moa/id/configuration/config/ConfigurationProvider.java  | 12 ++++++------
 .../egovernment/moa/id/auth/MOAIDAuthSpringInitializer.java | 13 ++++++-------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java
index 1ca5bcc2c..cfb39b15c 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java
@@ -139,12 +139,12 @@ public class ConfigurationProvider {
 			props.load(fis);			
 			fis.close();
 
-			//Workaround -> can be removed in next version
-			if (MiscUtil.isEmpty(System.getProperty("spring.profiles.active"))) {
-				log.info("Set System-Property to activate 'byteBased' config values");
-				System.setProperty("spring.profiles.active", "byteBasedConfig");
-					
-			}
+//			//Workaround -> can be removed in next version
+//			if (MiscUtil.isEmpty(System.getProperty("spring.profiles.active"))) {
+//				log.info("Set System-Property to activate 'byteBased' config values");
+//				System.setProperty("spring.profiles.active", "byteBasedConfig");
+//					
+//			}
 			
 			//initialize generic SpringContext to set profiles 
 			GenericApplicationContext rootContext = new GenericApplicationContext();
diff --git a/id/server/moa-id-spring-initializer/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthSpringInitializer.java b/id/server/moa-id-spring-initializer/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthSpringInitializer.java
index 8ed654692..d8146786a 100644
--- a/id/server/moa-id-spring-initializer/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthSpringInitializer.java
+++ b/id/server/moa-id-spring-initializer/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthSpringInitializer.java
@@ -26,7 +26,6 @@ import at.gv.egiz.components.spring.api.SpringLoader;
 import at.gv.egovernment.moa.id.commons.api.ConfigurationProvider;
 import at.gv.egovernment.moa.id.commons.utils.MOAIDMessageProvider;
 import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.util.MiscUtil;
 
 /**
  * Web application initializer
@@ -58,12 +57,12 @@ public class MOAIDAuthSpringInitializer implements WebApplicationInitializer {
 	@Override
 	public void onStartup(ServletContext servletContext) throws ServletException {
 		try {
-			//Workaround -> can be removed in next version
-			if (MiscUtil.isEmpty(System.getProperty("spring.profiles.active"))) {
-				Logger.info("Set System-Property to activate 'byteBased' config values");
-				System.setProperty("spring.profiles.active", "byteBasedConfig");
-					
-			}
+//			//Workaround -> can be removed in next version
+//			if (MiscUtil.isEmpty(System.getProperty("spring.profiles.active"))) {
+//				Logger.info("Set System-Property to activate 'byteBased' config values");
+//				System.setProperty("spring.profiles.active", "byteBasedConfig");
+//					
+//			}
 						
 			Logger.info("=============== Loading Config Root Context! ===============");
 			ApplicationContext cfgRootContext = 
-- 
cgit v1.2.3