From 0de1defea16585e63ad91e0e4d341b63033096d2 Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sat, 5 Jul 2025 14:36:09 +0100 Subject: [PATCH 1/9] Add a test of maven dependencies --- .github/workflows/maven.yml | 37 +++ gradle.properties | 1 + maven-tests/.gitignore | 2 + maven-tests/.mvn/jvm.config | 0 maven-tests/.mvn/maven.config | 0 .../.mvn/wrapper/maven-wrapper.properties | 19 ++ maven-tests/build.gradle.kts | 23 ++ maven-tests/mvnw | 259 ++++++++++++++++++ maven-tests/mvnw.cmd | 149 ++++++++++ maven-tests/pom.xml | 98 +++++++ .../okhttp3/maventest/SampleHttpClient.java | 39 +++ maven-tests/src/site/site.xml | 26 ++ .../squareup/okhttp3/maventest/AppTest.java | 16 ++ settings.gradle.kts | 5 + 14 files changed, 674 insertions(+) create mode 100644 .github/workflows/maven.yml create mode 100644 maven-tests/.gitignore create mode 100644 maven-tests/.mvn/jvm.config create mode 100644 maven-tests/.mvn/maven.config create mode 100644 maven-tests/.mvn/wrapper/maven-wrapper.properties create mode 100644 maven-tests/build.gradle.kts create mode 100644 maven-tests/mvnw create mode 100644 maven-tests/mvnw.cmd create mode 100644 maven-tests/pom.xml create mode 100644 maven-tests/src/main/java/com/squareup/okhttp3/maventest/SampleHttpClient.java create mode 100644 maven-tests/src/site/site.xml create mode 100644 maven-tests/src/test/java/com/squareup/okhttp3/maventest/AppTest.java diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml new file mode 100644 index 000000000000..f49050c87ba4 --- /dev/null +++ b/.github/workflows/maven.yml @@ -0,0 +1,37 @@ +name: containers + +on: + push: + branches: + - master + pull_request: + types: [opened, labeled, unlabeled, synchronize] + +permissions: + contents: read + +env: + GRADLE_OPTS: "-Dorg.gradle.jvmargs=-Xmx4g -Dorg.gradle.daemon=false -Dkotlin.incremental=false" + +jobs: + test_containers: + permissions: + checks: write # for actions/upload-artifact + runs-on: ubuntu-latest + if: github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'maven') + + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Configure JDK + uses: actions/setup-java@v4 + with: + distribution: 'zulu' + java-version: 17 + + - name: Run maven test + working-directory: ./maven-tests + run: ./mvnw verify diff --git a/gradle.properties b/gradle.properties index 439ab99d084e..306c30ab8ff8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,6 +7,7 @@ kotlin.mpp.applyDefaultHierarchyTemplate=false androidBuild=false graalBuild=false loomBuild=false +mavenBuild=false containerTests=false org.gradle.jvmargs='-Dfile.encoding=UTF-8' diff --git a/maven-tests/.gitignore b/maven-tests/.gitignore new file mode 100644 index 000000000000..6eeec870def3 --- /dev/null +++ b/maven-tests/.gitignore @@ -0,0 +1,2 @@ +build +target diff --git a/maven-tests/.mvn/jvm.config b/maven-tests/.mvn/jvm.config new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/maven-tests/.mvn/maven.config b/maven-tests/.mvn/maven.config new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/maven-tests/.mvn/wrapper/maven-wrapper.properties b/maven-tests/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 000000000000..2f94e6169877 --- /dev/null +++ b/maven-tests/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,19 @@ +# 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=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.10/apache-maven-3.9.10-bin.zip diff --git a/maven-tests/build.gradle.kts b/maven-tests/build.gradle.kts new file mode 100644 index 000000000000..9efef4369070 --- /dev/null +++ b/maven-tests/build.gradle.kts @@ -0,0 +1,23 @@ +plugins { + kotlin("jvm") +} +val testJavaVersion = System.getProperty("test.java.version", "21").toInt() + +tasks.withType { + useJUnitPlatform() + + val javaToolchains = project.extensions.getByType() + javaLauncher.set(javaToolchains.launcherFor { + languageVersion.set(JavaLanguageVersion.of(testJavaVersion)) + }) +} + +dependencies { + //noinspection UseTomlInstead + implementation("com.squareup.okhttp3:okhttp:5.0.0") + implementation("com.squareup.okhttp3:logging-interceptor:5.0.0") + + testImplementation(libs.junit) + testImplementation(libs.assertk) + testImplementation(libs.junit.vintage.engine) +} diff --git a/maven-tests/mvnw b/maven-tests/mvnw new file mode 100644 index 000000000000..19529ddf8c6e --- /dev/null +++ b/maven-tests/mvnw @@ -0,0 +1,259 @@ +#!/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 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + 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" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=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 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/maven-tests/mvnw.cmd b/maven-tests/mvnw.cmd new file mode 100644 index 000000000000..249bdf382222 --- /dev/null +++ b/maven-tests/mvnw.cmd @@ -0,0 +1,149 @@ +<# : batch portion +@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 Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' +$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +if ($env:MAVEN_USER_HOME) { + $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" +} +$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/maven-tests/pom.xml b/maven-tests/pom.xml new file mode 100644 index 000000000000..79a781ee51d2 --- /dev/null +++ b/maven-tests/pom.xml @@ -0,0 +1,98 @@ + + + + 4.0.0 + + com.squareup.okhttp3 + maven-tests + 5.0.0-SNAPSHOT + + maven-tests + A simple maven-test. + + + UTF-8 + 17 + 17 + + + + + junit + junit + 4.12 + test + + + + com.squareup.okhttp3 + okhttp-jvm + 5.0.0 + + + + + + + + + + + + + + + + + + + + maven-clean-plugin + 3.4.0 + + + maven-site-plugin + 3.12.1 + + + maven-project-info-reports-plugin + 3.6.1 + + + + maven-resources-plugin + 3.3.1 + + + maven-compiler-plugin + 3.13.0 + + + maven-surefire-plugin + 3.3.0 + + + maven-jar-plugin + 3.4.2 + + + maven-install-plugin + 3.1.2 + + + maven-deploy-plugin + 3.1.2 + + + + + + + + + maven-project-info-reports-plugin + + + + diff --git a/maven-tests/src/main/java/com/squareup/okhttp3/maventest/SampleHttpClient.java b/maven-tests/src/main/java/com/squareup/okhttp3/maventest/SampleHttpClient.java new file mode 100644 index 000000000000..7c0db68178c4 --- /dev/null +++ b/maven-tests/src/main/java/com/squareup/okhttp3/maventest/SampleHttpClient.java @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2025 Block, Inc. + * + * 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 + * + * 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. + */ + +package com.squareup.okhttp3.maventest; + +import java.io.IOException; + +import okhttp3.Headers; +import okhttp3.HttpUrl; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.Response; + +public class SampleHttpClient { + private final OkHttpClient client; + + public SampleHttpClient() { + client = new OkHttpClient.Builder().build(); + } + + public void makeCall() throws IOException { + try (Response response = client.newCall(new Request(HttpUrl.get("https://google.com/robots.txt"), Headers.EMPTY, "GET", null)).execute()) { + System.out.println(response.body().string()); + } + } +} diff --git a/maven-tests/src/site/site.xml b/maven-tests/src/site/site.xml new file mode 100644 index 000000000000..0ec552b31944 --- /dev/null +++ b/maven-tests/src/site/site.xml @@ -0,0 +1,26 @@ + + + + + maven-test + https://maven.apache.org/images/apache-maven-project.png + https://www.apache.org/ + + + + https://maven.apache.org/images/maven-logo-black-on-white.png + https://maven.apache.org/ + + + + org.apache.maven.skins + maven-fluido-skin + 1.7 + + + + + + + \ No newline at end of file diff --git a/maven-tests/src/test/java/com/squareup/okhttp3/maventest/AppTest.java b/maven-tests/src/test/java/com/squareup/okhttp3/maventest/AppTest.java new file mode 100644 index 000000000000..4b6b5f873819 --- /dev/null +++ b/maven-tests/src/test/java/com/squareup/okhttp3/maventest/AppTest.java @@ -0,0 +1,16 @@ +package com.squareup.okhttp3.maventest; + +import org.junit.Test; + +import java.io.IOException; + +/** + * Unit test for simple App. + */ +public class AppTest { + + @Test + public void testApp() throws IOException { + new SampleHttpClient().makeCall(); + } +} diff --git a/settings.gradle.kts b/settings.gradle.kts index 41b6eb1b15b8..ec3d130680be 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -18,6 +18,7 @@ project(":mockwebserver-junit5").name = "mockwebserver3-junit5" val androidBuild: String by settings val graalBuild: String by settings val loomBuild: String by settings +val mavenBuild: String by settings if (androidBuild.toBoolean()) { include(":regression-test") @@ -52,6 +53,10 @@ include(":samples:tlssurvey") include(":samples:unixdomainsockets") include(":container-tests") +if (mavenBuild.toBoolean()) { + include(":maven-tests") +} + project(":okhttp-logging-interceptor").name = "logging-interceptor" val androidHome = System.getenv("ANDROID_HOME") From 02c4e897b465fe51837a2d9263a2df327cd1f1f3 Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sat, 5 Jul 2025 14:40:22 +0100 Subject: [PATCH 2/9] rename --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index f49050c87ba4..99f370361523 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -1,4 +1,4 @@ -name: containers +name: maven on: push: @@ -14,7 +14,7 @@ env: GRADLE_OPTS: "-Dorg.gradle.jvmargs=-Xmx4g -Dorg.gradle.daemon=false -Dkotlin.incremental=false" jobs: - test_containers: + test_maven: permissions: checks: write # for actions/upload-artifact runs-on: ubuntu-latest From 6ba2a7c9aa350db51f37a063ba386de671c066e0 Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sat, 5 Jul 2025 14:41:32 +0100 Subject: [PATCH 3/9] executable --- maven-tests/mvnw | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 maven-tests/mvnw diff --git a/maven-tests/mvnw b/maven-tests/mvnw old mode 100644 new mode 100755 From fe84976a053826d73b9dde6f6da5bb73ae6e355d Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sat, 5 Jul 2025 14:52:13 +0100 Subject: [PATCH 4/9] quiet --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 99f370361523..25f9938c31f2 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -34,4 +34,4 @@ jobs: - name: Run maven test working-directory: ./maven-tests - run: ./mvnw verify + run: ./mvnw -q verify From bb38e75f2ac24a1b3abfff9f00d1df7150e15cf1 Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sun, 6 Jul 2025 18:39:09 +0100 Subject: [PATCH 5/9] Update AppTest.java --- .../com/squareup/okhttp3/maventest/AppTest.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/maven-tests/src/test/java/com/squareup/okhttp3/maventest/AppTest.java b/maven-tests/src/test/java/com/squareup/okhttp3/maventest/AppTest.java index 4b6b5f873819..98c878cebb61 100644 --- a/maven-tests/src/test/java/com/squareup/okhttp3/maventest/AppTest.java +++ b/maven-tests/src/test/java/com/squareup/okhttp3/maventest/AppTest.java @@ -1,3 +1,18 @@ +/* + * Copyright (C) 2025 Block, Inc. + * + * 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 + * + * 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. + */ package com.squareup.okhttp3.maventest; import org.junit.Test; From 1b6c53da340483aac8bc4ea4ab35cfb4f97135f0 Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sat, 12 Jul 2025 12:40:25 +0100 Subject: [PATCH 6/9] Make okhttp3.internal.platform.PlatformInitializer multiprocess --- .github/workflows/build.yml | 21 ++++++++++++++++++++ .github/workflows/maven.yml | 37 ------------------------------------ maven-tests/build.gradle.kts | 23 ---------------------- 3 files changed, 21 insertions(+), 60 deletions(-) delete mode 100644 .github/workflows/maven.yml delete mode 100644 maven-tests/build.gradle.kts diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0437a07f530c..f8078423521e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -716,3 +716,24 @@ jobs: script: ./gradlew -PandroidBuild=true :regression-test:connectedCheck env: API_LEVEL: ${{ matrix.api-level }} + + test_maven: + permissions: + checks: write # for actions/upload-artifact + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Configure JDK + uses: actions/setup-java@v4 + with: + distribution: 'zulu' + java-version: 17 + + - name: Run maven test + working-directory: ./maven-tests + run: ./mvnw -q verify diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml deleted file mode 100644 index 25f9938c31f2..000000000000 --- a/.github/workflows/maven.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: maven - -on: - push: - branches: - - master - pull_request: - types: [opened, labeled, unlabeled, synchronize] - -permissions: - contents: read - -env: - GRADLE_OPTS: "-Dorg.gradle.jvmargs=-Xmx4g -Dorg.gradle.daemon=false -Dkotlin.incremental=false" - -jobs: - test_maven: - permissions: - checks: write # for actions/upload-artifact - runs-on: ubuntu-latest - if: github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'maven') - - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Configure JDK - uses: actions/setup-java@v4 - with: - distribution: 'zulu' - java-version: 17 - - - name: Run maven test - working-directory: ./maven-tests - run: ./mvnw -q verify diff --git a/maven-tests/build.gradle.kts b/maven-tests/build.gradle.kts deleted file mode 100644 index 9efef4369070..000000000000 --- a/maven-tests/build.gradle.kts +++ /dev/null @@ -1,23 +0,0 @@ -plugins { - kotlin("jvm") -} -val testJavaVersion = System.getProperty("test.java.version", "21").toInt() - -tasks.withType { - useJUnitPlatform() - - val javaToolchains = project.extensions.getByType() - javaLauncher.set(javaToolchains.launcherFor { - languageVersion.set(JavaLanguageVersion.of(testJavaVersion)) - }) -} - -dependencies { - //noinspection UseTomlInstead - implementation("com.squareup.okhttp3:okhttp:5.0.0") - implementation("com.squareup.okhttp3:logging-interceptor:5.0.0") - - testImplementation(libs.junit) - testImplementation(libs.assertk) - testImplementation(libs.junit.vintage.engine) -} From 202738ca764df10106d25d8f8749a8ca9f0891b8 Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sat, 12 Jul 2025 12:56:49 +0100 Subject: [PATCH 7/9] Make test self contained --- .github/workflows/build.yml | 8 ++++-- maven-tests/.gitignore | 1 - maven-tests/pom.xml | 27 ++++++++++--------- .../okhttp3/maventest/SampleHttpClient.java | 4 +-- maven-tests/src/site/site.xml | 26 ------------------ .../squareup/okhttp3/maventest/AppTest.java | 9 ++++++- 6 files changed, 30 insertions(+), 45 deletions(-) delete mode 100644 maven-tests/src/site/site.xml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f8078423521e..244dba5f875c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -725,8 +725,6 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - with: - fetch-depth: 0 - name: Configure JDK uses: actions/setup-java@v4 @@ -734,6 +732,12 @@ jobs: distribution: 'zulu' java-version: 17 + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 + + - name: Publish local snapshot + run: ./gradlew publishToMavenLocal + - name: Run maven test working-directory: ./maven-tests run: ./mvnw -q verify diff --git a/maven-tests/.gitignore b/maven-tests/.gitignore index 6eeec870def3..eb5a316cbd19 100644 --- a/maven-tests/.gitignore +++ b/maven-tests/.gitignore @@ -1,2 +1 @@ -build target diff --git a/maven-tests/pom.xml b/maven-tests/pom.xml index 79a781ee51d2..8070b97e252b 100644 --- a/maven-tests/pom.xml +++ b/maven-tests/pom.xml @@ -6,7 +6,7 @@ com.squareup.okhttp3 maven-tests - 5.0.0-SNAPSHOT + 1.0.0-SNAPSHOT maven-tests A simple maven-test. @@ -21,27 +21,28 @@ junit junit - 4.12 + 4.13.2 test com.squareup.okhttp3 + okhttp-jvm - 5.0.0 + [5.0.0-SNAPSHOT,6.0.0-SNAPSHOT) - - - - - + + com.squareup.okhttp3 + mockwebserver3 + [5.0.0-SNAPSHOT,6.0.0-SNAPSHOT) + - - - - - + + com.squareup.okhttp3 + logging-interceptor + [5.0.0-SNAPSHOT,6.0.0-SNAPSHOT) + diff --git a/maven-tests/src/main/java/com/squareup/okhttp3/maventest/SampleHttpClient.java b/maven-tests/src/main/java/com/squareup/okhttp3/maventest/SampleHttpClient.java index 7c0db68178c4..76666d9814f6 100644 --- a/maven-tests/src/main/java/com/squareup/okhttp3/maventest/SampleHttpClient.java +++ b/maven-tests/src/main/java/com/squareup/okhttp3/maventest/SampleHttpClient.java @@ -31,8 +31,8 @@ public SampleHttpClient() { client = new OkHttpClient.Builder().build(); } - public void makeCall() throws IOException { - try (Response response = client.newCall(new Request(HttpUrl.get("https://google.com/robots.txt"), Headers.EMPTY, "GET", null)).execute()) { + public void makeCall(HttpUrl url) throws IOException { + try (Response response = client.newCall(new Request(url, Headers.EMPTY, "GET", null)).execute()) { System.out.println(response.body().string()); } } diff --git a/maven-tests/src/site/site.xml b/maven-tests/src/site/site.xml deleted file mode 100644 index 0ec552b31944..000000000000 --- a/maven-tests/src/site/site.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - maven-test - https://maven.apache.org/images/apache-maven-project.png - https://www.apache.org/ - - - - https://maven.apache.org/images/maven-logo-black-on-white.png - https://maven.apache.org/ - - - - org.apache.maven.skins - maven-fluido-skin - 1.7 - - - - - - - \ No newline at end of file diff --git a/maven-tests/src/test/java/com/squareup/okhttp3/maventest/AppTest.java b/maven-tests/src/test/java/com/squareup/okhttp3/maventest/AppTest.java index 4b6b5f873819..afcadf322608 100644 --- a/maven-tests/src/test/java/com/squareup/okhttp3/maventest/AppTest.java +++ b/maven-tests/src/test/java/com/squareup/okhttp3/maventest/AppTest.java @@ -1,5 +1,8 @@ package com.squareup.okhttp3.maventest; +import mockwebserver3.MockResponse; +import mockwebserver3.MockWebServer; +import okhttp3.Headers; import org.junit.Test; import java.io.IOException; @@ -8,9 +11,13 @@ * Unit test for simple App. */ public class AppTest { + private final MockWebServer mockWebServer = new MockWebServer(); @Test public void testApp() throws IOException { - new SampleHttpClient().makeCall(); + mockWebServer.enqueue(new MockResponse(200, Headers.of(), "Hello, Maven!")); + mockWebServer.start(); + + new SampleHttpClient().makeCall(mockWebServer.url("/")); } } From 0a38664d8dfc950bd513ee4117a27860983e166a Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sat, 12 Jul 2025 12:57:51 +0100 Subject: [PATCH 8/9] cleanup --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 244dba5f875c..c12cc75cb4b3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -718,8 +718,6 @@ jobs: API_LEVEL: ${{ matrix.api-level }} test_maven: - permissions: - checks: write # for actions/upload-artifact runs-on: ubuntu-latest steps: From af3e8a6b6b2e38ba44fd56c5953ea2d56b66cc3d Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sat, 12 Jul 2025 12:58:39 +0100 Subject: [PATCH 9/9] cleanup --- gradle.properties | 1 - settings.gradle.kts | 5 ----- 2 files changed, 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index 306c30ab8ff8..439ab99d084e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,6 @@ kotlin.mpp.applyDefaultHierarchyTemplate=false androidBuild=false graalBuild=false loomBuild=false -mavenBuild=false containerTests=false org.gradle.jvmargs='-Dfile.encoding=UTF-8' diff --git a/settings.gradle.kts b/settings.gradle.kts index ec3d130680be..41b6eb1b15b8 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -18,7 +18,6 @@ project(":mockwebserver-junit5").name = "mockwebserver3-junit5" val androidBuild: String by settings val graalBuild: String by settings val loomBuild: String by settings -val mavenBuild: String by settings if (androidBuild.toBoolean()) { include(":regression-test") @@ -53,10 +52,6 @@ include(":samples:tlssurvey") include(":samples:unixdomainsockets") include(":container-tests") -if (mavenBuild.toBoolean()) { - include(":maven-tests") -} - project(":okhttp-logging-interceptor").name = "logging-interceptor" val androidHome = System.getenv("ANDROID_HOME")