Skip to content

Commit 9b46f9b

Browse files
jfdenisejfdenise
authored
Merge pull request #504 from jfdenise/behave-wf-35.0.0.Final
Behave tests and examples upgraded to WildFly 35.0.0.Final and WildFly Maven Plugin 5.1.1.Final
2 parents d10aa05 + e006ec8 commit 9b46f9b

File tree

18 files changed

+39
-39
lines changed

18 files changed

+39
-39
lines changed

‎examples/cloud-default-config/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
<properties>
1313
<maven.compiler.source>11</maven.compiler.source>
1414
<maven.compiler.target>11</maven.compiler.target>
15-
<version.wildfly>33.0.1.Final</version.wildfly>
16-
<version.wildfly.plugin>5.0.1.Final</version.wildfly.plugin>
15+
<version.wildfly>35.0.0.Final</version.wildfly>
16+
<version.wildfly.plugin>5.1.1.Final</version.wildfly.plugin>
1717
<version.maven.war.plugin>3.3.2</version.maven.war.plugin>
1818
<version.wildfly.cloud.galleon.pack>7.0.2.Final</version.wildfly.cloud.galleon.pack>
19-
<version.wildfly.datasources.galleon.pack>8.0.1.Final</version.wildfly.datasources.galleon.pack>
19+
<version.wildfly.datasources.galleon.pack>9.1.0.Final</version.wildfly.datasources.galleon.pack>
2020
<jakarta.jakartaee-api.version>10.0.0</jakarta.jakartaee-api.version>
2121
</properties>
2222

‎examples/docker-build/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1515
<jakarta.jakartaee-api.version>10.0.0</jakarta.jakartaee-api.version>
1616
<version.maven.war.plugin>3.3.2</version.maven.war.plugin>
17-
<version.wildfly.plugin>5.0.1.Final</version.wildfly.plugin>
18-
<version.wildfly>33.0.1.Final</version.wildfly>
17+
<version.wildfly.plugin>5.1.1.Final</version.wildfly.plugin>
18+
<version.wildfly>35.0.0.Final</version.wildfly>
1919
</properties>
2020

2121
<dependencies>

‎examples/elytron-oidc-client-auto-reg/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<maven.compiler.source>11</maven.compiler.source>
1414
<maven.compiler.target>11</maven.compiler.target>
1515
<version.maven.war.plugin>3.3.2</version.maven.war.plugin>
16-
<version.wildfly>33.0.1.Final</version.wildfly>
17-
<version.wildfly.plugin>5.0.1.Final</version.wildfly.plugin>
16+
<version.wildfly>35.0.0.Final</version.wildfly>
17+
<version.wildfly.plugin>5.1.1.Final</version.wildfly.plugin>
1818
<jakarta.jakartaee-api.version>10.0.0</jakarta.jakartaee-api.version>
1919
</properties>
2020

‎examples/elytron-oidc-client/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<maven.compiler.source>11</maven.compiler.source>
1414
<maven.compiler.target>11</maven.compiler.target>
1515
<version.maven.war.plugin>3.3.2</version.maven.war.plugin>
16-
<version.wildfly.plugin>5.0.1.Final</version.wildfly.plugin>
17-
<version.wildfly>33.0.1.Final</version.wildfly>
16+
<version.wildfly.plugin>5.1.1.Final</version.wildfly.plugin>
17+
<version.wildfly>35.0.0.Final</version.wildfly>
1818
<jakarta.jakartaee-api.version>10.0.0</jakarta.jakartaee-api.version>
1919
</properties>
2020

‎examples/jms-broker/broker/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
<failOnMissingWebXml>false</failOnMissingWebXml>
3434
<jakarta.jakartaee-api.version>10.0.0</jakarta.jakartaee-api.version>
3535
<version.maven.war.plugin>3.3.2</version.maven.war.plugin>
36-
<version.wildfly>33.0.1.Final</version.wildfly>
36+
<version.wildfly>35.0.0.Final</version.wildfly>
3737
<version.wildfly.cloud.galleon.pack>7.0.2.Final</version.wildfly.cloud.galleon.pack>
38-
<version.wildfly.plugin>5.0.1.Final</version.wildfly.plugin>
38+
<version.wildfly.plugin>5.1.1.Final</version.wildfly.plugin>
3939
</properties>
4040

