Skip to content

Commit 4f64886

Browse files
emmartinsemmartins
authored
Merge pull request #325 from emmartins/CMTOOL-378
[CMTOOL-378] adds support for WildFly 35.0
2 parents 61e9294 + 8204ba9 commit 4f64886

File tree

68 files changed

+4234
-1
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+4234
-1
lines changed

‎.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
jdk: [11, 17]
19+
jdk: [17, 21]
2020
os: [ubuntu-latest, windows-latest]
2121
steps:
2222
- uses: actions/checkout@v4

‎dist/standalone/pom.xml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,56 @@
388388
<artifactId>jboss-server-migration-wildfly34.0-to-wildfly34.0</artifactId>
389389
</dependency>
390390

391+
<!-- wfly 35.0 -->
392+
<dependency>
393+
<groupId>${project.groupId}</groupId>
394+
<artifactId>jboss-server-migration-wildfly35.0-server</artifactId>
395+
</dependency>
396+
<dependency>
397+
<groupId>${project.groupId}</groupId>
398+
<artifactId>jboss-server-migration-wildfly25.0-to-wildfly35.0</artifactId>
399+
</dependency>
400+
<dependency>
401+
<groupId>${project.groupId}</groupId>
402+
<artifactId>jboss-server-migration-wildfly26.0-to-wildfly35.0</artifactId>
403+
</dependency>
404+
<dependency>
405+
<groupId>${project.groupId}</groupId>
406+
<artifactId>jboss-server-migration-wildfly27.0-to-wildfly35.0</artifactId>
407+
</dependency>
408+
<dependency>
409+
<groupId>${project.groupId}</groupId>
410+
<artifactId>jboss-server-migration-wildfly28.0-to-wildfly35.0</artifactId>
411+
</dependency>
412+
<dependency>
413+
<groupId>${project.groupId}</groupId>
414+
<artifactId>jboss-server-migration-wildfly29.0-to-wildfly35.0</artifactId>
415+
</dependency>
416+
<dependency>
417+
<groupId>${project.groupId}</groupId>
418+
<artifactId>jboss-server-migration-wildfly30.0-to-wildfly35.0</artifactId>
419+
</dependency>
420+
<dependency>
421+
<groupId>${project.groupId}</groupId>
422+
<artifactId>jboss-server-migration-wildfly31.0-to-wildfly35.0</artifactId>
423+
</dependency>
424+
<dependency>
425+
<groupId>${project.groupId}</groupId>
426+
<artifactId>jboss-server-migration-wildfly32.0-to-wildfly35.0</artifactId>
427+
</dependency>
428+
<dependency>
429+
<groupId>${project.groupId}</groupId>
430+
<artifactId>jboss-server-migration-wildfly33.0-to-wildfly35.0</artifactId>
431+
</dependency>
432+
<dependency>
433+
<groupId>${project.groupId}</groupId>
434+
<artifactId>jboss-server-migration-wildfly34.0-to-wildfly35.0</artifactId>
435+
</dependency>
436+
<dependency>
437+
<groupId>${project.groupId}</groupId>
438+
<artifactId>jboss-server-migration-wildfly35.0-to-wildfly35.0</artifactId>
439+
</dependency>
440+
391441
<!-- EXTERNAL DEPENDENCIES -->
392442

393443
<dependency>

‎docs/user-guides/migrations/wildfly35.0/wildfly25.0/pom.xml

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Copyright 2021 Red Hat, Inc.
4+
~
5+
~ Licensed under the Apache License, Version 2.0 (the "License");
6+
~ you may not use this file except in compliance with the License.
7+
~ You may obtain a copy of the License at
8+
~
9+
~ http://www.apache.org/licenses/LICENSE-2.0
10+
~
11+
~ Unless required by applicable law or agreed to in writing, software
12+
~ distributed under the License is distributed on an "AS IS" BASIS,
13+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
~ See the License for the specific language governing permissions and
15+
~ limitations under the License.
16+
-->
17+
18+
<project xmlns="http://maven.apache.org/POM/4.0.0"
19+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
21+
<modelVersion>4.0.0</modelVersion>
22+
23+
<parent>
24+
<groupId>org.jboss.migration</groupId>
25+
<artifactId>jboss-server-migration-parent</artifactId>
26+
<version>35.0.0.Final-SNAPSHOT</version>
27+
<relativePath>../../../../../pom.xml</relativePath>
28+
</parent>
29+
30+
<artifactId>jboss-server-migration-wildfly25.0-to-wildfly35.0-userguide</artifactId>
31+
32+
<name>JBoss Server Migration: User-Guide Wildfly 25.0 to Wildfly 35.0</name>
33+
34+
<dependencies>
35+
<dependency>
36+
<groupId>${project.groupId}</groupId>
37+
<artifactId>jboss-server-migration-docs-userguide-migration-includes</artifactId>
38+
</dependency>
39+
</dependencies>
40+
41+
<build>
42+
<plugins>
43+
<plugin>
44+
<artifactId>maven-resources-plugin</artifactId>
45+
<executions>
46+
<execution>
47+
<phase>generate-sources</phase>
48+
<goals>
49+
<goal>copy-resources</goal>
50+
</goals>
51+
<configuration>
52+
<outputDirectory>${project.build.directory}/asciidoc</outputDirectory>
53+
<resources>
54+
<resource>
55+
<directory>src/main/asciidoc</directory>
56+
</resource>
57+
</resources>
58+
</configuration>
59+
</execution>
60+
</executions>
61+
</plugin>
62+
<plugin>
63+
<groupId>org.apache.maven.plugins</groupId>
64+
<artifactId>maven-dependency-plugin</artifactId>
65+
<executions>
66+
<execution>
67+
<id>unpack-includes</id>
68+
<phase>generate-sources</phase>
69+
<goals>
70+
<goal>unpack-dependencies</goal>
71+
</goals>
72+
<configuration>
73+
<outputDirectory>${project.build.directory}/asciidoc</outputDirectory>
74+
<includeScope>compile</includeScope>
75+
</configuration>
76+
</execution>
77+
</executions>
78+
</plugin>
79+
<plugin>
80+
<groupId>org.asciidoctor</groupId>
81+
<artifactId>asciidoctor-maven-plugin</artifactId>
82+
<executions>
83+
<execution>
84+
<phase>generate-resources</phase>
85+
<goals>
86+
<goal>process-asciidoc</goal>
87+
</goals>
88+
<configuration>
89+
<sourceDocumentName>master.adoc</sourceDocumentName>
90+
<outputFile>${project.build.outputDirectory}/index.html</outputFile>
91+
</configuration>
92+
</execution>
93+
</executions>
94+
</plugin>
95+
</plugins>
96+
</build>
97+
98+
</project>

