Merge branch 'develop' into Scopes-154

* develop: try to fix upload script external snapshot script for travis remove by hand install of java changed travis java install travis will make snapshots for release branch travis will make snapshots for release branch update version for dev branch to 1.5.0-SNAPSHOT #311 update version to 1.4.1-SNAPSHOT #298 some small fixes for the pull request for list mapping Fixed compile errors in Eclipse. #311
sialcasa · Nov 4, 2015 · be91b80 · be91b80
2 parents 95d9e1b + f7838f8
commit be91b80
Show file tree

Hide file tree

Showing 23 changed files with 330 additions and 238 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,16 +1,20 @@
 language: java
 
-sudo: required
+sudo: false
 
 jdk:
   - oraclejdk8
 
 install: true
 
+addons:
+  apt:
+    packages:
+    - oracle-java8-installer
+
 before_install:
 - export DISPLAY=:99.0
 - sh -e /etc/init.d/xvfb start
-- sudo apt-get update && sudo apt-get install oracle-java8-installer
 - java -version
 
 env:
@@ -19,4 +23,5 @@ env:
   - secure: Bm0zIwBo4saIBlfr9YDvNqd8UN50FeT2hZyum3RFDmJqaXiUqwxw7sCz/lRjUwTfQrvGJXQ1I8le7zE4OVQdvpn4/LwwTJIjLY2jZNjzs4mZhkHzsM5IcGcL3lukR6soVYrGloQwmw63Okw2kZxces+1fveisPIKDlVaU1RTtMQ=
 
 after_success:
