You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by lk...@apache.org on 2022/12/22 18:02:22 UTC
[netbeans] branch delivery updated (fe168e6fb1 -> fedbbd143b)
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a change to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
discard fe168e6fb1 Fixing project loading issues with micronaut complex project.
omit 83d5a74de1 Upgrade version numbers for the affected modules
omit 61c57e2cd3 Make Java Platform available on non-java Gradle Projects
omit edb745340d Use Project Dictated JVM for Gradle Discovery (#4985)
omit 8fee76adf5 Made Gradle JavaCompilerProcessorFactory work in absence of a ClasspathProvider
omit 44ab4540a4 [#4865] Register JDPA and Java Compiler Output on Project level
omit bc6c461930 #4965: Fix issues with gradle pre-6.4 (#4995)
omit 5d3fe96b33 Fix #5015: Fix Gradle/broken task dependency and serialization (#5022)
omit 648564ff47 Fixed some Gradle introspection problems wit pre-6.1 Gradle Versions
add df9ce551fb Fixed some Gradle introspection problems wit pre-6.1 Gradle Versions
add 182ca8590f Fix #5015: Fix Gradle/broken task dependency and serialization (#5022)
add 367ae9dea0 #4965: Fix issues with gradle pre-6.4 (#4995)
add 435e86ad7b [#4865] Register JDPA and Java Compiler Output on Project level
add c729a4f1b6 Made Gradle JavaCompilerProcessorFactory work in absence of a ClasspathProvider
add c7b7d4a09f Use Project Dictated JVM for Gradle Discovery (#4985)
add 4a37b3625a Make Java Platform available on non-java Gradle Projects
add 6c11e077a6 Upgrade version numbers for the affected modules
new fedbbd143b Fixing project loading issues with micronaut complex project.
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (fe168e6fb1)
\
N -- N -- N refs/heads/delivery (fedbbd143b)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
---------------------------------------------------------------------
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
[netbeans] 01/01: Fixing project loading issues with micronaut complex project.
Posted by lk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit fedbbd143b852e8b41f370c7ca769c489f28c569
Author: Svata Dedic <sv...@oracle.com>
AuthorDate: Mon Dec 19 19:15:36 2022 +0100
Fixing project loading issues with micronaut complex project.
---
.../gradle/tooling/NbProjectInfoBuilder.java | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
index 0fd561a2cd..b17933e692 100644
--- a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
+++ b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
@@ -186,7 +186,7 @@ class NbProjectInfoBuilder {
public ValueAndType(Class type, Object value) {
this.type = type;
- this.value = Optional.of(value);
+ this.value = Optional.ofNullable(value);
}
public ValueAndType(Class type) {
@@ -290,7 +290,7 @@ class NbProjectInfoBuilder {
Map<String, Object> taskProperties = new HashMap<>();
Map<String, String> taskPropertyTypes = new HashMap<>();
- Map<String, Task> taskList = project.getTasks().getAsMap();
+ Map<String, Task> taskList = new HashMap<>(project.getTasks().getAsMap());
for (String s : taskList.keySet()) {
Task task = taskList.get(s);
Class taskClass = task.getClass();
@@ -307,7 +307,7 @@ class NbProjectInfoBuilder {
private void detectTaskDependencies(NbProjectInfoModel model) {
Map<String, Object> tasks = new HashMap<>();
- Map<String, Task> taskList = project.getTasks().getAsMap();
+ Map<String, Task> taskList = new HashMap<>(project.getTasks().getAsMap());
for (String s : taskList.keySet()) {
Task task = taskList.get(s);
Map<String, String> taskInfo = new HashMap<>();
@@ -684,7 +684,7 @@ class NbProjectInfoBuilder {
}
NamedDomainObjectContainer nc = (NamedDomainObjectContainer)value;
- Map<String, ?> m = nc.getAsMap();
+ Map<String, ?> m = new HashMap<>(nc.getAsMap());
List<String> ss = new ArrayList<>(m.keySet());
propertyTypes.put(prefix + propName + COLLECTION_KEYS_MARKER, String.join(";;", ss));
for (String k : m.keySet()) {
@@ -1000,14 +1000,12 @@ class NbProjectInfoBuilder {
List<String> compilerArgs;
- try {
- compilerArgs = (List<String>) getProperty(compileTask, "options", "allCompilerArgs");
- } catch (Throwable ex) {
- try {
- compilerArgs = (List<String>) getProperty(compileTask, "options", "compilerArgs");
- } catch (Throwable ex2) {
- compilerArgs = (List<String>) getProperty(compileTask, "kotlinOptions", "freeCompilerArgs");
- }
+ compilerArgs = (List<String>) getProperty(compileTask, "options", "allCompilerArgs");
+ if (compilerArgs == null) {
+ compilerArgs = (List<String>) getProperty(compileTask, "options", "compilerArgs");
+ }
+ if (compilerArgs == null) {
+ compilerArgs = (List<String>) getProperty(compileTask, "kotlinOptions", "freeCompilerArgs");
}
model.getInfo().put(propBase + lang + "_compiler_args", new ArrayList<>(compilerArgs));
}
---------------------------------------------------------------------
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