‎docs/user-guides/migrations/wildfly35.0/wildfly25.0/src/main/asciidoc/master.adoc

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
// setup of vars used by this and/or included docs
2+
:server-source-productName: WildFly 25.0
3+
:server-source-name: WildFly
4+
:server-source-version: 25.0.0.Final
5+
:server-source-baseDir: wildfly-25.0
6+
7+
:server-target-productName: WildFly 35.0
8+
:server-target-name: WildFly
9+
:server-target-version: 35.0.0.Final
10+
:server-target-baseDir: wildfly-35.0
11+
12+
:includesDir: topics
13+
14+
// toc setup
15+
:toc:
16+
:numbered:
17+
18+
// include abstract
19+
include::{includesDir}/ServerMigration.adoc[]
20+
21+
// customize
22+
The server migration from {server-source-productName} to {server-target-productName} includes:
23+
24+
* Modules Migration
25+
* Standalone Server Migration
26+
* Managed Domain Migration
27+
28+
:leveloffset: +1
29+
30+
// --- modules migration
31+
32+
include::{includesDir}/ServerMigration-Modules.adoc[]
33+
34+
// --- standalone server migration
35+
36+
include::{includesDir}/ServerMigration-StandaloneServer.adoc[]
37+
38+
:leveloffset: +1
39+
40+
// ------ standalone server configuration migration
41+
42+
include::{includesDir}/ServerMigration-StandaloneServer-StandaloneServerConfiguration.adoc[]
43+
44+
:leveloffset: +1
45+
46+
include::{includesDir}/WFLY25.0toWFLY35.0-ServerMigration-ServerConfiguration-MigrateJBossDomainProperties.adoc[]
47+
48+
include::{includesDir}/ServerMigration-ServerConfiguration-RemoveUnsupportedSubsystems.adoc[]
49+
50+
include::{includesDir}/ServerMigration-ServerConfiguration-MigrateReferencedModules.adoc[]
51+
52+
include::{includesDir}/ServerMigration-ServerConfiguration-MigrateReferencedPaths.adoc[]
53+
54+
:leveloffset: -1
55+
56+
:leveloffset: -1
57+
58+
// --- managed domain migration
59+
60+
include::{includesDir}/ServerMigration-ManagedDomain.adoc[]
61+
62+
// ------ domain configuration
63+
64+
:leveloffset: +1
65+
66+
include::{includesDir}/ServerMigration-ManagedDomain-DomainConfiguration.adoc[]
67+
68+
:leveloffset: +1
69+
70+
include::{includesDir}/WFLY25.0toWFLY35.0-ServerMigration-ServerConfiguration-MigrateJBossDomainProperties.adoc[]
71+
72+
include::{includesDir}/ServerMigration-ServerConfiguration-RemoveUnsupportedSubsystems.adoc[]
73+
74+
include::{includesDir}/ServerMigration-ServerConfiguration-MigrateReferencedModules.adoc[]
75+
76+
include::{includesDir}/ServerMigration-ServerConfiguration-MigrateReferencedPaths.adoc[]
77+
78+
include::{includesDir}/ServerMigration-ManagedDomain-AddHostExcludes.adoc[]
79+
80+
:leveloffset: -1
81+
82+
// ------ host configuration
83+
84+
include::{includesDir}/ServerMigration-ManagedDomain-HostConfiguration.adoc[]
85+
86+
:leveloffset: +1
87+
88+
include::{includesDir}/WFLY25.0toWFLY35.0-ServerMigration-ServerConfiguration-MigrateJBossDomainProperties.adoc[]
89+
90+
include::{includesDir}/ServerMigration-ServerConfiguration-MigrateReferencedModules.adoc[]
91+
92+
include::{includesDir}/ServerMigration-ServerConfiguration-MigrateReferencedPaths.adoc[]
93+
94+
:leveloffset: -1
95+
96+
:leveloffset: -1
97+
98+
:leveloffset: -1
99+

