From fa043ba4acfd4d09dba2be4b131086dcdd376a10 Mon Sep 17 00:00:00 2001
From: anhefti <andreas.hefti@let.ethz.ch>
Date: Wed, 6 May 2020 16:50:51 +0200
Subject: [PATCH 1/6] prepare for release

---
 pom.xml                                          | 4 ++--
 src/main/resources/config/application.properties | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9998493b..5e1438d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>ch.ethz.seb</groupId>
   <artifactId>seb-server</artifactId>
-  <version>${sebserver-version}-SNAPSHOT</version>
+  <version>${sebserver-version}</version>
   <name>seb-server</name>
   <description>web-service for SEB maintenance and monitoring active SEB sessions</description>
 
@@ -18,7 +18,7 @@
   <packaging>jar</packaging>
 
   <properties>
-    <sebserver-version>0.6.6</sebserver-version>
+    <sebserver-version>1.0.0</sebserver-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
   </properties>
diff --git a/src/main/resources/config/application.properties b/src/main/resources/config/application.properties
index d762160d..865d7213 100644
--- a/src/main/resources/config/application.properties
+++ b/src/main/resources/config/application.properties
@@ -1,6 +1,6 @@
 spring.application.name=SEB Server
 spring.profiles.active=dev
-sebserver.version=0.6.6 (RC for v1.0)
+sebserver.version=1.0.0
 
 ##########################################################
 ### Global Server Settings

From 06eb3ac182c143145529a72451d094230157958c Mon Sep 17 00:00:00 2001
From: anhefti <andreas.hefti@let.ethz.ch>
Date: Wed, 6 May 2020 18:39:42 +0200
Subject: [PATCH 2/6] preparing for release 1.0.0

---
 src/main/resources/messages.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties
index 21f6ffaa..a10b4060 100644
--- a/src/main/resources/messages.properties
+++ b/src/main/resources/messages.properties
@@ -5,7 +5,7 @@
 sebserver.overall.version=SEB Server Version : {0}
 
 sebserver.overall.about=About
-sebserver.overall.about.markup=<span style='font-family: Arial, Helvetica,sans-serif;font-size: 25px;font-weight: normal;font-style: normal;color: rgb(31, 64, 122);'>SEB Server About</span><br/><br/><span style='font-family: Arial, Helvetica,sans-serif;font-size: 18px;font-weight: bold;font-style: normal;'>1. Installation.</span><br/><br/><span style='font-family: Arial, Helvetica,sans-serif;font-size: 14px;font-weight: normal;font-style: normal;'>This is a SEB Server demo setup, ideal for testing or demonstrations.</span>
+sebserver.overall.about.markup=<span style='font-family: Arial, Helvetica,sans-serif;font-size: 25px;font-weight: normal;font-style: normal;color: rgb(31, 64, 122);'>SEB Server About</span><br/><br/><span style='font-family: Arial, Helvetica,sans-serif;font-size: 18px;font-weight: bold;font-style: normal;'>1. Installation.</span><br/><br/><span style='font-family: Arial, Helvetica,sans-serif;font-size: 14px;font-weight: normal;font-style: normal;'>This is the SEB Server development setup.</span>
 sebserver.overall.help=Documentation
 sebserver.overall.help.link=https://www.safeexambrowser.org/news_en.html
 

From bf868e4318d069b2958b0629932160cd35489539 Mon Sep 17 00:00:00 2001
From: anhefti <andreas.hefti@let.ethz.ch>
Date: Wed, 6 May 2020 20:02:30 +0200
Subject: [PATCH 3/6] added build-version property for jar name

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

diff --git a/pom.xml b/pom.xml
index 5e1438d5..c594bdae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,6 +19,7 @@
 
   <properties>
     <sebserver-version>1.0.0</sebserver-version>
+    <build-version>${sebserver-version}</build-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
   </properties>
@@ -44,6 +45,13 @@
               <release>${java.version}</release>
             </configuration>
           </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-jar-plugin</artifactId>
+            <configuration>
+              <finalName>${project.artifactId}-${build-version}</finalName>
+            </configuration>
+          </plugin>
         </plugins>
       </build>
       <dependencies>

From 48c60a9f6d5f9c3f708a5a3f8537ef1a92e2fd37 Mon Sep 17 00:00:00 2001
From: anhefti <andreas.hefti@let.ethz.ch>
Date: Wed, 6 May 2020 20:53:53 +0200
Subject: [PATCH 4/6] fixed build

---
 pom.xml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index c594bdae..9b07d877 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,7 @@
         <java.version>11</java.version>
       </properties>
       <build>
+        <finalName>${project.artifactId}-${build-version}</finalName>
         <plugins>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
@@ -45,13 +46,6 @@
               <release>${java.version}</release>
             </configuration>
           </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-jar-plugin</artifactId>
-            <configuration>
-              <finalName>${project.artifactId}-${build-version}</finalName>
-            </configuration>
-          </plugin>
         </plugins>
       </build>
       <dependencies>

From 4591e1823af22031c873453340734608e3f13506 Mon Sep 17 00:00:00 2001
From: anhefti <andreas.hefti@let.ethz.ch>
Date: Thu, 7 May 2020 13:17:29 +0200
Subject: [PATCH 5/6] fixed logging default

---
 src/main/resources/logback-spring.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index e2d65cf1..2908d3b8 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -51,7 +51,7 @@
     <Logger name="ch.ethz.seb" level="WARN" additivity="true">
         <appender-ref ref="STDOUT" />
     </Logger>
-    <Logger name="ch.ethz.seb.SEB_SERVER_INIT" level="INFO" additivity="true">
+    <Logger name="ch.ethz.seb.SEB_SERVER_INIT" level="INFO" additivity="false">
         <appender-ref ref="STDOUT" />
     </Logger>
     

From edbafd9a058d76776ef099cdea403321cb80d9e4 Mon Sep 17 00:00:00 2001
From: anhefti <andreas.hefti@let.ethz.ch>
Date: Thu, 7 May 2020 16:31:02 +0200
Subject: [PATCH 6/6] back to SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9b07d877..73a5f3a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <packaging>jar</packaging>
 
   <properties>
-    <sebserver-version>1.0.0</sebserver-version>
+    <sebserver-version>1.0.1-SNAPSHOT</sebserver-version>
     <build-version>${sebserver-version}</build-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>