- - "[[ $TRAVIS_BRANCH == \"develop\" ]] && { python addServer.py; mvn clean deploy -pl 'mvvmfx,mvvmfx-cdi,mvvmfx-guice,mvvmfx-archetype' -am -DskipTests=true --settings ~/.m2/mySettings.xml; };"
+ - chmod ugo+x travis_snapshot_release.sh
+ - ./travis_snapshot_release.sh
diff --git a/README.md b/README.md
@@ -11,20 +11,38 @@ __MVVM__ is the enhanced version of the [Presentation Model](http://martinfowler
 ### Maven dependency###
 
 #### Stable Release
-```
+
+This is the stable release that can be used in production.
+
+```xml
 <dependency>
 		<groupId>de.saxsys</groupId>
 		<artifactId>mvvmfx</artifactId>
 		<version>1.4.0</version>
 </dependency>
 ```
 
+#### Bugfix Development Snapshot
+
+Here we make bug fixes for the current stable release.
+
+```xml
+<dependency>
+		<groupId>de.saxsys</groupId>
+		<artifactId>mvvmfx</artifactId>
+		<version>1.4.1-SNAPSHOT</version>
+</dependency>
+```
+
 #### Development Snapshot
+
+Here we develop new features. This release is unstable and shouldn't be used in production. 
+
 ```
 <dependency>
 		<groupId>de.saxsys</groupId>
 		<artifactId>mvvmfx</artifactId>
-		<version>1.4.1-SNAPSHOT</version>
+		<version>1.5.0-SNAPSHOT</version>
 </dependency>
 ```
 

diff --git a/examples/books-example/pom.xml b/examples/books-example/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>de.saxsys.mvvmfx</groupId>
 		<artifactId>examples</artifactId>
-		<version>1.4.1-SNAPSHOT</version>
+		<version>1.5.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/examples/contacts-example/pom.xml b/examples/contacts-example/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>de.saxsys.mvvmfx</groupId>
 		<artifactId>examples</artifactId>
-		<version>1.4.1-SNAPSHOT</version>
+		<version>1.5.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>contacts-example</artifactId>
 

diff --git a/examples/mini-examples/fx-root-example/pom.xml b/examples/mini-examples/fx-root-example/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>mini-examples</artifactId>
 		<groupId>de.saxsys.mvvmfx</groupId>
-		<version>1.4.1-SNAPSHOT</version>
+		<version>1.5.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/examples/mini-examples/helloworld-without-fxml/pom.xml b/examples/mini-examples/helloworld-without-fxml/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>mini-examples</artifactId>
 		<groupId>de.saxsys.mvvmfx</groupId>
-		<version>1.4.1-SNAPSHOT</version>
+		<version>1.5.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/examples/mini-examples/helloworld/pom.xml b/examples/mini-examples/helloworld/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>mini-examples</artifactId>
 		<groupId>de.saxsys.mvvmfx</groupId>
-		<version>1.4.1-SNAPSHOT</version>
+		<version>1.5.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/examples/mini-examples/pom.xml b/examples/mini-examples/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>examples</artifactId>
 		<groupId>de.saxsys.mvvmfx</groupId>
-		<version>1.4.1-SNAPSHOT</version>
+		<version>1.5.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>

diff --git a/examples/mini-examples/synchronizefx-example/pom.xml b/examples/mini-examples/synchronizefx-example/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>mini-examples</artifactId>
 		<groupId>de.saxsys.mvvmfx</groupId>
-		<version>1.4.1-SNAPSHOT</version>
+		<version>1.5.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/examples/mini-examples/welcome-example/pom.xml b/examples/mini-examples/welcome-example/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>mini-examples</artifactId>
 		<groupId>de.saxsys.mvvmfx</groupId>
-		<version>1.4.1-SNAPSHOT</version>
+		<version>1.5.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>de.saxsys</groupId>
 		<artifactId>mvvmfx-parent</artifactId>
-		<version>1.4.1-SNAPSHOT</version>
+		<version>1.5.0-SNAPSHOT</version>
 	</parent>
 
 	<groupId>de.saxsys.mvvmfx</groupId>

diff --git a/examples/todomvc-example/pom.xml b/examples/todomvc-example/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>de.saxsys.mvvmfx</groupId>
 		<artifactId>examples</artifactId>
-		<version>1.4.1-SNAPSHOT</version>
+		<version>1.5.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/mvvmfx-archetype/pom.xml b/mvvmfx-archetype/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>de.saxsys</groupId>
 		<artifactId>mvvmfx-parent</artifactId>
-		<version>1.4.1-SNAPSHOT</version>
+		<version>1.5.0-SNAPSHOT</version>
 	</parent>
 
 

diff --git a/mvvmfx-archetype/src/main/resources/archetype-resources/pom.xml b/mvvmfx-archetype/src/main/resources/archetype-resources/pom.xml
@@ -16,7 +16,7 @@
 			<dependency>
 				<groupId>de.saxsys</groupId>
 				<artifactId>mvvmfx-parent</artifactId>
-				<version>1.4.1-SNAPSHOT</version>
+				<version>1.5.0-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

diff --git a/mvvmfx-cdi/pom.xml b/mvvmfx-cdi/pom.xml
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>de.saxsys</groupId>
 		<artifactId>mvvmfx-parent</artifactId>
-		<version>1.4.1-SNAPSHOT</version>
+		<version>1.5.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>mvvmfx-cdi</artifactId>

diff --git a/mvvmfx-guice/pom.xml b/mvvmfx-guice/pom.xml
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>de.saxsys</groupId>
 		<artifactId>mvvmfx-parent</artifactId>
-		<version>1.4.1-SNAPSHOT</version>
+		<version>1.5.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>mvvmfx-guice</artifactId>

diff --git a/mvvmfx-testing-utils/pom.xml b/mvvmfx-testing-utils/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvvmfx-parent</artifactId>
         <groupId>de.saxsys</groupId>
-        <version>1.4.1-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/mvvmfx-utils/pom.xml b/mvvmfx-utils/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvvmfx-parent</artifactId>
         <groupId>de.saxsys</groupId>
-        <version>1.4.1-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/mvvmfx/pom.xml b/mvvmfx/pom.xml
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>de.saxsys</groupId>
 		<artifactId>mvvmfx-parent</artifactId>
-		<version>1.4.1-SNAPSHOT</version>
+		<version>1.5.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>mvvmfx</artifactId>

diff --git a/mvvmfx/src/main/java/de/saxsys/mvvmfx/utils/commands/DelegateCommand.java b/mvvmfx/src/main/java/de/saxsys/mvvmfx/utils/commands/DelegateCommand.java
@@ -126,7 +126,7 @@ public void execute() {
 				try {
 					actionSupplier.get().action();
 				} catch (Exception e) {
-					e.printStackTrace();
+					throw new RuntimeException(e);
 				}
 			}
 		}