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

Sync Glow Preview branch with 31.0.0.final #861

Merged
merged 50 commits into from
Jan 25, 2024
Merged
Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
3025c0d
[WFLY-17678] Add Micrometer quickstart
jasondlee Apr 20, 2023
a5d9418
[WFLY-17678] Add Micrometer quickstart
emmartins Jan 17, 2024
89408bd
[WFLY-15849] OpenTelemetry Quickstart
jasondlee Dec 17, 2021
649dfd6
Merge pull request #662 from jasondlee/WFLY-17678
emmartins Jan 22, 2024
8e20467
Merge pull request #544 from jasondlee/WFLY-15849
emmartins Jan 22, 2024
c56159a
move micrometer and opentelemetry to parent 7; update root README
emmartins Jan 22, 2024
90e4681
[WFLY-18873] adds XML comment to mp rest client quickstart's pom.xml,…
emmartins Jan 23, 2024
6dec894
Merge pull request #855 from emmartins/WFLY-18873
emmartins Jan 24, 2024
abfa43a
fix mp rest client wildfly-jar plugin version name; removes no longer…
emmartins Jan 24, 2024
0d799a0
WFLY-18925: Flattened Quickstart READMEs
Jan 19, 2024
b20c23c
Merge pull request #854 from theashiot/WFLY-18925
emmartins Jan 24, 2024
80bb5f1
Commit from GitHub Actions (WildFly Quickstarts Reduce READMEs)
emmartins Jan 24, 2024
8293685
Adds auto update of root README.adoc
emmartins Jan 24, 2024
ecd388b
Updates reduce_readme.yml job title
emmartins Jan 24, 2024
adde9e1
Bump org.json:json in /contacts-jquerymobile/functional-tests
dependabot[bot] Jan 24, 2024
71ac5f1
Commit from GitHub Actions (WildFly Quickstarts Update 'README.adoc's)
emmartins Jan 24, 2024
2bc8f23
Fixes reduce_readme.yml
emmartins Jan 24, 2024
f89c60e
Fixes reduce_readme.yml
emmartins Jan 24, 2024
ed10398
[WFLY-18925] fixes flatenning of micrometer and open telemetry
emmartins Jan 24, 2024
ae6aa35
Merge pull request #856 from wildfly/dependabot/maven/contacts-jquery…
emmartins Jan 24, 2024
fb75a5c
Commit from GitHub Actions (WildFly Quickstarts Update 'README.adoc's)
emmartins Jan 24, 2024
403a485
[WFLY-18925] fixes flatenning of micrometer and open telemetry
emmartins Jan 24, 2024
3525837
Commit from GitHub Actions (WildFly Quickstarts Update 'README.adoc's)
emmartins Jan 24, 2024
c2c21d6
[WFLY-18925] adds flatenning of root README
emmartins Jan 24, 2024
4c19799
[WFLY-18925] fixes flatenning of root README
emmartins Jan 24, 2024
158afd1
Commit from GitHub Actions (WildFly Quickstarts Update 'README.adoc's)
emmartins Jan 24, 2024
5e8acc0
Upgrade to cloud 6.0.0.Final and datasources 7.0.0.Final
jfdenise Jan 25, 2024
f1120eb
Adds maven inject properties for versions in mp lra README
emmartins Jan 25, 2024
f92d9e2
Merge branch 'main' into wf_31
emmartins Jan 25, 2024
5ebe335
Merge pull request #858 from jfdenise/wf_31
emmartins Jan 25, 2024
1dca2ae
Commit from GitHub Actions (WildFly Quickstarts Update 'README.adoc's)
emmartins Jan 25, 2024
5a868ef
[WFLY-18950] Fixes root README-source ToAQ; optimizes GH workflow
emmartins Jan 25, 2024
6b4c595
Move to parent 8
emmartins Jan 25, 2024
00cfad2
Move server to WildFly 31.0.0.Final
emmartins Jan 25, 2024
589a1b1
Merge pull request #859 from emmartins/WFLY-18950
emmartins Jan 25, 2024
2fd1669
Move docs to 31.0.0.Final
emmartins Jan 25, 2024
3d6e135
Commit from GitHub Actions (WildFly Quickstarts Update 'README.adoc's)
emmartins Jan 25, 2024
3a9785b
Prepare for 31.0.0.Final release
emmartins Jan 25, 2024
d861ad0
Merge pull request #860 from emmartins/rel-31.0.0.Final
emmartins Jan 25, 2024
5963608
Commit from GitHub Actions (WildFly Quickstarts Update 'README.adoc's)
emmartins Jan 25, 2024
fdd0193
Prepare for 31.0.0.Final release (Helm charts)
emmartins Jan 25, 2024
07b1a4b
Prepare for 31.0.0.Final release (Helm charts)
emmartins Jan 25, 2024
b4ca9a4
Commit from GitHub Actions (WildFly Quickstarts Update 'README.adoc's)
emmartins Jan 25, 2024
4dd7e52
[WFLY-17678] Add Micrometer quickstart
jasondlee Apr 20, 2023
6077a06
[WFLY-17678] Add Micrometer quickstart
emmartins Jan 17, 2024
eb4238c
[WFLY-15849] OpenTelemetry Quickstart
jasondlee Dec 17, 2021
7968fa4
move micrometer and opentelemetry to parent 7; update root README
emmartins Jan 22, 2024
5f22b77
Merge commit 'b4ca9a43b66d96aff01d3da9f9714b65b9bb38b0' into glow-pre…
kabir Jan 25, 2024
1063471
Add micrometer and opentelemetry with Glow support
jfdenise Jan 25, 2024
fe93e01
Merge pull request #19 from jfdenise/glow-preview-31.0.0.Final
kabir Jan 25, 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
Prev Previous commit
Next Next commit
Adds maven inject properties for versions in mp lra README
emmartins committed Jan 25, 2024
commit f1120eb58b98b08adf05e0d8ce7836f55c05cfef
10 changes: 5 additions & 5 deletions microprofile-lra/README-source.adoc
Original file line number Diff line number Diff line change
@@ -184,19 +184,19 @@ Open the generated `pom.xml`.

