Skip to content
Snippets Groups Projects
Commit 3e259dc0 authored by Goik Martin's avatar Goik Martin
Browse files

Merge branch 'java_9_tj' into 'master'

Java 9

See merge request !2
parents 51bbb1ac 6d73bd88
No related branches found
No related tags found
1 merge request!2Java 9
......@@ -2,4 +2,55 @@
/.settings/
.classpath
.project
dependency-reduced-pom.xml
\ No newline at end of file
dependency-reduced-pom.xml
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
# Source: https://github.com/github/gitignore/blob/master/Global/JetBrains.gitignore
# User-specific stuff:
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/dictionaries
# Sensitive or high-churn files:
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
# Gradle:
.idea/**/gradle.xml
.idea/**/libraries
# CMake
cmake-build-debug/
cmake-build-release/
# Mongo Explorer plugin:
.idea/**/mongoSettings.xml
## File-based project format:
*.iws
## Plugin-specific files:
# IntelliJ
out/
# mpeltonen/sbt-idea plugin
.idea_modules/
# JIRA plugin
atlassian-ide-plugin.xml
# Cursive Clojure plugin
.idea/replstate.xml
# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties
\ No newline at end of file
......@@ -4,7 +4,7 @@
<groupId>de.hdm-stuttgart.mi.sda2</groupId>
<artifactId>maven-prototype-javafx</artifactId>
<version>1.0</version>
<version>1.1</version>
<packaging>jar</packaging>
<name>account</name>
......@@ -34,13 +34,6 @@
<artifactId>controlsfx</artifactId>
<version>8.20.9</version>
</dependency>
<!-- supposed to be superseeded by Jdk 8u40 in mid-2015 -->
<dependency>
<groupId>org.controlsfx</groupId>
<artifactId>openjfx-dialogs</artifactId>
<version>1.0.3</version>
</dependency>
</dependencies>
......@@ -51,8 +44,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>1.9</source>
<target>1.9</target>
</configuration>
</plugin>
<plugin>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment