Skip to content

Commit

Permalink
Merge branch 'hotfix_237_update_dependency_versions' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
manuel-mauky committed May 13, 2015
2 parents a0875e1 + 769daa5 commit 2522843
Show file tree
Hide file tree
Showing 19 changed files with 57 additions and 33 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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>
```

Expand Down
2 changes: 1 addition & 1 deletion examples/mvvmfx-books-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion examples/mvvmfx-cdi-starter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion examples/mvvmfx-complex-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion examples/mvvmfx-contacts/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion examples/mvvmfx-fx-root-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion examples/mvvmfx-guice-starter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion examples/mvvmfx-helloworld-without-fxml/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion examples/mvvmfx-helloworld/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion examples/mvvmfx-synchronizefx/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion examples/mvvmfx-todomvc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion mvvmfx-archetype/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.saxsys</groupId>
<artifactId>mvvmfx-parent</artifactId>
<version>1.2.0</version>
<version>1.2.1</version>
</parent>


Expand Down
5 changes: 1 addition & 4 deletions mvvmfx-cdi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
4 changes: 1 addition & 3 deletions mvvmfx-guice/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion mvvmfx-testing-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
3 changes: 1 addition & 2 deletions mvvmfx-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -33,7 +33,6 @@
<dependency>
<groupId>de.saxsys</groupId>
<artifactId>jfx-testrunner</artifactId>
<version>1.1</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
5 changes: 1 addition & 4 deletions mvvmfx/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>

Expand Down
45 changes: 39 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>

Expand Down

0 comments on commit 2522843

Please sign in to comment.