update to Java17 update jogl to 2.6 push version to 2.4

.classpath

@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="bin/main" path="src">
-		<attributes>
-			<attribute name="gradle_scope" value="main"/>
-			<attribute name="gradle_used_by_scope" value="main,test"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="bin/test" path="test">
-		<attributes>
-			<attribute name="gradle_scope" value="test"/>
-			<attribute name="gradle_used_by_scope" value="test"/>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
-	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
-	<classpathentry kind="output" path="bin/default"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="bin/test" path="test">
+		<attributes>
+			<attribute name="gradle_scope" value="test"/>
+			<attribute name="gradle_used_by_scope" value="test"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="bin/main" path="src">
+		<attributes>
+			<attribute name="gradle_scope" value="main"/>
+			<attribute name="gradle_used_by_scope" value="main,test"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin/default"/>
+</classpath>

.externalToolBuilders/org.eclipse.jdt.core.javabuilder.launch

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+    <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
+    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_DISABLED_BUILDER" value="org.eclipse.jdt.core.javabuilder"/>
+    <mapAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"/>
+    <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+</launchConfiguration>

.github/workflows/build.yml

@@ -0,0 +1,65 @@
+name: Build WorldWind Java
+
+on:
+  push:
+    branches: [ main, develop ]
+  pull_request:
+    branches: [ main, develop ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        java-version: [11]
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Set up JDK ${{ matrix.java-version }}
+      uses: actions/setup-java@v4
+      with:
+        java-version: ${{ matrix.java-version }}
+        distribution: 'temurin'
+
+    - name: Cache Gradle packages
+      uses: actions/cache@v4
+      with:
+        path: |
+          ~/.gradle/caches
+          ~/.gradle/wrapper
+        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+        restore-keys: |
+          ${{ runner.os }}-gradle-
+
+    - name: Make gradlew executable
+      run: chmod +x ./gradlew
+
+    - name: Build with Gradle
+      run: ./gradlew build --no-daemon --warning-mode all
+
+    - name: Run tests
+      run: ./gradlew test --no-daemon --warning-mode all
+
+    - name: Upload build artifacts
+      uses: actions/upload-artifact@v4
+      if: matrix.java-version == 11
+      with:
+        name: worldwind-java-build-${{ github.sha }}
+        path: |
+          build/libs/
+          worldwind-*.jar
+          worldwindx-*.jar
+        retention-days: 30
+
+    - name: Upload test results
+      uses: actions/upload-artifact@v4
+      if: always()
+      with:
+        name: test-results-java-${{ matrix.java-version }}-${{ github.sha }}
+        path: |
+          build/test-results/
+          build/reports/
+        retention-days: 30

.gitignore

@@ -6,4 +6,15 @@ classes
 testClasses
 
 worldwind.jar
-worldwindx.jar
+<<<<<<< HEAD
+worldwindx.jar
+
+gradle
+gradlew
+gradlew.bat
+.gradle
+.nb-gradle
+/bin/
+=======
+worldwindx.jar
+>>>>>>> 57b265b6dc19cccf73759b7e3a41ef452b3742d7

.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>worldwind</name>
+	<name>worldwind-WorldWindJava</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -15,9 +15,30 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value>&lt;project&gt;/.externalToolBuilders/org.eclipse.jdt.core.javabuilder.launch</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1757090846118</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

.settings/org.eclipse.buildship.core.prefs

@@ -1,13 +1,13 @@
-arguments=
-auto.sync=false
+arguments=--init-script C\:\\Users\\tlund\\AppData\\Roaming\\Cursor\\User\\globalStorage\\redhat.java\\1.45.0\\config_win\\org.eclipse.osgi\\58\\0\\.cp\\gradle\\init\\init.gradle --init-script C\:\\Users\\tlund\\AppData\\Roaming\\Cursor\\User\\globalStorage\\redhat.java\\1.45.0\\config_win\\org.eclipse.osgi\\58\\0\\.cp\\gradle\\protobuf\\init.gradle
+auto.sync=true
 build.scans.enabled=false
 connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
 connection.project.dir=
 eclipse.preferences.version=1
 gradle.user.home=
-java.home=
+java.home=C\:/Program Files/Zulu/zulu-17
 jvm.arguments=
 offline.mode=false
-override.workspace.settings=false
-show.console.view=false
-show.executions.view=false
+override.workspace.settings=true
+show.console.view=true
+show.executions.view=true

.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=ignore
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.source=17

.settings/org.eclipse.ltk.core.refactoring.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false

.vscode/java.project

@@ -27,5 +27,5 @@
         "jackson-core-asl.jar",
         "junit-4.5.jar"
     ],
