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.

Sign up for GitHub

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

Improve tests #52

Open
wants to merge 2 commits into
base: 1.x
Choose a base branch
from
Open

Improve tests #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
839d817
Fix scm url to point to the one in wildfly-extras organization
gaol Jan 20, 2025
40de838
[Issue-49] Improve the test
gaol Jan 20, 2025
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
103 changes: 53 additions & 50 deletions build/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,28 @@
<artifactId>wildfly-vertx-feature-pack</artifactId>
<type>zip</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>wildfly-vertx-feature-pack-manifest</artifactId>
<version>${project.version}</version>
<classifier>manifest</classifier>
<type>yaml</type>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

<build>
<finalName>${project.artifactId}-${project.version}</finalName>
<finalName>${server.name}</finalName>
<plugins>
<plugin>
<groupId>org.jboss.galleon</groupId>
<artifactId>galleon-maven-plugin</artifactId>
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-maven-plugin</artifactId>
<executions>
<execution>
<id>server-provisioning</id>
Expand All @@ -52,79 +66,68 @@
</goals>
<phase>compile</phase>
<configuration>
<install-dir>${project.build.directory}/${project.artifactId}-${project.version}</install-dir>
<record-state>false</record-state>

<log-time>${galleon.log.time}</log-time>
<offline>${galleon.offline}</offline>
<plugin-options>
<provisioning-dir>${project.build.directory}/${project.artifactId}-${project.version}</provisioning-dir>
<record-provisioning-state>true</record-provisioning-state>
<offline-provisioning>true</offline-provisioning>
<galleon-options>
<jboss-fork-embedded>${galleon.fork.embedded}</jboss-fork-embedded>
<optional-packages>passive+</optional-packages>
<config-stability-level>preview</config-stability-level>
<package-stability-level>preview</package-stability-level>
<ignore-not-excluded-layers>true</ignore-not-excluded-layers>
</plugin-options>
</galleon-options>
<feature-packs>
<feature-pack>
<groupId>${project.groupId}</groupId>
<artifactId>wildfly-vertx-feature-pack</artifactId>
<version>${project.version}</version>
<inherit-configs>false</inherit-configs>
</feature-pack>
<feature-pack>
<transitive>true</transitive>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-ee-galleon-pack</artifactId>
<version>${version.org.wildfly}</version>
<included-packages>
<name>docs.examples.configs</name>
<name>modules.all</name>
</included-packages>
<included-configs>
<config>
<model>standalone</model>
<name>standalone.xml</name>
</config>
</included-configs>
<inherit-configs>true</inherit-configs>
</feature-pack>
<feature-pack>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-galleon-pack</artifactId>
<version>${version.org.wildfly}</version>
<included-packages>
<name>docs.examples.configs</name>
<name>modules.all</name>
</included-packages>
<included-configs>
<config>
<model>standalone</model>
<name>standalone-microprofile.xml</name>
</config>
</included-configs>
<inherit-configs>true</inherit-configs>
</feature-pack>
</feature-packs>
<configurations>
<config>
<model>standalone</model>
<name>standalone.xml</name>
<layers>
<layer>jaxrs-server</layer>
<layer>vertx</layer>
</layers>
</config>
<config>
<model>standalone</model>
<name>standalone-microprofile.xml</name>
<layers>
<layer>jaxrs-server</layer>
<layer>microprofile-platform</layer>
<layer>vertx</layer>
</layers>
</config>
</configurations>
<channels>
<channel>
<manifest>
<groupId>${project.groupId}</groupId>
<artifactId>wildfly-vertx-feature-pack-manifest</artifactId>
<version>${project.version}</version>
</manifest>
</channel>
</channels>
</configuration>
</execution>
<execution>
<id>vertx-subsystem-init</id>
<goals>
<goal>execute-commands</goal>
</goals>
<phase>compile</phase>
<configuration>
<offline>true</offline>
<jboss-home>${project.build.directory}/${project.artifactId}-${project.version}</jboss-home>
<commands>
<command>embed-server --stability=preview</command>
<command>/extension=org.wildfly.extension.vertx:add</command>
<command>/subsystem=vertx:add</command>
<command>/subsystem=vertx/vertx=vertx:add</command>
<command>stop-embedded-server</command>
</commands>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ...ocal/src/main/resources/packages/docs.licenses/content/docs/licenses/pm/wildfly/tasks.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<tasks xmlns="urn:wildfly:wildfly-feature-pack-tasks:3.1">
<copy-path src="docs/licenses/licenses.xsl" relative-to="content" target="docs/licenses/wildfly-vertx-extension-licenses.xsl"/>
<transform stylesheet="docs/licenses/wildfly-mvc-krazo-licenses.xsl" src="docs/licenses/wildfly-vertx-extension-feature-pack-licenses.xml" output="docs/licenses/wildfly-vertx-extension-feature-pack-licenses.html" feature-pack-properties="true" phase="FINALIZING"/>
<transform stylesheet="docs/licenses/wildfly-vertx-extension-licenses.xsl" src="docs/licenses/wildfly-vertx-extension-feature-pack-licenses.xml" output="docs/licenses/wildfly-vertx-extension-feature-pack-licenses.html" feature-pack-properties="true" phase="FINALIZING"/>
<delete path="docs/licenses/wildfly-vertx-extension-licenses.xsl"/>
<line-endings phase="FINALIZING">
<unix>
Expand Down
82 changes: 82 additions & 0 deletions galleon-feature-pack/manifest/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright The WildFly Authors
~ SPDX-License-Identifier: Apache-2.0
-->
<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.wildfly.extras.vertx</groupId>
<artifactId>wildfly-vertx-feature-pack-parent</artifactId>
<version>1.0.3.Final-SNAPSHOT</version>
</parent>

