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

Bump version.microprofile-metrics from 3.0.1 to 5.1.1 #676

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
d61608b
Move master branch references to main
radcortez Sep 10, 2021
763057c
Upgrade to GitHub-native Dependabot
dependabot-preview[bot] Apr 29, 2021
36fb8bc
Bump smallrye-config from 2.0.2 to 2.8.2
dependabot[bot] Jan 17, 2022
21e97eb
Bump smallrye-parent from 26 to 31
dependabot[bot] Jan 5, 2022
f0a5263
Bump smallrye-parent from 26 to 31
dependabot[bot] Jan 18, 2022
ee18010
Bump smallrye-config from 2.8.2 to 2.9.0
dependabot[bot] Feb 14, 2022
40282f0
Bump microprofile-config-api from 2.0 to 2.0.1
dependabot[bot] Feb 14, 2022
6fcfd97
Bump smallrye-common-annotation from 1.8.0 to 1.10.0
dependabot[bot] Feb 15, 2022
4b8442f
Bump version.microprofile-metrics from 3.0 to 3.0.1
dependabot[bot] Feb 16, 2022
53f8e4a
Bump smallrye-config from 2.9.0 to 2.9.2
dependabot[bot] Mar 17, 2022
be478e8
Requests without an Accept header are not accepted
pedroigor May 26, 2022
f3cbfb6
Release 3.0.5
jmartisk May 27, 2022
adaa9e2
[maven-release-plugin] prepare release 3.0.5
smallrye-ci May 27, 2022
5a185d9
[maven-release-plugin] prepare for next development iteration
smallrye-ci May 27, 2022
5a8b15b
Bump smallrye-config from 2.9.2 to 2.10.1
dependabot[bot] Jun 14, 2022
7817b7f
Bump smallrye-common-annotation from 1.10.0 to 1.12.0
dependabot[bot] Jun 14, 2022
18b062e
Bump smallrye-parent from 34 to 36 (#540)
dependabot[bot] Sep 5, 2022
e40d844
Remove Java 8 Build
radcortez Sep 5, 2022
e7ed435
Update dependabot to check micrometer branch
Channyboy Jan 27, 2023
4710ab6
Bump version.microprofile-metrics from 3.0.1 to 5.1.1
dependabot[bot] Jan 17, 2024
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
20 changes: 20 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
version: 2
updates:
- package-ecosystem: "maven"
directory: "/"
schedule:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "maven"
directory: "/"
schedule:
interval: "daily"
target-branch: "micrometer"
open-pull-requests-limit: 10
# Avoid any Dependabot branch name collisions
pull-request-branch-name:
separator: "-"
labels:
- "micrometer"
- "dependencies"
4 changes: 2 additions & 2 deletions .github/project.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: SmallRye Metrics
release:
current-version: 3.0.4
next-version: 3.0.5-SNAPSHOT
current-version: 3.0.5
next-version: 3.0.6-SNAPSHOT
20 changes: 15 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ name: SmallRye Build

on:
push:
branches-ignore:
- 'dependabot/**'
branches:
- main
- jakarta
- micrometer
paths-ignore:
- '.gitignore'
- 'CODEOWNERS'
Expand All @@ -20,11 +22,10 @@ on:

jobs:
build:
if: github.event_name == 'pull_request'
runs-on: ubuntu-latest
strategy:
matrix:
java: [8, 11, 14]
java: [11, 17]
name: build with jdk ${{matrix.java}}

steps:
Expand All @@ -39,13 +40,22 @@ jobs:
- name: build with maven
run: mvn -B formatter:validate verify --file pom.xml

- uses: actions/upload-artifact@v2
name: tck-report
with:
name: tck-report
path: testsuite/tck/target/surefire-reports

quality:
if: github.event_name == 'push' && github.repository == 'smallrye/smallrye-metrics'
needs: [build]
if: github.event_name == 'push' && github.repository_owner == 'smallrye'
runs-on: ubuntu-latest
name: quality

steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: actions/setup-java@v1
with:
java-version: 11
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
name: pre release

steps:
- uses: radcortez/project-metadata-action@master
- uses: radcortez/project-metadata-action@main
name: retrieve project metadata
id: metadata
with:
Expand All @@ -24,7 +24,7 @@ jobs:
echo '::error::Cannot release a SNAPSHOT version.'
exit 1

- uses: radcortez/milestone-review-action@master
- uses: radcortez/milestone-review-action@main
name: milestone review
with:
github-token: ${{secrets.GITHUB_TOKEN}}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
GITHUB_TOKEN: ${{secrets.RELEASE_TOKEN}}

steps:
- uses: radcortez/project-metadata-action@master
- uses: radcortez/project-metadata-action@main
name: retrieve project metadata
id: metadata
with:
Expand All @@ -28,7 +28,7 @@ jobs:

- uses: actions/setup-java@v1
with:
java-version: 8
java-version: 11

- name: maven release ${{steps.metadata.outputs.current-version}}
run: |
Expand All @@ -46,7 +46,7 @@ jobs:
git push
git push --tags

- uses: radcortez/milestone-release-action@master
- uses: radcortez/milestone-release-action@main
name: milestone release
with:
github-token: ${{secrets.GITHUB_TOKEN}}
Expand Down
6 changes: 3 additions & 3 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
:microprofile-metrics: https://github.com/eclipse/microprofile-metrics/
:ci: https://github.com/smallrye/smallrye-config/actions?query=workflow%3A%22SmallRye+Build%22
:sonar: https://sonarcloud.io/dashboard?id=smallrye_smallrye-config
:ci: https://github.com/smallrye/smallrye-metrics/actions?query=workflow%3A%22SmallRye+Build%22
:sonar: https://sonarcloud.io/dashboard?id=smallrye_smallrye-metrics

image:https://github.com/smallrye/smallrye-metrics/workflows/SmallRye%20Build/badge.svg?branch=master[link={ci}]
image:https://github.com/smallrye/smallrye-metrics/workflows/SmallRye%20Build/badge.svg?branch=main[link={ci}]
image:https://sonarcloud.io/api/project_badges/measure?project=smallrye_smallrye-metrics&metric=alert_status["Quality Gate Status", link={sonar}]
image:https://img.shields.io/github/license/smallrye/smallrye-metrics.svg["License", link="http://www.apache.org/licenses/LICENSE-2.0"]
image:https://img.shields.io/maven-central/v/io.smallrye/smallrye-metrics?color=green[]
Expand Down
2 changes: 1 addition & 1 deletion api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>smallrye-metrics-parent</artifactId>
<groupId>io.smallrye</groupId>
<version>3.0.5-SNAPSHOT</version>
<version>3.0.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion coverage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-metrics-parent</artifactId>
<version>3.0.5-SNAPSHOT</version>
<version>3.0.6-SNAPSHOT</version>
</parent>

<artifactId>smallrye-metrics-coverage</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion implementation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-metrics-parent</artifactId>
<version>3.0.5-SNAPSHOT</version>
<version>3.0.6-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,10 @@ Optional<String> getBestMatchingMediaType(Stream<String> acceptHeaders) {
}
});

