Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

merge version 1.3.1 into stable branch #273

Merged
merged 14 commits into from
Jun 17, 2015
Merged

merge version 1.3.1 into stable branch #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e748343
Merge pull request #261 from sialcasa/stable
manuel-mauky Jun 10, 2015
97c0108
#256 update version to 1.4.0-SNAPSHOT for next dev cycle
manuel-mauky Jun 10, 2015
0f804e9
#264 getHighestMessage now works as expected
manuel-mauky Jun 11, 2015
e925715
Merge pull request #265 from sialcasa/264_highest_message_bug
manuel-mauky Jun 11, 2015
37df395
#263 first attempt of a testing helper for Notifications
manuel-mauky Jun 11, 2015
aa2a3e3
#263 finished notification test helper
manuel-mauky Jun 15, 2015
7290ee9
Merge pull request #266 from sialcasa/263_publish_testable
manuel-mauky Jun 15, 2015
bb071ff
import mvvmfx-parent's children from managed dependencies
tomasz Jun 15, 2015
63afa96
Merge pull request #269 from tomasz/269_maven_managed_deps
manuel-mauky Jun 16, 2015
9a7fa0f
#260 small changes to (sometimes) failing test.
manuel-mauky Jun 16, 2015
4cf841b
#263 notifications from viewModels are now directly send if no UI thr…
manuel-mauky Jun 16, 2015
05f8e2f
Merge pull request #270 from sialcasa/263_notification_outside_ui_thread
manuel-mauky Jun 16, 2015
d7d7cc4
Merge pull request #271 from sialcasa/260_long_running_test
manuel-mauky Jun 16, 2015
750b0c4
#272 change version to 1.3.1 to prepare for release
manuel-mauky Jun 17, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions README.md
View file
Open in desktop
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.1</version>
<version>1.3.1</version>
</dependency>
```

Expand All @@ -24,7 +24,7 @@ __MVVM__ is the enhanced version of the [Presentation Model](http://martinfowler
<dependency>
<groupId>de.saxsys</groupId>
<artifactId>mvvmfx</artifactId>
<version>1.3.0-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</dependency>
```

