diff --git a/.shellcheckrc b/.shellcheckrc index e2d1334aa..ef17c90a1 100644 --- a/.shellcheckrc +++ b/.shellcheckrc @@ -5,3 +5,4 @@ disable=SC2294 disable=SC2034 disable=SC2031 disable=SC2030 +disable=SC3045 diff --git a/buildpacks/buildpack-gradle/tests/gradle-getting-started/.env b/buildpacks/buildpack-gradle/tests/gradle-getting-started/.env new file mode 100644 index 000000000..e3eeb7392 --- /dev/null +++ b/buildpacks/buildpack-gradle/tests/gradle-getting-started/.env @@ -0,0 +1 @@ +ENERGY=20 GeV diff --git a/buildpacks/buildpack-gradle/tests/gradle-getting-started/.github/CODEOWNERS b/buildpacks/buildpack-gradle/tests/gradle-getting-started/.github/CODEOWNERS new file mode 100644 index 000000000..a19ba5186 --- /dev/null +++ b/buildpacks/buildpack-gradle/tests/gradle-getting-started/.github/CODEOWNERS @@ -0,0 +1,8 @@ +# Note: Delete this file if you are copying the code in this repository into your own project. + +# Default to requesting pull request reviews from the Heroku Languages team. +* @heroku/languages + +# However, request review from the Heroku language owner for files that are updated +# by Dependabot, to reduce team review request noise. +build.gradle.kts @Malax diff --git a/buildpacks/buildpack-gradle/tests/gradle-getting-started/.github/dependabot.yml b/buildpacks/buildpack-gradle/tests/gradle-getting-started/.github/dependabot.yml new file mode 100644 index 000000000..dfa800a18 --- /dev/null +++ b/buildpacks/buildpack-gradle/tests/gradle-getting-started/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: "gradle" + directory: "/" + schedule: + interval: "monthly" diff --git a/buildpacks/buildpack-gradle/tests/gradle-getting-started/.gitignore b/buildpacks/buildpack-gradle/tests/gradle-getting-started/.gitignore new file mode 100644 index 000000000..ac14829b4 --- /dev/null +++ b/buildpacks/buildpack-gradle/tests/gradle-getting-started/.gitignore @@ -0,0 +1,29 @@ +.gradle +/build/ +!gradle/wrapper/gradle-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +docs/gradle-getting-started +docs/tmp +.vscode/ diff --git a/buildpacks/buildpack-gradle/tests/gradle-getting-started/LICENSE b/buildpacks/buildpack-gradle/tests/gradle-getting-started/LICENSE new file mode 100644 index 000000000..9f7552ba2 --- /dev/null +++ b/buildpacks/buildpack-gradle/tests/gradle-getting-started/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2023 Salesforce, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/buildpacks/buildpack-gradle/tests/gradle-getting-started/Procfile b/buildpacks/buildpack-gradle/tests/gradle-getting-started/Procfile new file mode 100644 index 000000000..e00553a77 --- /dev/null +++ b/buildpacks/buildpack-gradle/tests/gradle-getting-started/Procfile @@ -0,0 +1 @@ +web: java -jar build/libs/java-getting-started-gradle-1.0.0-SNAPSHOT.jar diff --git a/buildpacks/buildpack-gradle/tests/gradle-getting-started/README.md b/buildpacks/buildpack-gradle/tests/gradle-getting-started/README.md new file mode 100644 index 000000000..c5d2da0f7 --- /dev/null +++ b/buildpacks/buildpack-gradle/tests/gradle-getting-started/README.md @@ -0,0 +1,23 @@ +# Java: Getting Started (Gradle) + +A barebones Java app, which can easily be deployed to Heroku. + +If you want to use Maven instead of Gradle, see [Java: Getting Started (Maven)](https://github.com/heroku/java-getting-started). + +## Deploying to Heroku + +Using resources for this example app counts towards your usage. [Delete your app](https://devcenter.heroku.com/articles/heroku-cli-commands#heroku-apps-destroy) and [database](https://devcenter.heroku.com/articles/heroku-postgresql#removing-the-add-on) as soon as you are done experimenting to control costs. + +By default, apps use Eco dynos if you are subscribed to Eco. Otherwise, it defaults to Basic dynos. The Eco dynos plan is shared across all Eco dynos in your account and is recommended if you plan on deploying many small apps to Heroku. Learn more about our low-cost plans [here](https://blog.heroku.com/new-low-cost-plans). + +Eligible students can apply for platform credits through our new [Heroku for GitHub Students program](https://blog.heroku.com/github-student-developer-program). + +This application supports the [Getting Started with Java (Gradle) on Heroku](https://devcenter.heroku.com/articles/getting-started-with-gradle-on-heroku) article - check it out for instructions on how to deploy this app to Heroku and also run it locally. + +Alternatively, you can deploy it using this Heroku Button: + +[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy) + +For more information about using Java on Heroku, see these Dev Center articles: + +- [Java on Heroku](https://devcenter.heroku.com/categories/java) diff --git a/buildpacks/buildpack-gradle/tests/gradle-getting-started/app.json b/buildpacks/buildpack-gradle/tests/gradle-getting-started/app.json new file mode 100644 index 000000000..a4b770d6f --- /dev/null +++ b/buildpacks/buildpack-gradle/tests/gradle-getting-started/app.json @@ -0,0 +1,5 @@ +{ + "name": "Start on Heroku: Java", + "description": "A barebones Java app, which can easily be deployed to Heroku.", + "addons": ["heroku-postgresql"] +} diff --git a/buildpacks/buildpack-gradle/tests/gradle-getting-started/build.gradle.kts b/buildpacks/buildpack-gradle/tests/gradle-getting-started/build.gradle.kts new file mode 100644 index 000000000..bf06d4419 --- /dev/null +++ b/buildpacks/buildpack-gradle/tests/gradle-getting-started/build.gradle.kts @@ -0,0 +1,21 @@ +plugins { + java + id("org.springframework.boot") version "3.3.1" + id("io.spring.dependency-management") version "1.1.5" +} + +group = "com.heroku" +version = "1.0.0-SNAPSHOT" +java.sourceCompatibility = JavaVersion.VERSION_17 + +repositories { + mavenCentral() +} + +dependencies { + implementation("org.springframework.boot:spring-boot-starter") + implementation("org.springframework.boot:spring-boot-starter-web") + implementation("org.springframework.boot:spring-boot-starter-jdbc") + implementation("org.springframework.boot:spring-boot-starter-thymeleaf") + implementation("org.postgresql:postgresql") +} diff --git a/buildpacks/buildpack-gradle/tests/gradle-getting-started/gradle/wrapper/gradle-wrapper.jar b/buildpacks/buildpack-gradle/tests/gradle-getting-started/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..249e5832f Binary files /dev/null and b/buildpacks/buildpack-gradle/tests/gradle-getting-started/gradle/wrapper/gradle-wrapper.jar differ diff --git a/buildpacks/buildpack-gradle/tests/gradle-getting-started/gradle/wrapper/gradle-wrapper.properties b/buildpacks/buildpack-gradle/tests/gradle-getting-started/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..774fae876 --- /dev/null +++ b/buildpacks/buildpack-gradle/tests/gradle-getting-started/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/buildpacks/buildpack-gradle/tests/gradle-getting-started/gradlew b/buildpacks/buildpack-gradle/tests/gradle-getting-started/gradlew new file mode 100755 index 000000000..81f705cb1 --- /dev/null +++ b/buildpacks/buildpack-gradle/tests/gradle-getting-started/gradlew @@ -0,0 +1,242 @@ +#!/bin/sh + +# +# 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. +# You may obtain a copy of the License at +# +# https://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. +# + +############################################################################## +# +# 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/master/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 +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 + +APP_HOME=$(cd "${APP_HOME:-./}" && pwd -P) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${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"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +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 ;; #( + MSYS* | MINGW*) msys=true ;; #( + NONSTOP*) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +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 + if [ ! -x "$JAVACMD" ]; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +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. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop"; then + case $MAX_FD in #( + max*) + MAX_FD=$(ulimit -H -n) \ + || warn "Could not query maximum file descriptor limit" + ;; + esac + case $MAX_FD in #( + '' | soft) : ;; #( + *) + ulimit -n "$MAX_FD" \ + || warn "Could not set maximum file descriptor limit to $MAX_FD" + ;; + esac +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" || "$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 + 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 + # 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 +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +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/buildpacks/buildpack-gradle/tests/gradle-getting-started/gradlew.bat b/buildpacks/buildpack-gradle/tests/gradle-getting-started/gradlew.bat new file mode 100644 index 000000000..53a6b238d --- /dev/null +++ b/buildpacks/buildpack-gradle/tests/gradle-getting-started/gradlew.bat @@ -0,0 +1,91 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +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. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +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. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +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! +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 + +:omega diff --git a/buildpacks/buildpack-gradle/tests/gradle-getting-started/settings.gradle.kts b/buildpacks/buildpack-gradle/tests/gradle-getting-started/settings.gradle.kts new file mode 100644 index 000000000..509e5805c --- /dev/null +++ b/buildpacks/buildpack-gradle/tests/gradle-getting-started/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "java-getting-started-gradle" diff --git a/buildpacks/buildpack-gradle/tests/gradle-getting-started/src/main/java/com/heroku/java/GettingStartedApplication.java b/buildpacks/buildpack-gradle/tests/gradle-getting-started/src/main/java/com/heroku/java/GettingStartedApplication.java new file mode 100644 index 000000000..b4e0c016e --- /dev/null +++ b/buildpacks/buildpack-gradle/tests/gradle-getting-started/src/main/java/com/heroku/java/GettingStartedApplication.java @@ -0,0 +1,54 @@ +package com.heroku.java; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; + +import javax.sql.DataSource; +import java.sql.Connection; +import java.util.ArrayList; +import java.util.Map; + +@SpringBootApplication +@Controller +public class GettingStartedApplication { + private final DataSource dataSource; + + @Autowired + public GettingStartedApplication(DataSource dataSource) { + this.dataSource = dataSource; + } + + @GetMapping("/") + public String index() { + return "index"; + } + + @GetMapping("/database") + String database(Map model) { + try (Connection connection = dataSource.getConnection()) { + final var statement = connection.createStatement(); + statement.executeUpdate("CREATE TABLE IF NOT EXISTS ticks (tick timestamp)"); + statement.executeUpdate("INSERT INTO ticks VALUES (now())"); + + final var resultSet = statement.executeQuery("SELECT tick FROM ticks"); + final var output = new ArrayList<>(); + while (resultSet.next()) { + output.add("Read from DB: " + resultSet.getTimestamp("tick")); + } + + model.put("records", output); + return "database"; + + } catch (Throwable t) { + model.put("message", t.getMessage()); + return "error"; + } + } + + public static void main(String[] args) { + SpringApplication.run(GettingStartedApplication.class, args); + } +} diff --git a/buildpacks/buildpack-gradle/tests/gradle-getting-started/src/main/resources/application.properties b/buildpacks/buildpack-gradle/tests/gradle-getting-started/src/main/resources/application.properties new file mode 100644 index 000000000..698b1a145 --- /dev/null +++ b/buildpacks/buildpack-gradle/tests/gradle-getting-started/src/main/resources/application.properties @@ -0,0 +1,6 @@ +server.port=${PORT:5000} +# Default to "jdbc:postgresql://example.com:5432/database" so that the application at least starts up when +# JDBC_DATABASE_URL is not set. We use this here to reduce friction when newcomers work with this getting started +# application. Production applications should not have a default like this, especially not ones that have credentials +# in them! +spring.datasource.url=${JDBC_DATABASE_URL:jdbc:postgresql://example.com:5432/database} diff --git a/buildpacks/buildpack-gradle/tests/gradle-getting-started/src/main/resources/banner.txt b/buildpacks/buildpack-gradle/tests/gradle-getting-started/src/main/resources/banner.txt new file mode 100644 index 000000000..fd3b8f9da --- /dev/null +++ b/buildpacks/buildpack-gradle/tests/gradle-getting-started/src/main/resources/banner.txt @@ -0,0 +1,8 @@ + _ _ _ + | | | | | | + | |__| | ___ _ __ ___ | | ___ _ + | __ |/ _ \ '__/ _ \| |/ / | | | + | | | | __/ | | (_) | <| |_| | + |_| |_|\___|_| \___/|_|\_\\__,_| + +:: Built with Spring Boot :: ${spring-boot.version} diff --git a/buildpacks/buildpack-gradle/tests/gradle-getting-started/src/main/resources/public/lang-logo.png b/buildpacks/buildpack-gradle/tests/gradle-getting-started/src/main/resources/public/lang-logo.png new file mode 100644 index 000000000..4ae38636d Binary files /dev/null and b/buildpacks/buildpack-gradle/tests/gradle-getting-started/src/main/resources/public/lang-logo.png differ diff --git a/buildpacks/buildpack-gradle/tests/gradle-getting-started/src/main/resources/public/stylesheets/main.css b/buildpacks/buildpack-gradle/tests/gradle-getting-started/src/main/resources/public/stylesheets/main.css new file mode 100644 index 000000000..006f453af --- /dev/null +++ b/buildpacks/buildpack-gradle/tests/gradle-getting-started/src/main/resources/public/stylesheets/main.css @@ -0,0 +1,39 @@ +.jumbotron { + background: #532F8C; + color: white; + padding-bottom: 80px; +} + +.jumbotron .btn-primary { + background: #845ac7; + border-color: #845ac7; +} + +.jumbotron .btn-primary:hover { + background: #7646c1; +} + +.jumbotron p { + color: #d9ccee; + max-width: 75%; + margin: 1em auto 2em; +} + +.navbar + .jumbotron { + margin-top: -20px; +} + +.jumbotron .lang-logo { + display: block; + background: #B01302; + border-radius: 50%; + overflow: hidden; + width: 100px; + height: 100px; + margin: auto; + border: 2px solid white; +} + +.jumbotron .lang-logo img { + max-width: 100%; +} diff --git a/buildpacks/buildpack-gradle/tests/gradle-getting-started/src/main/resources/templates/database.html b/buildpacks/buildpack-gradle/tests/gradle-getting-started/src/main/resources/templates/database.html new file mode 100644 index 000000000..80c8ecc1b --- /dev/null +++ b/buildpacks/buildpack-gradle/tests/gradle-getting-started/src/main/resources/templates/database.html @@ -0,0 +1,13 @@ + + + + +
+

