You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by jt...@apache.org on 2021/08/04 04:17:17 UTC
[netbeans] branch master updated: Updating the HTML/Java project
template to work with Gradle 7.0
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new a3aa3d1 Updating the HTML/Java project template to work with Gradle 7.0
new 6456f47 Merge pull request #3083 from JaroslavTulach/jtulach/UpdateProjectTemplateToGradle70
a3aa3d1 is described below
commit a3aa3d14feba70f4a664e43b835f5be4a9387499
Author: Jaroslav Tulach <ja...@oracle.com>
AuthorDate: Mon Aug 2 07:26:58 2021 +0200
Updating the HTML/Java project template to work with Gradle 7.0
---
.../htmlui/resources/desktop_build.gradle.fmk | 4 ++--
.../htmlui/resources/gradle-wrapper.properties.fmk | 25 ----------------------
.../modules/gradle/htmlui/resources/layer.xml | 7 ------
.../gradle/htmlui/resources/root_build.gradle.fmk | 19 ++++++++--------
.../gradle/htmlui/resources/web_build.gradle.fmk | 9 +-------
5 files changed, 12 insertions(+), 52 deletions(-)
diff --git a/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/desktop_build.gradle.fmk b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/desktop_build.gradle.fmk
index f29b5f6..c4c2755 100644
--- a/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/desktop_build.gradle.fmk
+++ b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/desktop_build.gradle.fmk
@@ -51,8 +51,8 @@ if (!jdk8) {
</#noparse>
dependencies {
implementation commonProject
- implementation "org.netbeans.html:net.java.html.boot:1.6.1"
+ implementation "org.netbeans.html:net.java.html.boot:1.7.2"
implementation "com.dukescript.api:javafx.beaninfo:0.5"
runtimeOnly "com.dukescript.api:javafx.base:8.60.11"
- runtimeOnly "org.netbeans.html:net.java.html.boot.fx:1.6.1"
+ runtimeOnly "org.netbeans.html:net.java.html.boot.fx:1.7.2"
}
diff --git a/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/gradle-wrapper.properties.fmk b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/gradle-wrapper.properties.fmk
deleted file mode 100644
index 46ca126..0000000
--- a/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/gradle-wrapper.properties.fmk
+++ /dev/null
@@ -1,25 +0,0 @@
-<#--
-
- 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.
-
--->
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
diff --git a/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/layer.xml b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/layer.xml
index cbc65ca..719d483 100644
--- a/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/layer.xml
+++ b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/layer.xml
@@ -44,13 +44,6 @@
<file name="settings.gradle" url="settings.gradle.fmk">
<attr name="javax.script.ScriptEngine" stringvalue="freemarker"/>
</file>
- <folder name="gradle">
- <folder name="wrapper">
- <file name="gradle-wrapper.properties" url="gradle-wrapper.properties.fmk">
- <attr name="javax.script.ScriptEngine" stringvalue="freemarker"/>
- </file>
- </folder>
- </folder>
<folder name="app">
<file name="build.gradle" url="app_build.gradle.fmk">
<attr name="javax.script.ScriptEngine" stringvalue="freemarker"/>
diff --git a/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/root_build.gradle.fmk b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/root_build.gradle.fmk
index eda3807..dea1aaf 100644
--- a/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/root_build.gradle.fmk
+++ b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/root_build.gradle.fmk
@@ -18,15 +18,14 @@
under the License.
-->
-<#noparse>
-plugins {
- id "me.tatarka.retrolambda" version "3.7.1"
-}
-
apply plugin: 'java'
-
-group 'com.dukescript.demo'
-version '1.0-SNAPSHOT'
+<#if group?has_content>
+group '${group}'
+</#if>
+<#if version?has_content>
+version '${version}'
+</#if>
+<#noparse>
allprojects {
repositories {
@@ -38,9 +37,9 @@ targetCompatibility = '1.8'
sourceCompatibility = '1.8'
dependencies {
- implementation "org.netbeans.html:net.java.html.json:1.6.1"
+ implementation "org.netbeans.html:net.java.html.json:1.7.2"
implementation "com.dukescript.api:javafx.base:8.60.11"
implementation "com.dukescript.api:javafx.beaninfo:0.5"
- runtimeOnly "org.netbeans.html:ko4j:1.6.1"
+ runtimeOnly "org.netbeans.html:ko4j:1.7.2"
}
</#noparse>
diff --git a/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/web_build.gradle.fmk b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/web_build.gradle.fmk
index e1dca2d..bbbc5ba 100644
--- a/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/web_build.gradle.fmk
+++ b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/web_build.gradle.fmk
@@ -19,13 +19,11 @@
-->
buildscript {
- ext.bck2brwsr_version = '0.31'
-
repositories {
mavenCentral()
}
dependencies {
- classpath "org.apidesign.bck2brwsr:bck2brwsr-maven-plugin:$bck2brwsr_version"
+ classpath "org.apidesign.bck2brwsr:bck2brwsr-maven-plugin:0.50"
}
}
@@ -47,11 +45,6 @@ dependencies {
runtimeOnly "com.dukescript.api:javafx.base:8.60.11"
}
-configurations.bck2brwsr {
- exclude group: 'org.jetbrains', module: 'annotations'
- extendsFrom configurations.runtimeClasspath
-}
-
bck2brwsrPages.from {
fileTree("${commonProject.projectDir}/src/main/webapp/pages")
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists