diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c1bf005e2..2f47cae04 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,7 @@ concurrency: jobs: build: name: build.${{ matrix.heroku }}-${{ matrix.buildx }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: fail-fast: true matrix: @@ -27,6 +27,7 @@ jobs: heroku: - 20 - 22 + - 24 steps: - uses: actions/checkout@v4 @@ -92,7 +93,7 @@ jobs: unit-tests: name: unit.heroku-${{ matrix.heroku }}.${{ matrix.buildpack }} needs: build - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: fail-fast: false matrix: @@ -113,6 +114,7 @@ jobs: heroku: - 20 - 22 + - 24 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d80bc45f5..30e1a8618 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,18 +5,19 @@ name: release on: push: tags: - - '*' + - "*" jobs: build: name: release - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: fail-fast: false matrix: heroku: - 20 - 22 + - 24 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml index d3f073712..a28488abf 100644 --- a/.github/workflows/tag-release.yml +++ b/.github/workflows/tag-release.yml @@ -10,14 +10,14 @@ on: jobs: build: name: build.${{ matrix.heroku }}-${{ matrix.buildx }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: fail-fast: true matrix: buildx: - "false" heroku: - - 22 + - 24 steps: - uses: actions/checkout@v4 @@ -58,7 +58,7 @@ jobs: tag-release: name: tag-release needs: build - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 @@ -70,7 +70,7 @@ jobs: - name: download packages uses: actions/download-artifact@v4 with: - name: build-22-false + name: build-24-false path: build - name: Login to DockerHub diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index b9ff547ab..ff7a0746d 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -4,13 +4,13 @@ name: Bump buildpacks # yamllint disable-line rule:truthy on: schedule: - - cron: '37 13 * * *' + - cron: "37 13 * * *" workflow_dispatch: {} jobs: build: name: bump-buildpacks - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 with: 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/CHANGELOG.md b/CHANGELOG.md index b42ac0562..84550a4f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,42 @@ All notable changes to this project will be documented in this file. +## [0.10.0](https://github.com/gliderlabs/herokuish/compare/v0.9.2...v0.10.0) - 2024-08-24 + +- #1249 @dokku-bot: Update nodejs to version v255 +- #1250 @dokku-bot: chore(deps): bump org.apache.maven.plugins:maven-dependency-plugin from 3.7.0 to 3.7.1 in /buildpacks/buildpack-java/tests/java-jetty +- #1251 @dokku-bot: chore(deps): bump rack from 3.1.3 to 3.1.4 in /buildpacks/buildpack-ruby/tests/ruby-sinatra +- #1252 @dokku-bot: chore(deps): bump rack from 3.1.3 to 3.1.4 in /buildpacks/buildpack-multi/tests/multi +- #1253 @HectorMalot: Publish package for Ubuntu 24.04 +- #1254 @dokku-bot: Update ruby to version v273 +- #1255 @dokku-bot: Update ruby to version v274 +- #1256 @dokku-bot: Update python to version v253 +- #1257 @dokku-bot: chore(deps): bump rack from 3.1.4 to 3.1.5 in /buildpacks/buildpack-multi/tests/multi +- #1258 @dokku-bot: chore(deps): bump rack from 3.1.4 to 3.1.5 in /buildpacks/buildpack-ruby/tests/ruby-sinatra +- #1259 @dokku-bot: chore(deps): bump rack from 3.1.5 to 3.1.6 in /buildpacks/buildpack-multi/tests/multi +- #1260 @dokku-bot: chore(deps): bump rack from 3.1.5 to 3.1.6 in /buildpacks/buildpack-ruby/tests/ruby-sinatra +- #1261 @dokku-bot: Update ruby to version v275 +- #1262 @dokku-bot: Update nodejs to version v256 +- #1263 @dokku-bot: chore(deps-dev): bump heroku/heroku-buildpack-php from 253 to 254 in /buildpacks/buildpack-php/tests/php +- #1264 @dokku-bot: Update php to version v254 +- #1265 @dokku-bot: Update ruby to version v276 +- #1266 @dokku-bot: Update nodejs to version v257 +- #1268 @dokku-bot: chore(deps): bump rack from 3.1.6 to 3.1.7 in /buildpacks/buildpack-multi/tests/multi +- #1269 @dokku-bot: Update ruby to version v277 +- #1270 @dokku-bot: Update nodejs to version v258 +- #1282 @josegonzalez: Update ci runners to ubuntu-22.04 +- #1283 @josegonzalez: Build and default to heroku-24 based image +- #1284 @dokku-bot: chore(deps): bump gunicorn from 22.0.0 to 23.0.0 in /buildpacks/buildpack-multi/tests/multi +- #1285 @dokku-bot: chore(deps): bump gunicorn from 22.0.0 to 23.0.0 in /buildpacks/buildpack-python/tests/python-flask +- #1286 @dokku-bot: chore(deps): bump gunicorn from 22.0.0 to 23.0.0 in /buildpacks/buildpack-python/tests/python-django +- #1287 @dokku-bot: Update nodejs to version v262 +- #1288 @dokku-bot: chore(deps): bump golang from 1.22 to 1.23 +- #1289 @dokku-bot: Update go to version v195 +- #1290 @josegonzalez: chore: drop linux/arm (32-bit) support +- #1291 @dokku-bot: chore(deps): bump org.apache.maven.plugins:maven-dependency-plugin from 3.7.1 to 3.8.0 in /buildpacks/buildpack-java/tests/java-jetty +- #1292 @josegonzalez: Remove unmaintained heroku/play buildpack +- #1293 @josegonzalez: Update test applications in java and gradle buildpacks + ## [0.9.2](https://github.com/gliderlabs/herokuish/compare/v0.9.1...v0.9.2) - 2024-06-21 - #1205 @dependabot: chore(deps-dev): bump heroku/heroku-buildpack-php from 231 to 249 in /buildpacks/buildpack-php/tests/php diff --git a/Dockerfile b/Dockerfile index 36eab300d..2ba00e1f8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG STACK_VERSION=20 -FROM golang:1.22 AS builder +FROM golang:1.23 AS builder RUN mkdir /src COPY . /src/ WORKDIR /src diff --git a/Makefile b/Makefile index 66d33a5d3..94f11a2aa 100644 --- a/Makefile +++ b/Makefile @@ -4,12 +4,12 @@ REPOSITORY = herokuish DESCRIPTION = 'Herokuish uses Docker and Buildpacks to build applications like Heroku' HARDWARE = $(shell uname -m) SYSTEM_NAME = $(shell uname -s | tr '[:upper:]' '[:lower:]') -VERSION ?= 0.9.2 +VERSION ?= 0.10.0 IMAGE_NAME ?= $(NAME) BUILD_TAG ?= dev PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish -BUILDPACK_ORDER := multi ruby nodejs clojure python java gradle scala play php go static null +BUILDPACK_ORDER := multi ruby nodejs clojure python java gradle scala php go static null SHELL := /bin/bash SYSTEM := $(shell sh -c 'uname -s 2>/dev/null') DOCKER_ARGS ?= "--pull" @@ -57,13 +57,14 @@ build: bindata.go build/docker: $(MAKE) build/docker/20 STACK_VERSION=20 $(MAKE) build/docker/22 STACK_VERSION=22 + $(MAKE) build/docker/24 STACK_VERSION=24 build/docker/$(STACK_VERSION): bindata.go ifeq ($(BUILDX),true) ifeq ($(STACK_VERSION),20) - docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm,linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=$(STACK_VERSION) --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-$(STACK_VERSION) -t $(IMAGE_NAME):latest-$(STACK_VERSION) -t $(IMAGE_NAME):$(BUILD_TAG) -t $(IMAGE_NAME):latest . + docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=$(STACK_VERSION) --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-$(STACK_VERSION) -t $(IMAGE_NAME):latest-$(STACK_VERSION) -t $(IMAGE_NAME):$(BUILD_TAG) -t $(IMAGE_NAME):latest . else - docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm,linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=$(STACK_VERSION) --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-$(STACK_VERSION) -t $(IMAGE_NAME):latest-$(STACK_VERSION) . + docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=$(STACK_VERSION) --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-$(STACK_VERSION) -t $(IMAGE_NAME):latest-$(STACK_VERSION) . endif else docker build --no-cache ${DOCKER_ARGS} --pull --progress plain --build-arg STACK_VERSION=$(STACK_VERSION) --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-$(STACK_VERSION) -t $(IMAGE_NAME):latest-$(STACK_VERSION) -t $(IMAGE_NAME):$(BUILD_TAG) . @@ -128,6 +129,7 @@ clean: deps: bindata.go docker pull heroku/heroku:20-build docker pull heroku/heroku:22-build + docker pull heroku/heroku:24-build cd / && go get -u github.com/progrium/basht/... $(MAKE) bindata.go go get || true @@ -180,6 +182,7 @@ release-packagecloud-deb: package_cloud build/deb/$(NAME)_$(VERSION)_all.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/bionic build/deb/$(NAME)_$(VERSION)_all.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/focal build/deb/$(NAME)_$(VERSION)_all.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/jammy build/deb/$(NAME)_$(VERSION)_all.deb + package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/noble build/deb/$(NAME)_$(VERSION)_all.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/stretch build/deb/$(NAME)_$(VERSION)_all.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/buster build/deb/$(NAME)_$(VERSION)_all.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/bullseye build/deb/$(NAME)_$(VERSION)_all.deb diff --git a/README.md b/README.md index 4fa4615aa..9c18c69c7 100644 --- a/README.md +++ b/README.md @@ -2,13 +2,13 @@ [![Build Status](https://github.com/gliderlabs/herokuish/workflows/CI/badge.svg)](https://github.com/gliderlabs/herokuish/actions?query=workflow%3ACI) [![IRC Channel](https://img.shields.io/badge/irc-%23gliderlabs-blue.svg)](https://kiwiirc.com/client/irc.freenode.net/#gliderlabs) -[![Docker Hub](https://img.shields.io/badge/docker%20hub-v0.9.2-blue)](https://hub.docker.com/r/gliderlabs/herokuish) +[![Docker Hub](https://img.shields.io/badge/docker%20hub-v0.10.0-blue)](https://hub.docker.com/r/gliderlabs/herokuish) A command line tool for emulating Heroku build and runtime tasks in containers. Herokuish is made for platform authors. The project consolidates and decouples Heroku compatibility logic (running buildpacks, parsing Procfile) and supporting workflow (importing/exporting slugs) from specific platform images like those in Dokku/Buildstep, Deis, Flynn, etc. -The goal is to be the definitive, well maintained and heavily tested Heroku emulation utility shared by all. It is based on the [Heroku:20, and Heroku:22 system images](https://github.com/heroku/stack-images). Together they form a toolkit for achieving Heroku compatibility. +The goal is to be the definitive, well maintained and heavily tested Heroku emulation utility shared by all. It is based on the [Heroku:20, Heroku:22, and Heroku:24 system images](https://github.com/heroku/stack-images). Together they form a toolkit for achieving Heroku compatibility. Herokuish is a community project and is in no way affiliated with Heroku. @@ -19,7 +19,7 @@ Download and uncompress the latest binary tarball from [releases](https://github For example, you can do this directly in your Dockerfiles installing into `/bin` as one step: ```shell -RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.9.2/herokuish_0.9.2_linux_x86_64.tgz \ +RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.10.0/herokuish_0.10.0_linux_x86_64.tgz \ | tar -xzC /bin ``` diff --git a/bin/setup.sh b/bin/setup.sh index 5f077cd7d..665db9eb7 100755 --- a/bin/setup.sh +++ b/bin/setup.sh @@ -10,16 +10,27 @@ setup_02="$(cat /tmp/setup-02.sh)" echo "$setup_01" >/tmp/setup-01.sh chmod +x /tmp/setup-01.sh -# Ensure we install from ports for arm/arm64 systems +# Ensure we install from ports for arm64 systems # Skip unsupported syslinux if [[ -n "$TARGETARCH" ]] && [[ "$TARGETARCH" != "amd64" ]]; then sed -i 's#http://archive.ubuntu.com/ubuntu/#http://ports.ubuntu.com/ubuntu-ports/#' /tmp/setup-01.sh sed -i '/syslinux/d' /tmp/setup-01.sh fi -# Skip unsupported postgresql on arm:20 -if [[ "$TARGETARCH" == "arm" ]]; then - sed -i '/postgresql-client-16/d' /tmp/setup-01.sh +# Use time_64 packages for 24 stack +if [[ "$STACK_VERSION" == "24" ]]; then + sed -i 's/libev4/libev4t64/' /tmp/setup-01.sh + sed -i 's/libevent-2.1-7/libevent-2.1-7t64/' /tmp/setup-01.sh + sed -i 's/libevent-core-2.1-7/libevent-core-2.1-7t64/' /tmp/setup-01.sh + sed -i 's/libevent-extra-2.1-7/libevent-extra-2.1-7t64/' /tmp/setup-01.sh + sed -i 's/libevent-openssl-2.1-7/libevent-openssl-2.1-7t64/' /tmp/setup-01.sh + sed -i 's/libevent-pthreads-2.1-7/libevent-pthreads-2.1-7t64/' /tmp/setup-01.sh + sed -i 's/libgnutls-openssl27/libgnutls-openssl27t64/' /tmp/setup-01.sh + sed -i 's/libgnutls30/libgnutls30t64/' /tmp/setup-01.sh + sed -i 's/libmemcached11/libmemcached11t64/' /tmp/setup-01.sh + sed -i 's/libuv1/libuv1t64/' /tmp/setup-01.sh + sed -i 's/libvips42/libvips42t64/' /tmp/setup-01.sh + sed -i 's/libzip4/libzip4t64/' /tmp/setup-01.sh fi # from base image @@ -41,11 +52,6 @@ rm -rf /var/lib/apt/lists/* echo "$setup_02" >/tmp/setup-02.sh chmod +x /tmp/setup-02.sh -# Skip unsupported postgresql on arm:20 -if [[ "$TARGETARCH" == "arm" ]]; then - sed -i '/postgresql-server-dev-16/d' /tmp/setup-02.sh -fi - # from build image /tmp/setup-02.sh diff --git a/build-deps/24/imagemagick-policy.xml b/build-deps/24/imagemagick-policy.xml new file mode 100644 index 000000000..f0ab0d662 --- /dev/null +++ b/build-deps/24/imagemagick-policy.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/build-deps/24/postgresql-ACCC4CF8.asc b/build-deps/24/postgresql-ACCC4CF8.asc new file mode 100644 index 000000000..8480576ec --- /dev/null +++ b/build-deps/24/postgresql-ACCC4CF8.asc @@ -0,0 +1,77 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=DA1T +-----END PGP PUBLIC KEY BLOCK----- diff --git a/buildpacks/buildpack-go/buildpack-version b/buildpacks/buildpack-go/buildpack-version index e23f9bdb6..bd80f5c1e 100644 --- a/buildpacks/buildpack-go/buildpack-version +++ b/buildpacks/buildpack-go/buildpack-version @@ -1 +1 @@ -v192 +v195 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 d918559dd..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.7.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/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 11c037932..96ff9245b 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -4,7 +4,7 @@ GEM base64 (0.2.0) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) - rack (3.1.3) + rack (3.1.7) rack-protection (4.0.0) base64 (>= 0.1.0) rack (>= 3.0.0, < 4) diff --git a/buildpacks/buildpack-multi/tests/multi/requirements.txt b/buildpacks/buildpack-multi/tests/multi/requirements.txt index 4c8df95ed..4234e3aab 100644 --- a/buildpacks/buildpack-multi/tests/multi/requirements.txt +++ b/buildpacks/buildpack-multi/tests/multi/requirements.txt @@ -1,4 +1,4 @@ Flask==3.0.3 Jinja2==3.1.4 -gunicorn==22.0.0 +gunicorn==23.0.0 markupsafe==2.1.5 diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index 24446d231..3f0ab0065 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v254 +v262 diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index c78eb4b79..c6dd33869 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v253 +v255 diff --git a/buildpacks/buildpack-php/tests/php/composer.lock b/buildpacks/buildpack-php/tests/php/composer.lock index b48fc09aa..da473ef72 100644 --- a/buildpacks/buildpack-php/tests/php/composer.lock +++ b/buildpacks/buildpack-php/tests/php/composer.lock @@ -1058,16 +1058,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.29.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4" + "reference": "0424dff1c58f028c451efff2045f5d92410bd540" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4", - "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/0424dff1c58f028c451efff2045f5d92410bd540", + "reference": "0424dff1c58f028c451efff2045f5d92410bd540", "shasum": "" }, "require": { @@ -1117,7 +1117,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.30.0" }, "funding": [ { @@ -1133,7 +1133,7 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-05-31T15:07:36+00:00" }, { "name": "symfony/polyfill-intl-idn", @@ -1308,16 +1308,16 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.29.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec" + "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec", - "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fd22ab50000ef01661e2a31d850ebaa297f8e03c", + "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c", "shasum": "" }, "require": { @@ -1368,7 +1368,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.30.0" }, "funding": [ { @@ -1384,7 +1384,7 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-06-19T12:30:46+00:00" }, { "name": "symfony/polyfill-php72", @@ -1543,16 +1543,16 @@ }, { "name": "symfony/polyfill-php80", - "version": "v1.29.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b" + "reference": "77fa7995ac1b21ab60769b7323d600a991a90433" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", - "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/77fa7995ac1b21ab60769b7323d600a991a90433", + "reference": "77fa7995ac1b21ab60769b7323d600a991a90433", "shasum": "" }, "require": { @@ -1603,7 +1603,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.30.0" }, "funding": [ { @@ -1619,7 +1619,83 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-05-31T15:07:36+00:00" + }, + { + "name": "symfony/polyfill-php81", + "version": "v1.30.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php81.git", + "reference": "3fb075789fb91f9ad9af537c4012d523085bd5af" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/3fb075789fb91f9ad9af537c4012d523085bd5af", + "reference": "3fb075789fb91f9ad9af537c4012d523085bd5af", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php81\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php81/tree/v1.30.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-06-19T12:30:46+00:00" }, { "name": "symfony/routing", @@ -1999,16 +2075,16 @@ }, { "name": "twig/twig", - "version": "v3.10.3", + "version": "v3.11.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "67f29781ffafa520b0bbfbd8384674b42db04572" + "reference": "e80fb8ebba85c7341a97a9ebf825d7fd4b77708d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/67f29781ffafa520b0bbfbd8384674b42db04572", - "reference": "67f29781ffafa520b0bbfbd8384674b42db04572", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/e80fb8ebba85c7341a97a9ebf825d7fd4b77708d", + "reference": "e80fb8ebba85c7341a97a9ebf825d7fd4b77708d", "shasum": "" }, "require": { @@ -2016,7 +2092,8 @@ "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-ctype": "^1.8", "symfony/polyfill-mbstring": "^1.3", - "symfony/polyfill-php80": "^1.22" + "symfony/polyfill-php80": "^1.22", + "symfony/polyfill-php81": "^1.29" }, "require-dev": { "psr/container": "^1.0|^2.0", @@ -2062,7 +2139,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.10.3" + "source": "https://github.com/twigphp/Twig/tree/v3.11.0" }, "funding": [ { @@ -2074,22 +2151,22 @@ "type": "tidelift" } ], - "time": "2024-05-16T10:04:27+00:00" + "time": "2024-08-08T16:15:16+00:00" } ], "packages-dev": [ { "name": "heroku/heroku-buildpack-php", - "version": "v253", + "version": "v255", "source": { "type": "git", "url": "https://github.com/heroku/heroku-buildpack-php.git", - "reference": "dd69b2ae22209a47fe4038fd32abd3bdf0eaa2a1" + "reference": "3163beae4bc19943e0c3ccf4b1e476993c24101c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/dd69b2ae22209a47fe4038fd32abd3bdf0eaa2a1", - "reference": "dd69b2ae22209a47fe4038fd32abd3bdf0eaa2a1", + "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/3163beae4bc19943e0c3ccf4b1e476993c24101c", + "reference": "3163beae4bc19943e0c3ccf4b1e476993c24101c", "shasum": "" }, "bin": [ @@ -2119,9 +2196,9 @@ ], "support": { "issues": "https://github.com/heroku/heroku-buildpack-php/issues", - "source": "https://github.com/heroku/heroku-buildpack-php/tree/v253" + "source": "https://github.com/heroku/heroku-buildpack-php/tree/v255" }, - "time": "2024-06-13T14:55:00+00:00" + "time": "2024-08-02T14:53:27+00:00" } ], "aliases": [], diff --git a/buildpacks/buildpack-play/buildpack-url b/buildpacks/buildpack-play/buildpack-url deleted file mode 100644 index 964c71d51..000000000 --- a/buildpacks/buildpack-play/buildpack-url +++ /dev/null @@ -1 +0,0 @@ -https://github.com/heroku/heroku-buildpack-play diff --git a/buildpacks/buildpack-play/buildpack-version b/buildpacks/buildpack-play/buildpack-version deleted file mode 100644 index 4aa0e0a78..000000000 --- a/buildpacks/buildpack-play/buildpack-version +++ /dev/null @@ -1 +0,0 @@ -v26 diff --git a/buildpacks/buildpack-play/tests/play/Procfile b/buildpacks/buildpack-play/tests/play/Procfile deleted file mode 100644 index 4ff02e214..000000000 --- a/buildpacks/buildpack-play/tests/play/Procfile +++ /dev/null @@ -1 +0,0 @@ -web: target/universal/stage/bin/exampleapp -Dhttp.port=$PORT diff --git a/buildpacks/buildpack-play/tests/play/app/controllers/Application.java b/buildpacks/buildpack-play/tests/play/app/controllers/Application.java deleted file mode 100644 index 9a3d9bce3..000000000 --- a/buildpacks/buildpack-play/tests/play/app/controllers/Application.java +++ /dev/null @@ -1,14 +0,0 @@ -package controllers; - -import play.*; -import play.mvc.*; - -import views.html.*; - -public class Application extends Controller { - - public Result index() { - return ok("play\n"); - } - -} diff --git a/buildpacks/buildpack-play/tests/play/app/views/index.scala.html b/buildpacks/buildpack-play/tests/play/app/views/index.scala.html deleted file mode 100644 index 63772f5f9..000000000 --- a/buildpacks/buildpack-play/tests/play/app/views/index.scala.html +++ /dev/null @@ -1,20 +0,0 @@ -@* - * This template takes a two arguments, a String containing a - * message to display and an AssetsFinder to locate static assets. - *@ -@(message: String) - -@* - * Call the `main` template with two arguments. The first - * argument is a `String` with the title of the page, the second - * argument is an `Html` object containing the body of the page. - *@ -@main("Welcome to Play") { - - @* - * Get an `Html` object by calling the built-in Play welcome - * template and passing a `String` message. - *@ - @welcome(message, style = "scala") - -} diff --git a/buildpacks/buildpack-play/tests/play/app/views/main.scala.html b/buildpacks/buildpack-play/tests/play/app/views/main.scala.html deleted file mode 100644 index 6c72d80e2..000000000 --- a/buildpacks/buildpack-play/tests/play/app/views/main.scala.html +++ /dev/null @@ -1,15 +0,0 @@ -@(title: String)(content: Html) - - - - - - @title - - - - - - @content - - diff --git a/buildpacks/buildpack-play/tests/play/app/views/welcome.scala.html b/buildpacks/buildpack-play/tests/play/app/views/welcome.scala.html deleted file mode 100644 index 1c65bf648..000000000 --- a/buildpacks/buildpack-play/tests/play/app/views/welcome.scala.html +++ /dev/null @@ -1,137 +0,0 @@ -@(message: String, style: String = "scala") - -@defining(play.core.PlayVersion.current) { version => - -
-
-

@message

-
-
- -
-
- -

Welcome to Play

- -

- Congratulations, you’ve just created a new Play application. This page will help you with the next few steps. -

- -
-

- You’re using Play @version -

-
- -

Why do you see this page?

- -

- The conf/routes file defines a route that tells Play to invoke the HomeController.index action - whenever a browser requests the / URI using the GET method: -

- -
# Home page
-GET     /               controllers.HomeController.index
- -

- Play has invoked the controllers.HomeController.index method to obtain the Action to execute: -

- -
def index = Action {
-  Ok(views.html.index("Your new application is ready."))
-}
- -

- An action is a function that handles the incoming HTTP request, and returns the HTTP result to send back to the web client. - Here we send a 200 OK response, using a template to fill its content. -

- -

- The template is defined in the app/views/index.scala.html file and compiled as a Scala function. -

- -
@@(message: String)
-
-@@main("Welcome to Play") {
-
-    @@welcome(message, style = "scala")
-
-}
- -

- The first line of the template defines the function signature. Here it just takes a single String parameter. - This template then calls another function defined in app/views/main.scala.html, which displays the HTML - layout, and another function that displays this welcome message. You can freely add any HTML fragment mixed with Scala - code in this file. -

- -

You can read more about Twirl, the template language used by Play, and how Play handles actions.

- -

Need more info on the console?

- -

- For more information on the various commands you can run on Play, i.e. running tests and packaging applications for production, see Using the Play console. -

- -

Need to set up an IDE?

- -

- You can start hacking your application right now using any text editor. Any changes will be automatically reloaded at each page refresh, - including modifications made to Scala source files. -

- -

- If you want to set-up your application in IntelliJ IDEA or any other Java IDE, check the - Setting up your preferred IDE page. -

- -

Need more documentation?

- -

- Play documentation is available at https://www.playframework.com/documentation. -

- -

- Play comes with lots of example templates showcasing various bits of Play functionality at https://www.playframework.com/download#examples. -

- -

Need more help?

- -

- Play questions are asked and answered on Stackoverflow using the "playframework" tag: https://stackoverflow.com/questions/tagged/playframework -

- -

- The Discuss Play Forum is where Play users come to seek help, - announce projects, and discuss issues and new features. -

- -

- Gitter is a real time chat channel, like IRC. The playframework/playframework channel is used by Play users to discuss the ins and outs of writing great Play applications. -

- -
- - - -
-} diff --git a/buildpacks/buildpack-play/tests/play/build.sbt b/buildpacks/buildpack-play/tests/play/build.sbt deleted file mode 100644 index e83055422..000000000 --- a/buildpacks/buildpack-play/tests/play/build.sbt +++ /dev/null @@ -1,10 +0,0 @@ -name := "exampleApp" - -version := "1.0-SNAPSHOT" - -libraryDependencies ++= Seq( - javaJdbc, - guice -) - -lazy val root = (project in file(".")).enablePlugins(PlayScala) diff --git a/buildpacks/buildpack-play/tests/play/conf/application.conf b/buildpacks/buildpack-play/tests/play/conf/application.conf deleted file mode 100644 index 7485e4ce4..000000000 --- a/buildpacks/buildpack-play/tests/play/conf/application.conf +++ /dev/null @@ -1,69 +0,0 @@ -# This is the main configuration file for the application. -# ~~~~~ - -# Secret key -# ~~~~~ -# The secret key is used to secure cryptographics functions. -# If you deploy your application to several instances be sure to use the same key! -play.http.secret.key="UdmA?IWB:ITcH4tSSXs03SMd" - -# The application languages -# ~~~~~ -play.i18n.langs = ["en"] - -# Global object class -# ~~~~~ -# Define the Global object class for this application. -# Default to Global in the root package. -# application.global=Global - -# Router -# ~~~~~ -# Define the Router object to use for this application. -# This router will be looked up first when the application is starting up, -# so make sure this is the entry point. -# Furthermore, it's assumed your route file is named properly. -# So for an application router like `conf/my.application.Router`, -# you may need to define a router file `my.application.routes`. -# Default to Routes in the root package (and `conf/routes`) -# application.router=my.application.Routes - -# Database configuration -# ~~~~~ -# You can declare as many datasources as you want. -# By convention, the default datasource is named `default` -# -# db.default.driver=org.h2.Driver -# db.default.url="jdbc:h2:mem:play" -# db.default.user=sa -# db.default.password="" -# -# You can expose this datasource via JNDI if needed (Useful for JPA) -# db.default.jndiName=DefaultDS - -# Evolutions -# ~~~~~ -# You can disable evolutions if needed -# evolutionplugin=disabled - -# Ebean configuration -# ~~~~~ -# You can declare as many Ebean servers as you want. -# By convention, the default server is named `default` -# -# ebean.default="models.*" - -# Logger -# ~~~~~ -# You can also configure logback (http://logback.qos.ch/), -# by providing an application-logger.xml file in the conf directory. - -# Root logger: -logger.root=ERROR - -# Logger used by the framework: -logger.play=INFO - -# Logger provided to your application: -logger.application=DEBUG - diff --git a/buildpacks/buildpack-play/tests/play/conf/dependencies.yml b/buildpacks/buildpack-play/tests/play/conf/dependencies.yml deleted file mode 100644 index 108ad473e..000000000 --- a/buildpacks/buildpack-play/tests/play/conf/dependencies.yml +++ /dev/null @@ -1,4 +0,0 @@ -# Application dependencies - -require: - - play 2.8.2 diff --git a/buildpacks/buildpack-play/tests/play/conf/routes b/buildpacks/buildpack-play/tests/play/conf/routes deleted file mode 100644 index d865bc769..000000000 --- a/buildpacks/buildpack-play/tests/play/conf/routes +++ /dev/null @@ -1,9 +0,0 @@ -# Routes -# This file defines all application routes (Higher priority routes first) -# ~~~~ - -# Home page -GET / controllers.Application.index() - -# Map static resources from the /public folder to the /assets URL path -GET /assets/*file controllers.Assets.at(path="/public", file) diff --git a/buildpacks/buildpack-play/tests/play/project/build.properties b/buildpacks/buildpack-play/tests/play/project/build.properties deleted file mode 100644 index 0837f7a13..000000000 --- a/buildpacks/buildpack-play/tests/play/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.3.13 diff --git a/buildpacks/buildpack-play/tests/play/project/plugins.sbt b/buildpacks/buildpack-play/tests/play/project/plugins.sbt deleted file mode 100644 index eb33617aa..000000000 --- a/buildpacks/buildpack-play/tests/play/project/plugins.sbt +++ /dev/null @@ -1,5 +0,0 @@ -// Comment to get more information during initialization -logLevel := Level.Warn - -// Use the Play sbt plugin for Play projects -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.2") diff --git a/buildpacks/buildpack-play/tests/play/public/images/favicon.png b/buildpacks/buildpack-play/tests/play/public/images/favicon.png deleted file mode 100644 index c7d92d2ae..000000000 Binary files a/buildpacks/buildpack-play/tests/play/public/images/favicon.png and /dev/null differ diff --git a/buildpacks/buildpack-play/tests/play/public/javascripts/jquery-1.9.0.min.js b/buildpacks/buildpack-play/tests/play/public/javascripts/jquery-1.9.0.min.js deleted file mode 100644 index 50d1b22f2..000000000 --- a/buildpacks/buildpack-play/tests/play/public/javascripts/jquery-1.9.0.min.js +++ /dev/null @@ -1,4 +0,0 @@ -/*! jQuery v1.9.0 | (c) 2005, 2012 jQuery Foundation, Inc. | jquery.org/license */(function(e,t){"use strict";function n(e){var t=e.length,n=st.type(e);return st.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}function r(e){var t=Tt[e]={};return st.each(e.match(lt)||[],function(e,n){t[n]=!0}),t}function i(e,n,r,i){if(st.acceptData(e)){var o,a,s=st.expando,u="string"==typeof n,l=e.nodeType,c=l?st.cache:e,f=l?e[s]:e[s]&&s;if(f&&c[f]&&(i||c[f].data)||!u||r!==t)return f||(l?e[s]=f=K.pop()||st.guid++:f=s),c[f]||(c[f]={},l||(c[f].toJSON=st.noop)),("object"==typeof n||"function"==typeof n)&&(i?c[f]=st.extend(c[f],n):c[f].data=st.extend(c[f].data,n)),o=c[f],i||(o.data||(o.data={}),o=o.data),r!==t&&(o[st.camelCase(n)]=r),u?(a=o[n],null==a&&(a=o[st.camelCase(n)])):a=o,a}}function o(e,t,n){if(st.acceptData(e)){var r,i,o,a=e.nodeType,u=a?st.cache:e,l=a?e[st.expando]:st.expando;if(u[l]){if(t&&(r=n?u[l]:u[l].data)){st.isArray(t)?t=t.concat(st.map(t,st.camelCase)):t in r?t=[t]:(t=st.camelCase(t),t=t in r?[t]:t.split(" "));for(i=0,o=t.length;o>i;i++)delete r[t[i]];if(!(n?s:st.isEmptyObject)(r))return}(n||(delete u[l].data,s(u[l])))&&(a?st.cleanData([e],!0):st.support.deleteExpando||u!=u.window?delete u[l]:u[l]=null)}}}function a(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(Nt,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:wt.test(r)?st.parseJSON(r):r}catch(o){}st.data(e,n,r)}else r=t}return r}function s(e){var t;for(t in e)if(("data"!==t||!st.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}function u(){return!0}function l(){return!1}function c(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}function f(e,t,n){if(t=t||0,st.isFunction(t))return st.grep(e,function(e,r){var i=!!t.call(e,r,e);return i===n});if(t.nodeType)return st.grep(e,function(e){return e===t===n});if("string"==typeof t){var r=st.grep(e,function(e){return 1===e.nodeType});if(Wt.test(t))return st.filter(t,r,!n);t=st.filter(t,r)}return st.grep(e,function(e){return st.inArray(e,t)>=0===n})}function p(e){var t=zt.split("|"),n=e.createDocumentFragment();if(n.createElement)for(;t.length;)n.createElement(t.pop());return n}function d(e,t){return e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function h(e){var t=e.getAttributeNode("type");return e.type=(t&&t.specified)+"/"+e.type,e}function g(e){var t=nn.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function m(e,t){for(var n,r=0;null!=(n=e[r]);r++)st._data(n,"globalEval",!t||st._data(t[r],"globalEval"))}function y(e,t){if(1===t.nodeType&&st.hasData(e)){var n,r,i,o=st._data(e),a=st._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)st.event.add(t,n,s[n][r])}a.data&&(a.data=st.extend({},a.data))}}function v(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!st.support.noCloneEvent&&t[st.expando]){r=st._data(t);for(i in r.events)st.removeEvent(t,i,r.handle);t.removeAttribute(st.expando)}"script"===n&&t.text!==e.text?(h(t).text=e.text,g(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),st.support.html5Clone&&e.innerHTML&&!st.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Zt.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}function b(e,n){var r,i,o=0,a=e.getElementsByTagName!==t?e.getElementsByTagName(n||"*"):e.querySelectorAll!==t?e.querySelectorAll(n||"*"):t;if(!a)for(a=[],r=e.childNodes||e;null!=(i=r[o]);o++)!n||st.nodeName(i,n)?a.push(i):st.merge(a,b(i,n));return n===t||n&&st.nodeName(e,n)?st.merge([e],a):a}function x(e){Zt.test(e.type)&&(e.defaultChecked=e.checked)}function T(e,t){if(t in e)return t;for(var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=Nn.length;i--;)if(t=Nn[i]+n,t in e)return t;return r}function w(e,t){return e=t||e,"none"===st.css(e,"display")||!st.contains(e.ownerDocument,e)}function N(e,t){for(var n,r=[],i=0,o=e.length;o>i;i++)n=e[i],n.style&&(r[i]=st._data(n,"olddisplay"),t?(r[i]||"none"!==n.style.display||(n.style.display=""),""===n.style.display&&w(n)&&(r[i]=st._data(n,"olddisplay",S(n.nodeName)))):r[i]||w(n)||st._data(n,"olddisplay",st.css(n,"display")));for(i=0;o>i;i++)n=e[i],n.style&&(t&&"none"!==n.style.display&&""!==n.style.display||(n.style.display=t?r[i]||"":"none"));return e}function C(e,t,n){var r=mn.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function k(e,t,n,r,i){for(var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;4>o;o+=2)"margin"===n&&(a+=st.css(e,n+wn[o],!0,i)),r?("content"===n&&(a-=st.css(e,"padding"+wn[o],!0,i)),"margin"!==n&&(a-=st.css(e,"border"+wn[o]+"Width",!0,i))):(a+=st.css(e,"padding"+wn[o],!0,i),"padding"!==n&&(a+=st.css(e,"border"+wn[o]+"Width",!0,i)));return a}function E(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=ln(e),a=st.support.boxSizing&&"border-box"===st.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=un(e,t,o),(0>i||null==i)&&(i=e.style[t]),yn.test(i))return i;r=a&&(st.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+k(e,t,n||(a?"border":"content"),r,o)+"px"}function S(e){var t=V,n=bn[e];return n||(n=A(e,t),"none"!==n&&n||(cn=(cn||st("