From 02f1ffc6bf4a011649221d74dd1a01969cd32d06 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Thu, 14 Apr 2016 22:26:36 +0200
Subject: [PATCH 1/2] updated antkit creation (tarball no longer contains a
 base directory)

---
 main/ant-kit/assembly.xml | 21 +++++++++++----------
 main/ant-kit/pom.xml      |  9 ++++++---
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/main/ant-kit/assembly.xml b/main/ant-kit/assembly.xml
index a7cc9f35f..1b6cf69c1 100644
--- a/main/ant-kit/assembly.xml
+++ b/main/ant-kit/assembly.xml
@@ -1,25 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+	<id>tarball</id>
+	<includeBaseDirectory>false</includeBaseDirectory>
 	<formats>
 		<format>tar.gz</format>
 	</formats>
-	<includeBaseDirectory>true</includeBaseDirectory>
-	<baseDirectory>cryptomator_${project.version}</baseDirectory>
 	<fileSets>
 		<fileSet>
 			<directory>target/libs</directory>
+			<includes>
+				<include>*.jar</include>
+			</includes>
 			<outputDirectory>libs</outputDirectory>
 		</fileSet>
 		<fileSet>
-			<directory>target/bundlefiles</directory>
-			<outputDirectory>bundlefiles</outputDirectory>
+			<directory>target</directory>
+			<includes>
+				<include>build.xml</include>
+			</includes>
+			<filtered>false</filtered>
+			<outputDirectory>.</outputDirectory>
 		</fileSet>
 	</fileSets>
-	<files>
-		<file>
-			<source>target/build.xml</source>
-			<filtered>false</filtered>
-		</file>
-	</files>
 </assembly>
\ No newline at end of file
diff --git a/main/ant-kit/pom.xml b/main/ant-kit/pom.xml
index f106181e8..c694cedc2 100644
--- a/main/ant-kit/pom.xml
+++ b/main/ant-kit/pom.xml
@@ -67,7 +67,7 @@
 				</executions>
 			</plugin>
 
-			<!-- create cryptomator_1.2.3-4.tar.gz: -->
+			<!-- create antkit.tar.gz: -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
@@ -81,8 +81,11 @@
 					</execution>
 				</executions>
 				<configuration>
-					<descriptor>assembly.xml</descriptor>
-					<finalName>cryptomator_${project.version}</finalName>
+					<descriptors>
+						<descriptor>assembly.xml</descriptor>
+					</descriptors>
+					<appendAssemblyId>false</appendAssemblyId>
+					<finalName>antkit</finalName>
 				</configuration>
 			</plugin>
 		</plugins>

From 5f56dacc4e01a0470cd2b10b6e923cef52c0315a Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Thu, 14 Apr 2016 22:39:19 +0200
Subject: [PATCH 2/2] adjusted travis configuration [ci skip]

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ade74987c..ff30b781b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,7 +48,7 @@ deploy:
     secure: "ZjE1j93v3qbPIe2YbmhS319aCbMdLQw0HuymmluTurxXsZtn9D4t2+eTr99vBVxGRuB5lzzGezPR5zjk5W7iHF7xhwrawXrFzr2rPJWzWFt0aM+Ry2njU1ROTGGXGTbv4anWeBlgMxLEInTAy/9ytOGNJlec83yc0THpOY2wxnk="
   file:
     - "main/uber-jar/target/Cryptomator-$TRAVIS_TAG.jar"
-    - "main/ant-kit/target/cryptomator_$TRAVIS_TAG.tar.gz"
+    - "main/ant-kit/target/antkit.tar.gz"
   skip_cleanup: true
   on:
     repo: cryptomator/cryptomator