From bb71d81832cfcfce71eac0e28de9a664bcc8bdde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20G=C3=B6bel?= <goebel@sub.uni-goettingen.de>
Date: Fri, 15 Dec 2017 08:49:57 +0100
Subject: [PATCH 1/3] artifact cleanup for Jenkins

---
 generic.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/generic.xml b/generic.xml
index 1c45d8f..2a2d7d0 100644
--- a/generic.xml
+++ b/generic.xml
@@ -160,7 +160,7 @@
         <echo message="Successfully built a generic version of SADE. Very well."/>
     </target>
 
-    <target name="artifact">
+    <target name="artifact" depends="artifact-cleanup">
         <tar destfile="${build.dir}/sade-${version}.tar.gz" compression="gzip" longfile="gnu">
               <tarfileset dir="${build.dir}/sade" filemode="755">
                   <include name="**/*.sh"/>
@@ -170,6 +170,11 @@
               </tarfileset>
         </tar>
     </target>
+    <target>
+        <delete>
+            <fileset dir="${build.dir}" includes="sade-*.tar.gz"/>
+        </delete>
+    </target>
 
     <!-- ************************************* -->
     <!-- * ALL DEPENDENCIES BELOW THIS LINE! * -->
-- 
GitLab


From 3cf006d9432f607253de15bf2e1a7fc627727a60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20G=C3=B6bel?= <goebel@sub.uni-goettingen.de>
Date: Fri, 15 Dec 2017 08:53:18 +0100
Subject: [PATCH 2/3] develop app in develop build

---
 generic.build.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generic.build.properties b/generic.build.properties
index 92720e0..689b41e 100644
--- a/generic.build.properties
+++ b/generic.build.properties
@@ -17,7 +17,7 @@ exist.dist=${exist.dest}/dist/eXist-db-${exist.version}
 
 # SADE configuration
 sade.git=https\://gitlab.gwdg.de/SADE/SADE.git
-sade.branch=master
+sade.branch=develop
 sade.dest=${build.dir}/expkg-sade
 
 # SADE Assets configuration
-- 
GitLab


From 7822e3afb681331a8a847971ccff7e9d432610a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20G=C3=B6bel?= <goebel@sub.uni-goettingen.de>
Date: Fri, 15 Dec 2017 08:55:57 +0100
Subject: [PATCH 3/3] version and master checkout for release

---
 generic.build.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/generic.build.properties b/generic.build.properties
index 689b41e..8107072 100644
--- a/generic.build.properties
+++ b/generic.build.properties
@@ -1,5 +1,5 @@
 #Thu, 29 Jun 2017 12:22:45 +0200
-version=1.0.1
+version=1.0.2
 
 build.dir=${basedir}/build
 resources.dir=${basedir}/resources
@@ -17,7 +17,7 @@ exist.dist=${exist.dest}/dist/eXist-db-${exist.version}
 
 # SADE configuration
 sade.git=https\://gitlab.gwdg.de/SADE/SADE.git
-sade.branch=develop
+sade.branch=master
 sade.dest=${build.dir}/expkg-sade
 
 # SADE Assets configuration
-- 
GitLab