4141
<dependencies>

‎examples/jms-broker/mdb-consumer/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
<failOnMissingWebXml>false</failOnMissingWebXml>
3434
<jakarta.jakartaee-api.version>10.0.0</jakarta.jakartaee-api.version>
3535
<version.maven.war.plugin>3.3.2</version.maven.war.plugin>
36-
<version.wildfly>33.0.1.Final</version.wildfly>
37-
<version.wildfly.plugin>5.0.1.Final</version.wildfly.plugin>
36+
<version.wildfly>35.0.0.Final</version.wildfly>
37+
<version.wildfly.plugin>5.1.1.Final</version.wildfly.plugin>
3838
</properties>
3939

4040
<dependencies>

‎examples/jms-broker/producer/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
<failOnMissingWebXml>false</failOnMissingWebXml>
3434
<jakarta.jakartaee-api.version>10.0.0</jakarta.jakartaee-api.version>
3535
<version.maven.war.plugin>3.3.2</version.maven.war.plugin>
36-
<version.wildfly>33.0.1.Final</version.wildfly>
37-
<version.wildfly.plugin>5.0.1.Final</version.wildfly.plugin>
36+
<version.wildfly>35.0.0.Final</version.wildfly>
37+
<version.wildfly.plugin>5.1.1.Final</version.wildfly.plugin>
3838
</properties>
3939

4040
<dependencies>

‎examples/jsf-ejb-jpa/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<maven.compiler.source>11</maven.compiler.source>
1414
<maven.compiler.target>11</maven.compiler.target>
1515
<version.maven.war.plugin>3.3.2</version.maven.war.plugin>
16-
<version.wildfly>33.0.1.Final</version.wildfly>
17-
<version.wildfly.plugin>5.0.1.Final</version.wildfly.plugin>
16+
<version.wildfly>35.0.0.Final</version.wildfly>
17+
<version.wildfly.plugin>5.1.1.Final</version.wildfly.plugin>
1818
<jakarta.jakartaee-api.version>10.0.0</jakarta.jakartaee-api.version>
1919
</properties>
2020

‎examples/postgresql-multiple-datasources/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<maven.compiler.source>11</maven.compiler.source>
1414
<maven.compiler.target>11</maven.compiler.target>
1515
<version.maven.war.plugin>3.3.2</version.maven.war.plugin>
16-
<version.wildfly>33.0.1.Final</version.wildfly>
17-
<version.wildfly.plugin>5.0.1.Final</version.wildfly.plugin>
16+
<version.wildfly>35.0.0.Final</version.wildfly>
17+
<version.wildfly.plugin>5.1.1.Final</version.wildfly.plugin>
1818
<jakarta.jakartaee-api.version>10.0.0</jakarta.jakartaee-api.version>
1919
</properties>
2020

‎examples/postgresql-preview/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<maven.compiler.source>11</maven.compiler.source>
1414
<maven.compiler.target>11</maven.compiler.target>
1515
<version.maven.war.plugin>3.3.2</version.maven.war.plugin>
16-
<version.wildfly>33.0.1.Final</version.wildfly>
17-
<version.wildfly.plugin>5.0.1.Final</version.wildfly.plugin>
16+
<version.wildfly>35.0.0.Final</version.wildfly>
17+
<version.wildfly.plugin>5.1.1.Final</version.wildfly.plugin>
1818
</properties>
1919

2020
<dependencies>

‎examples/postgresql/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<maven.compiler.source>11</maven.compiler.source>
1414
<maven.compiler.target>11</maven.compiler.target>
1515
<version.maven.war.plugin>3.3.2</version.maven.war.plugin>
16-
<version.wildfly>33.0.1.Final</version.wildfly>
17-
<version.wildfly.plugin>5.0.1.Final</version.wildfly.plugin>
16+
<version.wildfly>35.0.0.Final</version.wildfly>
17+
<version.wildfly.plugin>5.1.1.Final</version.wildfly.plugin>
1818
<jakarta.jakartaee-api.version>10.0.0</jakarta.jakartaee-api.version>
1919
</properties>
2020

