This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch release111
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/release111 by this push:
new 9808114 Get OpenJFX samples working in release branch. (#1358)
9808114 is described below
commit 9808114767566031eb08b3a2dc775fc1e0dc8da8
Author: Neil C Smith <[email protected]>
AuthorDate: Sun Jul 7 17:21:19 2019 +0100
Get OpenJFX samples working in release branch. (#1358)
* Add OpenJFX samples module to JavaFX cluster, and add as dependency to
javafx2.kit to enable via ergonomics.
* Fix RAT fail due to missing license on project.properties.
---
javafx/javafx2.kit/nbproject/project.xml | 6 ++++++
javafx/openjfx.samples/nbproject/project.properties | 17 +++++++++++++++++
nbbuild/cluster.properties | 3 ++-
3 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/javafx/javafx2.kit/nbproject/project.xml
b/javafx/javafx2.kit/nbproject/project.xml
index 572a74b..51deab7 100644
--- a/javafx/javafx2.kit/nbproject/project.xml
+++ b/javafx/javafx2.kit/nbproject/project.xml
@@ -80,6 +80,12 @@
</run-dependency>
</dependency>
<dependency>
+
<code-name-base>org.netbeans.modules.openjfx.samples</code-name-base>
+ <run-dependency>
+ <specification-version>1.0</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
<code-name-base>org.netbeans.modules.maven.kit</code-name-base>
<run-dependency>
<release-version>1</release-version>
diff --git a/javafx/openjfx.samples/nbproject/project.properties
b/javafx/openjfx.samples/nbproject/project.properties
index ce61fd4..c0af75f 100644
--- a/javafx/openjfx.samples/nbproject/project.properties
+++ b/javafx/openjfx.samples/nbproject/project.properties
@@ -1 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
index d16330a..5a2071f 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
@@ -1565,7 +1565,8 @@ nb.cluster.javafx=\
javafx2.platform,\
javafx2.project,\
javafx2.samples,\
- javafx2.scenebuilder
+ javafx2.scenebuilder,\
+ openjfx.samples
nb.cluster.remote.dir=extra
nb.cluster.remote.depends=\
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
