[netbeans] branch master updated: Move NbProjectInfo out of Gradle API package
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 3929f3d892 Move NbProjectInfo out of Gradle API package
3929f3d892 is described below
commit 3929f3d89229baa9ca7aa3941f10254f490225b1
Author: Laszlo Kishalmi
AuthorDate: Thu Mar 31 07:00:25 2022 -0700
Move NbProjectInfo out of Gradle API package
---
.../nbproject/org-netbeans-modules-gradle.sig | 26 --
.../org/netbeans/modules/gradle/DebugTooling.java | 2 +-
.../gradle/tooling/NbProjectInfoBuilder.java | 2 +-
.../modules/gradle/tooling/NbProjectInfoModel.java | 2 +-
.../gradle/tooling/NetBeansToolingPlugin.java | 2 +-
.../{api => tooling/internal}/ModelFetcher.java| 2 +-
.../{api => tooling/internal}/NbProjectInfo.java | 2 +-
.../modules/gradle/cache/ProjectInfoDiskCache.java | 4 ++--
.../gradle/loaders/AbstractProjectLoader.java | 2 +-
.../gradle/loaders/BundleProjectLoader.java| 3 +--
.../gradle/loaders/LegacyProjectLoader.java| 4 ++--
.../modules/gradle/loaders/ModelCache.java | 2 +-
.../loaders/NbProjectInfoCachingDescriptor.java| 2 +-
13 files changed, 14 insertions(+), 41 deletions(-)
diff --git a/extide/gradle/nbproject/org-netbeans-modules-gradle.sig
b/extide/gradle/nbproject/org-netbeans-modules-gradle.sig
index c95a1b7659..a1d7b34833 100644
--- a/extide/gradle/nbproject/org-netbeans-modules-gradle.sig
+++ b/extide/gradle/nbproject/org-netbeans-modules-gradle.sig
@@ -230,23 +230,6 @@ meth public java.lang.String getPath()
supr java.lang.Object
hfds CAMLE_CASE_SPLITTER,description,group,name,path
-CLSS public final org.netbeans.modules.gradle.api.ModelFetcher
-cons public init()
-cons public init(java.util.concurrent.ExecutorService)
-meth public <%0 extends java.lang.Object, %1 extends java.lang.Object>
java.util.concurrent.Future<{%%0}>
requestModel(java.lang.Class<{%%0}>,java.lang.Class<{%%1}>,org.gradle.api.Action)
-meth public <%0 extends java.lang.Object, %1 extends java.lang.Object>
java.util.concurrent.Future<{%%0}>
requestModel(java.lang.String,java.lang.Class<{%%0}>,java.lang.Class<{%%1}>,org.gradle.api.Action)
-meth public <%0 extends java.lang.Object, %1 extends java.lang.Object> void
modelAction(java.lang.String,java.lang.Class<{%%0}>,java.lang.Class<{%%1}>,org.gradle.api.Action,org.gradle.api.Action<{%%0}>,org.gradle.api.Action)
-meth public <%0 extends java.lang.Object, %1 extends java.lang.Object> void
modelAction(java.lang.String,java.lang.Class<{%%0}>,org.gradle.api.Action<{%%0}>)
-meth public <%0 extends java.lang.Object, %1 extends java.lang.Object> void
modelAction(java.lang.String,java.lang.Class<{%%0}>,org.gradle.api.Action<{%%0}>,org.gradle.api.Action)
-meth public <%0 extends java.lang.Object> java.util.concurrent.Future<{%%0}>
requestModel(java.lang.Class<{%%0}>)
-meth public <%0 extends java.lang.Object> java.util.concurrent.Future<{%%0}>
requestModel(java.lang.String,java.lang.Class<{%%0}>)
-meth public boolean awaitTermination(long,java.util.concurrent.TimeUnit)
throws java.lang.InterruptedException
-meth public boolean isAcceptingRequests()
-meth public void
fetchModels(org.gradle.tooling.ProjectConnection,org.gradle.api.Action)
-supr java.lang.Object
-hfds REQUEST_SEQUENCER,action,executor,lock,modelResults
-hcls ModelRequest,ModelResult,MultiModelAction
-
CLSS public abstract interface
org.netbeans.modules.gradle.api.ModuleSearchSupport
meth public abstract
java.util.Set
findModules(java.lang.String)
meth public abstract
java.util.Set
findModules(java.lang.String,java.lang.String,java.lang.String)
@@ -297,15 +280,6 @@ meth public static
org.netbeans.modules.gradle.api.NbGradleProject$Quality value
meth public static org.netbeans.modules.gradle.api.NbGradleProject$Quality[]
values()
supr java.lang.Enum
-CLSS public abstract interface org.netbeans.modules.gradle.api.NbProjectInfo
-intf org.gradle.tooling.model.Model
-intf org.netbeans.modules.gradle.tooling.Model
-meth public abstract boolean getMiscOnly()
-meth public abstract java.util.Map getExt()
-meth public abstract java.util.Map getInfo()
-meth public abstract java.util.Set getProblems()
-meth public abstract
java.util.Set getReports()
-
CLSS public abstract interface
org.netbeans.modules.gradle.api.execute.ActionMapping
fld public final static java.lang.String CUSTOM_PREFIX = "custom-"
innr public final static !enum ReloadRule
diff --git
a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/DebugTooling.java
b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/DebugTooling.java
index 8b2866bf00..859fd0ed4e 100644
---
a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/DebugTooling.java
+++
[netbeans] branch master updated: upgrade maven-indexer to 6.21 and remove workaround for MINDEXER-157.
This is an automated email from the ASF dual-hosted git repository. mbien 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 d5d7b4b8a0 upgrade maven-indexer to 6.21 and remove workaround for MINDEXER-157. new bd6a7294a9 Merge pull request #4193 from mbien/indexer621 d5d7b4b8a0 is described below commit d5d7b4b8a0a7bbe95f61326a9568dc4e75be9eb5 Author: Michael Bien AuthorDate: Fri Jun 3 15:18:13 2022 +0200 upgrade maven-indexer to 6.21 and remove workaround for MINDEXER-157. --- java/maven.indexer/external/binaries-list | 2 +- ...e-6.2.0-license.txt => indexer-core-6.2.1-license.txt} | 2 +- ...ore-6.2.0-notice.txt => indexer-core-6.2.1-notice.txt} | 0 java/maven.indexer/nbproject/project.properties | 2 +- java/maven.indexer/nbproject/project.xml | 4 ++-- .../modules/maven/indexer/NexusRepositoryIndexerImpl.java | 15 --- 6 files changed, 5 insertions(+), 20 deletions(-) diff --git a/java/maven.indexer/external/binaries-list b/java/maven.indexer/external/binaries-list index b94b9cd08a..473bee0fc9 100644 --- a/java/maven.indexer/external/binaries-list +++ b/java/maven.indexer/external/binaries-list @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -DAC8414BE5ED80848526A503A2BE7EDF859825BB org.apache.maven.indexer:indexer-core:6.2.0 +F81F2D9431B345599ABD1E22FC489344B1BE03F1 org.apache.maven.indexer:indexer-core:6.2.1 75DCF930ECE95581AF3F31AF5692E4963FC7AD8E org.apache.lucene:lucene-core:8.11.1 558A389A0D68AA7CC4C26B9128C72D0D269D471F org.apache.lucene:lucene-highlighter:8.11.1 5A44DF2CB26FA1E0E64BE53FE474C7F1D5A3E634 org.apache.lucene:lucene-queryparser:8.11.1 diff --git a/java/maven.indexer/external/indexer-core-6.2.0-license.txt b/java/maven.indexer/external/indexer-core-6.2.1-license.txt similarity index 99% rename from java/maven.indexer/external/indexer-core-6.2.0-license.txt rename to java/maven.indexer/external/indexer-core-6.2.1-license.txt index 3c7c61e236..0c76dd2ca3 100644 --- a/java/maven.indexer/external/indexer-core-6.2.0-license.txt +++ b/java/maven.indexer/external/indexer-core-6.2.1-license.txt @@ -1,6 +1,6 @@ Name: Maven Indexer Description: Maven remote repository indexing engine. -Version: 6.2.0 +Version: 6.2.1 Origin: Apache Software Foundation License: Apache-2.0 URL: https://repo1.maven.org/maven2/org/apache/maven/indexer/ diff --git a/java/maven.indexer/external/indexer-core-6.2.0-notice.txt b/java/maven.indexer/external/indexer-core-6.2.1-notice.txt similarity index 100% rename from java/maven.indexer/external/indexer-core-6.2.0-notice.txt rename to java/maven.indexer/external/indexer-core-6.2.1-notice.txt diff --git a/java/maven.indexer/nbproject/project.properties b/java/maven.indexer/nbproject/project.properties index 5d02339f7c..6c42a1dcbc 100644 --- a/java/maven.indexer/nbproject/project.properties +++ b/java/maven.indexer/nbproject/project.properties @@ -19,7 +19,7 @@ test.config.stableBTD.includes=**/*Test.class is.autoload=true javac.source=1.8 javac.compilerargs=-Xlint -Xlint:-serial -release.external/indexer-core-6.2.0.jar=modules/ext/maven/indexer-core-6.2.0.jar +release.external/indexer-core-6.2.1.jar=modules/ext/maven/indexer-core-6.2.1.jar release.external/lucene-core-8.11.1.jar=modules/ext/maven/lucene-core-8.11.1.jar release.external/lucene-highlighter-8.11.1.jar=modules/ext/maven/lucene-highlighter-8.11.1.jar release.external/lucene-queryparser-8.11.1.jar=modules/ext/maven/lucene-queryparser-8.11.1.jar diff --git a/java/maven.indexer/nbproject/project.xml b/java/maven.indexer/nbproject/project.xml index 41d03c3ad0..4d016d62a8 100644 --- a/java/maven.indexer/nbproject/project.xml +++ b/java/maven.indexer/nbproject/project.xml @@ -175,8 +175,8 @@ org.netbeans.modules.maven.indexer.spi.impl - ext/maven/indexer-core-6.2.0.jar -external/indexer-core-6.2.0.jar + ext/maven/indexer-core-6.2.1.jar +external/indexer-core-6.2.1.jar ext/maven/lucene-core-8.11.1.jar diff --git a/java/maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java b/java/maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java index 42a9e0df19..4ab573fd62 100644 --- a/java/maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java +++ b/java/maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java @@ -1688,21 +1688,6 @@ public class NexusRepositoryIndexerImpl implements RepositoryIndexerImplementati } private void storeGroupCache(RepositoryInfo repoInfo, IndexingContext ic) throws
svn commit: r55019 - /dev/netbeans/netbeans-installers/14/ /release/netbeans/netbeans-installers/14/
Author: skygo Date: Thu Jun 9 13:41:04 2022 New Revision: 55019 Log: Apache NetBeans 14 windows installer Added: release/netbeans/netbeans-installers/14/Apache-NetBeans-14-bin-windows-x64.exe - copied unchanged from r55018, dev/netbeans/netbeans-installers/14/Apache-NetBeans-14-bin-windows-x64.exe release/netbeans/netbeans-installers/14/Apache-NetBeans-14-bin-windows-x64.exe.asc - copied unchanged from r55018, dev/netbeans/netbeans-installers/14/Apache-NetBeans-14-bin-windows-x64.exe.asc release/netbeans/netbeans-installers/14/Apache-NetBeans-14-bin-windows-x64.exe.sha512 - copied unchanged from r55018, dev/netbeans/netbeans-installers/14/Apache-NetBeans-14-bin-windows-x64.exe.sha512 Removed: dev/netbeans/netbeans-installers/14/Apache-NetBeans-14-bin-windows-x64.exe dev/netbeans/netbeans-installers/14/Apache-NetBeans-14-bin-windows-x64.exe.asc dev/netbeans/netbeans-installers/14/Apache-NetBeans-14-bin-windows-x64.exe.sha512 - 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
svn commit: r55018 - /dev/netbeans/netbeans-installers/13/
Author: skygo Date: Thu Jun 9 13:39:25 2022 New Revision: 55018 Log: removing released installer for Apache NetBeans 13 Removed: dev/netbeans/netbeans-installers/13/ - 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: Fix potential NPE in GradleModuleFileCache21 when trying to resolve non-gradle artifacts.
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 d4c991929a Fix potential NPE in GradleModuleFileCache21 when trying to
resolve non-gradle artifacts.
d4c991929a is described below
commit d4c991929ac33daf2c8733b0f700e00e0f70acb7
Author: Laszlo Kishalmi
AuthorDate: Wed Jun 8 16:20:14 2022 +0200
Fix potential NPE in GradleModuleFileCache21 when trying to resolve
non-gradle artifacts.
---
.../src/org/netbeans/modules/gradle/GradleModuleFileCache21.java | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git
a/extide/gradle/src/org/netbeans/modules/gradle/GradleModuleFileCache21.java
b/extide/gradle/src/org/netbeans/modules/gradle/GradleModuleFileCache21.java
index b81a28a26b..7782891774 100644
--- a/extide/gradle/src/org/netbeans/modules/gradle/GradleModuleFileCache21.java
+++ b/extide/gradle/src/org/netbeans/modules/gradle/GradleModuleFileCache21.java
@@ -222,12 +222,16 @@ public final class GradleModuleFileCache21 {
}
public CachedArtifactVersion resolveCachedArtifactVersion(Path artifact)
throws IllegalArgumentException {
-return new CachedArtifactVersion(artifact.getParent().getParent());
+return artifact == null
+|| artifact.getParent() == null
+|| artifact.getParent().getParent() == null
+? null
+: new CachedArtifactVersion(artifact.getParent().getParent());
}
public CachedArtifactVersion.Entry resolveEntry(Path artifact) throws
IllegalArgumentException {
CachedArtifactVersion av = resolveCachedArtifactVersion(artifact);
-return av.entries.get(artifact.getFileName().toString());
+return av != null ? av.entries.get(artifact.getFileName().toString())
: null;
}
public CachedArtifactVersion resolveModule(String moduleId) throws
IllegalArgumentException {
-
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
svn commit: r55017 - /dev/netbeans/netbeans-platform/14/ /dev/netbeans/netbeans/14/ /release/netbeans/netbeans-platform/13/ /release/netbeans/netbeans-platform/14/ /release/netbeans/netbeans/13/ /rele
Author: skygo Date: Thu Jun 9 13:35:55 2022 New Revision: 55017 Log: Apache NetBeans 14 release Added: release/netbeans/netbeans-platform/14/ - copied from r55016, dev/netbeans/netbeans-platform/14/ release/netbeans/netbeans/14/ - copied from r55016, dev/netbeans/netbeans/14/ Removed: dev/netbeans/netbeans-platform/14/ dev/netbeans/netbeans/14/ release/netbeans/netbeans-platform/13/ release/netbeans/netbeans/13/ - 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: Add property sheet for Gradle Configuration nodes
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 81af35ca15 Add property sheet for Gradle Configuration nodes
81af35ca15 is described below
commit 81af35ca1534a04554019de8336a14d628a1eb50
Author: Laszlo Kishalmi
AuthorDate: Thu Jun 2 21:42:38 2022 +0200
Add property sheet for Gradle Configuration nodes
---
extide/gradle/nbproject/project.xml| 2 +-
.../gradle/tooling/NbProjectInfoBuilder.java | 11 +++
.../gradle/api/GradleBaseProjectBuilder.java | 5 +
.../modules/gradle/api/GradleConfiguration.java| 26 ++
.../modules/gradle/cache/ProjectInfoDiskCache.java | 2 +-
.../modules/gradle/nodes/ConfigurationsNode.java | 104 +++--
6 files changed, 121 insertions(+), 29 deletions(-)
diff --git a/extide/gradle/nbproject/project.xml
b/extide/gradle/nbproject/project.xml
index 65840173c7..024a39262f 100644
--- a/extide/gradle/nbproject/project.xml
+++ b/extide/gradle/nbproject/project.xml
@@ -314,7 +314,7 @@
-7.38.1
+7.62
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 bc3c26203f..ff6c30571d 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
@@ -28,6 +28,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
@@ -53,6 +54,8 @@ import
org.gradle.api.artifacts.result.ComponentArtifactsResult;
import org.gradle.api.artifacts.result.ResolvedArtifactResult;
import org.gradle.api.artifacts.result.ResolvedDependencyResult;
import org.gradle.api.artifacts.result.UnresolvedDependencyResult;
+import org.gradle.api.attributes.Attribute;
+import org.gradle.api.attributes.AttributeContainer;
import org.gradle.api.distribution.DistributionContainer;
import org.gradle.api.file.ConfigurableFileCollection;
import org.gradle.api.initialization.IncludedBuild;
@@ -417,8 +420,16 @@ class NbProjectInfoBuilder {
String propBase = "configuration_" + it.getName() + "_";
model.getInfo().put(propBase + "non_resolving", !resolvable(it));
model.getInfo().put(propBase + "transitive", it.isTransitive());
+model.getInfo().put(propBase + "canBeConsumed",
it.isCanBeConsumed());
model.getInfo().put(propBase + "extendsFrom",
it.getExtendsFrom().stream().map(c ->
c.getName()).collect(Collectors.toCollection(HashSet::new)));
model.getInfo().put(propBase + "description",
it.getDescription());
+
+Map attributes = new LinkedHashMap<>();
+AttributeContainer attrs = it.getAttributes();
+for (Attribute attr : attrs.keySet()) {
+attributes.put(attr.getName(),
String.valueOf(attrs.getAttribute(attr)));
+}
+model.getInfo().put(propBase + "attributes", attributes);
});
//visibleConfigurations = visibleConfigurations.findAll() {
resolvable(it) }
visibleConfigurations.forEach(it -> {
diff --git
a/extide/gradle/src/org/netbeans/modules/gradle/api/GradleBaseProjectBuilder.java
b/extide/gradle/src/org/netbeans/modules/gradle/api/GradleBaseProjectBuilder.java
index dc5586c114..5aefbc9e75 100644
---
a/extide/gradle/src/org/netbeans/modules/gradle/api/GradleBaseProjectBuilder.java
+++
b/extide/gradle/src/org/netbeans/modules/gradle/api/GradleBaseProjectBuilder.java
@@ -284,6 +284,11 @@ class GradleBaseProjectBuilder implements
ProjectInfoExtractor.Result {
Boolean transitive = (Boolean) info.get("configuration_" +
name + "_transitive");
conf.transitive = transitive == null ? true : transitive;
+Boolean canBeConsumed = (Boolean) info.get("configuration_" +
name + "_canBeConsumed");
+conf.canBeConsumed = canBeConsumed == null ? false :
canBeConsumed;
+
+conf.attributes = (Map)
info.get("configuration_" + name + "_attributes");
+
conf.description = (String) info.get("configuration_" + name +
"_description");
}
for (String name : configurationNames) {
diff --git
