Remove buildpack stdlib

Author: Malax

bin/compile

@@ -1,11 +1,8 @@
 #!/usr/bin/env bash
 # bin/compile <build-dir> <cache-dir> <env-dir>
 
-# fail fast
 set -e
 
-BPLOG_PREFIX="buildpack.java"
-
 BP_DIR=$(
 	cd "$(dirname "${0}")/"..
 	pwd
@@ -15,9 +12,9 @@ BUILD_DIR=$1
 CACHE_DIR=$2
 ENV_DIR=$3
 
+source "${BP_DIR}/lib/util.sh"
 source "${BP_DIR}/lib/common.sh"
 source "${BP_DIR}/lib/maven.sh"
-source "${BP_DIR}/lib/buildpack-stdlib-v7.sh"
 source "${BP_DIR}/lib/metadata.sh"
 
 # Initialise the buildpack metadata store.
@@ -26,12 +23,9 @@ source "${BP_DIR}/lib/metadata.sh"
 meta_init "${CACHE_DIR}" "java"
 meta_setup
 
-export_env "${ENV_DIR}" "." "JAVA_OPTS|JAVA_TOOL_OPTIONS"
+export_env_dir "${ENV_DIR}" "." "JAVA_OPTS|JAVA_TOOL_OPTIONS"
 
 install_jdk "${BUILD_DIR}" "${CACHE_DIR}"
 
-[ -n "$(find "${BUILD_DIR}" -type f -name "*.kt")" ] && mcount "kotlin.source"
-[ -n "$(find "${BUILD_DIR}" -type f -name "*.groovy")" ] && mcount "groovy.source"
-
 run_mvn "compile" "${BUILD_DIR}" "${CACHE_DIR}"
 remove_mvn "${BUILD_DIR}" "${CACHE_DIR}"

bin/test

@@ -13,9 +13,8 @@ ENV_DIR=$2
 
 source "${BP_DIR}/lib/common.sh"
 source "${BP_DIR}/lib/maven.sh"
-source "${BP_DIR}/lib/buildpack-stdlib-v7.sh"
 
-export_env "${ENV_DIR}" "." "JAVA_OPTS|JAVA_TOOL_OPTIONS"
+export_env_dir "${ENV_DIR}" "." "JAVA_OPTS|JAVA_TOOL_OPTIONS"
 
 cd "${BUILD_DIR}"
 

bin/test-compile

@@ -17,9 +17,8 @@ ENV_DIR=$3
 
 source "${BP_DIR}/lib/common.sh"
 source "${BP_DIR}/lib/maven.sh"
-source "${BP_DIR}/lib/buildpack-stdlib-v7.sh"
 
-export_env "${ENV_DIR}" "." "JAVA_OPTS|JAVA_TOOL_OPTIONS"
+export_env_dir "${ENV_DIR}" "." "JAVA_OPTS|JAVA_TOOL_OPTIONS"
 
 install_jdk "${BUILD_DIR}"
 

lib/buildpack-stdlib-v7.sh

@@ -10,7 +10,6 @@ install_maven() {
 	definedMavenVersion=$(detect_maven_version "${buildDir}")
 
 	mavenVersion=${definedMavenVersion:-$DEFAULT_MAVEN_VERSION}
-	mcount "mvn.version.${mavenVersion}"
 
 	status_pending "Installing Maven ${mavenVersion}"
 	local mavenUrl="https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/${mavenVersion}/apache-maven-${mavenVersion}-bin.tar.gz"
@@ -89,9 +88,6 @@ install_jdk() {
 	local install_dir=${1}
 	local cache_dir=${2}
 
-	local start
-	start=$(nowms)
-
 	JVM_COMMON_BUILDPACK=${JVM_COMMON_BUILDPACK:-https://buildpack-registry.s3.us-east-1.amazonaws.com/buildpacks/heroku/jvm.tgz}
 	mkdir -p /tmp/jvm-common
 	curl --fail --retry 3 --retry-connrefused --connect-timeout 5 --silent --location "${JVM_COMMON_BUILDPACK}" | tar xzm -C /tmp/jvm-common --strip-components=1
@@ -101,9 +97,6 @@ install_jdk() {
 	source /tmp/jvm-common/bin/java
 	#shellcheck source=/dev/null
 	source /tmp/jvm-common/opt/jdbc.sh
-	mtime "jvm-common.install.time" "${start}"
 
-	start=$(nowms)
 	install_java_with_overlay "${install_dir}" "${cache_dir}"
-	mtime "jvm.install.time" "${start}"
 }

lib/common.sh

@@ -33,25 +33,20 @@ _mvn_settings_opt() {
 	local mavenInstallDir="${2}"
 
 	if [ -n "$MAVEN_SETTINGS_PATH" ]; then
-		mcount "mvn.settings.path"
 		echo -n "-s $MAVEN_SETTINGS_PATH"
 	elif [ -n "$MAVEN_SETTINGS_URL" ]; then
 		local settingsXml="${mavenInstallDir}/.m2/settings.xml"
 		mkdir -p "$(dirname "${settingsXml}")"
 		curl --retry 3 --retry-connrefused --connect-timeout 5 --silent --max-time 10 --location "${MAVEN_SETTINGS_URL}" --output "${settingsXml}"
-		mcount "mvn.settings.url"
 		if [ -f "${settingsXml}" ]; then
 			echo -n "-s ${settingsXml}"
 		else
-			mcount "mvn.settings.url.fail"
 			error "Could not download settings.xml from the URL defined in MAVEN_SETTINGS_URL!"
 			return 1
 		fi
 	elif [ -f "${home}/settings.xml" ]; then
-		mcount "mvn.settings.file"
 		echo -n "-s ${home}/settings.xml"
 	else
-		mcount "mvn.settings.default"
 		echo -n ""
 	fi
 }
@@ -86,15 +81,11 @@ run_mvn() {
 		cache_copy ".m2/wrapper" "${mavenInstallDir}" "${home}"
 		chmod +x "${home}/mvnw"
 		local mavenExe="./mvnw"
-		mcount "mvn.version.wrapper"
 	else
 		# shellcheck disable=SC2164
 		cd "${mavenInstallDir}"
-		local start
-		start=$(nowms)
 
 		install_maven "${mavenInstallDir}" "${home}"
-		mtime "mvn.${scope}.time" "${start}"
 		PATH="${mavenInstallDir}/.maven/bin:$PATH"
 		local mavenExe="mvn"
 		# shellcheck disable=SC2164
@@ -115,21 +106,13 @@ run_mvn() {
 	status "Executing Maven"
 	echo "$ ${mavenExe} ${mvnOpts}" | indent
 
-	local cache_status
-	cache_status="$(get_cache_status "${mavenInstallDir}")"
-	local start
-	start=$(nowms)
-
 	# We rely on word splitting for mvn_settings_opt and mvnOpts:
 	# shellcheck disable=SC2086
 	if ! ${mavenExe} -DoutputFile=target/mvn-dependency-list.log -B ${mvn_settings_opt} ${mvnOpts} | indent; then
 		error "Failed to build app with Maven
 We're sorry this build is failing! If you can't find the issue in application code,
 please submit a ticket so we can help: https://help.heroku.com/"
 	fi
-
-	mtime "mvn.${scope}.time" "${start}"
-	mtime "mvn.${scope}.time.cache.${cache_status}" "${start}"
 }
 
 write_mvn_profile() {

lib/maven.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+export_env_dir() {
+	env_dir=$1
+	whitelist_regex=${2:-''}
+	blacklist_regex=${3:-'^(PATH|GIT_DIR|CPATH|CPPATH|LD_PRELOAD|LIBRARY_PATH|JAVA_OPTS|JAVA_TOOL_OPTIONS)$'}
+	if [ -d "$env_dir" ]; then
+		for env_var_path in "$env_dir"/*; do
+			if [ -f "$env_var_path" ]; then
+				basename "$env_var_path" | grep -E "$whitelist_regex" | grep -qvE "$blacklist_regex" &&
+					export "$(basename "$env_var_path")=$(cat "$env_var_path")"
+			fi
+			:
+		done
+	fi
+}
+
+nowms() {
+	date +%s%3N
+}