‎docs/user-guides/migrations/wildfly35.0/wildfly25.0/src/main/asciidoc/topics/WFLY25.0toWFLY35.0-ServerMigration-ServerConfiguration-MigrateJBossDomainProperties.adoc

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
= Migrate JBoss Domain Properties
2+
3+
The words `master` and `slave` on Domain related property names were replaced with the words 'primary' and 'secondary', and the migrates automatically fixes any usage of the old property names.
4+
5+
The console logs any properties renamed by the migration.
6+
7+
[source,options="nowrap"]
8+
----
9+
INFO JBoss domain property jboss.domain.master.address migrated to jboss.domain.primary.address
10+
INFO JBoss domain property jboss.domain.master.port migrated to jboss.domain.primary.port
11+
INFO JBoss domain property jboss.domain.master.protocol migrated to jboss.domain.primary.protocol
12+
----
13+
14+
If any property was successfully renamed the following message will be logged.
15+
[source,options="nowrap"]
16+
----
17+
INFO JBoss domain properties migrated.
18+
----

‎docs/user-guides/migrations/wildfly35.0/wildfly26.0/pom.xml

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Copyright 2021 Red Hat, Inc.
4+
~
5+
~ Licensed under the Apache License, Version 2.0 (the "License");
6+
~ you may not use this file except in compliance with the License.
7+
~ You may obtain a copy of the License at
8+
~
9+
~ http://www.apache.org/licenses/LICENSE-2.0
10+
~
11+
~ Unless required by applicable law or agreed to in writing, software
12+
~ distributed under the License is distributed on an "AS IS" BASIS,
13+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
~ See the License for the specific language governing permissions and
15+
~ limitations under the License.
16+
-->
17+
18+
<project xmlns="http://maven.apache.org/POM/4.0.0"
19+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
21+
<modelVersion>4.0.0</modelVersion>
22+
23+
<parent>
24+
<groupId>org.jboss.migration</groupId>
25+
<artifactId>jboss-server-migration-parent</artifactId>
26+
<version>35.0.0.Final-SNAPSHOT</version>
27+
<relativePath>../../../../../pom.xml</relativePath>
28+
</parent>
29+
30+
<artifactId>jboss-server-migration-wildfly26.0-to-wildfly35.0-userguide</artifactId>
31+
32+
<name>JBoss Server Migration: User-Guide Wildfly 26.0 to Wildfly 35.0</name>
33+
34+
<dependencies>
35+
<dependency>
36+
<groupId>${project.groupId}</groupId>
37+
<artifactId>jboss-server-migration-docs-userguide-migration-includes</artifactId>
38+
</dependency>
39+
</dependencies>
40+
41+
<build>
42+
<plugins>
43+
<plugin>
44+
<artifactId>maven-resources-plugin</artifactId>
45+
<executions>
46+
<execution>
47+
<phase>generate-sources</phase>
48+
<goals>
49+
<goal>copy-resources</goal>
50+
</goals>
51+
<configuration>
52+
<outputDirectory>${project.build.directory}/asciidoc</outputDirectory>
53+
<resources>
54+
<resource>
55+
<directory>src/main/asciidoc</directory>
56+
</resource>
57+
</resources>
58+
</configuration>
59+
</execution>
60+
</executions>
61+
</plugin>
62+
<plugin>
63+
<groupId>org.apache.maven.plugins</groupId>
64+
<artifactId>maven-dependency-plugin</artifactId>
65+
<executions>
66+
<execution>
67+
<id>unpack-includes</id>
68+
<phase>generate-sources</phase>
69+
<goals>
70+
<goal>unpack-dependencies</goal>
71+
</goals>
72+
<configuration>
73+
<outputDirectory>${project.build.directory}/asciidoc</outputDirectory>
74+
<includeScope>compile</includeScope>
75+
</configuration>
76+
</execution>
77+
</executions>
78+
</plugin>
79+
<plugin>
80+
<groupId>org.asciidoctor</groupId>
81+
<artifactId>asciidoctor-maven-plugin</artifactId>
82+
<executions>
83+
<execution>
84+
<phase>generate-resources</phase>
85+
<goals>
86+
<goal>process-asciidoc</goal>
87+
</goals>
88+
<configuration>
89+
<sourceDocumentName>master.adoc</sourceDocumentName>
90+
<outputFile>${project.build.outputDirectory}/index.html</outputFile>
91+
</configuration>
92+
</execution>
93+
</executions>
94+
</plugin>
95+
</plugins>
96+
</build>
97+
98+
</project>

0 commit comments

Comments
 (0)