‎examples/saml-auto-reg/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<maven.compiler.source>11</maven.compiler.source>
1414
<maven.compiler.target>11</maven.compiler.target>
1515
<version.maven.war.plugin>3.3.2</version.maven.war.plugin>
16-
<version.wildfly>33.0.1.Final</version.wildfly>
17-
<version.wildfly.plugin>5.0.1.Final</version.wildfly.plugin>
16+
<version.wildfly>35.0.0.Final</version.wildfly>
17+
<version.wildfly.plugin>5.1.1.Final</version.wildfly.plugin>
1818
<jakarta.jakartaee-api.version>10.0.0</jakarta.jakartaee-api.version>
1919
</properties>
2020

‎examples/web-clustering/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<maven.compiler.source>11</maven.compiler.source>
1414
<maven.compiler.target>11</maven.compiler.target>
1515
<version.maven.war.plugin>3.3.2</version.maven.war.plugin>
16-
<version.wildfly>33.0.1.Final</version.wildfly>
17-
<version.wildfly.plugin>5.0.1.Final</version.wildfly.plugin>
16+
<version.wildfly>35.0.0.Final</version.wildfly>
17+
<version.wildfly.plugin>5.1.1.Final</version.wildfly.plugin>
1818
<jakarta.jakartaee-api.version>10.0.0</jakarta.jakartaee-api.version>
1919
</properties>
2020
<dependencies>

‎wildfly-builder-image/tests/features/legacy-elytron.feature

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Scenario: Build elytron app
55
Given s2i build https://github.com/wildfly/wildfly-s2i from test/test-app-web-security with env and true using legacy-s2i-images-ee-10-test-apps
66
| variable | value |
77
| GALLEON_PROVISION_LAYERS | datasources-web-server |
8-
| GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:35.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
8+
| GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:35.0.0.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
99
Then container log should contain WFLYSRV0025
1010

1111
Scenario: check Elytron configuration with elytron core realms security domain fail

‎wildfly-builder-image/tests/features/legacy-s2i.feature

+8-8
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Scenario: Test preconfigure.sh
1616
| variable | value |
1717
| TEST_EXTENSION_PRE_ADD_PROPERTY | foo |
1818
| GALLEON_PROVISION_LAYERS | cloud-server |
19-
| GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:35.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
19+
| GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:35.0.0.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
2020
Then container log should contain WFLYSRV0025
2121
And container log should contain WFLYSRV0010: Deployed "ROOT.war"
2222
And check that page is served
@@ -31,12 +31,12 @@ Scenario: Test preconfigure.sh
3131
Given failing s2i build http://github.com/openshift/openshift-jee-sample from . using master
3232
| variable | value |
3333
| GALLEON_PROVISION_LAYERS | foo |
34-
| GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:35.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
34+
| GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:35.0.0.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
3535

