Skip to content

Commit

Permalink
Merge pull request #460 from jfdenise/examples-with-glow
Browse files Browse the repository at this point in the history 
Use WildFly Glow for examples
  • Loading branch information
@jfdenise
jfdenise authored Jan 11, 2024
2 parents 6069c96 + e2e27b7 commit 6154bc0
Show file tree
Hide file tree
Showing 14 changed files with 73 additions and 167 deletions.
2 changes: 1 addition & 1 deletion examples/cloud-default-config/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<version.wildfly>31.0.0.Beta1</version.wildfly>
<version.wildfly.plugin>4.2.0.Final</version.wildfly.plugin>
<version.wildfly.plugin>5.0.0.Beta2</version.wildfly.plugin>
<version.maven.war.plugin>3.3.2</version.maven.war.plugin>
<version.wildfly.cloud.galleon.pack>5.0.2.Final</version.wildfly.cloud.galleon.pack>
<version.wildfly.datasources.galleon.pack>6.0.0.Final</version.wildfly.datasources.galleon.pack>
Expand Down
14 changes: 5 additions & 9 deletions examples/docker-build/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jakarta.jakartaee-api.version>10.0.0</jakarta.jakartaee-api.version>
<version.maven.war.plugin>3.3.2</version.maven.war.plugin>
<version.wildfly.plugin>4.2.0.Final</version.wildfly.plugin>
<version.wildfly.plugin>5.0.0.Beta2</version.wildfly.plugin>
<version.wildfly>31.0.0.Beta1</version.wildfly>
</properties>

Expand All @@ -41,14 +41,10 @@
<artifactId>wildfly-maven-plugin</artifactId>
<version>${version.wildfly.plugin}</version>
<configuration>
<feature-packs>
<feature-pack>
<location>org.wildfly:wildfly-galleon-pack:${version.wildfly}</location>
</feature-pack>
</feature-packs>
<layers>
<layer>cloud-server</layer>
</layers>
<discover-provisioning-info>
<version>${version.wildfly}</version>
<context>cloud</context>
</discover-provisioning-info>
<galleon-options>
<jboss-fork-embedded>true</jboss-fork-embedded>
</galleon-options>
Expand Down
19 changes: 5 additions & 14 deletions examples/elytron-oidc-client-auto-reg/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
<maven.compiler.target>11</maven.compiler.target>
<version.maven.war.plugin>3.3.2</version.maven.war.plugin>
<version.wildfly>31.0.0.Beta1</version.wildfly>
<version.wildfly.plugin>4.2.0.Final</version.wildfly.plugin>
<version.wildfly.cloud.galleon.pack>5.0.2.Final</version.wildfly.cloud.galleon.pack>
<version.wildfly.plugin>5.0.0.Beta2</version.wildfly.plugin>
<jakarta.jakartaee-api.version>10.0.0</jakarta.jakartaee-api.version>
</properties>

Expand All @@ -41,18 +40,10 @@
<artifactId>wildfly-maven-plugin</artifactId>
<version>${version.wildfly.plugin}</version>
<configuration>
<feature-packs>
<feature-pack>
<location>org.wildfly:wildfly-galleon-pack:${version.wildfly}</location>
</feature-pack>
<feature-pack>
<location>org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.wildfly.cloud.galleon.pack}</location>
</feature-pack>
</feature-packs>
<layers>
<layer>cloud-server</layer>
<layer>elytron-oidc-client</layer>
</layers>
<discover-provisioning-info>
<version>${version.wildfly}</version>
<context>cloud</context>
</discover-provisioning-info>
<runtime-name>ROOT.war</runtime-name>
</configuration>
<executions>
Expand Down
19 changes: 5 additions & 14 deletions examples/elytron-oidc-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<version.maven.war.plugin>3.3.2</version.maven.war.plugin>
<version.wildfly.plugin>4.2.0.Final</version.wildfly.plugin>
<version.wildfly.plugin>5.0.0.Beta2</version.wildfly.plugin>
<version.wildfly>31.0.0.Beta1</version.wildfly>
<version.wildfly.cloud.galleon.pack>5.0.2.Final</version.wildfly.cloud.galleon.pack>
<jakarta.jakartaee-api.version>10.0.0</jakarta.jakartaee-api.version>
</properties>

