pull 2.3.1

.travis.yml

@@ -48,13 +48,6 @@ script:
 
 # Deploy develop branch javadocs to gh_pages, and create and deploy CHANGELOG.md on tags
 deploy:
-  # Publish SNAPSHOT artifacts to oss.jfrog.org
-  - provider: script
-    script: ./gradlew artifactoryPublish -Psnapshot -Pbuild.number=$TRAVIS_BUILD_NUMBER --stacktrace
-    skip_cleanup: true
-    on:
-      branch: develop
-      jdk: oraclejdk8
   # Publish API documentation to GitHub Pages
   - provider: pages
     github_token: $GITHUB_API_KEY
@@ -63,13 +56,6 @@ deploy:
     on:
       branch: develop
       jdk: oraclejdk8
-  # Publish release artifacts to Bintray/JCenter
-  - provider: script
-    script: ./gradlew bintrayUpload -Prelease --stacktrace
-    skip_cleanup: true
-    on:
-      tags: true
-      jdk: oraclejdk8
   # Create CHANGELOG.md in the current directory
   - provider: script
     script: ./travis/changelog.sh >> CHANGELOG.md

build.gradle

@@ -1,44 +1,33 @@
-buildscript {
-    dependencies {
-        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:latest.release'
-    }
-}
-
-plugins {
-    id 'com.jfrog.bintray' version '1.8.1'
-}
-
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: 'com.jfrog.artifactory'
 
 group = 'earth.worldwind'
-version = '2.3.0' + (project.hasProperty('snapshot') ? '-SNAPSHOT' : '')
+version = '2.3.1' + (project.hasProperty('snapshot') ? '-SNAPSHOT' : '')
 
 ant {
     property(file: 'release-build.properties')
     property(file: "gdal.${org.gradle.internal.os.OperatingSystem.current().isWindows() ? 'win' : 'unix'}.properties")
 }
 
 ext {
-    joglVersion = '2.4.0-rc-20200202'
-    gdalVersion = '3.5.0'
+    joglVersion = '2.5.0'
+    gdalVersion = '3.10.0'
     jacksonVersion = '1.9.13'
     junitVersion = '4.5'
-    //systemGDAL = true
 }
 
 repositories {
     mavenLocal()
     mavenCentral()
+    maven { url = "https://jogamp.org/deployment/maven/" }
 }
 
 dependencies {
-	implementation group: 'com.metsci.ext.org.jogamp.jogl', name: 'jogl-all-main', version:"$project.joglVersion"
-    implementation group: 'com.metsci.ext.org.jogamp.gluegen', name: 'gluegen-rt-main', version:"$project.joglVersion"
-    
+	implementation "org.jogamp.jogl:jogl-all-main:$project.joglVersion"
+    implementation "org.jogamp.gluegen:gluegen-rt-main:$project.joglVersion"
+
     if (project.hasProperty('systemGDAL')) {
-        implementation files("C:\\Program Files\\GDAL\\java\\gdal.jar")
+        implementation files("${ant.properties['gdal.jar.dir']}/gdal.jar")
     } else {
         implementation "org.gdal:gdal:$project.gdalVersion"
     }
@@ -60,10 +49,10 @@ task sourcesJar(type: Jar, dependsOn: classes) {
     }
 }
 
-task worldwindJar(type: Jar) {
+task extensionsJar(type: Jar) {
     group = 'build'
-    description = 'Assembles a jar archive containing the WorldWind classes.'
-    archivesBaseName = 'worldwind'
+    description = 'Assembles a jar archive containing the extension classes.'
+    baseName = 'worldwindx'
     from (sourceSets.main.output) {
         exclude 'com/**'
         exclude 'config/**'
@@ -72,9 +61,9 @@ task worldwindJar(type: Jar) {
     }
     doLast {
         copy {
-            from "$buildDir/libs/$worldwindJar.archiveFileName"
+            from "$buildDir/libs/$extensionsJar.archiveFileName"
             into project.projectDir
-            rename "$worldwindJar.archiveFileName", "$worldwindJar.baseName.$worldwindJar.extension"
+            rename "$extensionsJar.archiveFileName", "$extensionsJar.baseName.$extensionsJar.extension"
         }
     }
 }
@@ -108,7 +97,7 @@ def pomConfig = {
 
 publishing {
     publications {
-        bintray(MavenPublication) {
+        maven(MavenPublication) {
             from components.java
             artifact sourcesJar
             artifact javadocJar
@@ -129,53 +118,6 @@ publishing {
     }
 }
 
-bintray {
-    user = System.getenv('BINTRAY_USER')
-    key = System.getenv('BINTRAY_API_KEY')
-    publications = ['bintray']
-    pkg {
-        repo = System.getenv('BINTRAY_REPOSITORY')
-        name = System.getenv('BINTRAY_PACKAGE')
-        userOrg = System.getenv('BINTRAY_ORGANIZATION')
-        desc = 'A community supported fork of the NASA WorldWind Java SDK (WWJ) ' +
-            'is for building cross-platform 3D geospatial desktop applications in Java.'
-        websiteUrl = 'https://worldwind.earth'
-        issueTrackerUrl = 'https://github.com/WorldWindEarth/WorldWindJava/issues'
-        vcsUrl = 'https://github.com/WorldWindEarth/WorldWindJava'
-        licenses = ['NASA-1.3']
-        labels = ['nasa', 'worldwind', 'worldwindjava', 'gis', 'geospatial',
-            'globe', '3d', 'jogl', 'maps', 'imagery', 'terrain',
-            'visualization', 'wms', 'wmts', 'shapes', 'shapefile', 'kml',
-            'opengl', 'sdk-java', 'community-edition'
-        ]
-        githubRepo = 'WorldWindEarth/WorldWindJava'
-        version {
-            name = project.version
-            desc = "WorldWind v$project.version"
-            vcsTag = System.getenv('TRAVIS_TAG')
-            released = new Date()
-        }
-    }
-}
-
-artifactory {
-    contextUrl = 'https://oss.jfrog.org/artifactory'
-    publish {
-        repository {
-            repoKey = 'oss-snapshot-local'
-            username = System.getenv('BINTRAY_USER')
-            password = System.getenv('BINTRAY_API_KEY')
-        }
-        defaults {
-            publications('bintray')
-            publishArtifacts = true
-        }
-    }
-    if (project.hasProperty('build.number')) {
-        clientConfig.info.setBuildNumber(project.getProperty('build.number'))
-    }
-}
-
 sourceSets {
     main {
         java {
@@ -234,7 +176,7 @@ javadoc {
 
 artifacts {
     archives sourcesJar
-    archives worldwindJar
+    archives extensionsJar
     archives javadocJar
 }