Database Output

+ +
+ + + diff --git a/buildpacks/buildpack-gradle/tests/gradle-getting-started/src/main/resources/templates/error.html b/buildpacks/buildpack-gradle/tests/gradle-getting-started/src/main/resources/templates/error.html new file mode 100644 index 000000000..46631050d --- /dev/null +++ b/buildpacks/buildpack-gradle/tests/gradle-getting-started/src/main/resources/templates/error.html @@ -0,0 +1,8 @@ + + + + +

Exception message

+ + + diff --git a/buildpacks/buildpack-gradle/tests/gradle-getting-started/src/main/resources/templates/fragments/layout.html b/buildpacks/buildpack-gradle/tests/gradle-getting-started/src/main/resources/templates/fragments/layout.html new file mode 100644 index 000000000..bdcc674af --- /dev/null +++ b/buildpacks/buildpack-gradle/tests/gradle-getting-started/src/main/resources/templates/fragments/layout.html @@ -0,0 +1,69 @@ + + + + Java Getting Started on Heroku + + + + + + + +
+ + + + + diff --git a/buildpacks/buildpack-gradle/tests/gradle-getting-started/src/main/resources/templates/index.html b/buildpacks/buildpack-gradle/tests/gradle-getting-started/src/main/resources/templates/index.html new file mode 100644 index 000000000..17c781f87 --- /dev/null +++ b/buildpacks/buildpack-gradle/tests/gradle-getting-started/src/main/resources/templates/index.html @@ -0,0 +1 @@ +gradle-getting-started diff --git a/buildpacks/buildpack-gradle/tests/gradle-getting-started/system.properties b/buildpacks/buildpack-gradle/tests/gradle-getting-started/system.properties new file mode 100644 index 000000000..b21dad9cb --- /dev/null +++ b/buildpacks/buildpack-gradle/tests/gradle-getting-started/system.properties @@ -0,0 +1,2 @@ +# https://devcenter.heroku.com/articles/java-support#specifying-a-java-version +java.runtime.version=17 diff --git a/buildpacks/buildpack-gradle/tests/gradle/test.sh b/buildpacks/buildpack-gradle/tests/gradle-getting-started/test.sh similarity index 100% rename from buildpacks/buildpack-gradle/tests/gradle/test.sh rename to buildpacks/buildpack-gradle/tests/gradle-getting-started/test.sh diff --git a/buildpacks/buildpack-gradle/tests/gradle/Procfile b/buildpacks/buildpack-gradle/tests/gradle/Procfile deleted file mode 100644 index 4f491455b..000000000 --- a/buildpacks/buildpack-gradle/tests/gradle/Procfile +++ /dev/null @@ -1 +0,0 @@ -web: ./build/install/app/bin/app \ No newline at end of file diff --git a/buildpacks/buildpack-gradle/tests/gradle/build.gradle b/buildpacks/buildpack-gradle/tests/gradle/build.gradle deleted file mode 100644 index 02129b45b..000000000 --- a/buildpacks/buildpack-gradle/tests/gradle/build.gradle +++ /dev/null @@ -1,18 +0,0 @@ -apply plugin:'java' -apply plugin:'application' - -mainClassName = "HelloWorld" -applicationName = "app" - -repositories { - maven { - url "https://repo.maven.apache.org/maven2" - } -} - -dependencies { - compile 'org.eclipse.jetty:jetty-servlet:7.5.3.v20111011' - compile 'javax.servlet:servlet-api:2.5' -} - -task stage(dependsOn: ['clean', 'installApp']) diff --git a/buildpacks/buildpack-gradle/tests/gradle/src/main/java/HelloWorld.java b/buildpacks/buildpack-gradle/tests/gradle/src/main/java/HelloWorld.java deleted file mode 100644 index ecf71b1db..000000000 --- a/buildpacks/buildpack-gradle/tests/gradle/src/main/java/HelloWorld.java +++ /dev/null @@ -1,24 +0,0 @@ -import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.http.*; -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.servlet.*; - -public class HelloWorld extends HttpServlet { - - @Override - protected void doGet(HttpServletRequest req, HttpServletResponse resp) - throws ServletException, IOException { - resp.getWriter().print("gradle\n"); - } - - public static void main(String[] args) throws Exception{ - Server server = new Server(Integer.valueOf(System.getenv("PORT"))); - ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS); - context.setContextPath("/"); - server.setHandler(context); - context.addServlet(new ServletHolder(new HelloWorld()),"/*"); - server.start(); - server.join(); - } -} \ No newline at end of file diff --git a/buildpacks/buildpack-java/tests/java-getting-started/.env b/buildpacks/buildpack-java/tests/java-getting-started/.env new file mode 100644 index 000000000..e3eeb7392 --- /dev/null +++ b/buildpacks/buildpack-java/tests/java-getting-started/.env @@ -0,0 +1 @@ +ENERGY=20 GeV diff --git a/buildpacks/buildpack-java/tests/java-getting-started/.github/CODEOWNERS b/buildpacks/buildpack-java/tests/java-getting-started/.github/CODEOWNERS new file mode 100644 index 000000000..01b36b0fa --- /dev/null +++ b/buildpacks/buildpack-java/tests/java-getting-started/.github/CODEOWNERS @@ -0,0 +1,8 @@ +# Note: Delete this file if you are copying the code in this repository into your own project. + +# Default to requesting pull request reviews from the Heroku Languages team. +* @heroku/languages + +# However, request review from the Heroku language owner for files that are updated +# by Dependabot, to reduce team review request noise. +pom.xml @Malax diff --git a/buildpacks/buildpack-java/tests/java-getting-started/.github/dependabot.yml b/buildpacks/buildpack-java/tests/java-getting-started/.github/dependabot.yml new file mode 100644 index 000000000..8a24324e6 --- /dev/null +++ b/buildpacks/buildpack-java/tests/java-getting-started/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: "maven" + directory: "/" + schedule: + interval: "monthly" diff --git a/buildpacks/buildpack-java/tests/java-getting-started/.gitignore b/buildpacks/buildpack-java/tests/java-getting-started/.gitignore new file mode 100644 index 000000000..7ed0d6b67 --- /dev/null +++ b/buildpacks/buildpack-java/tests/java-getting-started/.gitignore @@ -0,0 +1,32 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/buildpacks/buildpack-java/tests/java-getting-started/.mvn/wrapper/MavenWrapperDownloader.java b/buildpacks/buildpack-java/tests/java-getting-started/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 000000000..b901097f2 --- /dev/null +++ b/buildpacks/buildpack-java/tests/java-getting-started/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,117 @@ +/* + * Copyright 2007-present the original author or authors. + * + * 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. + */ +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if(mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if(mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if(!outputFile.getParentFile().exists()) { + if(!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/buildpacks/buildpack-java/tests/java-getting-started/.mvn/wrapper/maven-wrapper.jar b/buildpacks/buildpack-java/tests/java-getting-started/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 000000000..bf82ff01c Binary files /dev/null and b/buildpacks/buildpack-java/tests/java-getting-started/.mvn/wrapper/maven-wrapper.jar differ diff --git a/buildpacks/buildpack-java/tests/java-getting-started/.mvn/wrapper/maven-wrapper.properties b/buildpacks/buildpack-java/tests/java-getting-started/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 000000000..ca5ab4bab --- /dev/null +++ b/buildpacks/buildpack-java/tests/java-getting-started/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,18 @@ +# 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 +# +# https://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. +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.7/apache-maven-3.8.7-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/buildpacks/buildpack-java/tests/java-getting-started/LICENSE b/buildpacks/buildpack-java/tests/java-getting-started/LICENSE new file mode 100644 index 000000000..9f7552ba2 --- /dev/null +++ b/buildpacks/buildpack-java/tests/java-getting-started/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2023 Salesforce, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/buildpacks/buildpack-java/tests/java-getting-started/Procfile b/buildpacks/buildpack-java/tests/java-getting-started/Procfile new file mode 100644 index 000000000..0abb00a94 --- /dev/null +++ b/buildpacks/buildpack-java/tests/java-getting-started/Procfile @@ -0,0 +1 @@ +web: java -jar target/java-getting-started-1.0.0-SNAPSHOT.jar diff --git a/buildpacks/buildpack-java/tests/java-getting-started/README.md b/buildpacks/buildpack-java/tests/java-getting-started/README.md new file mode 100644 index 000000000..1bea9de3d --- /dev/null +++ b/buildpacks/buildpack-java/tests/java-getting-started/README.md @@ -0,0 +1,21 @@ +# Java: Getting Started (Maven) + +A barebones Java app, which can easily be deployed to Heroku. + +## Deploying to Heroku + +Using resources for this example app counts towards your usage. [Delete your app](https://devcenter.heroku.com/articles/heroku-cli-commands#heroku-apps-destroy) and [database](https://devcenter.heroku.com/articles/heroku-postgresql#removing-the-add-on) as soon as you are done experimenting to control costs. + +By default, apps use Eco dynos if you are subscribed to Eco. Otherwise, it defaults to Basic dynos. The Eco dynos plan is shared across all Eco dynos in your account and is recommended if you plan on deploying many small apps to Heroku. Learn more about our low-cost plans [here](https://blog.heroku.com/new-low-cost-plans). + +Eligible students can apply for platform credits through our new [Heroku for GitHub Students program](https://blog.heroku.com/github-student-developer-program). + +This application supports the [Getting Started with Java on Heroku](https://devcenter.heroku.com/articles/getting-started-with-java) article - check it out for instructions on how to deploy this app to Heroku and also run it locally. + +Alternatively, you can deploy it using this Heroku Button: + +[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy) + +For more information about using Java on Heroku, see these Dev Center articles: + +- [Java on Heroku](https://devcenter.heroku.com/categories/java) diff --git a/buildpacks/buildpack-java/tests/java-getting-started/app.json b/buildpacks/buildpack-java/tests/java-getting-started/app.json new file mode 100644 index 000000000..a4b770d6f --- /dev/null +++ b/buildpacks/buildpack-java/tests/java-getting-started/app.json @@ -0,0 +1,5 @@ +{ + "name": "Start on Heroku: Java", + "description": "A barebones Java app, which can easily be deployed to Heroku.", + "addons": ["heroku-postgresql"] +} diff --git a/buildpacks/buildpack-java/tests/java-getting-started/mvnw b/buildpacks/buildpack-java/tests/java-getting-started/mvnw new file mode 100755 index 000000000..ae1f2f7e5 --- /dev/null +++ b/buildpacks/buildpack-java/tests/java-getting-started/mvnw @@ -0,0 +1,331 @@ +#!/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 +# +# https://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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# 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 + export JAVA_HOME="$(/usr/libexec/java_home)" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ]; then + if [ -r /etc/gentoo-release ]; then + JAVA_HOME=$(java-config --jre-home) + fi +fi + +if [ -z "$M2_HOME" ]; then + ## resolve links - $0 may be a link to maven's home + 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 + done + + saveddir=$(pwd) + + M2_HOME=$(dirname "$PRG")/.. + + # make it fully qualified + M2_HOME=$(cd "$M2_HOME" && pwd) + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin; then + [ -n "$M2_HOME" ] \ + && M2_HOME=$(cygpath --unix "$M2_HOME") + [ -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 "$M2_HOME" ] \ + && M2_HOME="$( ( + cd "$M2_HOME" + pwd + ))" + [ -n "$JAVA_HOME" ] \ + && JAVA_HOME="$( ( + cd "$JAVA_HOME" + 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 + \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." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# 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" + 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/.." + pwd + ) + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' <"$1")" + fi +} + +BASE_DIR=$(find_maven_basedir "$(pwd)") +if [ -z "$BASE_DIR" ]; then + exit 1 +fi + +########################################################################################## +# 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. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + fi + while IFS="=" read key value; do + case "$key" in wrapperUrl) + jarUrl="$value" + break + ;; + esac + done <"$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") + fi + + if command -v wget >/dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl >/dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=$(cygpath --path --windows "$javaClass") + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +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 "$M2_HOME" ] \ + && M2_HOME=$(cygpath --path --windows "$M2_HOME") + [ -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 + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/buildpacks/buildpack-java/tests/java-getting-started/mvnw.cmd b/buildpacks/buildpack-java/tests/java-getting-started/mvnw.cmd new file mode 100644 index 000000000..1d8ab018e --- /dev/null +++ b/buildpacks/buildpack-java/tests/java-getting-started/mvnw.cmd @@ -0,0 +1,188 @@ +@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 https://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 Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@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. +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. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +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. +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 DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_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 DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_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('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@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/buildpacks/buildpack-java/tests/java-getting-started/pom.xml b/buildpacks/buildpack-java/tests/java-getting-started/pom.xml new file mode 100644 index 000000000..eac79e56c --- /dev/null +++ b/buildpacks/buildpack-java/tests/java-getting-started/pom.xml @@ -0,0 +1,54 @@ + + + 4.0.0 + + java-getting-started + + + org.springframework.boot + spring-boot-starter-parent + 3.3.0 + + + + com.heroku + java-getting-started + 1.0.0-SNAPSHOT + + + 17 + + + + + org.springframework.boot + spring-boot-starter + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-jdbc + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + org.postgresql + postgresql + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + diff --git a/buildpacks/buildpack-java/tests/java-getting-started/src/main/java/com/heroku/java/GettingStartedApplication.java b/buildpacks/buildpack-java/tests/java-getting-started/src/main/java/com/heroku/java/GettingStartedApplication.java new file mode 100644 index 000000000..b4e0c016e --- /dev/null +++ b/buildpacks/buildpack-java/tests/java-getting-started/src/main/java/com/heroku/java/GettingStartedApplication.java @@ -0,0 +1,54 @@ +package com.heroku.java; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; + +import javax.sql.DataSource; +import java.sql.Connection; +import java.util.ArrayList; +import java.util.Map; + +@SpringBootApplication +@Controller +public class GettingStartedApplication { + private final DataSource dataSource; + + @Autowired + public GettingStartedApplication(DataSource dataSource) { + this.dataSource = dataSource; + } + + @GetMapping("/") + public String index() { + return "index"; + } + + @GetMapping("/database") + String database(Map model) { + try (Connection connection = dataSource.getConnection()) { + final var statement = connection.createStatement(); + statement.executeUpdate("CREATE TABLE IF NOT EXISTS ticks (tick timestamp)"); + statement.executeUpdate("INSERT INTO ticks VALUES (now())"); + + final var resultSet = statement.executeQuery("SELECT tick FROM ticks"); + final var output = new ArrayList<>(); + while (resultSet.next()) { + output.add("Read from DB: " + resultSet.getTimestamp("tick")); + } + + model.put("records", output); + return "database"; + + } catch (Throwable t) { + model.put("message", t.getMessage()); + return "error"; + } + } + + public static void main(String[] args) { + SpringApplication.run(GettingStartedApplication.class, args); + } +} diff --git a/buildpacks/buildpack-java/tests/java-getting-started/src/main/resources/application.properties b/buildpacks/buildpack-java/tests/java-getting-started/src/main/resources/application.properties new file mode 100644 index 000000000..698b1a145 --- /dev/null +++ b/buildpacks/buildpack-java/tests/java-getting-started/src/main/resources/application.properties @@ -0,0 +1,6 @@ +server.port=${PORT:5000} +# Default to "jdbc:postgresql://example.com:5432/database" so that the application at least starts up when +# JDBC_DATABASE_URL is not set. We use this here to reduce friction when newcomers work with this getting started +# application. Production applications should not have a default like this, especially not ones that have credentials +# in them! +spring.datasource.url=${JDBC_DATABASE_URL:jdbc:postgresql://example.com:5432/database} diff --git a/buildpacks/buildpack-java/tests/java-getting-started/src/main/resources/banner.txt b/buildpacks/buildpack-java/tests/java-getting-started/src/main/resources/banner.txt new file mode 100644 index 000000000..fd3b8f9da --- /dev/null +++ b/buildpacks/buildpack-java/tests/java-getting-started/src/main/resources/banner.txt @@ -0,0 +1,8 @@ + _ _ _ + | | | | | | + | |__| | ___ _ __ ___ | | ___ _ + | __ |/ _ \ '__/ _ \| |/ / | | | + | | | | __/ | | (_) | <| |_| | + |_| |_|\___|_| \___/|_|\_\\__,_| + +:: Built with Spring Boot :: ${spring-boot.version} diff --git a/buildpacks/buildpack-java/tests/java-getting-started/src/main/resources/public/lang-logo.png b/buildpacks/buildpack-java/tests/java-getting-started/src/main/resources/public/lang-logo.png new file mode 100644 index 000000000..4ae38636d Binary files /dev/null and b/buildpacks/buildpack-java/tests/java-getting-started/src/main/resources/public/lang-logo.png differ diff --git a/buildpacks/buildpack-java/tests/java-getting-started/src/main/resources/public/stylesheets/main.css b/buildpacks/buildpack-java/tests/java-getting-started/src/main/resources/public/stylesheets/main.css new file mode 100644 index 000000000..006f453af --- /dev/null +++ b/buildpacks/buildpack-java/tests/java-getting-started/src/main/resources/public/stylesheets/main.css @@ -0,0 +1,39 @@ +.jumbotron { + background: #532F8C; + color: white; + padding-bottom: 80px; +} + +.jumbotron .btn-primary { + background: #845ac7; + border-color: #845ac7; +} + +.jumbotron .btn-primary:hover { + background: #7646c1; +} + +.jumbotron p { + color: #d9ccee; + max-width: 75%; + margin: 1em auto 2em; +} + +.navbar + .jumbotron { + margin-top: -20px; +} + +.jumbotron .lang-logo { + display: block; + background: #B01302; + border-radius: 50%; + overflow: hidden; + width: 100px; + height: 100px; + margin: auto; + border: 2px solid white; +} + +.jumbotron .lang-logo img { + max-width: 100%; +} diff --git a/buildpacks/buildpack-java/tests/java-getting-started/src/main/resources/templates/database.html b/buildpacks/buildpack-java/tests/java-getting-started/src/main/resources/templates/database.html new file mode 100644 index 000000000..80c8ecc1b --- /dev/null +++ b/buildpacks/buildpack-java/tests/java-getting-started/src/main/resources/templates/database.html @@ -0,0 +1,13 @@ + + + + +
+