Expand All @@ -41,18 +40,10 @@
<artifactId>wildfly-maven-plugin</artifactId>
<version>${version.wildfly.plugin}</version>
<configuration>
<feature-packs>
<feature-pack>
<location>org.wildfly:wildfly-galleon-pack:${version.wildfly}</location>
</feature-pack>
<feature-pack>
<location>org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.wildfly.cloud.galleon.pack}</location>
</feature-pack>
</feature-packs>
<layers>
<layer>cloud-server</layer>
<layer>elytron-oidc-client</layer>
</layers>
<discover-provisioning-info>
<version>${version.wildfly}</version>
<context>cloud</context>
</discover-provisioning-info>
<runtime-name>ROOT.war</runtime-name>
</configuration>
<executions>
Expand Down
2 changes: 1 addition & 1 deletion examples/jms-broker/broker/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<version.maven.war.plugin>3.3.2</version.maven.war.plugin>
<version.wildfly>31.0.0.Beta1</version.wildfly>
<version.wildfly.cloud.galleon.pack>5.0.2.Final</version.wildfly.cloud.galleon.pack>
<version.wildfly.plugin>4.2.0.Final</version.wildfly.plugin>
<version.wildfly.plugin>5.0.0.Beta2</version.wildfly.plugin>
</properties>

<dependencies>
Expand Down
21 changes: 7 additions & 14 deletions examples/jms-broker/mdb-consumer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@
<jakarta.jakartaee-api.version>10.0.0</jakarta.jakartaee-api.version>
<version.maven.war.plugin>3.3.2</version.maven.war.plugin>
<version.wildfly>31.0.0.Beta1</version.wildfly>
<version.wildfly.cloud.galleon.pack>5.0.2.Final</version.wildfly.cloud.galleon.pack>
<version.wildfly.plugin>4.2.0.Final</version.wildfly.plugin>
<version.wildfly.plugin>5.0.0.Beta2</version.wildfly.plugin>
</properties>

<dependencies>
Expand All @@ -60,18 +59,12 @@
<artifactId>wildfly-maven-plugin</artifactId>
<version>${version.wildfly.plugin}</version>
<configuration>
<feature-packs>
<feature-pack>
<location>org.wildfly:wildfly-galleon-pack:${version.wildfly}</location>
</feature-pack>
<feature-pack>
<location>org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.wildfly.cloud.galleon.pack}</location>
</feature-pack>
</feature-packs>
<layers>
<layer>cloud-server</layer>
<layer>ejb</layer>
</layers>
<discover-provisioning-info>
<version>${version.wildfly}</version>
<context>cloud</context>
<!-- remote broker added by CLI script -->
<failsOnError>false</failsOnError>
</discover-provisioning-info>
<packaging-scripts>
<cli-session>
<scripts>
Expand Down
20 changes: 7 additions & 13 deletions examples/jms-broker/producer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@
<jakarta.jakartaee-api.version>10.0.0</jakarta.jakartaee-api.version>
<version.maven.war.plugin>3.3.2</version.maven.war.plugin>
<version.wildfly>31.0.0.Beta1</version.wildfly>
<version.wildfly.cloud.galleon.pack>5.0.2.Final</version.wildfly.cloud.galleon.pack>
<version.wildfly.plugin>4.2.0.Final</version.wildfly.plugin>
<version.wildfly.plugin>5.0.0.Beta2</version.wildfly.plugin>
</properties>

<dependencies>
Expand All @@ -60,17 +59,12 @@
<artifactId>wildfly-maven-plugin</artifactId>
<version>${version.wildfly.plugin}</version>
<configuration>
<feature-packs>
<feature-pack>
<location>org.wildfly:wildfly-galleon-pack:${version.wildfly}</location>
</feature-pack>
<feature-pack>
<location>org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.wildfly.cloud.galleon.pack}</location>
</feature-pack>
</feature-packs>
<layers>
<layer>cloud-server</layer>
</layers>
<discover-provisioning-info>
<version>${version.wildfly}</version>
<context>cloud</context>
<!-- remote broker added by CLI script -->
<failsOnError>false</failsOnError>
</discover-provisioning-info>
<packaging-scripts>
<cli-session>
<scripts>
Expand Down
19 changes: 5 additions & 14 deletions examples/jsf-ejb-jpa/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
<maven.compiler.target>11</maven.compiler.target>
<version.maven.war.plugin>3.3.2</version.maven.war.plugin>
<version.wildfly>31.0.0.Beta1</version.wildfly>
<version.wildfly.cloud.galleon.pack>5.0.2.Final</version.wildfly.cloud.galleon.pack>
<version.wildfly.plugin>4.2.0.Final</version.wildfly.plugin>
<version.wildfly.plugin>5.0.0.Beta2</version.wildfly.plugin>
<jakarta.jakartaee-api.version>10.0.0</jakarta.jakartaee-api.version>
</properties>