-    "javaVersion": "11"
+    "javaVersion": "17"
 }

.vscode/launch.json

@@ -1,12 +1,16 @@
 {
     "version": "0.2.0",
     "configurations": [
+
         {
             "type": "java",
             "name": "WorldWindow",
             "request": "launch",
             "mainClass": "gov.nasa.worldwindx.applications.worldwindow.WorldWindow",
-            "projectName": "worldwind-WorldWindJava"
+
+            "projectName": "worldwind-WorldWindJava",
+            "vmArgs": "-Djava.util.logging.config.file=logging.properties --add-exports java.base/java.lang=ALL-UNNAMED --add-exports java.desktop/sun.awt=ALL-UNNAMED --add-exports java.desktop/sun.java2d=ALL-UNNAMED"
+
         },
         {
             "type": "java",
@@ -15,7 +19,7 @@
             "mainClass": "gov.nasa.worldwindx.applications.worldwindow.WorldWindow",
             "projectName": "WorldWindJava",
             "args": "",
-            "vmArgs": "-Djava.util.logging.config.file=logging.properties",
+            "vmArgs": "-Djava.util.logging.config.file=logging.properties --add-exports java.base/java.lang=ALL-UNNAMED --add-exports java.desktop/sun.awt=ALL-UNNAMED --add-exports java.desktop/sun.java2d=ALL-UNNAMED",
             "cwd": "${workspaceFolder}",
             "console": "integratedTerminal",
             "env": {

.vscode/settings.json

@@ -29,11 +29,11 @@
     "java.project.importOnFirstTimeStartup": "automatic",
     "java.import.gradle.enabled": true,
     "java.import.gradle.wrapper.enabled": true,
-    "java.import.gradle.java.home": null,
+    "java.import.gradle.java.home": "",
     "java.import.gradle.offline.enabled": false,
     "java.import.gradle.arguments": "",
     "java.import.gradle.jvmArguments": "",
-    "java.import.gradle.user.home": null,
+    "java.import.gradle.user.home": "",
     "java.import.gradle.importedProjects": [],
     "java.import.gradle.excludedProjects": [],
     "java.import.gradle.nestedProjects": true,

README_DEVELOPER.txt

@@ -38,8 +38,8 @@ The JOGL library provides WorldWind Java with (1) a Java binding to the OpenGL A
 with Java's AWT and Swing windowing toolkits:
 http://jogamp.org/jogl/www/
 
-WorldWind Java uses JOGL v2.4, released on March 7th, 2020 and downloaded from:
-https://jogamp.org/deployment/v2.4.0-rc-20200307/archive/jogamp-all-platforms.7z
+WorldWind Java uses JOGL v2.6.0, released in 2024 and downloaded from:
+https://jogamp.org/deployment/v2.6.0/archive/jogamp-all-platforms.7z
 
 The JOGL library compiled JAR files and README files are checked into the WorldWind Java source, distributed with all
 WorldWind Java builds and included in the WorldWind Java Web Start deployment. This is necessary in order ensure

RELEASE_NOTES.txt

@@ -9,15 +9,15 @@ WorldWind's API remains unchanged in this release and we are committed to mainta
 The primary goal of the WorldWind Java (WWJ) v2.2.0 release is to modernize the SDK after a period of inactivity. During this process some defects were addressed as well. Highlights of v2.2.0:
 
 - Upgrade to Java 11
-- Upgrade to the OpenGL layer (JOGL) 2.4
+- Upgrade to the OpenGL layer (JOGL) 2.6.0
 - Switch to the Apache 2.0 license
 - Deprecation of unsupported functionality such as Applets, WebStart and WebView.
 
 WorldWind's API remains largely unchanged in this release and we are committed to maintaining a consistent API in future releases.
 
 The prior release of WorldWind Java, v2.1.0, was compiled with Java 8. The decision was made to upgrade WWJ to Java 11 based on questionable support options for Java 8 at the time. This situation has evolved over time and we are evaluating whether a Java 8 version of WWJ is desirable. Your feedback is welcome. 
 
-Migrating to Java 11 and JOGL 2.4 went relatively smoothly. Primary areas of work:
+Migrating to Java 17 and JOGL 2.6.0 went relatively smoothly. Primary areas of work:
 
 - The package names for JOGL have changed although the API remains relatively consistent.
 - Creating work alike code to replace the use of unpublished JRE APIs that now throw an access exception. For example, setting the java library path system property. Discussions around the types of changes that need to be made when moving from 8 to 11 are broadly available on the Web.