Rename to Java Provisioner

Fix shadow issues
Enable github workflows

Author: LexManos

.github/workflows/publish.yml

@@ -0,0 +1,28 @@
+name: Publish
+
+on:
+  push:
+    branches: [ "master" ]
+    paths-ignore:
+      - '.github/workflows/**'
+      - 'README.md'
+      - 'settings.gradle'
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    uses: MinecraftForge/SharedActions/.github/workflows/gradle.yml@v0
+    with:
+      java: 17
+      gradle_tasks: "check publish"
+      artifact_name: "java-provisioner"
+    secrets:
+      DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+      PROMOTE_ARTIFACT_WEBHOOK: ${{ secrets.PROMOTE_ARTIFACT_WEBHOOK }}
+      PROMOTE_ARTIFACT_USERNAME: ${{ secrets.PROMOTE_ARTIFACT_USERNAME }}
+      PROMOTE_ARTIFACT_PASSWORD: ${{ secrets.PROMOTE_ARTIFACT_PASSWORD }}
+      MAVEN_USER: ${{ secrets.MAVEN_USER }}
+      MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+      GRADLE_CACHE_KEY: ${{ secrets.GRADLE_CACHE_KEY }}

README.md

@@ -0,0 +1,3 @@
+## Java Provisioner
+
+A tool that locates, and if nessasary, downloads a Java distribution using Disco

build.gradle

@@ -1,17 +1,19 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import com.github.jengelman.gradle.plugins.shadow.transformers.PropertiesFileTransformer
 
 plugins {
     id 'java-library'
     id 'idea'
+    id 'eclipse'
     id 'maven-publish'
     alias libs.plugins.licenser
     alias libs.plugins.gradleutils
     alias libs.plugins.shadow
 }
 
-final projectDisplayName = 'Java Version'
+final projectDisplayName = 'Java Provisioner'
 final projectVendor = 'Forge Development LLC'
-description = 'Java Version management using Disco'
+description = 'A tool that locates, and if nessasary, downloads a Java distribution using Disco'
 group = 'net.minecraftforge'
 version = gitversion.tagOffset
 
@@ -20,7 +22,7 @@ println "Version: $version"
 java {
     // Currently JOpt is the limiting, requiring java 8
     // But also toolchains don't support building for anything lower then 8
-    toolchain.languageVersion = JavaLanguageVersion.of 8
+    toolchain.languageVersion = JavaLanguageVersion.of(8)
     withSourcesJar()
 }
 
@@ -62,8 +64,8 @@ license {
 tasks.named('jar', Jar) {
     manifest {
         attributes([
-            'Main-Class'           : 'net.minecraftforge.java_version.Main',
-            'Automatic-Module-Name': 'net.minecraftforge.java_version',
+            'Main-Class'           : 'net.minecraftforge.java_provisioner.Main',
+            'Automatic-Module-Name': 'net.minecraftforge.java_provisioner',
             'Sealed'               : true
         ])
         attributes([
@@ -73,15 +75,20 @@ tasks.named('jar', Jar) {
             'Implementation-Title'  : projectDisplayName,
             'Implementation-Vendor' : projectVendor,
             'Implementation-Version': project.version
-        ], 'net/minecraftforge/java_version/')
+        ], 'net/minecraftforge/java_provisioner/')
     }
 
     from createJavaProbeClass.outputs.files
 }
 
 tasks.named('shadowJar', ShadowJar) {
     enableRelocation = true
-    relocationPrefix = 'net.minecraftforge.java_version.shadow'
+    relocationPrefix = 'net.minecraftforge.java_provisioner.shadow'
+    // Rewrite JOpt's message files, so that help text is displayed nicely.
+    transform(PropertiesFileTransformer) {
+        paths = [ 'Messages.properties$' ]
+        keyTransformer = { key -> relocationPrefix.get() + '.' + key }
+    }
 }
 
 tasks.withType(JavaCompile).configureEach {
@@ -120,4 +127,8 @@ publishing {
     }
 }
 
+eclipse {
+    synchronizationTasks javaProbeJar
+}
+
 idea.module { downloadJavadoc = downloadSources = true }

settings.gradle

@@ -24,4 +24,4 @@ dependencyResolutionManagement {
     }
 }
 
