Skip to content

Commit

Permalink
Fixes helloworld-ws + Optimizes mail, micrometer, opentelemetry
Browse files Browse the repository at this point in the history
  • Loading branch information
@emmartins
emmartins committed Dec 17, 2024
1 parent a59e3c0 commit c5a556a
Show file tree
Hide file tree
Showing 4 changed files with 99 additions and 42 deletions.
29 changes: 22 additions & 7 deletions helloworld-ws/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
<version.server>35.0.0.Beta1</version.server>
<!-- the versions for BOMs, Packs and Plugins -->
<version.bom.ee>${version.server}</version.bom.ee>
<version.pack.cloud>7.0.2.Final</version.pack.cloud>
<version.plugin.wildfly>5.1.0.Final</version.plugin.wildfly>

</properties>
Expand Down Expand Up @@ -137,9 +138,15 @@
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-maven-plugin</artifactId>
<configuration>
<discover-provisioning-info>
<version>${version.server}</version>
</discover-provisioning-info>
<feature-packs>
<feature-pack>
<location>org.wildfly:wildfly-galleon-pack:${version.server}</location>
</feature-pack>
</feature-packs>
<layers>
<layer>cloud-server</layer>
<layer>webservices</layer>
</layers>
</configuration>
<executions>
<execution>
Expand All @@ -160,10 +167,18 @@
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-maven-plugin</artifactId>
<configuration>
<discover-provisioning-info>
<version>${version.server}</version>
<context>cloud</context>
</discover-provisioning-info>
<feature-packs>
<feature-pack>
<location>org.wildfly:wildfly-galleon-pack:${version.server}</location>
</feature-pack>
<feature-pack>
<location>org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud}</location>
</feature-pack>
</feature-packs>
<layers>
<layer>cloud-server</layer>
<layer>webservices</layer>
</layers>
</configuration>
<executions>
<execution>
Expand Down
14 changes: 11 additions & 3 deletions mail/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,17 @@
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-maven-plugin</artifactId>
<configuration>
<discover-provisioning-info>
<version>${version.server}</version>
</discover-provisioning-info>
<feature-packs>
<feature-pack>
<location>org.wildfly:wildfly-galleon-pack:${version.server}</location>
</feature-pack>
</feature-packs>
<layers>
<layer>core-tools</layer>
<layer>core-server</layer>
<layer>mail</layer>
<layer>jsf</layer>
</layers>
<packaging-scripts>
<packaging-script>
<scripts>
Expand Down
55 changes: 33 additions & 22 deletions micrometer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,13 +132,16 @@
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-maven-plugin</artifactId>
<configuration>
<discover-provisioning-info>
<version>${version.server}</version>
<!-- A workaround for WFLY-18955 -->
<add-ons>
<add-on>micrometer</add-on>
</add-ons>
</discover-provisioning-info>
<feature-packs>
<feature-pack>
<location>org.wildfly:wildfly-galleon-pack:${version.server}</location>
</feature-pack>
</feature-packs>
<layers>
<layer>cdi</layer>
<layer>jaxrs-server</layer>
<layer>micrometer</layer>
</layers>
<!-- use cli script(s) to configure the server -->
<packaging-scripts>
<packaging-script>
Expand Down Expand Up @@ -172,13 +175,16 @@
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-maven-plugin</artifactId>
<configuration>
<discover-provisioning-info>
<version>${version.server}</version>
<!-- A workaround for WFLY-18955 -->
<add-ons>
<add-on>micrometer</add-on>
</add-ons>
</discover-provisioning-info>
<feature-packs>
<feature-pack>
<location>org.wildfly:wildfly-galleon-pack:${version.server}</location>
</feature-pack>
</feature-packs>
<layers>
<layer>cdi</layer>
<layer>cloud-server</layer>
<layer>micrometer</layer>
</layers>
<bootable-jar>true</bootable-jar>
<packaging-scripts>
<packaging-script>
Expand Down Expand Up @@ -208,14 +214,19 @@
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-maven-plugin</artifactId>
<configuration>
<discover-provisioning-info>
<version>${version.server}</version>
<context>cloud</context>
<!-- A workaround for WFLY-18955 -->
<add-ons>
<add-on>micrometer</add-on>
</add-ons>
</discover-provisioning-info>
<feature-packs>
<feature-pack>
<location>org.wildfly:wildfly-galleon-pack:${version.server}</location>
</feature-pack>
<feature-pack>
<location>org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud}</location>
</feature-pack>
</feature-packs>
<layers>
<layer>cdi</layer>
<layer>cloud-server</layer>
<layer>micrometer</layer>
</layers>
<packaging-scripts>
<packaging-script>
<scripts>
Expand Down
43 changes: 33 additions & 10 deletions opentelemetry-tracing/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,16 @@
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-maven-plugin</artifactId>
<configuration>
<discover-provisioning-info>
<version>${version.server}</version>
</discover-provisioning-info>
<feature-packs>
<feature-pack>
<location>org.wildfly:wildfly-galleon-pack:${version.server}</location>
</feature-pack>
</feature-packs>
<layers>
<layer>cdi</layer>
<layer>cloud-server</layer>
<layer>opentelemetry</layer>
</layers>
<packaging-scripts>
<packaging-script>
<scripts>
Expand Down Expand Up @@ -166,9 +173,16 @@
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-maven-plugin</artifactId>
<configuration>
<discover-provisioning-info>
<version>${version.server}</version>
</discover-provisioning-info>
<feature-packs>
<feature-pack>
<location>org.wildfly:wildfly-galleon-pack:${version.server}</location>
</feature-pack>
</feature-packs>
<layers>
<layer>cdi</layer>
<layer>cloud-server</layer>
<layer>opentelemetry</layer>
</layers>
<bootable-jar>true</bootable-jar>
<packaging-scripts>
<packaging-script>
Expand Down Expand Up @@ -198,10 +212,19 @@
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-maven-plugin</artifactId>
<configuration>
<discover-provisioning-info>
<version>${version.server}</version>
<context>cloud</context>
</discover-provisioning-info>
<feature-packs>
<feature-pack>
<location>org.wildfly:wildfly-galleon-pack:${version.server}</location>
</feature-pack>
<feature-pack>
<location>org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud}</location>
</feature-pack>
</feature-packs>
<layers>
<layer>cdi</layer>
<layer>cloud-server</layer>
<layer>opentelemetry</layer>
</layers>
<packaging-scripts>
<packaging-script>
<scripts>
Expand Down

0 comments on commit c5a556a

Please sign in to comment.