Merge branch 'hotfix_237_update_dependency_versions' into stable

sialcasa · May 13, 2015 · 2522843 · 2522843
2 parents a0875e1 + 769daa5
commit 2522843
Show file tree

Hide file tree

Showing 19 changed files with 57 additions and 33 deletions.
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ __MVVM__ is the enhanced version of the [Presentation Model](http://martinfowler
 <dependency>
 		<groupId>de.saxsys</groupId>
 		<artifactId>mvvmfx</artifactId>
-		<version>1.2.0</version>
+		<version>1.2.1</version>
 </dependency>
 ```
 

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

diff --git a/examples/mvvmfx-cdi-starter/pom.xml b/examples/mvvmfx-cdi-starter/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>de.saxsys</groupId>
 		<artifactId>mvvmfx-examples</artifactId>
-		<version>1.2.0</version>
+		<version>1.2.1</version>
 	</parent>
 
 	<properties>

diff --git a/examples/mvvmfx-complex-example/pom.xml b/examples/mvvmfx-complex-example/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>de.saxsys</groupId>
 		<artifactId>mvvmfx-examples</artifactId>
-		<version>1.2.0</version>
+		<version>1.2.1</version>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

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

diff --git a/examples/mvvmfx-fx-root-example/pom.xml b/examples/mvvmfx-fx-root-example/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>de.saxsys</groupId>
 		<artifactId>mvvmfx-examples</artifactId>
-		<version>1.2.0</version>
+		<version>1.2.1</version>
 	</parent>
 
 	<properties>

diff --git a/examples/mvvmfx-guice-starter/pom.xml b/examples/mvvmfx-guice-starter/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>de.saxsys</groupId>
 		<artifactId>mvvmfx-examples</artifactId>
-		<version>1.2.0</version>
+		<version>1.2.1</version>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/examples/mvvmfx-helloworld-without-fxml/pom.xml b/examples/mvvmfx-helloworld-without-fxml/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>de.saxsys</groupId>
 		<artifactId>mvvmfx-examples</artifactId>
-		<version>1.2.0</version>
+		<version>1.2.1</version>
 	</parent>
 
 	<properties>

diff --git a/examples/mvvmfx-helloworld/pom.xml b/examples/mvvmfx-helloworld/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>de.saxsys</groupId>
 		<artifactId>mvvmfx-examples</artifactId>
-		<version>1.2.0</version>
+		<version>1.2.1</version>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/examples/mvvmfx-synchronizefx/pom.xml b/examples/mvvmfx-synchronizefx/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>de.saxsys</groupId>
 		<artifactId>mvvmfx-examples</artifactId>
-		<version>1.2.0</version>
+		<version>1.2.1</version>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/examples/mvvmfx-todomvc/pom.xml b/examples/mvvmfx-todomvc/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>mvvmfx-examples</artifactId>
 		<groupId>de.saxsys</groupId>
-		<version>1.2.0</version>
+		<version>1.2.1</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.2.0</version>
+		<version>1.2.1</version>
 	</parent>
 
 	<artifactId>mvvmfx-examples</artifactId>

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.2.0</version>
+		<version>1.2.1</version>
 	</parent>
 
 

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.2.0</version>
+		<version>1.2.1</version>
 	</parent>
 
 	<artifactId>mvvmfx-cdi</artifactId>
@@ -61,20 +61,17 @@
 		<dependency>
 			<groupId>javax.enterprise</groupId>
 			<artifactId>cdi-api</artifactId>
-			<version>1.1</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.jboss.weld.se</groupId>
 			<artifactId>weld-se</artifactId>
-			<version>2.1.0.Final</version>
 		</dependency>
 
 		<!-- Testing Frameworks -->
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
-			<version>1.1.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

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.2.0</version>
+		<version>1.2.1</version>
 	</parent>
 
 	<artifactId>mvvmfx-guice</artifactId>
@@ -54,10 +54,8 @@
 		<dependency>
 			<groupId>com.cathive.fx</groupId>
 			<artifactId>fx-guice</artifactId>
-			<version>8.0.0</version>
 		</dependency>
 
-
 		<!-- Testing Frameworks -->
 		<dependency>
 			<groupId>org.assertj</groupId>

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.2.0</version>
+        <version>1.2.1</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.2.0</version>
+        <version>1.2.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -33,7 +33,6 @@
         <dependency>
             <groupId>de.saxsys</groupId>
             <artifactId>jfx-testrunner</artifactId>
-            <version>1.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>

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.2.0</version>
+		<version>1.2.1</version>
 	</parent>
 
 	<artifactId>mvvmfx</artifactId>
@@ -72,21 +72,18 @@
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
-			<version>1.1.2</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>de.saxsys</groupId>
 			<artifactId>jfx-testrunner</artifactId>
-			<version>1.1</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>com.cedarsoft.commons</groupId>
 			<artifactId>test-utils</artifactId>
-			<version>6.1.1</version>
 			<scope>test</scope>
 		</dependency>
 

diff --git a/pom.xml b/pom.xml
@@ -26,7 +26,7 @@
 	<groupId>de.saxsys</groupId>
 	<artifactId>mvvmfx-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>1.2.0</version>
+	<version>1.2.1</version>
 	<name>mvvmFX parent</name>
 	<description>Application Framework for MVVM with JavaFX.</description>
 	<url>http://www.saxsys.de</url>
@@ -90,23 +90,23 @@
 			<dependency>
 				<groupId>org.slf4j</groupId>
 				<artifactId>slf4j-api</artifactId>
-				<version>1.7.6</version>
+				<version>1.7.12</version>
 			</dependency>
 			<dependency>
 				<groupId>org.slf4j</groupId>
 				<artifactId>slf4j-simple</artifactId>
-				<version>1.7.9</version>
+				<version>1.7.12</version>
 			</dependency>
 			<dependency>
 				<groupId>net.jodah</groupId>
 				<artifactId>typetools</artifactId>
-				<version>0.4.0</version>
+				<version>0.4.1</version>
 			</dependency>
 
 			<dependency>
 				<groupId>eu.lestard</groupId>
 				<artifactId>advanced-bindings</artifactId>
-				<version>0.3.0</version>
+				<version>0.4.0</version>
 			</dependency>
 
 			<dependency>
@@ -115,6 +115,24 @@
 				<version>0.1</version>
 			</dependency>
 
+			<!-- DI frameworks -->
+			<dependency>
+				<groupId>javax.enterprise</groupId>
+				<artifactId>cdi-api</artifactId>
+				<version>1.2</version>
+			</dependency>
+			<dependency>
+				<groupId>org.jboss.weld.se</groupId>
+				<artifactId>weld-se</artifactId>
+				<version>2.2.11.Final</version>
+			</dependency>
+
+			<dependency>
+				<groupId>com.cathive.fx</groupId>
+				<artifactId>fx-guice</artifactId>
+				<version>8.0.0</version>
+			</dependency>
+
 			<!-- Testing Frameworks -->
 			<dependency>
 				<groupId>junit</groupId>
@@ -141,8 +159,23 @@
 				<groupId>eu.lestard</groupId>
 				<artifactId>assertj-javafx</artifactId>
 				<version>0.3.0</version>
-				<scope>test</scope>
 			</dependency>
+			<dependency>
+				<groupId>de.saxsys</groupId>
+				<artifactId>jfx-testrunner</artifactId>
+				<version>1.1</version>
+			</dependency>
+			<dependency>
+				<groupId>com.cedarsoft.commons</groupId>
+				<artifactId>test-utils</artifactId>
+				<version>6.1.1</version>
+			</dependency>
+			<dependency>
+				<groupId>ch.qos.logback</groupId>
+				<artifactId>logback-classic</artifactId>
+				<version>1.1.3</version>
+			</dependency>
+
 		</dependencies>
 	</dependencyManagement>