Now using OpenJFX 11 (final) release.

dlsc-software-consulting-gmbh · Jan 9, 2019 · 96b36a9 · 96b36a9
1 parent f1b4f67
commit 96b36a9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 42 deletions.
diff --git a/formsfx-core/pom.xml b/formsfx-core/pom.xml
@@ -76,11 +76,10 @@
                     <force>true</force>
                     <windowtitle>FormsFX API</windowtitle>
                     <detectLinks>true</detectLinks>
-                    <javadocExecutable>/Library/Java/JavaVirtualMachines/jdk-10.jdk/Contents/Home/bin/javadoc</javadocExecutable>
+                    <javadocExecutable>/Library/Java/JavaVirtualMachines/jdk-11.jdk/Contents/Home/bin/javadoc</javadocExecutable>
                     <links>
                         <link>http://docs.oracle.com/javase/10/docs/api/</link>
                         <link>http://docs.oracle.com/javase/10/javafx/api/</link>
-                        <link>http://controlsfx.bitbucket.org</link>
                     </links>
                     <additionalJOption>-J-Djavafx.javadoc=true</additionalJOption>
                     <docfilessubdirs>true</docfilessubdirs>
@@ -113,9 +112,9 @@
                     <licenseName>apache20</licenseName>
                     <licenseResolver>${project.baseUri}/src/license
                     </licenseResolver>
-                    <organizationName>DLSC Software &amp; Consulting
+                    <organizationName>DLSC Software &amp; Consulting GmbH
                     </organizationName>
-                    <inceptionYear>2017</inceptionYear>
+                    <inceptionYear>2019</inceptionYear>
                     <projectName>FormsFX</projectName>
                     <processStartTag>
                         ========================LICENSE_START=================================
@@ -153,13 +152,13 @@
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-controls</artifactId>
-            <version>11-ea+25</version>
+            <version>11</version>
         </dependency>
 
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-fxml</artifactId>
-            <version>11-ea+25</version>
+            <version>11</version>
         </dependency>
 
         <!-- Test Dependencies -->

diff --git a/formsfx-core/src/license/licenses.properties b/formsfx-core/src/license/licenses.properties
@@ -1,37 +1 @@
-
-# ========================LICENSE_START=================================
-# FormsFX
-# %%
-# Copyright (C) 2017 DLSC Software & Consulting
-# %%
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#        http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# =========================LICENSE_END==================================
-
-# #%L
-# formsfx
-# %%
-# Copyright (C) 2017 DLSC Software & Consulting
-# %%
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#        http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# #L%
 apache20=Apache License 2.0
diff --git a/pom.xml b/pom.xml
@@ -10,6 +10,10 @@
     <packaging>pom</packaging>
     <version>11.3.1</version>
 
+    <prerequisites>
+        <maven>3.5.2</maven>
+    </prerequisites>
+
     <modules>
         <module>formsfx-core</module>
         <module>formsfx-demo</module>