Update to JDK 11, NetBeans 11.3 and GeoTools 28.2 (#185)

* Snap 3454 tb geotools (#184) * Migration to GeoTools 28 * GeoTools update to 28.2 * intermediate - loading issues * replaced commons-lang with commons-lang3 * further updates for JDK11 --------- Co-authored-by: Tom <[email protected]> * updated mockito * fixed several errors of type 'Private classes referenced in module' * added reporting for javadoc * Using NetBeans 10 * updated snap-gui-lib which is using NetBeans 10 * set version to 10.0.0-JDK11SHOT to differentiate from master * Updated worldwind and related jogamp libraries. * Use JDK 11 in CI/QA pipeline * Update NetBeans to 11.3 * SNAP-843 update GLCM help (cherry picked from commit 6abe12b) * removed persistence of the ViewType (list or details) of files in the SnapFileChooser. The old way is not allowed and also not working anymore. And there is no alternative. * require Java > 11 in manifest.mf * set SourceVersion.RELEASE_11 in AboutBoxProcessor * org-esa-snap-ui-tooladapter-docs and org-esa-snap-ui-vfs-docs had same position 2.480. Now set org-esa-snap-ui-vfs-docs to 2481 * SNAP-953 Added explanations for CV and ENL (cherry picked from commit 4e41928) * removed 1.8 source/target settings and set them to 11 * removed 1.8 source/target settings and set them to 11 * removed 1.8 source/target settings and set them to 11 * Improve artifacts list * updated projects to make use of new help system * Cannot use EmptyImage.java anymore in metadata view. Thus, we stick to the default image. * merged RemoteExecutionDialog --------- Co-authored-by: Tom <[email protected]> Co-authored-by: Olaf Danne <[email protected]> Co-authored-by: BALDO Frederick <[email protected]> Co-authored-by: Luis Veci <[email protected]> Co-authored-by: Jun Lu <[email protected]>
senbox-org · May 10, 2023 · 56ecc53 · 56ecc53
1 parent 433b171
commit 56ecc53
Show file tree

Hide file tree

Showing 122 changed files with 764 additions and 731 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 # included templates
 include:
-  - 'https://gitlab.com/senbox-org/snap-engine/raw/master/.gitlab-ci.yml'
+  - 'https://gitlab.com/senbox-org/snap-engine/raw/JDK11/.gitlab-ci.yml'
 
 mvn-build:
   artifacts:

diff --git a/lib-gdal-preferences-ui/pom.xml b/lib-gdal-preferences-ui/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.esa.snap</groupId>
         <artifactId>snap-desktop</artifactId>
-        <version>10.0.0-SNAPSHOT</version>
+        <version>10.0.0-JDK11SHOT</version>
     </parent>
 
     <artifactId>lib-gdal-preferences-ui</artifactId>
@@ -46,6 +46,10 @@
             <artifactId>org-openide-awt</artifactId>
             <version>${netbeans.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.netbeans.api</groupId>
+            <artifactId>org-openide-util</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.netbeans.api</groupId>
             <artifactId>org-openide-util-lookup</artifactId>

diff --git a/lib-gdal-preferences-ui/src/main/nbm/manifest.mf b/lib-gdal-preferences-ui/src/main/nbm/manifest.mf
@@ -3,7 +3,7 @@ OpenIDE-Module-Specification-Version: ${snap.nbmSpecVersion}
 OpenIDE-Module-Implementation-Version: ${snap.nbmImplVersion}
 AutoUpdate-Show-In-Client: false
 AutoUpdate-Essential-Module: true
-OpenIDE-Module-Java-Dependencies: Java > 1.8
+OpenIDE-Module-Java-Dependencies: Java > 11
 OpenIDE-Module-Display-Category: SNAP Core
 OpenIDE-Module-Long-Description: <p>This modules provides some GDAL binaries for use with GDAL readers and writers.
  </p><p><b>Vendor:</b> CS ROMANIA</p><

diff --git a/nbexec/pom.xml b/nbexec/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>nbexec</artifactId>
     <!-- packaging must be "jar", not "nbm" -->
     <packaging>jar</packaging>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>10.0.0-JDK11SHOT</version>
 
     <name>Java NetBeans Launcher</name>
     <description>Plain Java launcher for NetBeans Platform (Maven) development in IDEs other than NetBeans IDE
@@ -67,8 +67,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.2</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>11</source>
+                    <target>11</target>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.esa.snap</groupId>
         <artifactId>snap-engine</artifactId>
-        <version>10.0.0-SNAPSHOT</version>
+        <version>10.0.0-JDK11SHOT</version>
     </parent>
 
     <artifactId>snap-desktop</artifactId>
@@ -16,8 +16,9 @@
     <description>Desktop GUI for SNAP based on NetBeans Platform</description>
 
     <properties>
-        <netbeans.version>RELEASE82</netbeans.version>
-        <snap-gui-lib.version>1.0</snap-gui-lib.version>
+        <netbeans.version>RELEASE113</netbeans.version>
+        <snap-gui-lib.version>1.2.0</snap-gui-lib.version>
+        <snap-help-system.version>1.0.0</snap-help-system.version>
         <user.language>en</user.language>
         <sonar.qualitygate.wait>true</sonar.qualitygate.wait>
         <sonar.java.binaries>**/classes</sonar.java.binaries>
@@ -79,11 +80,6 @@
                 <artifactId>org-netbeans-modules-autoupdate-ui</artifactId>
                 <version>${netbeans.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.netbeans.api</groupId>
-                <artifactId>org-netbeans-modules-javahelp</artifactId>
-                <version>${netbeans.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.netbeans.api</groupId>
                 <artifactId>org-netbeans-modules-options-api</artifactId>
@@ -171,11 +167,6 @@
                 <artifactId>org-openide-windows</artifactId>
                 <version>${netbeans.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.netbeans.external</groupId>
-                <artifactId>beansbinding-1.2.1</artifactId>
-                <version>${netbeans.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.netbeans.api</groupId>
                 <artifactId>org-netbeans-api-progress-nb</artifactId>
@@ -192,6 +183,11 @@
                 <artifactId>snap-gui-lib</artifactId>
                 <version>${snap-gui-lib.version}</version>
             </dependency>
+            <dependency>
+                <groupId>eu.esa.snap.netbeans</groupId>
+                <artifactId>snap-help-system</artifactId>
+                <version>${snap-help-system.version}</version>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>snap-rcp</artifactId>
@@ -236,6 +232,7 @@
                 <scope>test</scope>
             </dependency>
         </dependencies>
+
     </dependencyManagement>
 
     <repositories>
@@ -259,7 +256,6 @@
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
-                    <aggregate>true</aggregate>
                     <subpackages>
                         org.esa.snap.rcp:org.esa.snap.ui:
                     </subpackages>
@@ -337,4 +333,30 @@
             <!-- .............................................................. -->
         </plugins>
     </build>
+
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>3.5.0</version>
+                <reportSets>
+                    <reportSet>
+                        <id>aggregate</id>
+                        <inherited>false</inherited>
+                        <reports>
+                            <report>aggregate</report>
+                        </reports>
+                    </reportSet>
+                    <reportSet>
+                        <id>default</id>
+                        <reports>
+                            <report>javadoc</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+        </plugins>
+    </reporting>
+
 </project>
diff --git a/snap-application/pom.xml b/snap-application/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.esa.snap</groupId>
         <artifactId>snap-desktop</artifactId>
-        <version>10.0.0-SNAPSHOT</version>
+        <version>10.0.0-JDK11SHOT</version>
     </parent>
 
     <artifactId>snap-application</artifactId>
@@ -248,7 +248,7 @@
                                     <version>[3.2.5,)</version>
                                 </requireMavenVersion>
                                 <requireJavaVersion>
-                                    <version>1.8</version>
+                                    <version>11</version>
                                 </requireJavaVersion>
                             </rules>
                         </configuration>

diff --git a/snap-binning-ui/pom.xml b/snap-binning-ui/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.esa.snap</groupId>
         <artifactId>snap-desktop</artifactId>
-        <version>10.0.0-SNAPSHOT</version>
+        <version>10.0.0-JDK11SHOT</version>
     </parent>
 
     <artifactId>snap-binning-ui</artifactId>
@@ -90,8 +90,8 @@
             <artifactId>org-openide-util-ui</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-netbeans-modules-javahelp</artifactId>
+            <groupId>eu.esa.snap.netbeans</groupId>
+            <artifactId>snap-help-system</artifactId>
         </dependency>
 
         <dependency>

diff --git a/snap-binning-ui/src/main/java/org/esa/snap/binning/docs/package-info.java b/snap-binning-ui/src/main/java/org/esa/snap/binning/docs/package-info.java
@@ -1,4 +1,4 @@
 @HelpSetRegistration(helpSet = "help.hs", position = 4300)
 package org.esa.snap.binning.docs;
 
-import org.netbeans.api.javahelp.HelpSetRegistration;
+import eu.esa.snap.netbeans.javahelp.api.HelpSetRegistration;
diff --git a/snap-binning-ui/src/main/nbm/manifest.mf b/snap-binning-ui/src/main/nbm/manifest.mf
@@ -3,7 +3,7 @@ OpenIDE-Module-Specification-Version: ${snap.nbmSpecVersion}
 OpenIDE-Module-Implementation-Version: ${snap.nbmImplVersion}
 AutoUpdate-Show-In-Client: false
 AutoUpdate-Essential-Module: true
-OpenIDE-Module-Java-Dependencies: Java > 1.8
+OpenIDE-Module-Java-Dependencies: Java > 11
 OpenIDE-Module-Display-Category: SNAP Core
 OpenIDE-Module-Layer: org/esa/snap/binning/layer.xml
 OpenIDE-Module-Long-Description: <p>The GUI for the Level-3 Binning

diff --git a/snap-binning-ui/src/main/resources/org/esa/snap/binning/docs/binning/SpatialDataDay.html b/snap-binning-ui/src/main/resources/org/esa/snap/binning/docs/binning/SpatialDataDay.html
@@ -43,7 +43,7 @@ <h3>Spatial Data-Day</h3>
     extension
     allows to select pixels with the lowest temporal discrepancy for the same spatial area.<br>
     More detailed information can be found in the
-    <object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer">
+    <object classid="java:eu.esa.snap.netbeans.javahelp.BrowserDisplayer">
         <param name="content" value="https://www.globcolour.info/CDR_Docs/GlobCOLOUR_PUG_v4.1.pdf">
         <param name="text"
                value="<html>GlobColour Product User Guide in section <i>3.4 'The GlobColour data-day approach'</html>">

diff --git a/snap-binning-ui/src/main/resources/org/esa/snap/binning/docs/binning/overview.html b/snap-binning-ui/src/main/resources/org/esa/snap/binning/docs/binning/overview.html
@@ -36,7 +36,7 @@
 <h3>Overview</h3>
 
 <p>The SNAP Level 3 Binning Operator is based on the NASA SeaWiFS binning algorithm as described in:
-    <object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer">
+    <object classid="java:eu.esa.snap.netbeans.javahelp.BrowserDisplayer">
         <param name="content" value="http://oceancolor.gsfc.nasa.gov/SeaWiFS/TECH_REPORTS/PreLPDF/PreLVol32.pdf">
         <param name="text" value="<html>&quot;Level 3
     SeaWiFS Data Products: Spatial and Temporal Binning Algorithms&quot; J.W.Campbell,

diff --git a/snap-branding/pom.xml b/snap-branding/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.esa.snap</groupId>
         <artifactId>snap-desktop</artifactId>
-        <version>10.0.0-SNAPSHOT</version>
+        <version>10.0.0-JDK11SHOT</version>
     </parent>
 
     <artifactId>snap-branding</artifactId>

diff --git a/snap-change-detection-ui/pom.xml b/snap-change-detection-ui/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>snap-desktop</artifactId>
         <groupId>org.esa.snap</groupId>
-        <version>10.0.0-SNAPSHOT</version>
+        <version>10.0.0-JDK11SHOT</version>
     </parent>
 
     <artifactId>snap-change-detection-ui</artifactId>
@@ -85,10 +85,6 @@
             <groupId>org.netbeans.api</groupId>
             <artifactId>org-netbeans-api-annotations-common</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-netbeans-modules-javahelp</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>junit</groupId>

diff --git a/snap-change-detection-ui/src/main/java/org/esa/snap/change/detection/docs/package-info.java b/snap-change-detection-ui/src/main/java/org/esa/snap/change/detection/docs/package-info.java
@@ -1,4 +1,4 @@
 @HelpSetRegistration(helpSet = "help.hs", position = 6020)
 package org.esa.snap.change.detection.docs;
 
-import org.netbeans.api.javahelp.HelpSetRegistration;
+import eu.esa.snap.netbeans.javahelp.api.HelpSetRegistration;
diff --git a/snap-change-detection-ui/src/main/nbm/manifest.mf b/snap-change-detection-ui/src/main/nbm/manifest.mf
@@ -3,7 +3,7 @@ OpenIDE-Module-Specification-Version: ${snap.nbmSpecVersion}
 OpenIDE-Module-Implementation-Version: ${snap.nbmImplVersion}
 AutoUpdate-Show-In-Client: false
 AutoUpdate-Essential-Module: true
-OpenIDE-Module-Java-Dependencies: Java > 1.8
+OpenIDE-Module-Java-Dependencies: Java > 11
 OpenIDE-Module-Display-Category: SNAP Core
 OpenIDE-Module-Layer: org/esa/snap/change/detection/layer.xml
 OpenIDE-Module-Long-Description: <p>SNAP Change Detection UI</p>
diff --git a/snap-classification-ui/pom.xml b/snap-classification-ui/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.esa.snap</groupId>
         <artifactId>snap-desktop</artifactId>
-        <version>10.0.0-SNAPSHOT</version>
+        <version>10.0.0-JDK11SHOT</version>
     </parent>
 
     <name>SNAP Classification UI</name>
@@ -96,8 +96,8 @@
             <version>${netbeans.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-netbeans-modules-javahelp</artifactId>
+            <groupId>eu.esa.snap.netbeans</groupId>
+            <artifactId>snap-help-system</artifactId>
         </dependency>
     </dependencies>
 

diff --git a/snap-classification-ui/src/main/java/org/esa/snap/classification/docs/package-info.java b/snap-classification-ui/src/main/java/org/esa/snap/classification/docs/package-info.java
@@ -1,4 +1,4 @@
 @HelpSetRegistration(helpSet = "help.hs", position = 5920)
 package org.esa.snap.classification.docs;
 
-import org.netbeans.api.javahelp.HelpSetRegistration;
+import eu.esa.snap.netbeans.javahelp.api.HelpSetRegistration;
diff --git a/snap-classification-ui/src/main/nbm/manifest.mf b/snap-classification-ui/src/main/nbm/manifest.mf
@@ -3,7 +3,7 @@ OpenIDE-Module-Specification-Version: ${snap.nbmSpecVersion}
 OpenIDE-Module-Implementation-Version: ${snap.nbmImplVersion}
 AutoUpdate-Show-In-Client: false
 AutoUpdate-Essential-Module: true
-OpenIDE-Module-Java-Dependencies: Java > 1.8
+OpenIDE-Module-Java-Dependencies: Java > 11
 OpenIDE-Module-Display-Category: SNAP Core
 OpenIDE-Module-Layer: org/esa/snap/classification/layer.xml
 OpenIDE-Module-Long-Description: <p>SNAP Classification UI</p><p><b>Vendor:</b> Array Systems Computing Inc</p><p>

diff --git a/.../src/main/resources/org/esa/snap/classification/docs/operators/KDTreeKNNClassifierOp.html b/.../src/main/resources/org/esa/snap/classification/docs/operators/KDTreeKNNClassifierOp.html
@@ -56,15 +56,15 @@
     At the end, the class with the largest total weight wins. Commonly used weight functions include Fraction, Stairs,
     Inverse distance and Inverse square distance.</p>
 <p>The KD Tree KNN classifier uses a
-    <object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer">
+    <object classid="java:eu.esa.snap.netbeans.javahelp.BrowserDisplayer">
         <param name="content" value="https://en.wikipedia.org/wiki/K-d_tree">
         <param name="text" value="<html><u>KD Tree</u></html>">
     </object>
     to improve performance
     but, should give the same result as the slow KNN classifier.<br>
 </p>
 <br>
-<object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer">
+<object classid="java:eu.esa.snap.netbeans.javahelp.BrowserDisplayer">
     <param name="content" value="https://en.wikipedia.org/wiki/K-nearest_neighbors_algorithm">
     <param name="text" value="<html><u>https://en.wikipedia.org/wiki/K-nearest_neighbors_algorithm</u></html>">
 </object>

diff --git a/...n/resources/org/esa/snap/classification/docs/operators/MaximumLikelihoodClassifierOp.html b/...n/resources/org/esa/snap/classification/docs/operators/MaximumLikelihoodClassifierOp.html
@@ -23,7 +23,7 @@
     the maximum likelihood is classified into the corresponding class. The likelihood is defined as the posterior
     probability of a pixel belonging to a given class.</p>
 <br>
-<object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer">
+<object classid="java:eu.esa.snap.netbeans.javahelp.BrowserDisplayer">
     <param name="content" value="https://en.wikipedia.org/wiki/Maximum_likelihood_estimation">
     <param name="text" value="<html><u>https://en.wikipedia.org/wiki/Maximum_likelihood_estimation</u></html>">
 </object>

diff --git a/...c/main/resources/org/esa/snap/classification/docs/operators/RandomForestClassifierOp.html b/...c/main/resources/org/esa/snap/classification/docs/operators/RandomForestClassifierOp.html
@@ -36,7 +36,7 @@
     associated with correlated variables and over fitting (Breiman).</p>
 <br>
 
-<object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer">
+<object classid="java:eu.esa.snap.netbeans.javahelp.BrowserDisplayer">
     <param name="content" value="https://en.wikipedia.org/wiki/Random_forest">
     <param name="text" value="<html><u>https://en.wikipedia.org/wiki/Random_forest</u></html>">
 </object>

diff --git a/...ion-ui/src/main/resources/org/esa/snap/classification/docs/operators/SVMClassifierOp.html b/...ion-ui/src/main/resources/org/esa/snap/classification/docs/operators/SVMClassifierOp.html
@@ -45,7 +45,7 @@
     split into ten different groups, or folds, each containing an approximately equal number of valid and invalid
     samples. The SVM is run ten times, using each fold once for testing, and the remaining nine folds for training.</p>
 <br>
-<object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer">
+<object classid="java:eu.esa.snap.netbeans.javahelp.BrowserDisplayer">
     <param name="content" value="https://en.wikipedia.org/wiki/Support_vector_machine">
     <param name="text" value="<html><u>https://en.wikipedia.org/wiki/Support_vector_machine</u></html>">
 </object>

diff --git a/snap-collocation-ui/pom.xml b/snap-collocation-ui/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>snap-desktop</artifactId>
         <groupId>org.esa.snap</groupId>
-        <version>10.0.0-SNAPSHOT</version>
+        <version>10.0.0-JDK11SHOT</version>
     </parent>
 
     <artifactId>snap-collocation-ui</artifactId>
@@ -86,8 +86,8 @@
             <artifactId>org-netbeans-api-annotations-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-netbeans-modules-javahelp</artifactId>
+            <groupId>eu.esa.snap.netbeans</groupId>
+            <artifactId>snap-help-system</artifactId>
         </dependency>
 
         <dependency>

diff --git a/snap-collocation-ui/src/main/java/org/esa/snap/collocation/docs/package-info.java b/snap-collocation-ui/src/main/java/org/esa/snap/collocation/docs/package-info.java
@@ -1,4 +1,4 @@
 @HelpSetRegistration(helpSet = "help.hs", position = 4110)
 package org.esa.snap.collocation.docs;
 
-import org.netbeans.api.javahelp.HelpSetRegistration;
+import eu.esa.snap.netbeans.javahelp.api.HelpSetRegistration;
diff --git a/snap-collocation-ui/src/main/nbm/manifest.mf b/snap-collocation-ui/src/main/nbm/manifest.mf
@@ -3,7 +3,7 @@ OpenIDE-Module-Specification-Version: ${snap.nbmSpecVersion}
 OpenIDE-Module-Implementation-Version: ${snap.nbmImplVersion}
 AutoUpdate-Show-In-Client: false
 AutoUpdate-Essential-Module: true
-OpenIDE-Module-Java-Dependencies: Java > 1.8
+OpenIDE-Module-Java-Dependencies: Java > 11
 OpenIDE-Module-Display-Category: SNAP Core
 OpenIDE-Module-Layer: org/esa/snap/collocation/layer.xml
 OpenIDE-Module-Long-Description: <p>The GUI for the geographic colloc