-rootProject.name = 'java-version'
+rootProject.name = 'java-provisioner'

src/main/java/net/minecraftforge/java_version/Disco.java renamed to src/main/java/net/minecraftforge/java_provisioner/Disco.java

@@ -2,7 +2,7 @@
  * Copyright (c) Forge Development LLC and contributors
  * SPDX-License-Identifier: LGPL-2.1-only
  */
-package net.minecraftforge.java_version;
+package net.minecraftforge.java_provisioner;
 
 import java.io.BufferedWriter;
 import java.io.ByteArrayInputStream;
@@ -26,7 +26,6 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
-import java.util.TreeMap;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
@@ -35,6 +34,9 @@
 import com.google.gson.TypeAdapter;
 import com.google.gson.internal.bind.TypeAdapters;
 import com.google.gson.stream.JsonWriter;
+
+import net.minecraftforge.java_provisioner.util.OS;
+import net.minecraftforge.java_provisioner.util.ProcessUtils;
 import net.minecraftforge.util.download.DownloadUtils;
 import net.minecraftforge.util.hash.HashFunction;
 import net.minecraftforge.util.logging.Log;
@@ -49,9 +51,6 @@
 import com.google.gson.reflect.TypeToken;
 import com.google.gson.stream.JsonReader;
 
-import net.minecraftforge.java_version.util.OS;
-import net.minecraftforge.java_version.util.ProcessUtils;
-
 /**
  * A client for the <a href="https://github.com/foojayio/discoapi">foojay disco API</a>
  * <p>

src/main/java/net/minecraftforge/java_version/DiscoLocator.java renamed to src/main/java/net/minecraftforge/java_provisioner/DiscoLocator.java

@@ -2,16 +2,16 @@
  * Copyright (c) Forge Development LLC and contributors
  * SPDX-License-Identifier: LGPL-2.1-only
  */
-package net.minecraftforge.java_version;
+package net.minecraftforge.java_provisioner;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import net.minecraftforge.java_version.Disco.Arch;
-import net.minecraftforge.java_version.api.IJavaInstall;
-import net.minecraftforge.java_version.util.OS;
+import net.minecraftforge.java_provisioner.Disco.Arch;
+import net.minecraftforge.java_provisioner.api.IJavaInstall;
+import net.minecraftforge.java_provisioner.util.OS;
 
 /**
  * Locates java installs that have been downloaded from the <a href="https://github.com/foojayio/discoapi">disco API</a>

src/main/java/net/minecraftforge/java_version/DiscoMain.java renamed to src/main/java/net/minecraftforge/java_provisioner/DiscoMain.java

@@ -2,7 +2,7 @@
  * Copyright (c) Forge Development LLC and contributors
  * SPDX-License-Identifier: LGPL-2.1-only
  */
-package net.minecraftforge.java_version;
+package net.minecraftforge.java_provisioner;
 
 import java.io.File;
 import java.util.Arrays;
@@ -12,8 +12,8 @@
 import joptsimple.OptionSet;
 import joptsimple.OptionSpec;
 import joptsimple.util.EnumConverter;
