diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 29a50788..4f15c4db 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.1/apache-maven-3.9.1-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar diff --git a/pom.xml b/pom.xml index 6d703d6c..9728277c 100644 --- a/pom.xml +++ b/pom.xml @@ -43,11 +43,12 @@ 8 ${git.commit.author.time} - 2.0.12 + 2.0.13 4.7.5 - 0.9.0.M1 - 3.9.1 - 1.9.18 + 0.9.0.M2 + 3.9.6 + 2.4.12 + 1.9.20 3.14.0 3.13.0 3.6.1 @@ -106,12 +107,12 @@ com.google.inject guice - 5.1.0 + 6.0.0 com.google.guava guava - 31.1-jre + 33.2.0-jre com.google.code.findbugs @@ -149,17 +150,6 @@ maven-model-builder ${maven.version} - - org.apache.maven - maven-project - 2.2.1 - - - org.codehaus.plexus - plexus-container-default - - - org.apache.maven maven-repository-metadata @@ -235,6 +225,16 @@ plexus-utils 3.5.1 + + eu.maveniverse.maven.mima + context + ${mima.version} + + + eu.maveniverse.maven.mima.runtime + standalone-sisu + ${mima.version} + org.slf4j slf4j-api diff --git a/pomchecker-cli/pom.xml b/pomchecker-cli/pom.xml index b668be7a..14f9a9c0 100644 --- a/pomchecker-cli/pom.xml +++ b/pomchecker-cli/pom.xml @@ -43,9 +43,9 @@ - org.sonatype.plexus + org.codehaus.plexus plexus-cipher - 1.7 + 2.0 @@ -71,8 +71,12 @@ maven-model-builder - org.apache.maven - maven-project + eu.maveniverse.maven.mima + context + + + eu.maveniverse.maven.mima.runtime + standalone-sisu org.apache.maven @@ -221,13 +225,6 @@ org.apache.maven.plugins maven-shade-plugin - - - org.kordamp.shade - maven-shade-ext-transformers - 1.4.0 - - @@ -245,10 +242,8 @@ - - META-INF/sisu - + diff --git a/pomchecker-cli/src/main/java/org/kordamp/maven/checker/cli/internal/PomParser.java b/pomchecker-cli/src/main/java/org/kordamp/maven/checker/cli/internal/PomParser.java index e9e318c3..df3c3900 100644 --- a/pomchecker-cli/src/main/java/org/kordamp/maven/checker/cli/internal/PomParser.java +++ b/pomchecker-cli/src/main/java/org/kordamp/maven/checker/cli/internal/PomParser.java @@ -19,6 +19,9 @@ import com.google.common.base.CharMatcher; import com.google.common.collect.ImmutableMap; +import eu.maveniverse.maven.mima.context.Context; +import eu.maveniverse.maven.mima.context.ContextOverrides; +import eu.maveniverse.maven.mima.context.Runtimes; import org.apache.maven.execution.DefaultMavenExecutionRequest; import org.apache.maven.execution.MavenExecutionRequest; import org.apache.maven.project.MavenProject; @@ -26,7 +29,6 @@ import org.apache.maven.project.ProjectBuildingException; import org.apache.maven.project.ProjectBuildingRequest; import org.apache.maven.project.ProjectBuildingResult; -import org.apache.maven.repository.internal.MavenRepositorySystemUtils; import org.codehaus.plexus.ContainerConfiguration; import org.codehaus.plexus.DefaultContainerConfiguration; import org.codehaus.plexus.DefaultPlexusContainer; @@ -35,25 +37,13 @@ import org.codehaus.plexus.PlexusContainerException; import org.codehaus.plexus.classworlds.ClassWorld; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory; -import org.eclipse.aether.impl.DefaultServiceLocator; -import org.eclipse.aether.repository.LocalRepository; -import org.eclipse.aether.spi.connector.RepositoryConnectorFactory; -import org.eclipse.aether.spi.connector.transport.TransporterFactory; -import org.eclipse.aether.transport.file.FileTransporterFactory; -import org.eclipse.aether.transport.http.HttpTransporterFactory; import java.io.File; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; import java.util.Locale; import java.util.Properties; +import static java.util.Objects.requireNonNull; + /** * @author Andres Almiray * @since 1.1.0 @@ -63,29 +53,36 @@ public class PomParser { CharMatcher.inRange('a', 'z').or(CharMatcher.inRange('0', '9')); public static MavenProject createMavenProject(File pomFile) { - return createMavenProject(pomFile, createDefaultRepositorySystemSession(newRepositorySystem())); - } - - private static MavenProject createMavenProject(File pomFile, RepositorySystemSession session) { - // MavenCli's way to instantiate PlexusContainer + // HACK: MIMA provides sisu runtime, but we need Maven components as well, + // that are Plexus still. Hence, we "wrap" and boot Plexus around MIMA, and this + // awakens MIMA eager singleton activator. ClassWorld classWorld = - new ClassWorld("plexus.core", Thread.currentThread().getContextClassLoader()); + new ClassWorld("plexus.core", Thread.currentThread().getContextClassLoader()); ContainerConfiguration containerConfiguration = - new DefaultContainerConfiguration() - .setClassWorld(classWorld) - .setRealm(classWorld.getClassRealm("plexus.core")) - .setClassPathScanning(PlexusConstants.SCANNING_INDEX) - .setAutoWiring(true) - .setJSR250Lifecycle(true) - .setName("pom-reader"); + new DefaultContainerConfiguration() + .setClassWorld(classWorld) + .setRealm(classWorld.getClassRealm("plexus.core")) + .setClassPathScanning(PlexusConstants.SCANNING_INDEX) + .setAutoWiring(true) + .setJSR250Lifecycle(true) + .setName("pom-reader"); try { PlexusContainer container = new DefaultPlexusContainer(containerConfiguration); + try (Context context = Runtimes.INSTANCE.getRuntime().create(ContextOverrides.create().withUserSettings(true).build())) { + return createMavenProject(pomFile, context, container); + } + } catch (PlexusContainerException ex) { + throw new IllegalStateException(ex); + } + } + private static MavenProject createMavenProject(File pomFile, Context context, PlexusContainer plexusContainer) { + try { MavenExecutionRequest mavenExecutionRequest = new DefaultMavenExecutionRequest(); ProjectBuildingRequest projectBuildingRequest = mavenExecutionRequest.getProjectBuildingRequest(); - projectBuildingRequest.setRepositorySession(session); + projectBuildingRequest.setRepositorySession(context.repositorySystemSession()); // Profile activation needs properties such as JDK version Properties properties = new Properties(); // allowing duplicate entries @@ -94,51 +91,15 @@ private static MavenProject createMavenProject(File pomFile, RepositorySystemSes properties.putAll(System.getProperties()); projectBuildingRequest.setSystemProperties(properties); - ProjectBuilder projectBuilder = container.lookup(ProjectBuilder.class); + ProjectBuilder projectBuilder = plexusContainer.lookup(ProjectBuilder.class); ProjectBuildingResult projectBuildingResult = projectBuilder.build(pomFile, projectBuildingRequest); return projectBuildingResult.getProject(); - } catch (PlexusContainerException | ComponentLookupException | ProjectBuildingException ex) { + } catch (ComponentLookupException | ProjectBuildingException ex) { throw new IllegalStateException(ex); } } - private static RepositorySystem newRepositorySystem() { - DefaultServiceLocator locator = MavenRepositorySystemUtils.newServiceLocator(); - locator.addService(RepositoryConnectorFactory.class, BasicRepositoryConnectorFactory.class); - locator.addService(TransporterFactory.class, FileTransporterFactory.class); - locator.addService(TransporterFactory.class, HttpTransporterFactory.class); - - return locator.getService(RepositorySystem.class); - } - - private static DefaultRepositorySystemSession createDefaultRepositorySystemSession(RepositorySystem system) { - DefaultRepositorySystemSession session = MavenRepositorySystemUtils.newSession(); - LocalRepository localRepository = new LocalRepository(findLocalRepository()); - session.setLocalRepositoryManager(system.newLocalRepositoryManager(session, localRepository)); - return session; - } - - private static String findLocalRepository() { - Path home = Paths.get(System.getProperty("user.home")); - Path localRepo = home.resolve(".m2").resolve("repository"); - if (Files.isDirectory(localRepo)) { - return localRepo.toAbsolutePath().toString(); - } else { - return makeTemporaryLocalRepository(); - } - } - - private static String makeTemporaryLocalRepository() { - try { - File temporaryDirectory = Files.createTempDirectory("m2").toFile(); - temporaryDirectory.deleteOnExit(); - return temporaryDirectory.getAbsolutePath(); - } catch (IOException ex) { - return null; - } - } - public static ImmutableMap detectOsProperties() { return ImmutableMap.of( "os.detected.name", diff --git a/pomchecker-gradle-plugin/build.gradle b/pomchecker-gradle-plugin/build.gradle index bcef8dd6..431e4498 100644 --- a/pomchecker-gradle-plugin/build.gradle +++ b/pomchecker-gradle-plugin/build.gradle @@ -84,7 +84,8 @@ dependencies { api "org.apache.maven.resolver:maven-resolver-transport-file:$mavenResolverVersion" api "org.apache.maven.resolver:maven-resolver-transport-classpath:$mavenResolverVersion" api "org.apache.maven.resolver:maven-resolver-connector-basic:$mavenResolverVersion" - api "org.apache.maven:maven-project:$mavenProjectVersion" + api "eu.maveniverse.maven.mima:context:$mimaVersion" + api "eu.maveniverse.maven.mima.runtime:standalone-sisu:$mimaVersion" api "org.kordamp.gradle:base-gradle-plugin:$kordampPluginVersion" api "org.eclipse.sisu:org.eclipse.sisu.inject:$sisuVersion" api "org.eclipse.sisu:org.eclipse.sisu.plexus:$sisuVersion" diff --git a/pomchecker-gradle-plugin/gradle.properties b/pomchecker-gradle-plugin/gradle.properties index 35774686..e86292ad 100644 --- a/pomchecker-gradle-plugin/gradle.properties +++ b/pomchecker-gradle-plugin/gradle.properties @@ -18,26 +18,26 @@ group = org.kordamp.gradle version = 0.0.0-SNAPSHOT -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +sourceCompatibility = 11 +targetCompatibility = 11 -kordampPluginVersion = 0.46.10 -kordampBuildVersion = 2.9.1 +kordampPluginVersion = 0.54.0 +kordampBuildVersion = 3.4.0 commonsCollectionsVersion = 3.2.2 commonsLangVersion = 2.6 commonsLang3Version = 3.14.0 commonsLoggingVersion = 1.2 groovyVersion = 2.5.12 -guavaVersion = 31.1-jre -guiceVersion = 5.1.0 +guavaVersion = 33.2.0-jre +guiceVersion = 6.0.0 httpVersion = 4.5.10 -mavenProjectVersion = 2.2.1 -mavenVersion = 3.9.1 -mavenResolverVersion = 1.9.18 +mavenVersion = 3.9.6 +mimaVersion = 2.4.12 +mavenResolverVersion = 1.9.20 plexus2Version = 1.26 plexusVersion = 3.5.1 -sisuVersion = 0.9.0.M1 -slf4jVersion = 2.0.12 +sisuVersion = 0.9.0.M2 +slf4jVersion = 2.0.13 org.gradle.daemon = true org.gradle.caching = true diff --git a/pomchecker-gradle-plugin/gradle/wrapper/gradle-wrapper.properties b/pomchecker-gradle-plugin/gradle/wrapper/gradle-wrapper.properties index d355f4c4..b82aa23a 100644 --- a/pomchecker-gradle-plugin/gradle/wrapper/gradle-wrapper.properties +++ b/pomchecker-gradle-plugin/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/pomchecker-gradle-plugin/gradlew b/pomchecker-gradle-plugin/gradlew index 4f906e0c..1aa94a42 100755 --- a/pomchecker-gradle-plugin/gradlew +++ b/pomchecker-gradle-plugin/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 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. @@ -17,67 +17,99 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# 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/subprojects/plugins/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 -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 +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 -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"' +# 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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +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 - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +119,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar 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" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,88 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + 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" = "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 - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +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 -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -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" = "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` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + 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 - i=`expr $i + 1` + # 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 - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -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" +# 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, 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" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# 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/pomchecker-gradle-plugin/gradlew.bat b/pomchecker-gradle-plugin/gradlew.bat index 107acd32..25da30db 100644 --- a/pomchecker-gradle-plugin/gradlew.bat +++ b/pomchecker-gradle-plugin/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +41,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +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 @@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +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 @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +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! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +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 diff --git a/pomchecker-gradle-plugin/settings.gradle b/pomchecker-gradle-plugin/settings.gradle index 97968c0e..05defa4b 100644 --- a/pomchecker-gradle-plugin/settings.gradle +++ b/pomchecker-gradle-plugin/settings.gradle @@ -61,6 +61,7 @@ enforce { "org.slf4j:slf4j-nop:$slf4jVersion", "org.slf4j:jcl-over-slf4j:$slf4jVersion", "com.google.guava:guava:$guavaVersion", + "com.google.guava:failureaccess:1.0.2", "com.google.inject:guice:$guiceVersion", "org.apache.httpcomponents:httpclient:$httpVersion", "org.apache.httpcomponents:httpcore:4.4.16", diff --git a/pomchecker-gradle-plugin/src/main/groovy/org/kordamp/gradle/plugin/checker/internal/PomParser.java b/pomchecker-gradle-plugin/src/main/groovy/org/kordamp/gradle/plugin/checker/internal/PomParser.java index b01aa096..5980b3fe 100644 --- a/pomchecker-gradle-plugin/src/main/groovy/org/kordamp/gradle/plugin/checker/internal/PomParser.java +++ b/pomchecker-gradle-plugin/src/main/groovy/org/kordamp/gradle/plugin/checker/internal/PomParser.java @@ -19,6 +19,9 @@ import com.google.common.base.CharMatcher; import com.google.common.collect.ImmutableMap; +import eu.maveniverse.maven.mima.context.Context; +import eu.maveniverse.maven.mima.context.ContextOverrides; +import eu.maveniverse.maven.mima.context.Runtimes; import org.apache.maven.execution.DefaultMavenExecutionRequest; import org.apache.maven.execution.MavenExecutionRequest; import org.apache.maven.project.MavenProject; @@ -26,7 +29,6 @@ import org.apache.maven.project.ProjectBuildingException; import org.apache.maven.project.ProjectBuildingRequest; import org.apache.maven.project.ProjectBuildingResult; -import org.apache.maven.repository.internal.MavenRepositorySystemUtils; import org.codehaus.plexus.ContainerConfiguration; import org.codehaus.plexus.DefaultContainerConfiguration; import org.codehaus.plexus.DefaultPlexusContainer; @@ -35,57 +37,52 @@ import org.codehaus.plexus.PlexusContainerException; import org.codehaus.plexus.classworlds.ClassWorld; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory; -import org.eclipse.aether.impl.DefaultServiceLocator; -import org.eclipse.aether.repository.LocalRepository; -import org.eclipse.aether.spi.connector.RepositoryConnectorFactory; -import org.eclipse.aether.spi.connector.transport.TransporterFactory; -import org.eclipse.aether.transport.file.FileTransporterFactory; -import org.eclipse.aether.transport.http.HttpTransporterFactory; import java.io.File; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; import java.util.Locale; import java.util.Properties; +import static java.util.Objects.requireNonNull; + /** * @author Andres Almiray * @since 1.1.0 */ public class PomParser { private static final CharMatcher LOWER_ALPHA_NUMERIC = - CharMatcher.inRange('a', 'z').or(CharMatcher.inRange('0', '9')); + CharMatcher.inRange('a', 'z').or(CharMatcher.inRange('0', '9')); public static MavenProject createMavenProject(File pomFile) { - return createMavenProject(pomFile, createDefaultRepositorySystemSession(newRepositorySystem())); - } - - private static MavenProject createMavenProject(File pomFile, RepositorySystemSession session) { - // MavenCli's way to instantiate PlexusContainer + // HACK: MIMA provides sisu runtime, but we need Maven components as well, + // that are Plexus still. Hence, we "wrap" and boot Plexus around MIMA, and this + // awakens MIMA eager singleton activator. ClassWorld classWorld = - new ClassWorld("plexus.core", Thread.currentThread().getContextClassLoader()); + new ClassWorld("plexus.core", Thread.currentThread().getContextClassLoader()); ContainerConfiguration containerConfiguration = - new DefaultContainerConfiguration() - .setClassWorld(classWorld) - .setRealm(classWorld.getClassRealm("plexus.core")) - .setClassPathScanning(PlexusConstants.SCANNING_INDEX) - .setAutoWiring(true) - .setJSR250Lifecycle(true) - .setName("pom-reader"); + new DefaultContainerConfiguration() + .setClassWorld(classWorld) + .setRealm(classWorld.getClassRealm("plexus.core")) + .setClassPathScanning(PlexusConstants.SCANNING_INDEX) + .setAutoWiring(true) + .setJSR250Lifecycle(true) + .setName("pom-reader"); try { PlexusContainer container = new DefaultPlexusContainer(containerConfiguration); + try (Context context = Runtimes.INSTANCE.getRuntime().create(ContextOverrides.create().withUserSettings(true).build())) { + return createMavenProject(pomFile, context, container); + } + } catch (PlexusContainerException ex) { + throw new IllegalStateException(ex); + } + } + private static MavenProject createMavenProject(File pomFile, Context context, PlexusContainer plexusContainer) { + try { MavenExecutionRequest mavenExecutionRequest = new DefaultMavenExecutionRequest(); ProjectBuildingRequest projectBuildingRequest = - mavenExecutionRequest.getProjectBuildingRequest(); + mavenExecutionRequest.getProjectBuildingRequest(); - projectBuildingRequest.setRepositorySession(session); + projectBuildingRequest.setRepositorySession(context.repositorySystemSession()); // Profile activation needs properties such as JDK version Properties properties = new Properties(); // allowing duplicate entries @@ -94,64 +91,28 @@ private static MavenProject createMavenProject(File pomFile, RepositorySystemSes properties.putAll(System.getProperties()); projectBuildingRequest.setSystemProperties(properties); - ProjectBuilder projectBuilder = container.lookup(ProjectBuilder.class); + ProjectBuilder projectBuilder = plexusContainer.lookup(ProjectBuilder.class); ProjectBuildingResult projectBuildingResult = - projectBuilder.build(pomFile, projectBuildingRequest); + projectBuilder.build(pomFile, projectBuildingRequest); return projectBuildingResult.getProject(); - } catch (PlexusContainerException | ComponentLookupException | ProjectBuildingException ex) { + } catch (ComponentLookupException | ProjectBuildingException ex) { throw new IllegalStateException(ex); } } - private static RepositorySystem newRepositorySystem() { - DefaultServiceLocator locator = MavenRepositorySystemUtils.newServiceLocator(); - locator.addService(RepositoryConnectorFactory.class, BasicRepositoryConnectorFactory.class); - locator.addService(TransporterFactory.class, FileTransporterFactory.class); - locator.addService(TransporterFactory.class, HttpTransporterFactory.class); - - return locator.getService(RepositorySystem.class); - } - - private static DefaultRepositorySystemSession createDefaultRepositorySystemSession(RepositorySystem system) { - DefaultRepositorySystemSession session = MavenRepositorySystemUtils.newSession(); - LocalRepository localRepository = new LocalRepository(findLocalRepository()); - session.setLocalRepositoryManager(system.newLocalRepositoryManager(session, localRepository)); - return session; - } - - private static String findLocalRepository() { - Path home = Paths.get(System.getProperty("user.home")); - Path localRepo = home.resolve(".m2").resolve("repository"); - if (Files.isDirectory(localRepo)) { - return localRepo.toAbsolutePath().toString(); - } else { - return makeTemporaryLocalRepository(); - } - } - - private static String makeTemporaryLocalRepository() { - try { - File temporaryDirectory = Files.createTempDirectory("m2").toFile(); - temporaryDirectory.deleteOnExit(); - return temporaryDirectory.getAbsolutePath(); - } catch (IOException ex) { - return null; - } - } - public static ImmutableMap detectOsProperties() { return ImmutableMap.of( - "os.detected.name", - osDetectedName(), - "os.detected.arch", - osDetectedArch(), - "os.detected.classifier", - osDetectedName() + "-" + osDetectedArch()); + "os.detected.name", + osDetectedName(), + "os.detected.arch", + osDetectedArch(), + "os.detected.classifier", + osDetectedName() + "-" + osDetectedArch()); } private static String osDetectedName() { String osNameNormalized = - LOWER_ALPHA_NUMERIC.retainFrom(System.getProperty("os.name").toLowerCase(Locale.ENGLISH)); + LOWER_ALPHA_NUMERIC.retainFrom(System.getProperty("os.name").toLowerCase(Locale.ENGLISH)); if (osNameNormalized.startsWith("macosx") || osNameNormalized.startsWith("osx")) { return "osx"; @@ -165,7 +126,7 @@ private static String osDetectedName() { private static String osDetectedArch() { String osArchNormalized = - LOWER_ALPHA_NUMERIC.retainFrom(System.getProperty("os.arch").toLowerCase(Locale.ENGLISH)); + LOWER_ALPHA_NUMERIC.retainFrom(System.getProperty("os.arch").toLowerCase(Locale.ENGLISH)); switch (osArchNormalized) { case "x8664": case "amd64":