Magic-Mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2024-11-26 21:40:29 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

using java 8

Browse Source
This commit is contained in:
Markus Kreusch 2014-03-19 21:11:13 +01:00
parent 392ccdd20a
commit bb959dd3b4
2 changed files with 2 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
oce-main/oce-ui/pom.xml
View File

@ -33,32 +33,11 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<!-- JavaFX 2 -->
<dependency>
<groupId>com.oracle</groupId>
<artifactId>javafx</artifactId>
</dependency>
<!-- <dependency> -->
<!-- <groupId>com.aquafx-project</groupId> -->
<!-- <artifactId>aquafx</artifactId> -->
<!-- <version>0.1</version> -->
<!-- </dependency> -->
</dependencies>
<build>
<plugins>
<!-- allows building using the maven goal "com.zenjava:javafx-maven-plugin:jar" -->
<!-- Java < 8: invoke this before your first build: http://zenjava.com/javafx/maven/fix-classpath.html -->
<plugin>
<groupId>com.zenjava</groupId>
<artifactId>javafx-maven-plugin</artifactId>
<version>2.0</version>
<configuration>
<mainClass>${exec.mainClass}</mainClass>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>

19
oce-main/pom.xml
View File

@ -20,7 +20,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.java.version>1.7</project.java.version>
<project.java.version>1.8</project.java.version>
<!-- dependency versions -->
<log4j.version>1.2.16</log4j.version>
@ -29,12 +29,6 @@
<commons-io.version>2.4</commons-io.version>
<commons-collections.version>4.0</commons-collections.version>
<commons-lang.version>3.1</commons-lang.version>
<!-- Will be included in Java 8. Until then we need this dependency -->
<javafx.version>2.2</javafx.version>
<jdk.home>/Library/Java/JavaVirtualMachines/jdk1.7.0_45.jdk/Contents/Home</jdk.home>
<javafx.runtime.lib.jar>${jdk.home}/jre/lib/jfxrt.jar</javafx.runtime.lib.jar>
<javafx.tools.ant.jar>${jdk.home}/lib/ant-javafx.jar</javafx.tools.ant.jar>
</properties>
<developers>
@ -87,15 +81,6 @@
<version>2.3.0</version>
</dependency>
<!-- JavaFX -->
<dependency>
<groupId>com.oracle</groupId>
<artifactId>javafx</artifactId>
<version>${javafx.version}</version>
<systemPath>${javafx.runtime.lib.jar}</systemPath>
<scope>system</scope>
</dependency>
<!-- JUnit -->
<dependency>
<groupId>junit</groupId>
@ -118,7 +103,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<version>3.1</version>
<configuration>
<source>${project.java.version}</source>
<target>${project.java.version}</target>