-import net.minecraftforge.java_version.util.OS;
-import net.minecraftforge.java_version.util.ProcessUtils;
+import net.minecraftforge.java_provisioner.util.OS;
+import net.minecraftforge.java_provisioner.util.ProcessUtils;
 import net.minecraftforge.util.logging.Log;
 
 public class DiscoMain {
@@ -22,6 +22,8 @@ public static void main(String[] args) throws Exception {
         parser.allowsUnrecognizedOptions();
         OptionSpec<Void> helpO = parser.accepts("help", "Displays this help message and exits");
 
+        parser.accepts("disco-main", "Instructs the executable jar to use the DiscoMain entry point");
+
         OptionSpec<File> cacheO = parser.accepts("cache",
                 "Directory to store data needed for this program")
                 .withRequiredArg().ofType(File.class).defaultsTo(new File("cache"));

src/main/java/net/minecraftforge/java_version/GradleLocator.java renamed to src/main/java/net/minecraftforge/java_provisioner/GradleLocator.java

@@ -2,7 +2,7 @@
  * Copyright (c) Forge Development LLC and contributors
  * SPDX-License-Identifier: LGPL-2.1-only
  */
-package net.minecraftforge.java_version;
+package net.minecraftforge.java_provisioner;
 
 import java.io.File;
 import java.io.IOException;
@@ -11,8 +11,8 @@
 import java.util.List;
 import java.util.regex.Pattern;
 
-import net.minecraftforge.java_version.api.IJavaInstall;
-import net.minecraftforge.java_version.util.OS;
+import net.minecraftforge.java_provisioner.api.IJavaInstall;
+import net.minecraftforge.java_provisioner.util.OS;
 
 /*
  * Attempts to find the java install using various tools that Gradle uses

src/main/java/net/minecraftforge/java_version/JavaHomeLocator.java renamed to src/main/java/net/minecraftforge/java_provisioner/JavaHomeLocator.java

@@ -2,16 +2,16 @@
  * Copyright (c) Forge Development LLC and contributors
  * SPDX-License-Identifier: LGPL-2.1-only
  */
-package net.minecraftforge.java_version;
+package net.minecraftforge.java_provisioner;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import net.minecraftforge.java_version.api.IJavaInstall;
-import net.minecraftforge.java_version.api.IJavaLocator;
-import net.minecraftforge.java_version.util.OS;
-import net.minecraftforge.java_version.util.ProcessUtils;
+import net.minecraftforge.java_provisioner.api.IJavaInstall;
+import net.minecraftforge.java_provisioner.api.IJavaLocator;
+import net.minecraftforge.java_provisioner.util.OS;
+import net.minecraftforge.java_provisioner.util.ProcessUtils;
 
 /*
  * Attempts to find the java install using the JAVA_HOME environment variable.

src/main/java/net/minecraftforge/java_version/JavaVersion.java renamed to src/main/java/net/minecraftforge/java_provisioner/JavaVersion.java

@@ -2,7 +2,7 @@
  * Copyright (c) Forge Development LLC and contributors
  * SPDX-License-Identifier: LGPL-2.1-only
  */
-package net.minecraftforge.java_version;
+package net.minecraftforge.java_provisioner;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/net/minecraftforge/java_version/Main.java renamed to src/main/java/net/minecraftforge/java_provisioner/Main.java

@@ -2,32 +2,39 @@
  * Copyright (c) Forge Development LLC and contributors
  * SPDX-License-Identifier: LGPL-2.1-only
  */
-package net.minecraftforge.java_version;
+package net.minecraftforge.java_provisioner;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 
 import joptsimple.AbstractOptionSpec;
 import joptsimple.OptionParser;
 import joptsimple.OptionSet;
 import joptsimple.OptionSpec;
-import net.minecraftforge.java_version.Disco.Arch;
-import net.minecraftforge.java_version.Disco.Distro;
-import net.minecraftforge.java_version.api.IJavaInstall;
-import net.minecraftforge.java_version.api.IJavaLocator;
-import net.minecraftforge.java_version.util.OS;
+import net.minecraftforge.java_provisioner.Disco.Arch;
+import net.minecraftforge.java_provisioner.Disco.Distro;
+import net.minecraftforge.java_provisioner.api.IJavaInstall;
+import net.minecraftforge.java_provisioner.api.IJavaLocator;
+import net.minecraftforge.java_provisioner.util.OS;
 import net.minecraftforge.util.logging.Log;
 
 public class Main {
     public static void main(String[] args) throws Exception {
         OptionParser parser = new OptionParser();
-        parser.allowsUnrecognizedOptions();
+
+        if (hasArgument(args, "--disco-main")) {
+            DiscoMain.main(args);
+            return;
+        }
+
         OptionSpec<Void> helpO = parser.accepts("help", "Displays this help message and exits");
+        parser.accepts("disco-main", "Use the DiscoMain entry point");
 
         OptionSpec<File> cacheO = parser.accepts("cache",
                 "Directory to store data needed for this program")
@@ -38,11 +45,13 @@ public static void main(String[] args) throws Exception {
 
         OptionSpec<Integer> versionO = parser.accepts("version",
                 "Major version of java to try and locate")
-                .withOptionalArg().ofType(Integer.class);
+                .withRequiredArg().ofType(Integer.class);
 
         OptionSpec<Void> allO = parser.accepts("all",
                 "Display information about all detected java installs");
 
+        OptionSpec<Void> testO = parser.accepts("test", "Enable test functionality, provisioning a bunch of jdks.");
+
         OptionSet options = parser.parse(args);
         if (options.has(helpO)) {
             parser.printHelpOn(Log.INFO);
@@ -56,23 +65,39 @@ public static void main(String[] args) throws Exception {
         locators.add(new GradleLocator());
         locators.add(disco);
 
-        // populate downloaded for testing
-        Disco tmp = new Disco(cache);
-        for (Distro dist : new Distro[] { Distro.TEMURIN, Distro.AOJ, Distro.ORACLE, Distro.ZULU, Distro.GRAALVM, Distro.GRAALVM_COMMUNITY}) {
-            List<Disco.Package> jdks = tmp.getPackages(22, OS.CURRENT, dist, Arch.CURRENT);
-            int seen = 0;
-            for (Disco.Package pkg : jdks) {
-                if (seen++ < 3)
-                    tmp.extract(pkg);
+        if (options.has(testO)) {
+            // populate downloaded for testing
+            Disco tmp = new Disco(cache);
+            int version = options.has(versionO) ? options.valueOf(versionO) : 22;
+            for (Distro dist : new Distro[] { Distro.TEMURIN, Distro.AOJ, Distro.ORACLE, Distro.ZULU, Distro.GRAALVM, Distro.GRAALVM_COMMUNITY}) {
+                List<Disco.Package> jdks = tmp.getPackages(version, OS.CURRENT, dist, Arch.CURRENT);
+                int seen = 0;
+                for (Disco.Package pkg : jdks) {
+                    if (seen++ < 3)
+                        tmp.extract(pkg);
+                }
             }
         }
 
         if (options.has(allO)) {
             listAllJavaInstalls(locators);
-        } else {
+        } else if (options.has(versionO)) {
             int version = options.valueOf(versionO);
             findSpecificVersion(locators, disco, version);
+        } else {
+            Log.error("You must specify a version to search for using --version or --all to list all java installs.");
+            parser.printHelpOn(Log.INFO);
+            System.exit(-1);
+        }
+    }
+
+    private static boolean hasArgument(String[] args, String arg) {
+        for (String s : args) {
+            if (s.toLowerCase(Locale.ENGLISH).startsWith(arg))
+                return true;
         }
+
+        return false;
     }
 
     private static void findSpecificVersion(List<IJavaLocator> locators, DiscoLocator disco, int version) {

src/main/java/net/minecraftforge/java_version/api/IJavaInstall.java renamed to src/main/java/net/minecraftforge/java_provisioner/api/IJavaInstall.java

@@ -2,10 +2,11 @@
  * Copyright (c) Forge Development LLC and contributors
  * SPDX-License-Identifier: LGPL-2.1-only
  */
-package net.minecraftforge.java_version.api;
+package net.minecraftforge.java_provisioner.api;
 
 import java.io.File;
-import net.minecraftforge.java_version.JavaVersion;
+
+import net.minecraftforge.java_provisioner.JavaVersion;
 
 public interface IJavaInstall extends Comparable<IJavaInstall> {
     File home();

src/main/java/net/minecraftforge/java_version/api/IJavaLocator.java renamed to src/main/java/net/minecraftforge/java_provisioner/api/IJavaLocator.java

@@ -2,14 +2,14 @@
  * Copyright (c) Forge Development LLC and contributors
  * SPDX-License-Identifier: LGPL-2.1-only
  */
-package net.minecraftforge.java_version.api;
+package net.minecraftforge.java_provisioner.api;
 
 import java.io.File;
 import java.util.List;
 
-import net.minecraftforge.java_version.DiscoLocator;
-import net.minecraftforge.java_version.GradleLocator;
-import net.minecraftforge.java_version.JavaHomeLocator;
+import net.minecraftforge.java_provisioner.DiscoLocator;
+import net.minecraftforge.java_provisioner.GradleLocator;
+import net.minecraftforge.java_provisioner.JavaHomeLocator;
 
 public interface IJavaLocator {
     /**