The first thing to do is to change the minimum JDK to Java 11 and set the other relevant version properties:

[source,xml]
[source,xml,subs="attributes+"]
----
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>

<!-- the version for the Server -->
<version.server>31.0.0.Beta1</version.server>
<version.server>{versionServer}</version.server>
<!-- The versions for the BOMs, Packs and Plugins -->
<version.bom.ee>${version.server}</version.bom.ee>
<version.bom.microprofile>${version.server}</version.bom.microprofile>
<version.pack.cloud>5.0.0.Final</version.pack.cloud>
<version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
<version.plugin.wildfly-jar>10.0.0.Final</version.plugin.wildfly-jar>
<version.pack.cloud>{versionPackCloud}</version.pack.cloud>
<version.plugin.wildfly>{versionPluginWildfly}</version.plugin.wildfly>
<version.plugin.wildfly-jar>{versionPluginWildflyJar}</version.plugin.wildfly-jar>
----

Next we need to setup our dependencies. Add the following section to your
14 changes: 5 additions & 9 deletions microprofile-lra/README.adoc
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
ifdef::env-github[]
:artifactId: microprofile-lra
endif::[]

//***********************************************************************************
// Enable the following flag to build README.html files for JBoss EAP product builds.
// Comment it out for WildFly builds.
@@ -1367,19 +1363,19 @@ Open the generated `pom.xml`.

The first thing to do is to change the minimum JDK to Java 11 and set the other relevant version properties:

[source,xml]
[source,xml,subs="attributes+"]
----
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>

<!-- the version for the Server -->
<version.server>31.0.0.Beta1</version.server>
<version.server>{versionServer}</version.server>
<!-- The versions for the BOMs, Packs and Plugins -->
<version.bom.ee>${version.server}</version.bom.ee>
<version.bom.microprofile>${version.server}</version.bom.microprofile>
<version.pack.cloud>5.0.0.Final</version.pack.cloud>
<version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
<version.plugin.wildfly-jar>10.0.0.Final</version.plugin.wildfly-jar>
<version.pack.cloud>{versionPackCloud}</version.pack.cloud>
<version.plugin.wildfly>{versionPluginWildfly}</version.plugin.wildfly>
<version.plugin.wildfly-jar>{versionPluginWildflyJar}</version.plugin.wildfly-jar>
----

Next we need to setup our dependencies. Add the following section to your
15 changes: 15 additions & 0 deletions microprofile-lra/pom.xml
Original file line number Diff line number Diff line change
@@ -159,6 +159,21 @@
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<configuration>
<!-- adds versions properties as attributes for substitutions in README.adoc source blocks -->
<attributes>
<versionServer>${version.server}</versionServer>
<versionPackCloud>${version.pack.cloud}</versionPackCloud>
<versionPluginWildfly>${version.plugin.wildfly}</versionPluginWildfly>
<versionPluginWildflyJar>${version.plugin.wildfly-jar}</versionPluginWildflyJar>
</attributes>
</configuration>
</plugin>
</plugins>
</build>

<profiles>