Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a package description for org.springframework.boot.actuate.metrics.data #28756

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions ci/images/docker-lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,8 @@ start_docker() {

server_args="${server_args}"

for registry in $3; do
server_args="${server_args} --insecure-registry ${registry}"
done

if [ -n "$4" ]; then
server_args="${server_args} --registry-mirror $4"
if [ -n "$1" ]; then
server_args="${server_args} --registry-mirror https://$1"
fi

try_start() {
Expand Down
14 changes: 14 additions & 0 deletions ci/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ anchors:
file: git-repo/ci/tasks/build-project.yml
params:
BRANCH: ((branch))
DOCKER_HUB_MIRROR: ((docker-hub-mirror))
<<: *gradle-enterprise-task-params
<<: *docker-hub-task-params
run-system-tests-task-params: &run-system-tests-task-params
Expand Down Expand Up @@ -88,6 +89,10 @@ anchors:
gradle-publish-params: &gradle-publish-params
GRADLE_PUBLISH_KEY: ((gradle-publish-key))
GRADLE_PUBLISH_SECRET: ((gradle-publish-secret))
docker-hub-mirror-vars: &docker-hub-mirror-vars
docker-hub-mirror: ((docker-hub-mirror))
docker-hub-mirror-username: ((docker-hub-mirror-username))
docker-hub-mirror-password: ((docker-hub-mirror-password))
resource_types:
- name: artifactory-resource
type: registry-image
Expand Down Expand Up @@ -251,20 +256,23 @@ jobs:
image: ci-image
vars:
ci-image-name: ci-image
<<: *docker-hub-mirror-vars
- task: build-ci-image-jdk11
privileged: true
file: git-repo/ci/tasks/build-ci-image.yml
output_mapping:
image: ci-image-jdk11
vars:
ci-image-name: ci-image-jdk11
<<: *docker-hub-mirror-vars
- task: build-ci-image-jdk17
privileged: true
file: git-repo/ci/tasks/build-ci-image.yml
output_mapping:
image: ci-image-jdk17
vars:
ci-image-name: ci-image-jdk17
<<: *docker-hub-mirror-vars
- in_parallel:
- put: ci-image
params:
Expand Down Expand Up @@ -559,6 +567,8 @@ jobs:
RELEASE_TYPE: M
GITHUB_USERNAME: ((github-username))
GITHUB_TOKEN: ((github-ci-release-token))
vars:
<<: *docker-hub-mirror-vars
- put: github-pre-release
params:
name: generated-changelog/tag
Expand Down Expand Up @@ -588,6 +598,8 @@ jobs:
RELEASE_TYPE: RC
GITHUB_USERNAME: ((github-username))
GITHUB_TOKEN: ((github-ci-release-token))
vars:
<<: *docker-hub-mirror-vars
- put: github-pre-release
params:
name: generated-changelog/tag
Expand Down Expand Up @@ -647,6 +659,8 @@ jobs:
RELEASE_TYPE: RELEASE
GITHUB_USERNAME: ((github-username))
GITHUB_TOKEN: ((github-ci-release-token))
vars:
<<: *docker-hub-mirror-vars
- put: github-release
params:
name: generated-changelog/tag
Expand Down
5 changes: 5 additions & 0 deletions ci/tasks/build-ci-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ image_resource:
source:
repository: concourse/oci-build-task
tag: 0.9.1
registry_mirror:
host: ((docker-hub-mirror))
username: ((docker-hub-mirror-username))
password: ((docker-hub-mirror-password))
inputs:
- name: ci-images-git-repo
outputs:
Expand All @@ -15,6 +19,7 @@ params:
CONTEXT: ci-images-git-repo/ci/images
DOCKERFILE: ci-images-git-repo/ci/images/((ci-image-name))/Dockerfile
DOCKER_HUB_AUTH: ((docker-hub-auth))
REGISTRY_MIRRORS: ((docker-hub-mirror))
run:
path: /bin/sh
args:
Expand Down
3 changes: 2 additions & 1 deletion ci/tasks/build-project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@ params:
GRADLE_ENTERPRISE_CACHE_USERNAME:
GRADLE_ENTERPRISE_CACHE_PASSWORD:
GRADLE_ENTERPRISE_URL: https://ge.spring.io
DOCKER_HUB_MIRROR:
run:
path: bash
args:
- -ec
- |
source /docker-lib.sh
start_docker
start_docker $DOCKER_HUB_MIRROR
${PWD}/git-repo/ci/scripts/build-project.sh
4 changes: 4 additions & 0 deletions ci/tasks/generate-changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ image_resource:
source:
repository: springio/github-changelog-generator
tag: '0.0.7'
registry_mirror:
host: ((docker-hub-mirror))
username: ((docker-hub-mirror-username))
password: ((docker-hub-mirror-password))
inputs:
- name: git-repo
- name: artifactory-repo
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/*
* Copyright 2012-2021 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
*
* 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.
*/

/**
* Actuator support for Spring Data {@code Repository} metrics.
*/
package org.springframework.boot.actuate.metrics.data;