Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CMTOOL-378] adds support for WildFly 35.0 #325

Merged
merged 1 commit into from
Oct 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
fail-fast: false
matrix:
jdk: [11, 17]
jdk: [17, 21]
os: [ubuntu-latest, windows-latest]
steps:
- uses: actions/checkout@v4
Expand Down
50 changes: 50 additions & 0 deletions dist/standalone/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,56 @@
<artifactId>jboss-server-migration-wildfly34.0-to-wildfly34.0</artifactId>
</dependency>

<!-- wfly 35.0 -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jboss-server-migration-wildfly35.0-server</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jboss-server-migration-wildfly25.0-to-wildfly35.0</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jboss-server-migration-wildfly26.0-to-wildfly35.0</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jboss-server-migration-wildfly27.0-to-wildfly35.0</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jboss-server-migration-wildfly28.0-to-wildfly35.0</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jboss-server-migration-wildfly29.0-to-wildfly35.0</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jboss-server-migration-wildfly30.0-to-wildfly35.0</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jboss-server-migration-wildfly31.0-to-wildfly35.0</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jboss-server-migration-wildfly32.0-to-wildfly35.0</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jboss-server-migration-wildfly33.0-to-wildfly35.0</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jboss-server-migration-wildfly34.0-to-wildfly35.0</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jboss-server-migration-wildfly35.0-to-wildfly35.0</artifactId>
</dependency>

<!-- EXTERNAL DEPENDENCIES -->

<dependency>
Expand Down
98 changes: 98 additions & 0 deletions docs/user-guides/migrations/wildfly35.0/wildfly25.0/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Red Hat, Inc.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.jboss.migration</groupId>
<artifactId>jboss-server-migration-parent</artifactId>
<version>35.0.0.Final-SNAPSHOT</version>
<relativePath>../../../../../pom.xml</relativePath>
</parent>

<artifactId>jboss-server-migration-wildfly25.0-to-wildfly35.0-userguide</artifactId>

<name>JBoss Server Migration: User-Guide Wildfly 25.0 to Wildfly 35.0</name>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jboss-server-migration-docs-userguide-migration-includes</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<phase>generate-sources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/asciidoc</outputDirectory>
<resources>
<resource>
<directory>src/main/asciidoc</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>unpack-includes</id>
<phase>generate-sources</phase>
<goals>
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/asciidoc</outputDirectory>
<includeScope>compile</includeScope>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<executions>
<execution>
<phase>generate-resources</phase>
<goals>
<goal>process-asciidoc</goal>
</goals>
<configuration>
<sourceDocumentName>master.adoc</sourceDocumentName>
<outputFile>${project.build.outputDirectory}/index.html</outputFile>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
// setup of vars used by this and/or included docs
:server-source-productName: WildFly 25.0
:server-source-name: WildFly
:server-source-version: 25.0.0.Final
:server-source-baseDir: wildfly-25.0

:server-target-productName: WildFly 35.0
:server-target-name: WildFly
:server-target-version: 35.0.0.Final
:server-target-baseDir: wildfly-35.0

:includesDir: topics

// toc setup
:toc:
:numbered:

// include abstract
include::{includesDir}/ServerMigration.adoc[]

// customize
The server migration from {server-source-productName} to {server-target-productName} includes:

* Modules Migration
* Standalone Server Migration
* Managed Domain Migration

:leveloffset: +1

// --- modules migration

include::{includesDir}/ServerMigration-Modules.adoc[]

// --- standalone server migration

include::{includesDir}/ServerMigration-StandaloneServer.adoc[]

:leveloffset: +1

// ------ standalone server configuration migration

include::{includesDir}/ServerMigration-StandaloneServer-StandaloneServerConfiguration.adoc[]

:leveloffset: +1

include::{includesDir}/WFLY25.0toWFLY35.0-ServerMigration-ServerConfiguration-MigrateJBossDomainProperties.adoc[]

include::{includesDir}/ServerMigration-ServerConfiguration-RemoveUnsupportedSubsystems.adoc[]

include::{includesDir}/ServerMigration-ServerConfiguration-MigrateReferencedModules.adoc[]

include::{includesDir}/ServerMigration-ServerConfiguration-MigrateReferencedPaths.adoc[]

:leveloffset: -1

:leveloffset: -1

// --- managed domain migration

include::{includesDir}/ServerMigration-ManagedDomain.adoc[]

// ------ domain configuration

:leveloffset: +1

include::{includesDir}/ServerMigration-ManagedDomain-DomainConfiguration.adoc[]

:leveloffset: +1

include::{includesDir}/WFLY25.0toWFLY35.0-ServerMigration-ServerConfiguration-MigrateJBossDomainProperties.adoc[]

include::{includesDir}/ServerMigration-ServerConfiguration-RemoveUnsupportedSubsystems.adoc[]

include::{includesDir}/ServerMigration-ServerConfiguration-MigrateReferencedModules.adoc[]

include::{includesDir}/ServerMigration-ServerConfiguration-MigrateReferencedPaths.adoc[]

include::{includesDir}/ServerMigration-ManagedDomain-AddHostExcludes.adoc[]

:leveloffset: -1

// ------ host configuration

include::{includesDir}/ServerMigration-ManagedDomain-HostConfiguration.adoc[]

:leveloffset: +1

include::{includesDir}/WFLY25.0toWFLY35.0-ServerMigration-ServerConfiguration-MigrateJBossDomainProperties.adoc[]

include::{includesDir}/ServerMigration-ServerConfiguration-MigrateReferencedModules.adoc[]

include::{includesDir}/ServerMigration-ServerConfiguration-MigrateReferencedPaths.adoc[]

:leveloffset: -1

:leveloffset: -1

:leveloffset: -1

Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
= Migrate JBoss Domain Properties

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.

The console logs any properties renamed by the migration.

[source,options="nowrap"]
----
INFO JBoss domain property jboss.domain.master.address migrated to jboss.domain.primary.address
INFO JBoss domain property jboss.domain.master.port migrated to jboss.domain.primary.port
INFO JBoss domain property jboss.domain.master.protocol migrated to jboss.domain.primary.protocol
----

If any property was successfully renamed the following message will be logged.
[source,options="nowrap"]
----
INFO JBoss domain properties migrated.
----
98 changes: 98 additions & 0 deletions docs/user-guides/migrations/wildfly35.0/wildfly26.0/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Red Hat, Inc.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.jboss.migration</groupId>
<artifactId>jboss-server-migration-parent</artifactId>
<version>35.0.0.Final-SNAPSHOT</version>
<relativePath>../../../../../pom.xml</relativePath>
</parent>

<artifactId>jboss-server-migration-wildfly26.0-to-wildfly35.0-userguide</artifactId>

<name>JBoss Server Migration: User-Guide Wildfly 26.0 to Wildfly 35.0</name>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jboss-server-migration-docs-userguide-migration-includes</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<phase>generate-sources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/asciidoc</outputDirectory>
<resources>
<resource>
<directory>src/main/asciidoc</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>unpack-includes</id>
<phase>generate-sources</phase>
<goals>
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/asciidoc</outputDirectory>
<includeScope>compile</includeScope>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<executions>
<execution>
<phase>generate-resources</phase>
<goals>
<goal>process-asciidoc</goal>
</goals>
<configuration>
<sourceDocumentName>master.adoc</sourceDocumentName>
<outputFile>${project.build.outputDirectory}/index.html</outputFile>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
Loading