Expand All @@ -39,18 +38,10 @@
<artifactId>wildfly-maven-plugin</artifactId>
<version>${version.wildfly.plugin}</version>
<configuration>
<feature-packs>
<feature-pack>
<location>org.wildfly:wildfly-galleon-pack:${version.wildfly}</location>
</feature-pack>
</feature-packs>
<layers>
<layer>cloud-server</layer>
<layer>ejb-lite</layer>
<layer>jsf</layer>
<layer>jpa</layer>
<layer>h2-driver</layer>
</layers>
<discover-provisioning-info>
<version>${version.wildfly}</version>
<context>cloud</context>
</discover-provisioning-info>
<galleon-options>
<jboss-fork-embedded>true</jboss-fork-embedded>
</galleon-options>
Expand Down
26 changes: 8 additions & 18 deletions examples/postgresql-multiple-datasources/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@
<maven.compiler.target>11</maven.compiler.target>
<version.maven.war.plugin>3.3.2</version.maven.war.plugin>
<version.wildfly>31.0.0.Beta1</version.wildfly>
<version.wildfly.plugin>4.2.0.Final</version.wildfly.plugin>
<version.wildfly.cloud.galleon.pack>5.0.2.Final</version.wildfly.cloud.galleon.pack>
<version.wildfly.datasources.galleon.pack>6.0.0.Final</version.wildfly.datasources.galleon.pack>
<version.wildfly.plugin>5.0.0.Beta2</version.wildfly.plugin>
<jakarta.jakartaee-api.version>10.0.0</jakarta.jakartaee-api.version>
</properties>

Expand All @@ -41,21 +39,13 @@
<artifactId>wildfly-maven-plugin</artifactId>
<version>${version.wildfly.plugin}</version>
<configuration>
<feature-packs>
<feature-pack>
<location>org.wildfly:wildfly-galleon-pack:${version.wildfly}</location>
</feature-pack>
<feature-pack>
<location>org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.wildfly.cloud.galleon.pack}</location>
</feature-pack>
<feature-pack>
<location>org.wildfly:wildfly-datasources-galleon-pack:${version.wildfly.datasources.galleon.pack}</location>
</feature-pack>
</feature-packs>
<layers>
<layer>cloud-server</layer>
<layer>postgresql-driver</layer>
</layers>
<discover-provisioning-info>
<version>${version.wildfly}</version>
<context>cloud</context>
<add-ons>
<add-on>postgresql</add-on>
</add-ons>
</discover-provisioning-info>
<galleon-options>
<jboss-fork-embedded>true</jboss-fork-embedded>
</galleon-options>
Expand Down
27 changes: 9 additions & 18 deletions examples/postgresql-preview/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@
<maven.compiler.target>11</maven.compiler.target>
<version.maven.war.plugin>3.3.2</version.maven.war.plugin>
<version.wildfly>31.0.0.Beta1</version.wildfly>
<version.wildfly.plugin>4.2.0.Final</version.wildfly.plugin>
<version.wildfly.cloud.galleon.pack>5.0.2.Final</version.wildfly.cloud.galleon.pack>
<version.wildfly.datasources.galleon.pack>6.0.0.Final</version.wildfly.datasources.galleon.pack>
<version.wildfly.plugin>5.0.0.Beta2</version.wildfly.plugin>
</properties>

