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

Release 3.3.2 #304

Merged
merged 21 commits into from
Oct 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
cd1fd82
feat(TimeOut): Enable the TimeOut Settings from HttpEventCollectorSen…
Sep 18, 2024
f31d067
Merge pull request #295 from nico-duv/3.2.0-to
edeweerd1A Oct 30, 2024
50318c5
chore(release): release 3.2.1
edeweerd1A Oct 30, 2024
857b904
Merge pull request #299 from quarkiverse/release-3.2.1
edeweerd1A Oct 30, 2024
39e874b
chore(release): release 3.2.2
edeweerd1A Oct 30, 2024
5e67a5e
Split and Reuse the Release workflow
gastaldi Oct 16, 2024
8ff601a
Update file names
gastaldi Oct 16, 2024
ad5865b
Merge pull request #302 from quarkiverse/release-3.2.2
edeweerd1A Oct 30, 2024
e68c6de
Update the latest release version 3.2.2 in documentation
quarkiverse-ci[bot] Oct 30, 2024
cebeca4
[maven-release-plugin] prepare release 3.2.2
quarkiverse-ci[bot] Oct 30, 2024
2724a87
[maven-release-plugin] prepare for next development iteration
quarkiverse-ci[bot] Oct 30, 2024
8b264b5
chore(release): release 3.2.3
edeweerd1A Oct 30, 2024
dfee518
chore(pom): Update to quarkiverse-parent 18
edeweerd1A Oct 30, 2024
f815e8a
fix(pom): Fix exclusion condition of not-to-release profile
edeweerd1A Oct 31, 2024
d5213ee
Merge pull request #303 from quarkiverse/release-3.2.3
edeweerd1A Oct 31, 2024
7134d7b
Update the latest release version 3.2.3 in documentation
quarkiverse-ci[bot] Oct 31, 2024
075716e
[maven-release-plugin] prepare release 3.2.3
quarkiverse-ci[bot] Oct 31, 2024
964f3e2
[maven-release-plugin] prepare for next development iteration
quarkiverse-ci[bot] Oct 31, 2024
0339a0b
Merge branch 'rhbq/3.2' into lts/3.8
edeweerd1A Oct 31, 2024
45f04a5
chore(release): release 3.3.2
edeweerd1A Oct 31, 2024
f269531
fix(test-utils): Fix formatting of LoggingSplunkInjectingTestResource…
edeweerd1A Oct 31, 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
4 changes: 2 additions & 2 deletions .github/project.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Quarkiverse Extension
release:
current-version: 3.3.1
next-version: 3.4.0-SNAPSHOT
current-version: 3.3.2
next-version: 3.3.0-SNAPSHOT
25 changes: 8 additions & 17 deletions .github/workflows/pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,12 @@ on:
paths:
- '.github/project.yml'

jobs:
release:
runs-on: ubuntu-latest
name: pre release

steps:
- uses: radcortez/project-metadata-action@master
name: retrieve project metadata
id: metadata
with:
github-token: ${{secrets.GITHUB_TOKEN}}
metadata-file-path: '.github/project.yml'
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

- name: Validate version
if: contains(steps.metadata.outputs.current-version, 'SNAPSHOT')
run: |
echo '::error::Cannot release a SNAPSHOT version.'
exit 1
jobs:
pre-release:
name: Pre-Release
uses: quarkiverse/.github/.github/workflows/pre-release.yml@main
secrets: inherit
28 changes: 28 additions & 0 deletions .github/workflows/release-perform.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Quarkiverse Perform Release
run-name: Perform ${{github.event.inputs.tag || github.ref_name}} Release
on:
push:
tags:
- '*'
workflow_dispatch:
inputs:
tag:
description: 'Tag to release'
required: true

permissions:
attestations: write
id-token: write
contents: read

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
perform-release:
name: Perform Release
uses: quarkiverse/.github/.github/workflows/perform-release.yml@main
secrets: inherit
with:
version: ${{github.event.inputs.tag || github.ref_name}}
18 changes: 18 additions & 0 deletions .github/workflows/release-prepare.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Quarkiverse Prepare Release

on:
pull_request:
types: [ closed ]
paths:
- '.github/project.yml'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
prepare-release:
name: Prepare Release
if: ${{ github.event.pull_request.merged == true}}
uses: quarkiverse/.github/.github/workflows/prepare-release.yml@main
secrets: inherit
70 changes: 0 additions & 70 deletions .github/workflows/release.yml

This file was deleted.