if (tupleList.isEmpty()) {
return Optional.of(TEXT_PLAIN);
}

WTTuple bestMatchTuple = new WTTuple(-1, null);

// Iterate over the list and find the best match
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,4 +146,11 @@ public void testWithMissingPriorityMulti() {
assertThat(res.get()).isEqualTo("application/json");
}

@Test
public void testDefaultMediaTypeWhenAcceptHeaderNotSet() {
Optional<String> res = requestHandler.getBestMatchingMediaType(Stream.empty());
assertThat(res.isPresent()).isTrue();
assertThat(res.get()).isEqualTo("text/plain");
}

}
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,22 @@
<parent>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-parent</artifactId>
<version>26</version>
<version>36</version>
</parent>

<artifactId>smallrye-metrics-parent</artifactId>
<version>3.0.5-SNAPSHOT</version>
<version>3.0.6-SNAPSHOT</version>

<packaging>pom</packaging>
<name>SmallRye: MicroProfile Metrics Parent</name>
<url>http://smallrye.io</url>

<properties>
<version.microprofile-config>2.0</version.microprofile-config>
<version.microprofile-metrics>3.0</version.microprofile-metrics>
<version.microprofile-config>2.0.1</version.microprofile-config>
<version.microprofile-metrics>5.1.1</version.microprofile-metrics>

<version.smallrye.config>2.0.2</version.smallrye.config>
<version.smallrye.common>1.5.0</version.smallrye.common>
<version.smallrye.config>2.12.0</version.smallrye.config>
<version.smallrye.common>1.13.1</version.smallrye.common>

<version.jakarta.servlet>4.0.4</version.jakarta.servlet>

Expand Down
2 changes: 1 addition & 1 deletion release/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-metrics-parent</artifactId>
<version>3.0.5-SNAPSHOT</version>
<version>3.0.6-SNAPSHOT</version>
</parent>

<artifactId>smallrye-metrics-release</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion testsuite/api-tck/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-metrics-testsuite-parent</artifactId>
<version>3.0.5-SNAPSHOT</version>
<version>3.0.6-SNAPSHOT</version>
</parent>

<artifactId>smallrye-metrics-api-tck</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion testsuite/common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-metrics-testsuite-parent</artifactId>
<version>3.0.5-SNAPSHOT</version>
<version>3.0.6-SNAPSHOT</version>
</parent>

<artifactId>smallrye-metrics-testsuite-common</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion testsuite/extra/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-metrics-testsuite-parent</artifactId>
<version>3.0.5-SNAPSHOT</version>
<version>3.0.6-SNAPSHOT</version>
</parent>

<artifactId>smallrye-metrics-testsuite-extra</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion testsuite/optional-tck/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<artifactId>smallrye-metrics-testsuite-parent</artifactId>
<groupId>io.smallrye</groupId>
<version>3.0.5-SNAPSHOT</version>
<version>3.0.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion testsuite/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-metrics-parent</artifactId>
<version>3.0.5-SNAPSHOT</version>
<version>3.0.6-SNAPSHOT</version>
</parent>

<artifactId>smallrye-metrics-testsuite-parent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion testsuite/rest-tck/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-metrics-testsuite-parent</artifactId>
<version>3.0.5-SNAPSHOT</version>
<version>3.0.6-SNAPSHOT</version>
</parent>

<artifactId>smallrye-metrics-rest-tck</artifactId>
Expand Down
Loading