Skip to content

Commit 5d7a671

Browse files
jfdenisejfdenise
authored
Merge pull request #59 from jfdenise/eap81-beta-dev
Update examples for EAP 8.1 Beta
2 parents c888b22 + 72427be commit 5d7a671

File tree

14 files changed

+107
-81
lines changed

14 files changed

+107
-81
lines changed

‎examples/eap/custom-layers/application/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727

2828
<properties>
2929
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
30-
<maven.compiler.source>11</maven.compiler.source>
31-
<maven.compiler.target>11</maven.compiler.target>
30+
<maven.compiler.source>17</maven.compiler.source>
31+
<maven.compiler.target>17</maven.compiler.target>
3232
<jakarta.jakartaee-api.version>10.0.0</jakarta.jakartaee-api.version>
33-
<version.maven.war.plugin>3.3.2</version.maven.war.plugin>
33+
<version.maven.war.plugin>3.4.0</version.maven.war.plugin>
3434
<!-- This env variable is defined in the EAP S2I builder image -->
3535
<version.eap.plugin>${env.PROVISIONING_MAVEN_PLUGIN_VERSION}</version.eap.plugin>
3636
</properties>
@@ -84,7 +84,7 @@
8484
<channel>
8585
<manifest>
8686
<groupId>org.jboss.eap.channels</groupId>
87-
<artifactId>eap-8.0</artifactId>
87+
<artifactId>eap-8.1</artifactId>
8888
</manifest>
8989
</channel>
9090
</channels>

‎examples/eap/custom-layers/mariadb-galleon-pack/pom.xml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,27 @@
3535
<dependency>
3636
<groupId>org.jboss.eap</groupId>
3737
<artifactId>wildfly-ee-galleon-pack</artifactId>
38-
<version>8.0.5.GA-redhat-00001</version>
38+
<version>8.1.0.Beta-redhat-00002</version>
3939
<type>zip</type>
40+
<exclusions>
41+
<exclusion>
42+
<groupId>*</groupId>
43+
<artifactId>*</artifactId>
44+
</exclusion>
45+
</exclusions>
4046
</dependency>
4147
<dependency>
4248
<groupId>org.mariadb.jdbc</groupId>
4349
<artifactId>mariadb-java-client</artifactId>
44-
<version>2.7.2</version>
50+
<version>3.4.1</version>
4551
</dependency>
4652
</dependencies>
4753
<build>
4854
<plugins>
4955
<plugin>
5056
<groupId>org.wildfly.galleon-plugins</groupId>
5157
<artifactId>wildfly-galleon-maven-plugin</artifactId>
52-
<version>6.4.9.Final-redhat-00001</version>
58+
<version>7.3.1.Final</version>
5359
<executions>
5460
<execution>
5561
<id>mariadb-galleon-pack-build</id>

‎examples/eap/docker-build/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG runtime_image=registry-proxy.engineering.redhat.com/rh-osbs/jboss-eap-8-eap8-openjdk11-runtime-openshift-rhel8:latest
1+
ARG runtime_image=registry.redhat.io/jboss-eap-8-tech-preview/eap81-openjdk17-builder-openshift-rhel9:latest
22
FROM ${runtime_image}
33
COPY --chown=jboss:root target/server $JBOSS_HOME
44
RUN chmod -R ug+rwX $JBOSS_HOME

‎examples/eap/docker-build/README.md‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
# Building an EAP 8 application image using docker
1+
# Building an EAP 8.1 application image using docker
22

