(Upgrade) Collab-10581: Upgrade wuff plugin to gradle 7.5+

build.gradle

@@ -6,7 +6,7 @@ buildscript {
 
   dependencies {
     classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
-    classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:3.1.0'
+    classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.33.13'
   }
 }
 

gradle.properties

@@ -13,5 +13,5 @@ projectId=wuff
 projectLabels=wuff,gradle,plugin,eclipse,osgi,maven,rcp,ide
 slf4j_version=1.7.7
 unpuzzle_version=1.0.0
-version=1.1.0
+version=1.2.0
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Mon Aug 01 16:47:40 CEST 2022
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -1,25 +1,59 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -30,6 +64,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,31 +75,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -90,7 +105,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -110,10 +125,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +170,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -8,14 +24,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +62,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +75,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

libs/common.gradle

@@ -3,7 +3,7 @@
 
 apply plugin: 'java'
 apply plugin: 'groovy'
-apply plugin: 'maven' // need this for installing artifacts locally
+apply plugin: 'maven-publish' // need this for installing artifacts locally
 
 repositories {
   mavenLocal()
@@ -15,28 +15,28 @@ version = rootProject.version
 
 dependencies {
   if(gradle.gradleVersion.startsWith('1.'))
-    testCompile 'org.codehaus.groovy:groovy-backports-compat23:${gradle_2x_groovy_version}'
-  testCompile "org.spockframework:spock-core:${spock_version}", {
+    testImplementation 'org.codehaus.groovy:groovy-backports-compat23:${gradle_2x_groovy_version}'
+  testImplementation "org.spockframework:spock-core:${spock_version}", {
     exclude group: 'org.codehaus.groovy', module: 'groovy-all'
   }
 }
 
-sourceCompatibility = '1.6'
-targetCompatibility = '1.6'
+sourceCompatibility = '1.8'
+targetCompatibility = '1.8'
 
 // lib projects should be always installed into "$HOME/.m2"
-project.tasks.build.finalizedBy project.tasks.install
+project.tasks.build.finalizedBy project.tasks.publishToMavenLocal
 rootProject.tasks.buildExamples.dependsOn project.tasks.build
-rootProject.tasks.buildExamples.dependsOn project.tasks.install
+rootProject.tasks.buildExamples.dependsOn project.tasks.publishToMavenLocal
 
 task sourcesJar(type: Jar, dependsOn: classes, description: 'Creates sources jar') {
-  classifier = 'sources'
+  archiveClassifier  = 'sources'
   from sourceSets.main.allSource
 }
 
 task javadocJar(type: Jar, description: 'Creates javadoc jar') {
   dependsOn javadoc
-  classifier = 'javadoc'
+  archiveClassifier  = 'javadoc'
   from javadoc.destinationDir
   if(tasks.findByName('groovydoc')) {
     dependsOn groovydoc

libs/publish.gradle

@@ -1,7 +1,6 @@
 // include this file in subprojects:
 // apply from: rootProject.file('libs/publish.gradle')
 
-apply plugin: 'maven'
 apply plugin: 'maven-publish'
 apply plugin: 'com.jfrog.artifactory'
 apply plugin: 'com.jfrog.bintray'
@@ -48,12 +47,12 @@ publishing {
   }
 }
 
-install.repositories.mavenInstaller.pom*.whenConfigured { pom ->
+/*install.repositories.mavenInstaller.pom*.whenConfigured { pom ->
   pom.project {
     name thisProject.name
     configurePom.rehydrate(delegate, owner, thisObject).call()
   }
-}
+}*/
 
 artifactoryPublish {
   dependsOn { project.tasks.generatePomFileForMavenJavaPublication }

libs/sign.gradle

@@ -2,7 +2,7 @@ buildscript {
   repositories {
     mavenLocal()
     jcenter()
-    maven { url 'http://dl.bintray.com/content/noamt/gradle-plugins' }
+    maven { url 'https://dl.bintray.com/content/noamt/gradle-plugins' }
   }
 
   dependencies {

libs/unpuzzle/unpuzzle.plugin

@@ -2,7 +2,8 @@ buildscript {
   repositories {
     mavenLocal()
     jcenter()
-    maven { url 'http://oss.jfrog.org/artifactory/oss-snapshot-local' }
+    maven { url 'https://oss.jfrog.org/artifactory/oss-snapshot-local' }
+    maven { url 'https://nexus.collabdevteam.net/repository/maven-public/' }
   }
 
   dependencies {
@@ -13,7 +14,7 @@ buildscript {
 repositories {
   mavenLocal()
   jcenter()
-  maven { url 'http://oss.jfrog.org/artifactory/oss-snapshot-local' }
+  maven { url 'https://oss.jfrog.org/artifactory/oss-snapshot-local' }
 }
 
 import org.akhikhl.unpuzzle.UnpuzzlePlugin

libs/wuff-plugin/build.gradle

@@ -5,25 +5,26 @@ repositories {
   maven {
     url = uri("https://plugins.gradle.org/m2/")
   }
+  maven { url 'https://nexus.collabdevteam.net/repository/maven-public/' }
 }
 
 dependencies {
-  compile 'biz.aQute.bnd:biz.aQute.bnd.gradle:6.0.0'
-  compile 'com.github.blindpirate.osgi:com.github.blindpirate.osgi.gradle.plugin:0.0.3'
-  compile gradleApi()
-  compile "org.akhikhl.gradle-onejar:gradle-onejar:$gradle_onejar_version", {
+  implementation 'biz.aQute.bnd:biz.aQute.bnd.gradle:6.0.0'
+  implementation 'com.github.blindpirate.osgi:com.github.blindpirate.osgi.gradle.plugin:0.0.5'
+  implementation gradleApi()
+  implementation "org.akhikhl.gradle-onejar:gradle-onejar:$gradle_onejar_version", {
     exclude group: 'org.codehaus.groovy', module: 'groovy-all'
   }
-  compile "org.akhikhl.unpuzzle:unpuzzle-plugin:$unpuzzle_version", {
+  implementation "org.akhikhl.unpuzzle:unpuzzle-plugin:$unpuzzle_version", {
     exclude group: 'org.codehaus.groovy', module: 'groovy-all'
   }
-  compile 'commons-configuration:commons-configuration:1.10'
+  implementation 'commons-configuration:commons-configuration:1.10'
 
   //testCompile group: 'org.gradle', name: 'gradle-tooling-api', version: "$gradleWrapperVersion"
 
-  testCompile 'org.spockframework:spock-core:1.0-groovy-2.4', {
+  testImplementation 'org.spockframework:spock-core:1.0-groovy-2.4', {
 	exclude module : 'groovy-all'
   }
 
-  testCompile gradleTestKit()
+  testImplementation gradleTestKit()
 }

libs/wuff-plugin/src/main/groovy/org/akhikhl/wuff/EquinoxProductConfigurer.groovy

@@ -181,9 +181,9 @@ class EquinoxProductConfigurer {
       dependsOn PluginUtils.getProductBuildTaskName(product)
       project.tasks.build.dependsOn it
 
-      baseName = project.name
-      classifier = PluginUtils.getProductFileSuffix(product)
-      destinationDir = productOutputDir.parentFile
+      archiveBaseName = project.name
+      archiveClassifier = PluginUtils.getProductFileSuffix(product)
+      destinationDirectory = productOutputDir.parentFile
       if(archiveType == Tar) {
         extension = 'tar.gz'
         compression = Compression.GZIP