Database Output

+
    +
  • +
+
+ + + diff --git a/buildpacks/buildpack-java/tests/java-getting-started/src/main/resources/templates/error.html b/buildpacks/buildpack-java/tests/java-getting-started/src/main/resources/templates/error.html new file mode 100644 index 000000000..46631050d --- /dev/null +++ b/buildpacks/buildpack-java/tests/java-getting-started/src/main/resources/templates/error.html @@ -0,0 +1,8 @@ + + + + +

Exception message

+ + + diff --git a/buildpacks/buildpack-java/tests/java-getting-started/src/main/resources/templates/fragments/layout.html b/buildpacks/buildpack-java/tests/java-getting-started/src/main/resources/templates/fragments/layout.html new file mode 100644 index 000000000..1d1a0afa9 --- /dev/null +++ b/buildpacks/buildpack-java/tests/java-getting-started/src/main/resources/templates/fragments/layout.html @@ -0,0 +1,67 @@ + + + + Java Getting Started on Heroku + + + + + + + +
+ + + + + diff --git a/buildpacks/buildpack-java/tests/java-getting-started/src/main/resources/templates/index.html b/buildpacks/buildpack-java/tests/java-getting-started/src/main/resources/templates/index.html new file mode 100644 index 000000000..eba1228cc --- /dev/null +++ b/buildpacks/buildpack-java/tests/java-getting-started/src/main/resources/templates/index.html @@ -0,0 +1 @@ +java-getting-started diff --git a/buildpacks/buildpack-java/tests/java-getting-started/system.properties b/buildpacks/buildpack-java/tests/java-getting-started/system.properties new file mode 100644 index 000000000..b21dad9cb --- /dev/null +++ b/buildpacks/buildpack-java/tests/java-getting-started/system.properties @@ -0,0 +1,2 @@ +# https://devcenter.heroku.com/articles/java-support#specifying-a-java-version +java.runtime.version=17 diff --git a/buildpacks/buildpack-java/tests/java-jetty/test.sh b/buildpacks/buildpack-java/tests/java-getting-started/test.sh similarity index 100% rename from buildpacks/buildpack-java/tests/java-jetty/test.sh rename to buildpacks/buildpack-java/tests/java-getting-started/test.sh diff --git a/buildpacks/buildpack-java/tests/java-jetty/.env b/buildpacks/buildpack-java/tests/java-jetty/.env deleted file mode 100644 index 77e6325f8..000000000 --- a/buildpacks/buildpack-java/tests/java-jetty/.env +++ /dev/null @@ -1,9 +0,0 @@ -TEST1=The big brown fox1 -TEST2="The big brown fox2" - - -TEST3='The big brown fox3' -export TEST4=The big brown fox4 - -export TEST5="The big brown fox5" -export TEST6='The big brown fox6' diff --git a/buildpacks/buildpack-java/tests/java-jetty/Procfile b/buildpacks/buildpack-java/tests/java-jetty/Procfile deleted file mode 100644 index 9dca91ff2..000000000 --- a/buildpacks/buildpack-java/tests/java-jetty/Procfile +++ /dev/null @@ -1 +0,0 @@ -web: java -cp target/classes:target/dependency/* HelloWorld diff --git a/buildpacks/buildpack-java/tests/java-jetty/pom.xml b/buildpacks/buildpack-java/tests/java-jetty/pom.xml deleted file mode 100644 index 12868dbbf..000000000 --- a/buildpacks/buildpack-java/tests/java-jetty/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - 4.0.0 - com.example - 1.0-SNAPSHOT - helloworld - - - org.eclipse.jetty - jetty-servlet - 7.6.0.v20120127 - - - javax.servlet - servlet-api - 2.5 - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 3.8.0 - - - copy-dependencies - package - copy-dependencies - - - - - maven-compiler-plugin - 3.13.0 - - 1.6 - 1.6 - - - - - diff --git a/buildpacks/buildpack-java/tests/java-jetty/src/main/java/HelloWorld.java b/buildpacks/buildpack-java/tests/java-jetty/src/main/java/HelloWorld.java deleted file mode 100644 index 2bd1ccc10..000000000 --- a/buildpacks/buildpack-java/tests/java-jetty/src/main/java/HelloWorld.java +++ /dev/null @@ -1,24 +0,0 @@ -import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.http.*; -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.servlet.*; - -public class HelloWorld extends HttpServlet { - - @Override - protected void doGet(HttpServletRequest req, HttpServletResponse resp) - throws ServletException, IOException { - resp.getWriter().print("java-jetty\n"); - } - - public static void main(String[] args) throws Exception{ - Server server = new Server(Integer.valueOf(System.getenv("PORT"))); - ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS); - context.setContextPath("/"); - server.setHandler(context); - context.addServlet(new ServletHolder(new HelloWorld()),"/*"); - server.start(); - server.join(); - } -} diff --git a/include/herokuish.bash b/include/herokuish.bash index 228a54730..f8bc06bdd 100644 --- a/include/herokuish.bash +++ b/include/herokuish.bash @@ -113,6 +113,7 @@ herokuish-test() { echo -e "$output" if [[ "$output" != "$expected" ]]; then echo "::: TEST FAILED :::" + echo "::: EXPECTED: $expected :::" exit 2 fi fi