From fd9ca14d85574e4b3c9a81f4259cc0367a4ceb71 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastianstenzel@gmail.com>
Date: Thu, 2 Oct 2014 01:11:16 +0200
Subject: [PATCH] cleanup

---
 oce-main/oce-core/pom.xml       | 10 ++++++++--
 oce-main/oce-crypto-aes/pom.xml |  9 ++++++++-
 oce-main/oce-crypto-api/pom.xml |  9 +++++++++
 oce-main/oce-ui/pom.xml         |  8 ++++++--
 oce-main/pom.xml                | 13 ++++++++++---
 5 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/oce-main/oce-core/pom.xml b/oce-main/oce-core/pom.xml
index d24e2f8c2..cb63a1a99 100644
--- a/oce-main/oce-core/pom.xml
+++ b/oce-main/oce-core/pom.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2014 Sebastian Stenzel This file is licensed under the terms of the MIT license. See the LICENSE.txt file for more info. Contributors: Sebastian Stenzel - initial API and implementation -->
+<!--
+  Copyright (c) 2014 Sebastian Stenzel
+  This file is licensed under the terms of the MIT license.
+  See the LICENSE.txt file for more info.
+  
+  Contributors:
+      Sebastian Stenzel - initial API and implementation
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
@@ -12,7 +19,6 @@
 
 	<properties>
 		<jetty.version>9.1.0.v20131115</jetty.version>
-		<milton.version>2.6.2.4</milton.version>
 		<jackrabbit.version>2.9.0</jackrabbit.version>
 		<commons.transaction.version>1.2</commons.transaction.version>
 		<jta.version>1.1</jta.version>
diff --git a/oce-main/oce-crypto-aes/pom.xml b/oce-main/oce-crypto-aes/pom.xml
index 1d61a9d13..3faf1dd05 100644
--- a/oce-main/oce-crypto-aes/pom.xml
+++ b/oce-main/oce-crypto-aes/pom.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2014 Sebastian Stenzel This file is licensed under the terms of the MIT license. See the LICENSE.txt file for more info. Contributors: Sebastian Stenzel - initial API and implementation -->
+<!--
+  Copyright (c) 2014 Sebastian Stenzel
+  This file is licensed under the terms of the MIT license.
+  See the LICENSE.txt file for more info.
+  
+  Contributors:
+      Sebastian Stenzel - initial API and implementation
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
diff --git a/oce-main/oce-crypto-api/pom.xml b/oce-main/oce-crypto-api/pom.xml
index 804c5e823..ed89f4854 100644
--- a/oce-main/oce-crypto-api/pom.xml
+++ b/oce-main/oce-crypto-api/pom.xml
@@ -1,3 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2014 Sebastian Stenzel
+  This file is licensed under the terms of the MIT license.
+  See the LICENSE.txt file for more info.
+  
+  Contributors:
+      Sebastian Stenzel - initial API and implementation
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
diff --git a/oce-main/oce-ui/pom.xml b/oce-main/oce-ui/pom.xml
index 44634ecf1..9264524b6 100644
--- a/oce-main/oce-ui/pom.xml
+++ b/oce-main/oce-ui/pom.xml
@@ -94,7 +94,7 @@
 						<configuration>
 							<target xmlns:fx="javafx:com.sun.javafx.tools.ant">
 								<taskdef uri="javafx:com.sun.javafx.tools.ant" resource="com/sun/javafx/tools/ant/antlib.xml" classpath="${javafx.tools.ant.jar}" />
-								<fx:application id="fxApp" name="${project.name}" mainClass="${exec.mainClass}" />
+								<fx:application id="fxApp" version="${project.version}" name="${project.name}" mainClass="${exec.mainClass}" />
 
 								<fx:jar destfile="${project.build.directory}/${project.build.finalName}">
 									<fx:application refid="fxApp" />
@@ -105,7 +105,10 @@
 								</fx:jar>
 
 								<fx:deploy outdir="${project.build.directory}/dist" outfile="${project.build.finalName}" nativeBundles="all">
-									<fx:info title="Cloud Encryptor" vendor="cloudencryptor.org" />
+									<fx:info title="Cloud Encryptor" vendor="cloudencryptor.org">
+										<!-- todo provide .ico and .icns files for osx/win -->
+										<fx:icon href="shortcut.ico" width="32" height="32" depth="8"/>
+									</fx:info>
 									<fx:platform basedir="" javafx="2.2+" j2se="8.0" />
 									<fx:application refid="fxApp" />
 									<fx:resources>
@@ -113,6 +116,7 @@
 										<fx:fileset dir="${project.build.directory}" includes="${project.build.finalName}.jar" />
 										<fx:fileset dir="${project.build.directory}" includes="libs/*.jar" />
 									</fx:resources>
+									<fx:preferences install="false" />
 								</fx:deploy>
 							</target>
 						</configuration>
diff --git a/oce-main/pom.xml b/oce-main/pom.xml
index dc9320023..c44ce6801 100644
--- a/oce-main/pom.xml
+++ b/oce-main/pom.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2014 Sebastian Stenzel This file is licensed under the terms of the MIT license. See the LICENSE.txt file for more info. Contributors: Sebastian Stenzel - initial API and implementation -->
+<!--
+  Copyright (c) 2014 Sebastian Stenzel
+  This file is licensed under the terms of the MIT license.
+  See the LICENSE.txt file for more info.
+  
+  Contributors:
+      Sebastian Stenzel - initial API and implementation
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.sebastianstenzel.oce</groupId>
@@ -20,7 +27,7 @@
 		<junit.version>4.11</junit.version>
 		<commons-io.version>2.4</commons-io.version>
 		<commons-collections.version>4.0</commons-collections.version>
-		<commons-lang.version>3.1</commons-lang.version>
+		<commons-lang3.version>3.1</commons-lang3.version>
 		<commons-codec.version>1.9</commons-codec.version>
 	</properties>
 
@@ -64,7 +71,7 @@
 			<dependency>
 				<groupId>org.apache.commons</groupId>
 				<artifactId>commons-lang3</artifactId>
-				<version>${commons-lang.version}</version>
+				<version>${commons-lang3.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>commons-codec</groupId>