diff --git a/buildSrc/src/main/kotlin/com.teamscale.java-convention.gradle.kts b/buildSrc/src/main/kotlin/com.teamscale.java-convention.gradle.kts index 3899fbfb9..15d846186 100644 --- a/buildSrc/src/main/kotlin/com.teamscale.java-convention.gradle.kts +++ b/buildSrc/src/main/kotlin/com.teamscale.java-convention.gradle.kts @@ -6,10 +6,6 @@ plugins { group = "com.teamscale" -repositories { - mavenCentral() -} - java { toolchain { languageVersion.set(JavaLanguageVersion.of(21)) diff --git a/buildSrc/src/main/kotlin/com.teamscale.publish.gradle.kts b/buildSrc/src/main/kotlin/com.teamscale.publish.gradle.kts index 751f9e65b..5e3903b10 100644 --- a/buildSrc/src/main/kotlin/com.teamscale.publish.gradle.kts +++ b/buildSrc/src/main/kotlin/com.teamscale.publish.gradle.kts @@ -52,6 +52,9 @@ fun PublicationContainer.configureMavenPublication() { pluginManager.withPlugin("java-library") { from(components["java"]) } + pluginManager.withPlugin("org.gradlex.maven-plugin-development") { + from(components["java"]) + } } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 38f9a9c75..1b78514d4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -15,6 +15,7 @@ okhttp = "4.12.0" mockito = "5.15.2" mockitoKotlin = "5.4.0" picocli = "4.7.6" +maven = "3.9.9" [libraries] jetty-server = { module = "org.eclipse.jetty:jetty-server", version.ref = "jetty" } @@ -80,9 +81,14 @@ mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = " springboot-loader = { module = "org.springframework.boot:spring-boot-loader", version = "3.4.2" } +maven-core = { module = "org.apache.maven:maven-core", version.ref = "maven" } +maven-pluginApi = { module = "org.apache.maven:maven-plugin-api", version.ref = "maven" } +maven-pluginAnnotations = { module = "org.apache.maven.plugin-tools:maven-plugin-annotations", version = "3.15.1" } + [plugins] versions = { id = "com.github.ben-manes.versions", version = "0.52.0" } markdownToPdf = { id = "de.fntsoftware.gradle.markdown-to-pdf", version = "1.1.0" } nexusPublish = { id = "io.github.gradle-nexus.publish-plugin", version = "2.0.0" } pluginPublish = { id = "com.gradle.plugin-publish", version = "1.3.1" } gitProperties = { id = "com.gorylenko.gradle-git-properties", version = "2.4.2" } +mavenPluginDevelopment = { id = "org.gradlex.maven-plugin-development", version = "1.0.2" } diff --git a/settings.gradle.kts b/settings.gradle.kts index 0f879c849..c57abe294 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,3 +1,9 @@ +dependencyResolutionManagement { + repositories { + mavenCentral() + } +} + pluginManagement { plugins { kotlin("jvm") version "2.1.10" diff --git a/teamscale-maven-plugin/.gitignore b/teamscale-maven-plugin/.gitignore deleted file mode 100644 index 26d105fc4..000000000 --- a/teamscale-maven-plugin/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -target/ -.mvn/wrapper/maven-wrapper.jar - diff --git a/teamscale-maven-plugin/.mvn/wrapper/maven-wrapper.properties b/teamscale-maven-plugin/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index 23241dc39..000000000 --- a/teamscale-maven-plugin/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1,20 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you 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 -# -# http://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. -wrapperVersion=3.3.2 -distributionType=script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar diff --git a/teamscale-maven-plugin/README.md b/teamscale-maven-plugin/README.md index 195b7f48a..e1371e289 100644 --- a/teamscale-maven-plugin/README.md +++ b/teamscale-maven-plugin/README.md @@ -1,10 +1,5 @@ # Teamscale Maven Plugin Dev Setup -## Import into IntelliJ -The JaCoCo agent repo uses gradle, but since we are developing a maven plugin, it also uses maven as nested build system. -To get code completion etc. in IntelliJ, open the maven tool window and click on sync (🔄) there. -This will un-sync the gradle projects but instead sync the `teamscale-maven-plugin` project - ## Manual testing When doing manual tests, you can attach the IntelliJ debugger to the JVM in which the tests are run. Surefire (maven unit tests) creates its own JVM and you have to tell it to stop before the execution of the tests to attach a debugger. @@ -15,4 +10,4 @@ So if you want to manually test the changes to the plugin you need to: * Call `./gradlew publishToMavenLocal` to publish your plugin changes to your local maven cache * Create a maven project with some tests and installed Teamscale plugin (see [Docs](https://docs.teamscale.com/howto/providing-testwise-coverage/#tia-with-maven-and-junit-5)). The version should be the one stated in the root level `build.gradle.kts` file with a `-SNAPSHOT` suffix, e.g. `33.2.0-SNAPSHOT`. * In your maven project, call `mvn -Dmaven.surefire.debug verify`. The tests won't run until you do the next step. -* In IntelliJ, [create a Remote JVM debug run config](https://www.jetbrains.com/help/idea/attach-to-process.html#attach-to-remote) with default values. Set breakpoints in the code as needed and run the remote debug run config. The tests will resume now and your breakpoints in the plugin will be hit. \ No newline at end of file +* In IntelliJ, [create a Remote JVM debug run config](https://www.jetbrains.com/help/idea/attach-to-process.html#attach-to-remote) with default values. Set breakpoints in the code as needed and run the remote debug run config. The tests will resume now and your breakpoints in the plugin will be hit. diff --git a/teamscale-maven-plugin/auto-format-pom.sh b/teamscale-maven-plugin/auto-format-pom.sh deleted file mode 100755 index f64e0bd01..000000000 --- a/teamscale-maven-plugin/auto-format-pom.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -./mvnw org.codehaus.mojo:tidy-maven-plugin:1.1.0:pom diff --git a/teamscale-maven-plugin/build.gradle.kts b/teamscale-maven-plugin/build.gradle.kts index e24a2d461..369dae983 100644 --- a/teamscale-maven-plugin/build.gradle.kts +++ b/teamscale-maven-plugin/build.gradle.kts @@ -1,100 +1,31 @@ -import org.apache.tools.ant.taskdefs.condition.Os - -abstract class MavenExec : Exec() { - @TaskAction - override fun exec() { - executable = "./mvnw" - if (Os.isFamily(Os.FAMILY_WINDOWS)) { - executable = "cmd" - args(listOf("/c", "mvnw.cmd") + (args ?: emptyList())) - } - workingDir(".") - project.file("pom.xml").writeText( - project.file("pom.xml").readText().replace( - Regex("[^<]+"), - "${project.version}" - ).replace( - Regex("[^<]+"), - "${project.version}" - ) - ) - super.exec() - project.file("pom.xml").writeText( - project.file("pom.xml").readText().replace( - Regex("[^<]+"), - "34.0.0" - ).replace( - Regex("[^<]+"), - "1.0.0-SNAPSHOT" - ) - ) - } +plugins { + alias(libs.plugins.mavenPluginDevelopment) + com.teamscale.`java-convention` + com.teamscale.coverage + com.teamscale.publish } -tasks.register("clean") { - group = "build" - description = "Cleans the build directory" - args("clean") +publishAs { + readableName.set("Teamscale Maven Plugin") + description.set("Maven Plugin for Teamscale") } -tasks.register("build") { - group = "build" - description = "Builds the project and runs tests" - args( - "verify", - "-Drevision=${project.version}", - "-Dteamscale.agent.version=${project.version}" - ) +mavenPlugin { + helpMojoPackage.set("com.teamscale.maven.help") } -tasks.register("publishToMavenLocal") { - group = "publishing" - description = "Publishes the project to the local Maven repository" - args( - "install", - "-Drevision=${project.version}", - "-Dteamscale.agent.version=${project.version}" - ) -} +dependencies { + implementation(project(":agent")) + implementation(project(":report-generator")) + implementation(project(":teamscale-client")) -tasks.withType { - if (name != "clean") { - dependsOn(":agent:publishToMavenLocal") - dependsOn(":teamscale-client:publishToMavenLocal") - dependsOn(":impacted-test-engine:publishToMavenLocal") - } -} + compileOnly(libs.maven.core) + implementation(libs.maven.pluginApi) + compileOnly(libs.maven.pluginAnnotations) -if (project.hasProperty("sonatypeUsername") && - project.hasProperty("sonatypePassword") && - project.hasProperty("signing.keyId") && - project.hasProperty("gpgDirectory") -) { + implementation(libs.jgit) + implementation(libs.teamscaleLibCommons) - tasks.register("publishMavenPublicationToSonatypeRepository") { - group = "publishing" - description = "Publishes the Maven publication to the Sonatype repository" - doFirst { - file("/tmp/maven-settings.xml").writeText( - """ - - - - ossrh - ${project.property("sonatypeUsername")} - ${project.property("sonatypePassword")} - - - -""" - ) - } - args( - "deploy", "-s", "/tmp/maven-settings.xml", - "-Dgpg.passphrase=${project.property("signing.password")}", - "-Dgpg.homedir=${project.property("gpgDirectory")}", - "-Dgpg.keyname=${project.property("signing.keyId")}", - "-DsecretKeyRingFile=${project.property("signing.secretKeyRingFile")}" - ) - } + testImplementation(libs.junit.jupiter.api) + testImplementation(libs.assertj) } diff --git a/teamscale-maven-plugin/mvnw b/teamscale-maven-plugin/mvnw deleted file mode 100755 index 5e9618cac..000000000 --- a/teamscale-maven-plugin/mvnw +++ /dev/null @@ -1,332 +0,0 @@ -#!/bin/sh -# ---------------------------------------------------------------------------- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you 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 -# -# http://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. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Apache Maven Wrapper startup batch script, version 3.3.2 -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir -# -# Optional ENV vars -# ----------------- -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files -# ---------------------------------------------------------------------------- - -if [ -z "$MAVEN_SKIP_RC" ]; then - - if [ -f /usr/local/etc/mavenrc ]; then - . /usr/local/etc/mavenrc - fi - - if [ -f /etc/mavenrc ]; then - . /etc/mavenrc - fi - - if [ -f "$HOME/.mavenrc" ]; then - . "$HOME/.mavenrc" - fi - -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false -darwin=false -mingw=false -case "$(uname)" in -CYGWIN*) cygwin=true ;; -MINGW*) mingw=true ;; -Darwin*) - darwin=true - # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home - # See https://developer.apple.com/library/mac/qa/qa1170/_index.html - if [ -z "$JAVA_HOME" ]; then - if [ -x "/usr/libexec/java_home" ]; then - JAVA_HOME="$(/usr/libexec/java_home)" - export JAVA_HOME - else - JAVA_HOME="/Library/Java/Home" - export JAVA_HOME - fi - fi - ;; -esac - -if [ -z "$JAVA_HOME" ]; then - if [ -r /etc/gentoo-release ]; then - JAVA_HOME=$(java-config --jre-home) - fi -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin; then - [ -n "$JAVA_HOME" ] \ - && JAVA_HOME=$(cygpath --unix "$JAVA_HOME") - [ -n "$CLASSPATH" ] \ - && CLASSPATH=$(cygpath --path --unix "$CLASSPATH") -fi - -# For Mingw, ensure paths are in UNIX format before anything is touched -if $mingw; then - [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] \ - && JAVA_HOME="$( - cd "$JAVA_HOME" || ( - echo "cannot cd into $JAVA_HOME." >&2 - exit 1 - ) - pwd - )" -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="$(which javac)" - if [ -n "$javaExecutable" ] && ! [ "$(expr "$javaExecutable" : '\([^ ]*\)')" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=$(which readlink) - if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then - if $darwin; then - javaHome="$(dirname "$javaExecutable")" - javaExecutable="$(cd "$javaHome" && pwd -P)/javac" - else - javaExecutable="$(readlink -f "$javaExecutable")" - fi - javaHome="$(dirname "$javaExecutable")" - javaHome=$(expr "$javaHome" : '\(.*\)/bin') - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ]; then - 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 - else - JAVACMD="$( - \unset -f command 2>/dev/null - \command -v java - )" - fi -fi - -if [ ! -x "$JAVACMD" ]; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi - -if [ -z "$JAVA_HOME" ]; then - echo "Warning: JAVA_HOME environment variable is not set." >&2 -fi - -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { - if [ -z "$1" ]; then - echo "Path not specified to find_maven_basedir" >&2 - return 1 - fi - - basedir="$1" - wdir="$1" - while [ "$wdir" != '/' ]; do - if [ -d "$wdir"/.mvn ]; then - basedir=$wdir - break - fi - # workaround for JBEAP-8937 (on Solaris 10/Sparc) - if [ -d "${wdir}" ]; then - wdir=$( - cd "$wdir/.." || exit 1 - pwd - ) - fi - # end of workaround - done - printf '%s' "$( - cd "$basedir" || exit 1 - pwd - )" -} - -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - # Remove \r in case we run on Windows within Git Bash - # and check out the repository with auto CRLF management - # enabled. Otherwise, we may read lines that are delimited with - # \r\n and produce $'-Xarg\r' rather than -Xarg due to word - # splitting rules. - tr -s '\r\n' ' ' <"$1" - fi -} - -log() { - if [ "$MVNW_VERBOSE" = true ]; then - printf '%s\n' "$1" - fi -} - -BASE_DIR=$(find_maven_basedir "$(dirname "$0")") -if [ -z "$BASE_DIR" ]; then - exit 1 -fi - -MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} -export MAVEN_PROJECTBASEDIR -log "$MAVEN_PROJECTBASEDIR" - -########################################################################################## -# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -# This allows using the maven wrapper in projects that prohibit checking in binary data. -########################################################################################## -wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" -if [ -r "$wrapperJarPath" ]; then - log "Found $wrapperJarPath" -else - log "Couldn't find $wrapperJarPath, downloading it ..." - - if [ -n "$MVNW_REPOURL" ]; then - wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar" - else - wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar" - fi - while IFS="=" read -r key value; do - # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) - safeValue=$(echo "$value" | tr -d '\r') - case "$key" in wrapperUrl) - wrapperUrl="$safeValue" - break - ;; - esac - done <"$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" - log "Downloading from: $wrapperUrl" - - if $cygwin; then - wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") - fi - - if command -v wget >/dev/null; then - log "Found wget ... using wget" - [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - else - wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - fi - elif command -v curl >/dev/null; then - log "Found curl ... using curl" - [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" - else - curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" - fi - else - log "Falling back to using Java to download" - javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" - javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" - # For Cygwin, switch paths to Windows format before running javac - if $cygwin; then - javaSource=$(cygpath --path --windows "$javaSource") - javaClass=$(cygpath --path --windows "$javaClass") - fi - if [ -e "$javaSource" ]; then - if [ ! -e "$javaClass" ]; then - log " - Compiling MavenWrapperDownloader.java ..." - ("$JAVA_HOME/bin/javac" "$javaSource") - fi - if [ -e "$javaClass" ]; then - log " - Running MavenWrapperDownloader.java ..." - ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" - fi - fi - fi -fi -########################################################################################## -# End of extension -########################################################################################## - -# If specified, validate the SHA-256 sum of the Maven wrapper jar file -wrapperSha256Sum="" -while IFS="=" read -r key value; do - case "$key" in wrapperSha256Sum) - wrapperSha256Sum=$value - break - ;; - esac -done <"$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" -if [ -n "$wrapperSha256Sum" ]; then - wrapperSha256Result=false - if command -v sha256sum >/dev/null; then - if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c >/dev/null 2>&1; then - wrapperSha256Result=true - fi - elif command -v shasum >/dev/null; then - if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c >/dev/null 2>&1; then - wrapperSha256Result=true - fi - else - echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 - echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." >&2 - exit 1 - fi - if [ $wrapperSha256Result = false ]; then - echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2 - echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2 - echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2 - exit 1 - fi -fi - -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$JAVA_HOME" ] \ - && JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME") - [ -n "$CLASSPATH" ] \ - && CLASSPATH=$(cygpath --path --windows "$CLASSPATH") - [ -n "$MAVEN_PROJECTBASEDIR" ] \ - && MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR") -fi - -# Provide a "standardized" way to retrieve the CLI args that will -# work with both Windows and non-Windows executions. -MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*" -export MAVEN_CMD_LINE_ARGS - -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -# shellcheck disable=SC2086 # safe args -exec "$JAVACMD" \ - $MAVEN_OPTS \ - $MAVEN_DEBUG_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/teamscale-maven-plugin/mvnw.cmd b/teamscale-maven-plugin/mvnw.cmd deleted file mode 100644 index 1204076a9..000000000 --- a/teamscale-maven-plugin/mvnw.cmd +++ /dev/null @@ -1,206 +0,0 @@ -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Apache Maven Wrapper startup batch script, version 3.3.2 -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files -@REM ---------------------------------------------------------------------------- - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM set title of command window -title %0 -@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* -if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. >&2 -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. >&2 -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. >&2 -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. >&2 -goto error - -@REM ==== END VALIDATION ==== - -:init - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" -set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar" - -FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B -) - -@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -@REM This allows using the maven wrapper in projects that prohibit checking in binary data. -if exist %WRAPPER_JAR% ( - if "%MVNW_VERBOSE%" == "true" ( - echo Found %WRAPPER_JAR% - ) -) else ( - if not "%MVNW_REPOURL%" == "" ( - SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar" - ) - if "%MVNW_VERBOSE%" == "true" ( - echo Couldn't find %WRAPPER_JAR%, downloading it ... - echo Downloading from: %WRAPPER_URL% - ) - - powershell -Command "&{"^ - "$webclient = new-object System.Net.WebClient;"^ - "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ - "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ - "}"^ - "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ - "}" - if "%MVNW_VERBOSE%" == "true" ( - echo Finished downloading %WRAPPER_JAR% - ) -) -@REM End of extension - -@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file -SET WRAPPER_SHA_256_SUM="" -FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B -) -IF NOT %WRAPPER_SHA_256_SUM%=="" ( - powershell -Command "&{"^ - "Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash;"^ - "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ - "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ - " Write-Error 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ - " Write-Error 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ - " Write-Error 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ - " exit 1;"^ - "}"^ - "}" - if ERRORLEVEL 1 goto error -) - -@REM Provide a "standardized" way to retrieve the CLI args that will -@REM work with both Windows and non-Windows executions. -set MAVEN_CMD_LINE_ARGS=%* - -%MAVEN_JAVA_EXE% ^ - %JVM_CONFIG_MAVEN_PROPS% ^ - %MAVEN_OPTS% ^ - %MAVEN_DEBUG_OPTS% ^ - -classpath %WRAPPER_JAR% ^ - "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ - %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" -if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%"=="on" pause - -if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% - -cmd /C exit /B %ERROR_CODE% diff --git a/teamscale-maven-plugin/pom.xml b/teamscale-maven-plugin/pom.xml deleted file mode 100644 index 9594d72b7..000000000 --- a/teamscale-maven-plugin/pom.xml +++ /dev/null @@ -1,226 +0,0 @@ - - - 4.0.0 - - com.teamscale - teamscale-maven-plugin - - ${revision} - maven-plugin - - Teamscale Maven Plugin - Maven Plugin for Teamscale - https://github.com/cqse/teamscale-jacoco-agent - - CQSE GmbH - https://cqse.eu - - - - The Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - - - - CQSE GmbH - info@cqse.eu - CQSE GmbH - https://cqse.eu - - - - - scm:git:git@github.com:cqse/teamscale-jacoco-agent.git - scm:git:ssh://github.com:cqse/teamscale-jacoco-agent.git - https://github.com/cqse/teamscale-jacoco-agent - - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - 1.8 - 1.8 - 1.0.0-SNAPSHOT - - 34.0.0 - - - - - org.junit.jupiter - junit-jupiter-engine - 5.11.4 - test - - - com.teamscale - teamscale-jacoco-agent - ${teamscale.agent.version} - - - org.apache.maven - maven-plugin-api - 3.9.9 - provided - - - org.apache.maven.plugin-tools - maven-plugin-annotations - 3.15.1 - provided - - - org.apache.maven - maven-core - 3.9.9 - provided - - - org.eclipse.jgit - org.eclipse.jgit - 7.1.0.202411261347-r - - - com.teamscale - teamscale-lib-commons - 9.4.1 - - - com.teamscale - teamscale-client - ${teamscale.agent.version} - runtime - - - - - - - - - org.apache.maven.plugins - maven-wrapper-plugin - 3.3.2 - - script - - - - - - - org.apache.maven.plugins - maven-plugin-plugin - 3.15.1 - - - generate-helpmojo - - helpmojo - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.5.2 - - - org.apache.maven.plugins - maven-source-plugin - 3.3.1 - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.11.2 - - - attach-javadocs - - jar - - - - - - - - - - sign - - - gpg.passphrase - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 3.2.7 - - - sign-artifacts - verify - - sign - - - - - --pinentry-mode - loopback - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - 3.1.3 - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 - true - - ossrh - https://oss.sonatype.org/ - true - - - - - - - diff --git a/teamscale-maven-plugin/src/main/java/com/teamscale/maven/tia/TiaCoverageConvertMojo.java b/teamscale-maven-plugin/src/main/java/com/teamscale/maven/tia/TiaCoverageConvertMojo.java index 81aa2c5a5..c58e308a5 100644 --- a/teamscale-maven-plugin/src/main/java/com/teamscale/maven/tia/TiaCoverageConvertMojo.java +++ b/teamscale-maven-plugin/src/main/java/com/teamscale/maven/tia/TiaCoverageConvertMojo.java @@ -12,17 +12,17 @@ import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.project.MavenProject; -import shadow.com.teamscale.client.TestDetails; -import shadow.com.teamscale.report.EDuplicateClassFileBehavior; -import shadow.com.teamscale.report.ReportUtils; -import shadow.com.teamscale.report.testwise.ETestArtifactFormat; -import shadow.com.teamscale.report.testwise.TestwiseCoverageReportWriter; -import shadow.com.teamscale.report.testwise.jacoco.JaCoCoTestwiseReportGenerator; -import shadow.com.teamscale.report.testwise.model.TestExecution; -import shadow.com.teamscale.report.testwise.model.factory.TestInfoFactory; -import shadow.com.teamscale.report.util.ClasspathWildcardIncludeFilter; -import shadow.com.teamscale.report.util.CommandLineLogger; -import shadow.com.teamscale.report.util.ILogger; +import com.teamscale.client.TestDetails; +import com.teamscale.report.EDuplicateClassFileBehavior; +import com.teamscale.report.ReportUtils; +import com.teamscale.report.testwise.ETestArtifactFormat; +import com.teamscale.report.testwise.TestwiseCoverageReportWriter; +import com.teamscale.report.testwise.jacoco.JaCoCoTestwiseReportGenerator; +import com.teamscale.report.testwise.model.TestExecution; +import com.teamscale.report.testwise.model.factory.TestInfoFactory; +import com.teamscale.report.util.ClasspathWildcardIncludeFilter; +import com.teamscale.report.util.CommandLineLogger; +import com.teamscale.report.util.ILogger; import java.io.File; import java.io.IOException; diff --git a/teamscale-maven-plugin/src/main/java/com/teamscale/maven/upload/CoverageUploadMojo.java b/teamscale-maven-plugin/src/main/java/com/teamscale/maven/upload/CoverageUploadMojo.java index 915e411a5..ec5a4994b 100644 --- a/teamscale-maven-plugin/src/main/java/com/teamscale/maven/upload/CoverageUploadMojo.java +++ b/teamscale-maven-plugin/src/main/java/com/teamscale/maven/upload/CoverageUploadMojo.java @@ -10,9 +10,9 @@ import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.util.xml.Xpp3Dom; -import shadow.com.teamscale.client.CommitDescriptor; -import shadow.com.teamscale.client.EReportFormat; -import shadow.com.teamscale.client.TeamscaleClient; +import com.teamscale.client.CommitDescriptor; +import com.teamscale.client.EReportFormat; +import com.teamscale.client.TeamscaleClient; import java.io.File; import java.io.IOException;