<dependencies>
Expand Down Expand Up @@ -46,21 +44,14 @@
<artifactId>wildfly-maven-plugin</artifactId>
<version>${version.wildfly.plugin}</version>
<configuration>
<feature-packs>
<feature-pack>
<location>org.wildfly:wildfly-preview-feature-pack:${version.wildfly}</location>
</feature-pack>
<feature-pack>
<location>org.wildfly.cloud:wildfly-preview-cloud-galleon-pack:${version.wildfly.cloud.galleon.pack}</location>
</feature-pack>
<feature-pack>
<location>org.wildfly:wildfly-datasources-preview-galleon-pack:${version.wildfly.datasources.galleon.pack}</location>
</feature-pack>
</feature-packs>
<layers>
<layer>cloud-server</layer>
<layer>postgresql-datasource</layer>
</layers>
<discover-provisioning-info>
<version>${version.wildfly}</version>
<context>cloud</context>
<add-ons>
<add-on>postgresql</add-on>
</add-ons>
<preview>true</preview>
</discover-provisioning-info>
<galleon-options>
<jboss-fork-embedded>true</jboss-fork-embedded>
</galleon-options>
Expand Down
26 changes: 8 additions & 18 deletions examples/postgresql/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@
<maven.compiler.target>11</maven.compiler.target>
<version.maven.war.plugin>3.3.2</version.maven.war.plugin>
<version.wildfly>31.0.0.Beta1</version.wildfly>
<version.wildfly.plugin>4.2.0.Final</version.wildfly.plugin>
<version.wildfly.cloud.galleon.pack>5.0.2.Final</version.wildfly.cloud.galleon.pack>
<version.wildfly.datasources.galleon.pack>6.0.0.Final</version.wildfly.datasources.galleon.pack>
<version.wildfly.plugin>5.0.0.Beta2</version.wildfly.plugin>
<jakarta.jakartaee-api.version>10.0.0</jakarta.jakartaee-api.version>
</properties>

Expand All @@ -41,21 +39,13 @@
<artifactId>wildfly-maven-plugin</artifactId>
<version>${version.wildfly.plugin}</version>
<configuration>
<feature-packs>
<feature-pack>
<location>org.wildfly:wildfly-galleon-pack:${version.wildfly}</location>
</feature-pack>
<feature-pack>
<location>org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.wildfly.cloud.galleon.pack}</location>
</feature-pack>
<feature-pack>
<location>org.wildfly:wildfly-datasources-galleon-pack:${version.wildfly.datasources.galleon.pack}</location>
</feature-pack>
</feature-packs>
<layers>
<layer>cloud-server</layer>
<layer>postgresql-datasource</layer>
</layers>
<discover-provisioning-info>
<version>${version.wildfly}</version>
<context>cloud</context>
<add-ons>
<add-on>postgresql</add-on>
</add-ons>
</discover-provisioning-info>
<galleon-options>
<jboss-fork-embedded>true</jboss-fork-embedded>
</galleon-options>
Expand Down
23 changes: 5 additions & 18 deletions examples/saml-auto-reg/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,8 @@
<maven.compiler.target>11</maven.compiler.target>
<version.maven.war.plugin>3.3.2</version.maven.war.plugin>
<version.wildfly>31.0.0.Beta1</version.wildfly>
<version.wildfly.plugin>4.2.0.Final</version.wildfly.plugin>
<version.wildfly.cloud.galleon.pack>5.0.2.Final</version.wildfly.cloud.galleon.pack>
<version.wildfly.plugin>5.0.0.Beta2</version.wildfly.plugin>
<jakarta.jakartaee-api.version>10.0.0</jakarta.jakartaee-api.version>
<version.keycloak>22.0.1</version.keycloak>
</properties>

<dependencies>
Expand All @@ -42,21 +40,10 @@
<artifactId>wildfly-maven-plugin</artifactId>
<version>${version.wildfly.plugin}</version>
<configuration>
<feature-packs>
<feature-pack>
<location>org.wildfly:wildfly-galleon-pack:${version.wildfly}</location>
</feature-pack>
<feature-pack>
<location>org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.wildfly.cloud.galleon.pack}</location>
</feature-pack>
<feature-pack>
<location>org.keycloak:keycloak-saml-adapter-galleon-pack:${version.keycloak}</location>
</feature-pack>
</feature-packs>
<layers>
<layer>cloud-server</layer>
<layer>keycloak-saml</layer>
</layers>
<discover-provisioning-info>
<version>${version.wildfly}</version>
<context>cloud</context>
</discover-provisioning-info>
</configuration>
<executions>
<execution>
Expand Down
Loading

0 comments on commit 6154bc0

Please sign in to comment.