3-
In this example we are making use of the EAP 8 runtime image to build an EAP 8 server + JAX-RS application docker image.
3+
In this example we are making use of the EAP 8.1 runtime image to build an EAP 8.1 server + JAX-RS application docker image.
44
In order to create an EAP 8 server containing our application, we are using the [EAP Maven Plugin](https://github.com/jbossas/eap-maven-plugin).
55

6-
The docker image is built then deployed on an Openshift cluster using Helm charts for EAP 8.
6+
The docker image is built then deployed on an Openshift cluster using Helm charts for EAP 8.1.
77

88
# Use-cases
99

10-
* Test EAP 8 new features and/or bug fixes on Openshift.
10+
* Test EAP 8.1 new features and/or bug fixes on Openshift.
1111

1212
# EAP 8 Maven plugin configuration
1313

@@ -40,27 +40,27 @@ Technologies required to build and deploy this example
4040

4141
* docker
4242

43-
* Helm chart for EAP8 `jboss-eap/eap8`.
43+
* Helm chart for EAP 8.1 `jboss-eap/eap81`.
4444

4545
# Pre-requisites
4646

4747
* You have docker setup.
4848

4949
* You have a `Registry Service Account`. You can [create one](https://access.redhat.com/terms-based-registry/) if not.
5050

51-
* You have configured docker to access the EAP 8 images. For detailed instructions check the URL: `https://access.redhat.com/terms-based-registry/#/token/<your user id>/docker-login`.
51+
* You have configured docker to access the EAP 8.1 images. For detailed instructions check the URL: `https://access.redhat.com/terms-based-registry/#/token/<your user id>/docker-login`.
5252

5353
* You are logged into an OpenShift cluster and have `oc` command in your path
5454

5555
* You have installed Helm. Please refer to [Installing Helm page](https://helm.sh/docs/intro/install/) to install Helm in your environment
5656

57-
* You have installed the repository for the Helm charts for EAP 8
57+
* You have installed the repository for the Helm charts for EAP 8.1
5858

5959
```
6060
helm repo add jboss-eap https://jbossas.github.io/eap-charts/
6161
```
6262

63-
* You have built EAP 8 and artifacts are present in your local maven cache
63+
* You have built EAP 8.1 and artifacts are present in your local maven cache
6464

6565

6666
# Example steps
@@ -76,7 +76,7 @@ mvn clean package [-Dversion.eap=<your SNAPSHOT version>]
7676
2. Build the docker image
7777

7878
```
79-
docker build --squash -t eap8-myapp:latest .
79+
docker build --squash -t eap81-myapp:latest .
8080
```
8181

8282
## Deploy the image on Openshift
@@ -87,7 +87,7 @@ Make sure to set the `OPENSHIFT_IMAGE_REGISTRY` env variable with the actual rou
8787
When logging to the registry, the route to the registry will be printed on the console.
8888

8989
```
90-
export IMAGE=eap8-myapp:latest
90+
export IMAGE=eap81-myapp:latest
9191
export OPENSHIFT_NS=$(oc project -q)
9292
oc registry login
9393
# Copy the route in the env variable OPENSHIFT_IMAGE_REGISTRY
@@ -100,17 +100,17 @@ docker push $OPENSHIFT_IMAGE_REGISTRY/$OPENSHIFT_NS/$IMAGE
100100
2. Enable the pushed image stream resolution
101101

102102
```
103-
oc set image-lookup eap8-myapp
103+
oc set image-lookup eap81-myapp
104104
```
105105

106-
3. Deploy the example application using EAP 8 Helm charts
106+
3. Deploy the example application using EAP 8.1 Helm charts
107107

108108
```
109-
helm install eap8-myapp -f helm.yaml jboss-eap/eap8
109+
helm install eap81-myapp -f helm.yaml jboss-eap/eap81
110110
```
111111

112112
4. Access the endpoint
113113

114114
```
115-
curl https://$(oc get route eap8-myapp --template='{{ .spec.host }}')/
115+
curl https://$(oc get route eap81-myapp --template='{{ .spec.host }}')/
116116
```

‎examples/eap/docker-build/helm.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
image:
2-
name: eap8-myapp
2+
name: eap81-myapp
33
build:
44
enabled: false
55
deploy:

‎examples/eap/docker-build/pom.xml‎

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,12 @@
99
<name>Demo of a docker build</name>
1010

1111
<properties>
12-
<maven.compiler.source>11</maven.compiler.source>
13-
<maven.compiler.target>11</maven.compiler.target>
12+
<maven.compiler.source>17</maven.compiler.source>
13+
<maven.compiler.target>17</maven.compiler.target>
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1515
<jakarta.jakartaee-api.version>10.0.0</jakarta.jakartaee-api.version>
16-
<version.maven.war.plugin>3.3.2</version.maven.war.plugin>
17-
<version.eap.plugin>1.0.0.Beta7-redhat-00001</version.eap.plugin>
18-
<version.eap>8.0.0.GA-redhat-00001</version.eap>
19-
<version.eap.cloud>1.0.0.GA-redhat-00001</version.eap.cloud>
16+
<version.maven.war.plugin>3.4.0</version.maven.war.plugin>
17+
<version.eap.plugin>2.0.0.Beta1-redhat-00004</version.eap.plugin>
2018
</properties>
2119

2220
<dependencies>
@@ -42,12 +40,27 @@
4240
<artifactId>eap-maven-plugin</artifactId>
4341
<version>${version.eap.plugin}</version>
4442
<configuration>
43+
<channels>
44+
<channel>
45+
<manifest>
46+
<groupId>org.jboss.eap.channels</groupId>
47+
<artifactId>eap-8.1</artifactId>
48+
</manifest>
49+
</channel>
50+
<channel>
51+
<manifest>
52+
<groupId>org.jboss.eap.channels</groupId>
53+
<artifactId>wildfly-ee</artifactId>
54+
<version>${version.eap}</version>
55+
</manifest>
56+
</channel>
57+
</channels>
4558
<feature-packs>
4659
<feature-pack>
47-
<location>org.jboss.eap:wildfly-ee-galleon-pack:${version.eap}</location>
60+
<location>org.jboss.eap:wildfly-ee-galleon-pack</location>
4861
</feature-pack>
4962
<feature-pack>
50-
<location>org.jboss.eap.cloud:eap-cloud-galleon-pack:${version.eap.cloud}</location>
63+
<location>org.jboss.eap.cloud:eap-cloud-galleon-pack</location>
5164
</feature-pack>
5265
</feature-packs>
5366
<layers>

‎examples/eap/legacy-s2i-source-build/README.md‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
# Building an EAP 8 application image using EAP 8 S2I legacy source build
1+
# Building an EAP 8.1 application image using EAP 8.1 S2I legacy source build
22

33
In this example we are building and deploying to OpenShift an application that has been migrated to use Jakarta EE 10
44
but has not been updated to use the [EAP Maven Plugin](https://github.com/jbossas/eap-maven-plugin).
55

66
# Use-cases
77

8-
* User wants to keep the EAP 7.4.x S2I workflow. Start from a github source repository, use latest released EAP 8 artifacts and images.
8+
* User wants to keep the EAP 7.4.x S2I workflow. Start from a github source repository, use latest released EAP 8.1 artifacts and images.
99

1010
# Helm Chart provisioning configuration
1111

12-
EAP 8 provisioning configuration (feature-packs, layers and channels) is defined in EAP 8 Helm Chart yaml file.
12+
EAP 8.1 provisioning configuration (feature-packs, layers and channels) is defined in EAP 8.1 Helm Chart yaml file.
1313

1414
```
1515
...
@@ -21,7 +21,7 @@ build:
2121
galleonLayers:
2222
- jaxrs-server
2323
channels:
24-
- org.jboss.eap.channels:eap-8.0
24+
- org.jboss.eap.channels:eap-8.1
2525
...
2626
```
2727

@@ -32,7 +32,7 @@ High level view of the Helm Chart configuration.
3232
* `org.jboss.eap:wildfly-ee-galleon-pack`
3333
* `org.jboss.eap.cloud:eap-cloud-galleon-pack`
3434

35-
NB, the versions of the feature-packs are retrieved from the latest EAP8 channel: `org.jboss.eap.channels:eap-8.0`
35+
NB, the versions of the feature-packs are retrieved from the latest EAP 8.1 channel: `org.jboss.eap.channels:eap-8.1`
3636

3737
## Galleon layers
3838

@@ -54,7 +54,7 @@ Extra content packaged inside the provisioned server
5454

5555
Technologies required to build and deploy this example
5656

57-
* Helm chart for EAP8 `jboss-eap/eap8`.
57+
* Helm chart for EAP 8.1 `jboss-eap/eap81`.
5858

5959
# Pre-requisites
6060

@@ -66,15 +66,15 @@ Technologies required to build and deploy this example
6666

6767
* You have installed Helm. Please refer to [Installing Helm page](https://helm.sh/docs/intro/install/) to install Helm in your environment
6868

69-
* You have installed the repository for the Helm charts for EAP 8
69+
* You have installed the repository for the Helm charts for EAP 8.1
7070

7171
```
7272
helm repo add jboss-eap https://jbossas.github.io/eap-charts/
7373
```
7474

7575
# Example steps
7676

77-
1. Setup to pull EAP 8 s2i builder and runtime images in Openshift [only required for on-premise installation of OpenShift, not needed for OpenShift Sandbox]
77+
1. Setup to pull EAP 8.1 s2i builder and runtime images in Openshift [only required for on-premise installation of OpenShift, not needed for OpenShift Sandbox]
7878

7979
Create the authentication token secret for your OpenShift project using the YAML file that you downloaded:
8080

@@ -90,14 +90,14 @@ oc secrets link default 1234567-myserviceaccount-pull-secret --for=pull
9090
oc secrets link builder 1234567-myserviceaccount-pull-secret --for=pull
9191
```
9292

93-
2. Deploy the example application using EAP 8 Helm charts
93+
2. Deploy the example application using EAP 8.1 Helm charts
9494

9595
```
96-
helm install eap8-source-build-app -f helm.yaml jboss-eap/eap8
96+
helm install eap81-source-build-app -f helm.yaml jboss-eap/eap81
9797
```
9898

9999
3. Access the endpoint
100100

101101
```
102-
curl https://$(oc get route eap8-source-build-app --template='{{ .spec.host }}')/
102+
curl https://$(oc get route eap81-source-build-app --template='{{ .spec.host }}')/
103103
```

‎examples/eap/legacy-s2i-source-build/helm.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ build:
22
uri: https://github.com/jboss-container-images/jboss-eap-8-openshift-image
33
mode: s2i
44
contextDir: examples/eap/legacy-s2i-source-build
5-
ref: 8.0.0.GA
5+
ref: 8.1.0.BETA
66
s2i:
77
featurePacks:
88
- org.jboss.eap:wildfly-ee-galleon-pack
99
- org.jboss.eap.cloud:eap-cloud-galleon-pack
1010
galleonLayers:
1111
- jaxrs-server
1212
channels:
13-
- org.jboss.eap.channels:eap-8.0
13+
- org.jboss.eap.channels:eap-8.1
1414
deploy:
1515
replicas: 1

‎examples/eap/legacy-s2i-source-build/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
<name>Legacy application</name>
1010

1111
<properties>
12-
<maven.compiler.source>11</maven.compiler.source>
13-
<maven.compiler.target>11</maven.compiler.target>
12+
<maven.compiler.source>17</maven.compiler.source>
13+
<maven.compiler.target>17</maven.compiler.target>
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1515
<jakarta.jakartaee-api.version>10.0.0</jakarta.jakartaee-api.version>
16-
<version.maven.war.plugin>3.3.2</version.maven.war.plugin>
16+
<version.maven.war.plugin>3.4.0</version.maven.war.plugin>
1717
</properties>
1818

1919
<dependencies>

‎examples/eap/s2i-binary-build/README.md‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
# Building an EAP 8 application image using EAP 8 S2I binary build
1+
# Building an EAP 8 application image using EAP 8.1 S2I binary build
22

3-
In this example we are making use of the EAP 8 S2I builder image to build an EAP 8 server + JAX-RS application docker image on Openshift.
4-
In order to create an EAP 8 server containing our application, we are using the [EAP Maven Plugin](https://github.com/jbossas/eap-maven-plugin).
3+
In this example we are making use of the EAP 8.1 S2I builder image to build an EAP 8.1 server + JAX-RS application docker image on Openshift.
4+
In order to create an EAP 8.1 server containing our application, we are using the [EAP Maven Plugin](https://github.com/jbossas/eap-maven-plugin).
55

66
# Use-cases
77

8-
* Test EAP 8 new features and/or bug fixes on Openshift.
8+
* Test EAP 8.1 new features and/or bug fixes on Openshift.
99

10-
# EAP 8 Maven plugin configuration
10+
# EAP 8.1 Maven plugin configuration
1111

1212
High level view of the EAP Maven plugin configuration.
1313

@@ -46,7 +46,7 @@ Technologies required to build and deploy this example
4646

4747
* You are logged into an OpenShift cluster and have `oc` command in your path
4848

49-
* You have built EAP 8 and artifacts are present in your local maven cache
49+
* You have built EAP 8.1 and artifacts are present in your local maven cache
5050

5151
# Example steps
5252

@@ -79,38 +79,38 @@ oc secrets link builder 1234567-myserviceaccount-pull-secret --for=pull
7979
2. Import the EAP 8 s2i Builder image in Openshift
8080

8181
```
82-
oc import-image jboss-eap-8/eap8-openjdk11-builder-openshift-rhel8:latest --from=registry.redhat.io/jboss-eap-8/eap8-openjdk11-builder-openshift-rhel8:latest --confirm
82+
oc import-image registry.redhat.io/jboss-eap-8-tech-preview/eap81-openjdk17-builder-openshift-rhel9:latest --from=registry.redhat.io/jboss-eap-8-tech-preview/eap81-openjdk17-builder-openshift-rhel9:latest --confirm
8383
```
8484

8585
3. Create the binary build.
8686

8787
```
88-
oc new-build --strategy source --binary --image-stream eap8-openjdk11-builder-openshift-rhel8 --name eap8-binary-build-app-build
88+
oc new-build --strategy source --binary --image-stream eap81-openjdk17-builder-openshift-rhel9 --name eap81-binary-build-app-build
8989
```
9090

9191
4. Start a binary build from the full server that will output the application image.
9292

9393
```
94-
oc start-build eap8-binary-build-app-build --from-dir target/server
94+
oc start-build eap81-binary-build-app-build --from-dir target/server
9595
```
9696

97-
4.1 [Alternative] Start a binary build from the deployment only that will provision the EAP8 server, deploy the deployment and output the application image.
97+
4.1 [Alternative] Start a binary build from the deployment only that will provision the EAP 8.1 server, deploy the deployment and output the application image.
9898

9999
```
100-
oc start-build eap8-binary-build-app-build --from-file target/ROOT.war --env GALLEON_PROVISION_LAYERS=jaxrs-server \
100+
oc start-build eap81-binary-build-app-build --from-file target/ROOT.war --env GALLEON_PROVISION_LAYERS=jaxrs-server \
101101
--env GALLEON_PROVISION_FEATURE_PACKS="org.jboss.eap:wildfly-ee-galleon-pack,org.jboss.eap.cloud:eap-cloud-galleon-pack" \
102-
--env GALLEON_PROVISION_CHANNELS="org.jboss.eap.channels:eap-8.0"
102+
--env GALLEON_PROVISION_CHANNELS="org.jboss.eap.channels:eap-8.1"
103103
```
104104

105105
5. Deploy the example application
106106

107107
```
108-
oc new-app eap8-binary-build-app
109-
oc expose svc/eap8-binary-build-app
108+
oc new-app eap81-binary-build-app
109+
oc expose svc/eap81-binary-build-app
110110
```
111111

112112
6. Access the endpoint
113113

114114
```
115-
curl https://$(oc get route eap8-binary-build-app --template='{{ .spec.host }}')/
115+
curl https://$(oc get route eap81-binary-build-app --template='{{ .spec.host }}')/
116116
```

0 commit comments

Comments
 (0)