[netbeans-jenkins-lib] branch master updated: Updated manifest for NB16u1
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-jenkins-lib.git
The following commit(s) were added to refs/heads/master by this push:
new bfe35f6 Updated manifest for NB16u1
bfe35f6 is described below
commit bfe35f64b78eaa67b8c8138b5194bd57bc4ce388
Author: Laszlo Kishalmi
AuthorDate: Thu Dec 22 18:44:45 2022 -0800
Updated manifest for NB16u1
---
meta/netbeansrelease.json | 4
1 file changed, 4 insertions(+)
diff --git a/meta/netbeansrelease.json b/meta/netbeansrelease.json
index c30a2de..fee4c97 100644
--- a/meta/netbeansrelease.json
+++ b/meta/netbeansrelease.json
@@ -878,6 +878,10 @@
"321935444b183aea1c4ff255d8d2ab8d50c60606": {
"vote": "1",
"position": "4"
+},
+"73dbc4e7f761295839396d66021475e5802e2db3": {
+"version": "u1",
+"position": "5"
}
},
"releasedate": {
-
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch release160 updated: Fixing project loading issues with micronaut complex project.
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch release160
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/release160 by this push:
new 73dbc4e7f7 Fixing project loading issues with micronaut complex
project.
73dbc4e7f7 is described below
commit 73dbc4e7f761295839396d66021475e5802e2db3
Author: Svata Dedic
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 taskProperties = new HashMap<>();
Map taskPropertyTypes = new HashMap<>();
-Map taskList = project.getTasks().getAsMap();
+Map 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 tasks = new HashMap<>();
-Map taskList = project.getTasks().getAsMap();
+Map taskList = new
HashMap<>(project.getTasks().getAsMap());
for (String s : taskList.keySet()) {
Task task = taskList.get(s);
Map taskInfo = new HashMap<>();
@@ -684,7 +684,7 @@ class NbProjectInfoBuilder {
}
NamedDomainObjectContainer nc =
(NamedDomainObjectContainer)value;
-Map m = nc.getAsMap();
+Map m = new HashMap<>(nc.getAsMap());
List 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 compilerArgs;
-try {
-compilerArgs = (List)
getProperty(compileTask, "options", "allCompilerArgs");
-} catch (Throwable ex) {
-try {
-compilerArgs = (List)
getProperty(compileTask, "options", "compilerArgs");
-} catch (Throwable ex2) {
-compilerArgs = (List)
getProperty(compileTask, "kotlinOptions", "freeCompilerArgs");
-}
+compilerArgs = (List)
getProperty(compileTask, "options", "allCompilerArgs");
+if (compilerArgs == null) {
+compilerArgs = (List)
getProperty(compileTask, "options", "compilerArgs");
+}
+if (compilerArgs == null) {
+compilerArgs = (List)
getProperty(compileTask, "kotlinOptions", "freeCompilerArgs");
}
model.getInfo().put(propBase + lang +
"_compiler_args", new ArrayList<>(compilerArgs));
}
-
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch master updated: Prevent AOBE on empty bad class files.
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 30a8cefa5a Prevent AOBE on empty bad class files.
30a8cefa5a is described below
commit 30a8cefa5a73f258b61939729e845672e66826fe
Author: Laszlo Kishalmi
AuthorDate: Thu Dec 22 10:33:17 2022 -0800
Prevent AOBE on empty bad class files.
---
.../lib/nbjavac/services/NBClassReader.java| 34 --
1 file changed, 18 insertions(+), 16 deletions(-)
diff --git
a/java/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBClassReader.java
b/java/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBClassReader.java
index d1ca38a3c1..9bad23cc29 100644
--- a/java/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBClassReader.java
+++ b/java/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBClassReader.java
@@ -88,23 +88,25 @@ public class NBClassReader extends ClassReader {
JavaFileObject origFile = c.classfile;
try (InputStream in = origFile.openInputStream()) {
byte[] data = readFile(in);
-int major = (Byte.toUnsignedInt(data[6]) << 8) +
Byte.toUnsignedInt(data[7]);
-int maxMajor = ClassFile.Version.MAX().major;
-if (maxMajor < major) {
-if (log.currentSourceFile() != null) {
-log.warning(0, Warnings.BigMajorVersion(origFile,
major, maxMajor));
-}
-data[6] = (byte) (maxMajor >> 8);
-data[7] = (byte) (maxMajor & 0xFF);
-byte[] dataFin = data;
-c.classfile = new ForwardingJavaFileObject(origFile) {
-@Override
-public InputStream openInputStream() throws
IOException {
-return new ByteArrayInputStream(dataFin);
+if (data.length > 8) {
+int major = (Byte.toUnsignedInt(data[6]) << 8) +
Byte.toUnsignedInt(data[7]);
+int maxMajor = ClassFile.Version.MAX().major;
+if (maxMajor < major) {
+if (log.currentSourceFile() != null) {
+log.warning(0,
Warnings.BigMajorVersion(origFile, major, maxMajor));
}
-};
-super.readClassFile(c);
-return ;
+data[6] = (byte) (maxMajor >> 8);
+data[7] = (byte) (maxMajor & 0xFF);
+byte[] dataFin = data;
+c.classfile = new
ForwardingJavaFileObject(origFile) {
+@Override
+public InputStream openInputStream() throws
IOException {
+return new ByteArrayInputStream(dataFin);
+}
+};
+super.readClassFile(c);
+return ;
+}
}
} catch (IOException ex) {
Logger.getLogger(NBClassReader.class.getName()).log(Level.FINE, null, ex);
-
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@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.
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
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 taskProperties = new HashMap<>();
Map taskPropertyTypes = new HashMap<>();
-Map taskList = project.getTasks().getAsMap();
+Map 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 tasks = new HashMap<>();
-Map taskList = project.getTasks().getAsMap();
+Map taskList = new
HashMap<>(project.getTasks().getAsMap());
for (String s : taskList.keySet()) {
Task task = taskList.get(s);
Map taskInfo = new HashMap<>();
@@ -684,7 +684,7 @@ class NbProjectInfoBuilder {
}
NamedDomainObjectContainer nc =
(NamedDomainObjectContainer)value;
-Map m = nc.getAsMap();
+Map m = new HashMap<>(nc.getAsMap());
List 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 compilerArgs;
-try {
-compilerArgs = (List)
getProperty(compileTask, "options", "allCompilerArgs");
-} catch (Throwable ex) {
-try {
-compilerArgs = (List)
getProperty(compileTask, "options", "compilerArgs");
-} catch (Throwable ex2) {
-compilerArgs = (List)
getProperty(compileTask, "kotlinOptions", "freeCompilerArgs");
-}
+compilerArgs = (List)
getProperty(compileTask, "options", "allCompilerArgs");
+if (compilerArgs == null) {
+compilerArgs = (List)
getProperty(compileTask, "options", "compilerArgs");
+}
+if (compilerArgs == null) {
+compilerArgs = (List)
getProperty(compileTask, "kotlinOptions", "freeCompilerArgs");
}
model.getInfo().put(propBase + lang +
"_compiler_args", new ArrayList<>(compilerArgs));
}
-
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[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-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch delivery updated: Fixing project loading issues with micronaut complex project.
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
The following commit(s) were added to refs/heads/delivery by this push:
new fe168e6fb1 Fixing project loading issues with micronaut complex
project.
fe168e6fb1 is described below
commit fe168e6fb17bd96cd0de1447bc3a3b55eaa1de95
Author: Svata Dedic
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 taskProperties = new HashMap<>();
Map taskPropertyTypes = new HashMap<>();
-Map taskList = project.getTasks().getAsMap();
+Map 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 tasks = new HashMap<>();
-Map taskList = project.getTasks().getAsMap();
+Map taskList = new
HashMap<>(project.getTasks().getAsMap());
for (String s : taskList.keySet()) {
Task task = taskList.get(s);
Map taskInfo = new HashMap<>();
@@ -684,7 +684,7 @@ class NbProjectInfoBuilder {
}
NamedDomainObjectContainer nc =
(NamedDomainObjectContainer)value;
-Map m = nc.getAsMap();
+Map m = new HashMap<>(nc.getAsMap());
List 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 compilerArgs;
-try {
-compilerArgs = (List)
getProperty(compileTask, "options", "allCompilerArgs");
-} catch (Throwable ex) {
-try {
-compilerArgs = (List)
getProperty(compileTask, "options", "compilerArgs");
-} catch (Throwable ex2) {
-compilerArgs = (List)
getProperty(compileTask, "kotlinOptions", "freeCompilerArgs");
-}
+compilerArgs = (List)
getProperty(compileTask, "options", "allCompilerArgs");
+if (compilerArgs == null) {
+compilerArgs = (List)
getProperty(compileTask, "options", "compilerArgs");
+}
+if (compilerArgs == null) {
+compilerArgs = (List)
getProperty(compileTask, "kotlinOptions", "freeCompilerArgs");
}
model.getInfo().put(propBase + lang +
"_compiler_args", new ArrayList<>(compilerArgs));
}
-
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
