diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6540f36c..bf4b3a6f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ # separate terms of service, privacy policy, and support # documentation. -name: Java CI with Maven +name: Java CI with Gradle on: push: @@ -22,12 +22,12 @@ jobs: steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5 - - name: Set up JDK 23 + - name: Set up JDK 25 uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5 with: - java-version: '23' + java-version: '25' distribution: 'zulu' - cache: maven + cache: gradle - - name: Maven test - run: mvn test --batch-mode + - name: Gradle test + run: ./gradlew test diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 259849aa..17f46cd0 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -1,7 +1,4 @@ -# This workflow will build a package using Maven and then publish it to GitHub packages when a release is created -# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#apache-maven-with-a-settings-path - -name: Maven Package +name: Gradle Publish on: release: @@ -18,21 +15,19 @@ jobs: steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5 - - name: Set up JDK 23 + - name: Set up JDK 25 uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5 with: - java-version: '23' + java-version: '25' distribution: 'zulu' -# server-id: github # Value of the distributionManagement/repository/id field of the pom.xml -# settings-path: ${{ github.workspace }} # location for the settings.xml file - - name: Build with Maven - run: mvn -B deploy + - name: Build with Gradle + run: ./gradlew publish - name: Add output files to the Github release shell: bash run: | - gh release upload $TAG target/diagnostics-${TAG:1}-dist.zip target/diagnostics-${TAG:1}-dist.zip.sha256 + gh release upload $TAG build/distributions/diagnostics-${TAG:1}-dist.zip build/distributions/diagnostics-${TAG:1}-dist.zip.sha256 env: GITHUB_TOKEN: ${{ github.TOKEN }} TAG: ${{ github.event.release.tag_name }} diff --git a/.gitignore b/.gitignore index f044a664..0e857b40 100644 --- a/.gitignore +++ b/.gitignore @@ -55,7 +55,6 @@ crashlytics-build.properties ### Eclipse ### *.pydevproject .metadata -.gradle bin/ tmp/ *.tmp @@ -91,23 +90,15 @@ local.properties .texlipse -### Maven ### -target/ -pom.xml.tag -pom.xml.releaseBackup -pom.xml.versionsBackup -pom.xml.next -release.properties -dependency-reduced-pom.xml -buildNumber.properties +### Gradle ### +.gradle/ +build/ .DS_Store - - ./diagnostic-output ### VSCode .vscode/launch.json ### Temporary diags -*.zip \ No newline at end of file +*.zip diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1302172b..bc740c5c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -60,10 +60,10 @@ Note: `ossrh` matches the `id` used in the `pom.xml`. You can use any version of Once the `settings.xml` is setup, you can run ``` -mvn clean deploy +./gradlew publish ``` -This will deploy based on the version in the `pom.xml` file (`-SNAPSHOT` creates +This will deploy based on the version in the `gradle.properties` file (`-SNAPSHOT` creates it in their snapshot repository, which you should always do before a real release). diff --git a/Dockerfile b/Dockerfile index f1968ab6..81ffd356 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,23 +1,17 @@ -FROM docker.elastic.co/wolfi/jdk:openjdk-23.0.2-r7-dev@sha256:ea249437c8316cf2905ea40e1508933789cf293d68b08531e7d151a779d64b25 AS builder +FROM docker.elastic.co/wolfi/jdk:openjdk-25-dev AS builder ##################### -# Install dev tools +# Build code ##################### USER root -# need to be root to be able to install maven -RUN apk add --no-cache maven - -##################### -# Build code -##################### WORKDIR /build COPY ./ ./ -RUN mvn package +RUN ./gradlew build -FROM docker.elastic.co/wolfi/jdk:openjdk-23.0.2-r7@sha256:a4b87ff540ce784a1b69611aa8b60b743ad70e18ef97d6a6afec4bb906d5989b AS runner +FROM docker.elastic.co/wolfi/jdk:openjdk-25 AS runner ######################## # Prepare the code to run @@ -25,6 +19,6 @@ FROM docker.elastic.co/wolfi/jdk:openjdk-23.0.2-r7@sha256:a4b87ff540ce784a1b6961 WORKDIR /support-diagnostics COPY --from=builder /build/scripts /support-diagnostics -COPY --from=builder /build/target/lib /support-diagnostics/lib -COPY --from=builder /build/target/diagnostics-*.jar /support-diagnostics/lib +COPY --from=builder /build/build/libs/diagnostics-*.jar /support-diagnostics/lib/ +COPY --from=builder /build/build/lib/ /support-diagnostics/lib/ COPY --from=builder /build/src/main/resources /support-diagnostics/config diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 00000000..6e67a592 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,255 @@ +import java.security.MessageDigest + +plugins { + java + `maven-publish` + signing +} + +group = property("group") as String +version = property("version") as String + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + withSourcesJar() + withJavadocJar() +} + +repositories { + mavenCentral() +} + +val log4jVersion = "2.25.3" + +dependencies { + // Lombok + compileOnly("org.projectlombok:lombok:1.18.42") + annotationProcessor("org.projectlombok:lombok:1.18.42") + + // HTTP + implementation("org.apache.httpcomponents:httpclient:4.5.14") { + exclude(group = "commons-codec", module = "commons-codec") + exclude(group = "commons-logging", module = "commons-logging") + } + implementation("commons-codec:commons-codec:1.20.0") + + // JSON / Data + implementation("com.fasterxml.jackson.core:jackson-databind:2.20.1") + implementation("org.yaml:snakeyaml:2.5") + + // Logging + implementation("org.apache.logging.log4j:log4j-api:$log4jVersion") + implementation("org.apache.logging.log4j:log4j-core:$log4jVersion") + implementation("org.apache.logging.log4j:log4j-slf4j-impl:$log4jVersion") + implementation("org.apache.logging.log4j:log4j-jcl:$log4jVersion") + + // CLI + implementation("com.beust:jcommander:1.82") + + // Commons + implementation("commons-io:commons-io:2.21.0") + implementation("org.apache.commons:commons-compress:1.28.0") + implementation("org.apache.commons:commons-lang3:3.19.0") + + // System info + implementation("com.github.oshi:oshi-json:3.13.6") + + // SSH + implementation("com.github.mwiede:jsch:2.27.6") + + // Versioning + implementation("org.semver4j:semver4j:6.0.0") + + // Text IO + implementation("org.beryx:text-io:3.4.1") { + exclude(group = "org.slf4j", module = "slf4j-api") + exclude(group = "jline", module = "jline") + } + implementation("jline:jline:2.14.6") + + // Templating + implementation("org.freemarker:freemarker:2.3.34") + + // JAXB (needed since removal from JDK 9+) + implementation("javax.xml.bind:jaxb-api:2.3.1") + implementation("org.glassfish.jaxb:jaxb-runtime:4.0.6") + + // Test + testImplementation("org.junit.jupiter:junit-jupiter-engine:5.14.1") + testImplementation("org.junit.vintage:junit-vintage-engine:5.14.1") + testImplementation("org.junit.platform:junit-platform-launcher:1.14.1") + testRuntimeOnly("org.junit.platform:junit-platform-surefire-provider:1.3.2") + testImplementation("org.mock-server:mockserver-netty:5.15.0") +} + +// --------------------------------------------------------------------------- +// Jar +// --------------------------------------------------------------------------- +tasks.jar { + exclude("**/*.xml", "**/*.json", "**/*.ftlh") + manifest { + attributes( + "Implementation-Title" to project.name, + "Implementation-Version" to project.version, + ) + } +} + +// --------------------------------------------------------------------------- +// Copy runtime dependencies to build/lib (used by Docker builds) +// --------------------------------------------------------------------------- +val copyDependencies by tasks.registering(Copy::class) { + group = "distribution" + description = "Copies runtime dependency jars to build/lib." + from(configurations.runtimeClasspath) + into(layout.buildDirectory.dir("lib")) +} + +// --------------------------------------------------------------------------- +// Distribution zip (mirrors src/main/assembly/assembly.xml) +// --------------------------------------------------------------------------- +val distZip by tasks.registering(Zip::class) { + group = "distribution" + description = "Builds the distribution zip matching the Maven assembly layout." + + archiveBaseName.set("diagnostics") + archiveClassifier.set("dist") + destinationDirectory.set(layout.buildDirectory.dir("distributions")) + + dependsOn(tasks.jar, configurations.runtimeClasspath) + + // scripts/** → root (excluding share_ad_job_state/tests/**) + from("scripts") { + exclude("share_ad_job_state/tests/**") + } + + // Root docs + from(".") { + include("LICENSE.txt", "NOTICE.txt", "README.md") + } + + // config/ + from("src/main/resources") { + into("config") + } + + // lib/ — project jar + runtime dependencies + into("lib") { + from(tasks.jar) + from(configurations.runtimeClasspath) + } +} + +// --------------------------------------------------------------------------- +// SHA-256 checksum for the dist zip +// --------------------------------------------------------------------------- +val distZipChecksum by tasks.registering { + group = "distribution" + description = "Generates a SHA-256 checksum for the distribution zip." + dependsOn(distZip) + + val zipFile = distZip.flatMap { it.archiveFile } + val checksumFile = zipFile.map { file("${it.asFile.absolutePath}.sha256") } + + inputs.file(zipFile) + outputs.file(checksumFile) + + doLast { + val digest = MessageDigest.getInstance("SHA-256") + val bytes = zipFile.get().asFile.readBytes() + val hash = digest.digest(bytes) + val hex = hash.joinToString("") { byte -> "%02x".format(byte) } + checksumFile.get().writeText("$hex ${zipFile.get().asFile.name}\n") + } +} + +// Wire distribution tasks into the build lifecycle +tasks.named("build") { + dependsOn(distZip, distZipChecksum, copyDependencies) +} + +// --------------------------------------------------------------------------- +// Test +// --------------------------------------------------------------------------- +tasks.withType { + useJUnitPlatform() +} + +tasks.withType { + options.compilerArgs.addAll(listOf("-Xlint:deprecation", "-Xlint:unchecked")) + options.isFork = true + options.encoding = "UTF-8" +} + +// --------------------------------------------------------------------------- +// Publishing to Maven Central (OSSRH) +// --------------------------------------------------------------------------- +publishing { + publications { + create("mavenJava") { + from(components["java"]) + + pom { + name.set("Support Diagnostics Utilities") + description.set("Elastic Support Diagnostics Utilities") + url.set("http://github.com/elastic/support-diagnostics") + inceptionYear.set("2014") + + licenses { + license { + name.set("Elastic License") + url.set("https://www.elastic.co/licensing/elastic-license") + distribution.set("repo") + } + } + + developers { + developer { + organization.set("Elastic") + organizationUrl.set("https://www.elastic.co") + } + } + + scm { + connection.set("scm:git:git://github.com/elastic/support-diagnostics.git") + developerConnection.set("scm:git:ssh://github.com:elastic/support-diagnostics.git") + url.set("http://github.com/elastic/support-diagnostics/tree/main") + } + } + } + } + + repositories { + maven { + name = "ossrhSnapshots" + url = uri("https://oss.sonatype.org/content/repositories/snapshots") + credentials { + username = findProperty("ossrhUsername") as String? + ?: System.getenv("OSSRH_USERNAME") + password = findProperty("ossrhPassword") as String? + ?: System.getenv("OSSRH_PASSWORD") + } + } + maven { + name = "ossrhStaging" + url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/") + credentials { + username = findProperty("ossrhUsername") as String? + ?: System.getenv("OSSRH_USERNAME") + password = findProperty("ossrhPassword") as String? + ?: System.getenv("OSSRH_PASSWORD") + } + } + } +} + +signing { + // Use GPG command-line tool when a key is configured + if ((findProperty("signing.gnupg.keyName") ?: System.getenv("GPG_KEY_ID")) != null) { + useGpgCmd() + } + + sign(publishing.publications["mavenJava"]) + isRequired = gradle.taskGraph.hasTask("publish") +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..a0d98355 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,2 @@ +group=co.elastic.support +version=9.3.2-SNAPSHOT diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..f8e1ee31 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..23449a2b --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 00000000..adff685a --- /dev/null +++ b/gradlew @@ -0,0 +1,248 @@ +#!/bin/sh + +# +# Copyright © 2015 the original 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. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# 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"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..c4bdd3ab --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,93 @@ +@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 +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@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 + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 84b07490..00000000 --- a/pom.xml +++ /dev/null @@ -1,463 +0,0 @@ - - 4.0.0 - - co.elastic.support - diagnostics - 9.3.2-SNAPSHOT - jar - Support Diagnostics Utilities - Elastic Support Diagnostics Utilities - http://github.com/elastic/support-diagnostics - 2014 - - - - Elastic - https://www.elastic.co - - - - scm:git:git://github.com/elastic/support-diagnostics.git - scm:git:ssh://github.com:elastic/support-diagnostics.git - http://github.com/elastic/support-diagnostics/tree/main - - - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - Elastic License - https://www.elastic.co/licensing/elastic-license - repo - - - - - UTF-8 - 2.25.3 - - - - - org.projectlombok - lombok - 1.18.42 - provided - - - - org.apache.httpcomponents - httpclient - 4.5.14 - - - commons-codec - commons-codec - - - commons-logging - commons-logging - - - - - - commons-codec - commons-codec - 1.20.0 - - - - com.fasterxml.jackson.core - jackson-databind - 2.20.1 - - - - org.apache.logging.log4j - log4j-api - ${log4j.version} - - - - org.apache.logging.log4j - log4j-core - ${log4j.version} - - - - org.apache.logging.log4j - log4j-slf4j-impl - ${log4j.version} - - - - org.apache.logging.log4j - log4j-jcl - ${log4j.version} - - - - com.beust - jcommander - 1.82 - - - - org.yaml - snakeyaml - 2.5 - - - - commons-io - commons-io - 2.21.0 - - - - org.apache.commons - commons-compress - 1.28.0 - - - - org.apache.commons - commons-lang3 - 3.19.0 - - - - com.github.oshi - oshi-json - 3.13.6 - - - - com.github.mwiede - jsch - 2.27.6 - - - - org.semver4j - semver4j - 6.0.0 - - - - org.beryx - text-io - 3.4.1 - - - org.slf4j - slf4j-api - - - jline - jline - - - - - - jline - jline - 2.14.6 - - - - org.freemarker - freemarker - 2.3.34 - - - - org.junit.platform - junit-platform-launcher - 1.14.1 - test - - - - org.junit.jupiter - junit-jupiter-engine - 5.14.1 - test - - - - org.junit.vintage - junit-vintage-engine - 5.14.1 - test - - - - org.junit.platform - junit-platform-surefire-provider - 1.3.2 - test - - - - org.mock-server - mockserver-netty - 5.15.0 - test - - - - - javax.xml.bind - jaxb-api - 2.3.1 - - - - org.glassfish.jaxb - jaxb-runtime - 4.0.6 - - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - 3.6.2 - - - enforce-maven - - enforce - - - - - 3.6.0 - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.14.1 - - true - true - true - true - 1.8 - 1.8 - full - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.4.2 - - - **/*.xml - **/*.json - **/*.ftlh - - - - - true - - false - - - ${project.version} - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 3.9.0 - - - copy-installed - package - - copy-dependencies - - - compile - ${project.build.directory}/lib - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - 3.7.1 - - - - src/main/assembly/assembly.xml - - - - - make-assembly - package - - single - - - - - - - net.nicoulaj.maven.plugins - checksum-maven-plugin - 1.11 - - - checksum-maven-plugin-files - package - - files - - - - - - - ${project.build.directory} - - *.zip - - - - - SHA-256 - - - - - - com.mycila - license-maven-plugin - 5.0.0 - - - -
HEADER.txt
- - **/*.java - - - - - - - add-license-header - verify - - format - - - - - - - org.jasig.maven - notice-maven-plugin - 2.0.0 - - NOTICE.txt - ${project.basedir}/NOTICE.template - - - - update-notice - verify - - generate - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.0.0-M3 - - - - org.apache.maven.plugins - maven-source-plugin - 3.3.1 - - - attach-sources - - jar-no-fork - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.12.0 - - - attach-javadocs - - jar - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 3.2.8 - - - sign-artifacts - verify - - sign - - - - - - - diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 00000000..284d628f --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "diagnostics"