Merge branch 'release/1.4.6'

Preparing 1.4.6
Re-added "Implementation-Version" to the jars' manifest to determine Cryptomator version at runtime
2026-05-16 01:31:28 +00:00 · 2019-03-01 15:01:03 +01:00 · 2019-03-01 15:00:27 +01:00 · 2019-02-28 23:45:10 +01:00
6 changed files with 18 additions and 6 deletions
--- a/main/buildkit/pom.xml
+++ b/main/buildkit/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.5.0-SNAPSHOT</version>
+		<version>1.4.6</version>
 	</parent>
 	<artifactId>buildkit</artifactId>
 	<packaging>pom</packaging>
--- a/main/commons/pom.xml
+++ b/main/commons/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.5.0-SNAPSHOT</version>
+		<version>1.4.6</version>
 	</parent>
 	<artifactId>commons</artifactId>
 	<name>Cryptomator Commons</name>
--- a/main/keychain/pom.xml
+++ b/main/keychain/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.5.0-SNAPSHOT</version>
+		<version>1.4.6</version>
 	</parent>
 	<artifactId>keychain</artifactId>
 	<name>System Keychain Access</name>
--- a/main/launcher/pom.xml
+++ b/main/launcher/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.5.0-SNAPSHOT</version>
+		<version>1.4.6</version>
 	</parent>
 	<artifactId>launcher</artifactId>
 	<name>Cryptomator Launcher</name>
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>main</artifactId>
-	<version>1.5.0-SNAPSHOT</version>
+	<version>1.4.6</version>
 	<packaging>pom</packaging>
 	<name>Cryptomator</name>

@@ -292,6 +292,18 @@
 						</execution>
 					</executions>
 				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-jar-plugin</artifactId>
+					<configuration>
+						<archive>
+							<manifest>
+								<!-- adds Implementation-Version which can be read during runtime -->
+								<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+							</manifest>
+						</archive>
+					</configuration>
+				</plugin>
 				<plugin>
 					<groupId>org.jacoco</groupId>
 					<artifactId>jacoco-maven-plugin</artifactId>
--- a/main/ui/pom.xml
+++ b/main/ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.5.0-SNAPSHOT</version>
+		<version>1.4.6</version>
 	</parent>
 	<artifactId>ui</artifactId>
 	<name>Cryptomator GUI</name>
Author	SHA1	Message	Date
Tobias Hagemann	6aafa7bb5c	Merge branch 'release/1.4.6'	2019-03-01 15:01:03 +01:00
Tobias Hagemann	43f2110f68	Preparing 1.4.6	2019-03-01 15:00:27 +01:00
Sebastian Stenzel	0b8f8e53af	Re-added "Implementation-Version" to the jars' manifest to determine Cryptomator version at runtime	2019-02-28 23:45:10 +01:00