3636
Scenario: Test default cloud config
3737
Given s2i build https://github.com/wildfly/wildfly-s2i from test/test-app with env and True using legacy-s2i-images
3838
| variable | value |
39-
| GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:35.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
39+
| GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:35.0.0.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
4040
| GALLEON_PROVISION_LAYERS | cloud-default-config |
4141
Then container log should contain WFLYSRV0025
4242
And container log should contain WFLYSRV0010: Deployed "ROOT.war"
@@ -48,7 +48,7 @@ Scenario: Test preconfigure.sh
4848
Scenario: Test cloud-server, exclude jaxrs
4949
Given s2i build https://github.com/wildfly/wildfly-s2i from test/test-app with env and True using legacy-s2i-images
5050
| variable | value |
51-
| GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:35.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
51+
| GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:35.0.0.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
5252
| GALLEON_PROVISION_LAYERS | cloud-server,-jaxrs |
5353
Then container log should contain WFLYSRV0025
5454
And check that page is served
@@ -63,7 +63,7 @@ Scenario: Test external driver created during s2i.
6363
| variable | value |
6464
| ENV_FILES | /opt/server/standalone/configuration/datasources.env |
6565
| GALLEON_PROVISION_LAYERS | cloud-server |
66-
| GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:35.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
66+
| GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:35.0.0.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
6767
Then container log should contain WFLYSRV0025
6868
And check that page is served
6969
| property | value |
@@ -78,7 +78,7 @@ Scenario: Test external driver created during s2i.
7878
| ENV_FILES | /opt/server/standalone/configuration/datasources.env |
7979
| DISABLE_BOOT_SCRIPT_INVOKER | true |
8080
| GALLEON_PROVISION_LAYERS | cloud-server |
81-
| GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:35.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
81+
| GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:35.0.0.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
8282
Then container log should contain Configuring the server using embedded server
8383
Then container log should contain WFLYSRV0025
8484
And check that page is served
@@ -92,7 +92,7 @@ Scenario: Test external driver created during s2i.
9292
Given s2i build https://github.com/wildfly/wildfly-s2i from test/test-app-binary with env and True using legacy-s2i-images
9393
| variable | value |
9494
| GALLEON_PROVISION_LAYERS | jaxrs-server |
95-
| GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:35.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
95+
| GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:35.0.0.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
9696
Then container log should contain WFLYSRV0025
9797
And container log should contain WFLYSRV0010: Deployed "app.war"
9898
And check that page is served
@@ -105,7 +105,7 @@ Scenario: Test external driver created during s2i.
105105
| variable | value |
106106
| MAVEN_S2I_ARTIFACT_DIRS | app1/target,app2/target |
107107
| GALLEON_PROVISION_LAYERS | cloud-server |
108-
| GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:35.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
108+
| GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:35.0.0.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
109109
### PLACEHOLDER FOR CLOUD CUSTOM TESTING ###
110110
Then container log should contain WFLYSRV0010: Deployed "App1.war"
111111
Then container log should contain WFLYSRV0010: Deployed "App2.war"

‎wildfly-builder-image/tests/features/messaging.feature

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Scenario: Configure amq7 remote broker
55
Given s2i build https://github.com/wildfly/wildfly-s2i from test/test-app with env and true using legacy-s2i-images
66
| variable | value |
77
| GALLEON_PROVISION_LAYERS | cloud-server |
8-
| GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:35.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
8+
| GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:35.0.0.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
99
| MQ_SERVICE_PREFIX_MAPPING | wf-app-amq7=TEST |
1010
| WF_APP_AMQ_TCP_SERVICE_HOST | 127.0.0.1 |
1111
| WF_APP_AMQ_TCP_SERVICE_PORT | 5678 |

‎wildfly-builder-image/tests/features/no-jdk11.feature

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Feature: Wildfly Legacy s2i tests that can't run on JDK11
55
Given s2i build https://github.com/wildfly/wildfly-s2i from test/test-app with env and True using legacy-s2i-images
66
| variable | value |
77
| GALLEON_PROVISION_LAYERS | cloud-server |
8-
| GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-preview-feature-pack:35.0.0.Beta1, org.wildfly.cloud:wildfly-preview-cloud-galleon-pack:7.0.2.Final |
8+
| GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-preview-feature-pack:35.0.0.Final, org.wildfly.cloud:wildfly-preview-cloud-galleon-pack:7.0.2.Final |
99
Then container log should contain WFLYSRV0025
1010
And container log should contain WFLYSRV0010: Deployed "ROOT.war"
1111
And check that page is served

‎wildfly-builder-image/tests/features/oidc.feature

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Feature: OIDC tests
2424
Given s2i build http://github.com/wildfly/wildfly-s2i from test/test-app-elytron-oidc-client-legacy with env and True using main
2525
| variable | value |
2626
| GALLEON_PROVISION_LAYERS | cloud-server,elytron-oidc-client |
27-
| GALLEON_PROVISION_FEATURE_PACKS|org.wildfly:wildfly-galleon-pack:35.0.0.Beta1,org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
27+
| GALLEON_PROVISION_FEATURE_PACKS|org.wildfly:wildfly-galleon-pack:35.0.0.Final,org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
2828
Scenario: Check oidc subsystem configuration, legacy.
2929
Given XML namespaces
3030
| prefix | url |

0 commit comments

Comments
 (0)