Expand All @@ -36,9 +36,9 @@ If you need help you can use the forums on [Google Groups](https://groups.google
### Links

- [Project Page](http://sialcasa.github.io/mvvmFX/)
- [javadoc mvvmfx core](http://sialcasa.github.io/mvvmFX/javadoc/1.2.0/mvvmfx/)
- [javadoc mvvmfx-cdi](http://sialcasa.github.io/mvvmFX/javadoc/1.2.0/mvvmfx-cdi/)
- [javadoc mvvmfx-guice](http://sialcasa.github.io/mvvmFX/javadoc/1.2.0/mvvmfx-guice/)
- [javadoc mvvmfx-utils](http://sialcasa.github.io/mvvmFX/javadoc/1.2.0/mvvmfx-utils/)
- [javadoc mvvmfx-testing-utils](http://sialcasa.github.io/mvvmFX/javadoc/1.2.0/mvvmfx-testing-utils/)
- [javadoc mvvmfx core](http://sialcasa.github.io/mvvmFX/javadoc/1.3.0/mvvmfx/)
- [javadoc mvvmfx-cdi](http://sialcasa.github.io/mvvmFX/javadoc/1.3.0/mvvmfx-cdi/)
- [javadoc mvvmfx-guice](http://sialcasa.github.io/mvvmFX/javadoc/1.3.0/mvvmfx-guice/)
- [javadoc mvvmfx-utils](http://sialcasa.github.io/mvvmFX/javadoc/1.3.0/mvvmfx-utils/)
- [javadoc mvvmfx-testing-utils](http://sialcasa.github.io/mvvmFX/javadoc/1.3.0/mvvmfx-testing-utils/)

3 changes: 1 addition & 2 deletions examples/mvvmfx-books-example/pom.xml
View file
Open in desktop
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.3.0</version>
<version>1.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -21,7 +21,6 @@
<dependency>
<groupId>de.saxsys</groupId>
<artifactId>mvvmfx</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>eu.lestard</groupId>
Expand Down
5 changes: 1 addition & 4 deletions examples/mvvmfx-cdi-starter/pom.xml
View file
Open in desktop
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.3.0</version>
<version>1.3.1</version>
</parent>

<properties>
Expand All @@ -31,17 +31,14 @@
<dependency>
<groupId>de.saxsys</groupId>
<artifactId>mvvmfx</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>de.saxsys</groupId>
<artifactId>mvvmfx-cdi</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>de.saxsys</groupId>
<artifactId>mvvmfx-complex</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
Expand Down
3 changes: 1 addition & 2 deletions examples/mvvmfx-complex-example/pom.xml
View file
Open in desktop
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.3.0</version>
<version>1.3.1</version>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down Expand Up @@ -45,7 +45,6 @@
<dependency>
<groupId>de.saxsys</groupId>
<artifactId>mvvmfx</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
Expand Down
5 changes: 1 addition & 4 deletions examples/mvvmfx-contacts/pom.xml
View file
Open in desktop
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.3.0</version>
<version>1.3.1</version>
</parent>
<artifactId>mvvmfx-contacts</artifactId>

Expand All @@ -33,12 +33,10 @@
<dependency>
<groupId>de.saxsys</groupId>
<artifactId>mvvmfx</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>de.saxsys</groupId>
<artifactId>mvvmfx-cdi</artifactId>
<version>${project.parent.version}</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -117,7 +115,6 @@
<dependency>
<groupId>de.saxsys</groupId>
<artifactId>mvvmfx-testing-utils</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
3 changes: 1 addition & 2 deletions examples/mvvmfx-fx-root-example/pom.xml
View file
Open in desktop
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.3.0</version>
<version>1.3.1</version>
</parent>

<properties>
Expand All @@ -21,7 +21,6 @@
<dependency>
<groupId>de.saxsys</groupId>
<artifactId>mvvmfx</artifactId>
<version>${project.parent.version}</version>
</dependency>

<dependency>
Expand Down
5 changes: 1 addition & 4 deletions examples/mvvmfx-guice-starter/pom.xml
View file
Open in desktop
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.3.0</version>
<version>1.3.1</version>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down Expand Up @@ -45,17 +45,14 @@
<dependency>
<groupId>de.saxsys</groupId>
<artifactId>mvvmfx</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>de.saxsys</groupId>
<artifactId>mvvmfx-guice</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>de.saxsys</groupId>
<artifactId>mvvmfx-complex</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down
3 changes: 1 addition & 2 deletions examples/mvvmfx-helloworld-without-fxml/pom.xml
View file
Open in desktop
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.3.0</version>
<version>1.3.1</version>
</parent>

<properties>
Expand All @@ -21,7 +21,6 @@
<dependency>
<groupId>de.saxsys</groupId>
<artifactId>mvvmfx</artifactId>
<version>${project.parent.version}</version>
</dependency>
</dependencies>

Expand Down
3 changes: 1 addition & 2 deletions examples/mvvmfx-helloworld/pom.xml
View file
Open in desktop
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.3.0</version>
<version>1.3.1</version>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand All @@ -19,7 +19,6 @@
<dependency>
<groupId>de.saxsys</groupId>
<artifactId>mvvmfx</artifactId>
<version>${project.parent.version}</version>
</dependency>
</dependencies>

Expand Down
3 changes: 1 addition & 2 deletions examples/mvvmfx-synchronizefx/pom.xml
View file
Open in desktop
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.3.0</version>
<version>1.3.1</version>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand All @@ -19,7 +19,6 @@
<dependency>
<groupId>de.saxsys</groupId>
<artifactId>mvvmfx</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>de.saxsys.synchronizefx</groupId>
Expand Down
3 changes: 1 addition & 2 deletions examples/mvvmfx-todomvc/pom.xml
View file
Open in desktop
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.3.0</version>
<version>1.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -15,7 +15,6 @@
<dependency>
<groupId>de.saxsys</groupId>
<artifactId>mvvmfx</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.fxmisc.easybind</groupId>
Expand Down
58 changes: 57 additions & 1 deletion examples/pom.xml
View file
Open in desktop
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.3.0</version>
<version>1.3.1</version>
</parent>

<artifactId>mvvmfx-examples</artifactId>
Expand All @@ -25,4 +25,60 @@
<module>mvvmfx-todomvc</module>
</modules>


<dependencyManagement>
<dependencies>
<dependency>
<groupId>de.saxsys</groupId>
<artifactId>mvvmfx-complex</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>de.saxsys</groupId>
<artifactId>mvvmfx-guice-example</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>de.saxsys</groupId>
<artifactId>mvvmfx-cdi-example</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>de.saxsys</groupId>
<artifactId>mvvmfx-fx-root-example</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>de.saxsys</groupId>
<artifactId>mvvmfx-helloworld</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>de.saxsys</groupId>
<artifactId>mvvmfx-helloworld-without-fxml</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>de.saxsys</groupId>
<artifactId>mvvmfx-synchronizefx</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>de.saxsys</groupId>
<artifactId>mvvmfx-contacts</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>de.saxsys</groupId>
<artifactId>mvvmfx-library-example</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>de.saxsys</groupId>
<artifactId>mvvmfx-todomvc</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

</project>
6 changes: 1 addition & 5 deletions mvvmfx-archetype/pom.xml
View file
Open in desktop
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.3.0</version>
<version>1.3.1</version>
</parent>


Expand All @@ -17,10 +17,6 @@
An maven archetype to create an example application with mvvmFX
</description>

<properties>
<version.mvvmfx>${project.parent.version}</version.mvvmfx>
</properties>


<build>
<extensions>
Expand Down
12 changes: 11 additions & 1 deletion mvvmfx-archetype/src/main/resources/archetype-resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,22 @@
<maven.compiler.target>1.8</maven.compiler.target>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>de.saxsys</groupId>
<artifactId>mvvmfx-parent</artifactId>
<version>1.3.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>de.saxsys</groupId>
<artifactId>mvvmfx</artifactId>
<version>${version}</version>
</dependency>
</dependencies>

Expand Down
3 changes: 1 addition & 2 deletions mvvmfx-cdi/pom.xml
View file
Open in desktop
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.3.0</version>
<version>1.3.1</version>
</parent>

<artifactId>mvvmfx-cdi</artifactId>
Expand Down Expand Up @@ -49,7 +49,6 @@
<dependency>
<groupId>de.saxsys</groupId>
<artifactId>mvvmfx</artifactId>
<version>${project.parent.version}</version>
<scope>provided</scope>
</dependency>

Expand Down
3 changes: 1 addition & 2 deletions mvvmfx-guice/pom.xml
View file
Open in desktop
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.3.0</version>
<version>1.3.1</version>
</parent>

<artifactId>mvvmfx-guice</artifactId>
Expand All @@ -46,7 +46,6 @@
<dependency>
<groupId>de.saxsys</groupId>
<artifactId>mvvmfx</artifactId>
<version>${project.parent.version}</version>
<scope>provided</scope>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion mvvmfx-testing-utils/pom.xml
View file
Open in desktop
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.3.0</version>
<version>1.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Loading