<artifactId>wildfly-vertx-feature-pack-manifest</artifactId>
<version>1.0.3.Final-SNAPSHOT</version>

<name>WildFly Vertx Extension - WildFly Vertx Manifest</name>
<description>The WildFly channel manifest for the feature pack of the Vertx extension.</description>
<packaging>pom</packaging>

<properties>
<!-- This mainly used to produce the server distribution with specified versions of dependencies, which is
mainly used for the tests, so no need to deploy it. -->
<maven.deploy.skip>true</maven.deploy.skip>
</properties>

<build>
<plugins>
<!-- Use the resources plugin to apply expression replacement filtering to the channel.yaml -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-channel-resources</id>
<phase>process-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.basedir}/target</outputDirectory>
<resources>
<resource>
<directory>${basedir}/src/main/resources</directory>
<includes>
<include>${project.artifactId}.yaml</include>
</includes>
<filtering>true</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<!-- Attach the manifest.yaml to the build -->
<execution>
<id>attach-manifest</id>
<phase>package</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
<configuration>
<artifacts>
<artifact>
<file>${project.build.directory}/${project.artifactId}.yaml</file>
<type>yaml</type>
<classifier>manifest</classifier>
</artifact>
</artifacts>
</configuration>
</execution>
</executions>
</plugin>

</plugins>
</build>
</project>
15 changes: 15 additions & 0 deletions galleon-feature-pack/manifest/src/main/resources/wildfly-vertx-feature-pack-manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
schemaVersion: "1.0.0"
name: "${project.artifactId}"
id: "${project.groupId}:${project.artifactId}"
description: "The WildFly vertx channel to upgrade components and dependencies"
streams:
# wildfly-vertx-feature-pack dependencies
- groupId: "${project.groupId}"
artifactId: "wildfly-vertx-extension"
version: "${project.version}"
- groupId: "io.vertx"
artifactId: "vertx-core"
version: "${version.io.vertx.vertx}"
- groupId: "io.smallrye.reactive"
artifactId: "smallrye-mutiny-vertx-core"
version: "${version.io.smallrye.smallrye-mutiny-vertx}"
1 change: 1 addition & 0 deletions galleon-feature-pack/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@
<module>galleon-local</module>
<module>galleon-content</module>
<module>wildfly-feature-pack</module>
<module>manifest</module>
</modules>

<build>
Expand Down
21 changes: 10 additions & 11 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,18 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<!-- WildFly versions -->
<version.org.wildfly>34.0.0.Final</version.org.wildfly>
<version.org.wildfly.core>26.0.1.Final</version.org.wildfly.core>
<version.org.wildfly.common>1.6.0.Final</version.org.wildfly.common>
<version.io.vertx.vertx>4.5.9</version.io.vertx.vertx>
<version.io.smallrye.smallrye-mutiny-vertx>3.13.0</version.io.smallrye.smallrye-mutiny-vertx>
<version.org.wildfly>35.0.0.Final</version.org.wildfly>
<version.org.wildfly.core>27.0.0.Final</version.org.wildfly.core>
<version.org.wildfly.common>1.7.0.Final</version.org.wildfly.common>
<version.io.vertx.vertx>4.5.11</version.io.vertx.vertx>
<version.io.smallrye.smallrye-mutiny-vertx>3.15.0</version.io.smallrye.smallrye-mutiny-vertx>
<version.io.smallrye.smallrye-common>2.5.0</version.io.smallrye.smallrye-common>

<version.junit>4.13.1</version.junit>

<!-- Plugin dependency versions -->
<version.org.jboss.galleon>6.0.4.Final</version.org.jboss.galleon>
<version.org.wildfly.galleon-plugins>7.0.0.Final</version.org.wildfly.galleon-plugins>
<version.org.wildfly.galleon-plugins>7.3.1.Final</version.org.wildfly.galleon-plugins>
<version.org.wildfly.licenses.plugin>2.4.1.Final</version.org.wildfly.licenses.plugin>
<version.org.wildfly.plugins.wildfly-maven-plugin>5.0.0.Final</version.org.wildfly.plugins.wildfly-maven-plugin>
<version.org.apache.maven.plugins.maven-assembly-plugin>3.2.0</version.org.apache.maven.plugins.maven-assembly-plugin>
Expand All @@ -50,8 +50,7 @@
<galleon.offline>false</galleon.offline>
<assembly.tarLongFileMode>posix</assembly.tarLongFileMode>

<server.output.dir.prefix>wildfly</server.output.dir.prefix>
<server.output.dir.version>${project.version}</server.output.dir.version>
<server.build.output.dir>${project.basedir}/build/wildfly-vertx-build-${project.version}/</server.build.output.dir>

<!-- Release Information -->
<full.dist.product.release.name>WildFly Vertx Extension</full.dist.product.release.name>
Expand All @@ -60,9 +59,9 @@
</properties>

<scm>
<connection>scm:git:https://github.com/gaol/wildfly-vertx-extension.git</connection>
<developerConnection>scm:git:https://github.com/gaol/wildfly-vertx-extension.git</developerConnection>
<url>https://github.com/gaol/wildfly-vertx-extension/</url>
<connection>scm:git:https://github.com/wildfly-extras/wildfly-vertx-feature-pack.git</connection>
<developerConnection>scm:git:https://github.com/wildfly-extras/wildfly-vertx-feature-pack.git</developerConnection>
<url>https://github.com/wildfly-extras/wildfly-vertx-feature-pack</url>
<tag>HEAD</tag>
</scm>

Expand Down
Loading
Loading