Resolve merge conflicts between delivery and master after 15-rc3

jirkabs · Aug 9, 2022 · 4a153e1 · 4a153e1
2 parents 658e173 + b760079
commit 4a153e1
Show file tree

Hide file tree

Showing 24 changed files with 556 additions and 421 deletions.
diff --git a/extide/gradle/src/org/netbeans/modules/gradle/loaders/DiskCacheProjectLoader.java b/extide/gradle/src/org/netbeans/modules/gradle/loaders/DiskCacheProjectLoader.java
@@ -43,9 +43,13 @@ public GradleProject load() {
         if (cache.isCompatible()) {
             GradleProject prev = createGradleProject(ctx.project.getGradleFiles(), cache.loadData());
             LOG.log(Level.FINER, "Loaded from cache: {0}, valid: {1}", new Object[] { prev, cache.isValid() });
-            if (cache.isValid() && GradleArtifactStore.getDefault().sanityCheckCachedProject(prev)) {
-                updateSubDirectoryCache(prev);
-                return prev;
+            if (GradleArtifactStore.getDefault().sanityCheckCachedProject(prev)) {
+                if (cache.isValid()) {
+                    updateSubDirectoryCache(prev);
+                    return prev;
+                } else {
+                    return prev.invalidate("Disk cache data is invalid.");
+                }
             }
         }
         return null;

diff --git a/extide/gradle/src/org/netbeans/modules/gradle/loaders/GradleProjectLoaderImpl.java b/extide/gradle/src/org/netbeans/modules/gradle/loaders/GradleProjectLoaderImpl.java
@@ -88,7 +88,8 @@ public GradleProject loadProject(NbGradleProject.Quality aim, String description
                     ret = loader.load();
                     LOGGER.log(Level.FINER, "Loaded with loader {0} -> {1}", new Object[] { loader, ret });
                 }
-                if (ret != null) {
+                if ((ret != null) && ret.getQuality().atLeast(aim)) {
+                    // We have the quality we are looking for, let's be happy with that
                     break;
                 }
             } else {

diff --git a/...roovy.debug/src/org/netbeans/modules/groovy/debug/GroovyBreakpointAnnotationListener.java b/...roovy.debug/src/org/netbeans/modules/groovy/debug/GroovyBreakpointAnnotationListener.java
diff --git a/groovy/groovy.debug/src/org/netbeans/modules/groovy/debug/GroovyBreakpointStratifier.java b/groovy/groovy.debug/src/org/netbeans/modules/groovy/debug/GroovyBreakpointStratifier.java
@@ -52,6 +52,7 @@
 @ServiceProvider(service = BreakpointStratifier.class)
 public final class GroovyBreakpointStratifier implements BreakpointStratifier {
 
+    public final static String GROOVY_STRATUM = "Groovy"; //NOI18N
     private static final Logger LOGGER = Logger.getLogger(GroovyBreakpointStratifier.class.getName());
 
     public GroovyBreakpointStratifier() {
@@ -78,7 +79,7 @@ public void stratify(JPDABreakpoint breakpoint) {
                 String printText = pt.replace("{groovyName}", (groovyName != null) ? groovyName : "?"); // NOI18N
                 String groovyPath = getGroovyPath(url, fo);
 
-                lb.setStratum("Groovy"); // NOI18N
+                lb.setStratum(GROOVY_STRATUM);
                 lb.setSourceName(groovyName);
                 lb.setSourcePath(groovyPath);
                 lb.setPreferredClassName(findGroovyClassName(groovyPath, fo, lineNumber));

diff --git a/ide/c.jcraft.jsch/nbproject/project.xml b/ide/c.jcraft.jsch/nbproject/project.xml
@@ -38,8 +38,8 @@
                     <code-name-base>libs.c.kohlschutter.junixsocket</code-name-base>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>2.32</specification-version>
+                        <release-version>2</release-version>
+                        <specification-version>3.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

diff --git a/ide/docker.api/nbproject/project.xml b/ide/docker.api/nbproject/project.xml
@@ -30,8 +30,8 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>2.20</specification-version>
+                        <release-version>2</release-version>
+                        <specification-version>3.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

diff --git a/ide/docker.api/src/org/netbeans/modules/docker/api/DockerAction.java b/ide/docker.api/src/org/netbeans/modules/docker/api/DockerAction.java
@@ -1270,7 +1270,7 @@ private Endpoint createEndpoint() throws IOException {
                 return Endpoint.forSocket(s);
             } else if ("file".equals(realUrl.getProtocol())) {
                 AFUNIXSocket s = AFUNIXSocket.newInstance();
-                AFUNIXSocketAddress sockAdd = new AFUNIXSocketAddress(new File(realUrl.getFile()));
+                AFUNIXSocketAddress sockAdd = AFUNIXSocketAddress.of(new File(realUrl.getFile()));
                 s.connect(sockAdd);
                 return Endpoint.forSocket(s);
             } else {

diff --git a/ide/libs.c.kohlschutter.junixsocket/build.xml b/ide/libs.c.kohlschutter.junixsocket/build.xml
@@ -21,4 +21,23 @@
 -->
 <project name="ide/libs.c.kohlschutter.junixsocket" default="build" basedir=".">
     <import file="../../nbbuild/templates/projectized.xml"/>
+
+    <target name="gen-sigtest">
+        <!--
+        Workaround for sigtest generation failures. Problems:
+
+        - RuntimeInvisibleTypeAnnotations are not parsed properly
+          (the org.eclipse.jdt.annotation.NonNull annotation on the return
+          and parameter types causes this code to be executed)
+        - AFUNIXServerSocket::newImpl and
+          AFDatagramSocket::getAncillaryDataSupport return non-public types from
+          protected methods
+        - Protected constructor org.newsclub.net.unix.AFSocketAddress.init
+          (java.lang.Class<org.newsclub.net.unix.SentinelSocketAddress>,int)
+          uses a non-public type as parameter
+        -->
+        <antcall target="projectized.gen-sigtest">
+            <param name="sigtest.gen.fail.on.error" value="false"/>
+        </antcall>
+    </target>
 </project>
diff --git a/ide/libs.c.kohlschutter.junixsocket/external/binaries-list b/ide/libs.c.kohlschutter.junixsocket/external/binaries-list
@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-2D8230CF81242FF4103A9D673F36CD71E9F7D7E2 com.kohlschutter.junixsocket:junixsocket-native-common:2.4.0
-F1D5E97DB0AB7AD37E2F3C3DE49BB355D4A2ADD4 com.kohlschutter.junixsocket:junixsocket-common:2.4.0
+4A19CA3071BFAA7CB30AAD62D6F93FAA080EA9E8 com.kohlschutter.junixsocket:junixsocket-native-common:2.5.1
+87515D51236AFD95693FDC6F2233A98F9C1429B1 com.kohlschutter.junixsocket:junixsocket-common:2.5.1
diff --git a/...et/external/junixsocket-2.4.0-license.txt → ...et/external/junixsocket-2.5.1-license.txt b/...et/external/junixsocket-2.4.0-license.txt → ...et/external/junixsocket-2.5.1-license.txt
@@ -2,8 +2,8 @@ Name: junixsocket
 License: Apache-2.0
 Description: junixsocket is a Java/JNI library that allows the use of Unix Domain Sockets (AF_UNIX sockets) from Java.
 Origin: https://github.com/kohlschutter/junixsocket/
-Version: 2.4.0
-Files: junixsocket-common-2.4.0.jar, junixsocket-native-common-2.4.0.jar
+Version: 2.5.1
+Files: junixsocket-common-2.5.1.jar, junixsocket-native-common-2.5.1.jar
 
 
                                  Apache License

diff --git a/...ket/external/junixsocket-2.4.0-notice.txt → ...ket/external/junixsocket-2.5.1-notice.txt b/...ket/external/junixsocket-2.4.0-notice.txt → ...ket/external/junixsocket-2.5.1-notice.txt
diff --git a/ide/libs.c.kohlschutter.junixsocket/manifest.mf b/ide/libs.c.kohlschutter.junixsocket/manifest.mf
@@ -1,5 +1,4 @@
 Manifest-Version: 1.0
-OpenIDE-Module: libs.c.kohlschutter.junixsocket/1
+OpenIDE-Module: libs.c.kohlschutter.junixsocket/2
 OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/c/kohlschutter/junixsocket/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.34
-
+OpenIDE-Module-Specification-Version: 3.0