2 changes: 1 addition & 1 deletion deployment/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.quarkiverse.logging.splunk</groupId>
<artifactId>quarkus-logging-splunk-parent</artifactId>
<version>3.4.0-SNAPSHOT</version>
<version>3.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion docs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.quarkiverse.logging.splunk</groupId>
<artifactId>quarkus-logging-splunk-parent</artifactId>
<version>3.4.0-SNAPSHOT</version>
<version>3.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion integration-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>io.quarkiverse.logging.splunk</groupId>
<artifactId>quarkus-logging-splunk-parent</artifactId>
<version>3.4.0-SNAPSHOT</version>
<version>3.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
20 changes: 16 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<parent>
<groupId>io.quarkiverse</groupId>
<artifactId>quarkiverse-parent</artifactId>
<version>16</version>
<version>18</version>
</parent>
<groupId>io.quarkiverse.logging.splunk</groupId>
<artifactId>quarkus-logging-splunk-parent</artifactId>
<version>3.4.0-SNAPSHOT</version>
<version>3.3.0-SNAPSHOT</version>
<name>Splunk logging extension - Parent</name>
<description>Send logs to a Splunk HTTP Event Collector (HEC)</description>
<packaging>pom</packaging>
Expand Down Expand Up @@ -53,8 +53,6 @@
<module>test-utils</module>
<module>runtime</module>
<module>deployment</module>
<module>integration-test</module>
<module>docs</module>
</modules>
<repositories>
<repository>
Expand Down Expand Up @@ -152,4 +150,18 @@
</plugins>
</pluginManagement>
</build>
<profiles>
<profile>
<id>not-to-release</id>
<activation>
<property>
<name>!performRelease</name>
</property>
</activation>
<modules>
<module>docs</module>
<module>integration-test</module>
</modules>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.quarkiverse.logging.splunk</groupId>
<artifactId>quarkus-logging-splunk-parent</artifactId>
<version>3.4.0-SNAPSHOT</version>
<version>3.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion test-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.quarkiverse.logging.splunk</groupId>
<artifactId>quarkus-logging-splunk-parent</artifactId>
<version>3.4.0-SNAPSHOT</version>
<version>3.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ class LoggingSplunkInjectingTestResourceTest {

LoggingSplunkInjectingTestResource resource = new LoggingSplunkInjectingTestResource();

@BeforeEach
void setUp() {
when(context.devServicesProperties()).thenReturn(Map.of());
}
@BeforeEach
void setUp() {
when(context.devServicesProperties()).thenReturn(Map.of());
}

@Test
void disabled() {
Expand All @@ -38,31 +38,31 @@ void disabled() {
assertThat(testInstance.splunkHandlerUrl, nullValue());
}

@Test
void enabled() {
when(context.devServicesProperties()).thenReturn(Map.of("quarkus.log.handler.splunk.url",
"http://localhost:8088", "quarkus.log.handler.splunk.devservices.api-url", "http://localhost:8089"));
FieldWithAnnotation testInstance = new FieldWithAnnotation();
@Test
void enabled() {
when(context.devServicesProperties()).thenReturn(Map.of("quarkus.log.handler.splunk.url",
"http://localhost:8088", "quarkus.log.handler.splunk.devservices.api-url", "http://localhost:8089"));
FieldWithAnnotation testInstance = new FieldWithAnnotation();

resource.setIntegrationTestContext(context);
resource.inject(testInstance);
resource.setIntegrationTestContext(context);
resource.inject(testInstance);

assertThat(testInstance.splunkApiUrl, equalTo("http://localhost:8089"));
assertThat(testInstance.splunkHandlerUrl, equalTo("http://localhost:8088"));
}
assertThat(testInstance.splunkApiUrl, equalTo("http://localhost:8089"));
assertThat(testInstance.splunkHandlerUrl, equalTo("http://localhost:8088"));
}

@Test
void noAnnotationORWrongType() {
when(context.devServicesProperties()).thenReturn(Map.of("quarkus.log.handler.splunk.url",
"http://localhost:8088", "quarkus.log.handler.splunk.devservices.api-url", "http://localhost:8089"));
FieldWithNoAnnotation testInstance = new FieldWithNoAnnotation();
@Test
void noAnnotationORWrongType() {
when(context.devServicesProperties()).thenReturn(Map.of("quarkus.log.handler.splunk.url",
"http://localhost:8088", "quarkus.log.handler.splunk.devservices.api-url", "http://localhost:8089"));
FieldWithNoAnnotation testInstance = new FieldWithNoAnnotation();

resource.setIntegrationTestContext(context);
resource.inject(testInstance);
resource.setIntegrationTestContext(context);
resource.inject(testInstance);

assertThat(testInstance.splunkApiUrl, nullValue());
assertThat(testInstance.splunkHandlerUrl, nullValue());
}
assertThat(testInstance.splunkApiUrl, nullValue());
assertThat(testInstance.splunkHandlerUrl, nullValue());
}

public static class NoFields {

Expand Down
Loading