Skip to content

Commit

Permalink
Merge pull request #3289 from jamezp/wfp-feature-pack
Browse files Browse the repository at this point in the history
[RESTEASY-3234] Add a RESTEasy Preview Feature Pack.
  • Loading branch information
jamezp committed Oct 3, 2022
2 parents a612456 + a8765ea commit b10bfb5
Show file tree
Hide file tree
Showing 47 changed files with 425 additions and 115 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,17 @@ jobs:
name: server-logs-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.wildfly-version }}
path: '**/server.log'

test-with-security-manager:
additional-profiles:
runs-on: ubuntu-latest
timeout-minutes: 90
strategy:
fail-fast: false
matrix:
java: ['11']
wildfly-version: ['27.0.0.Beta1']
profile:
- '-Dsecurity.manager'
- '-Dprovision.preview'

steps:
- uses: actions/checkout@v3
Expand All @@ -66,10 +69,10 @@ jobs:
java-version: ${{ matrix.java }}
distribution: 'temurin'
cache: 'maven'
- name: Security Manager Tests - JDK ${{ matrix.java }} - WildFly ${{ matrix.wildfly-version }}
- name: Test with ${{ matrix.profile }} - JDK ${{ matrix.java }} - WildFly ${{ matrix.wildfly-version }}
run: |
echo "::group::Build Logs"
mvn clean install -U -B -fae '-Dsecurity.manager' '-Dserver.version=${{ matrix.wildfly-version }}' '-Dgithub.actions'
mvn clean install -U -B -fae ${{ matrix.profile }} '-Dserver.version=${{ matrix.wildfly-version }}' '-Dgithub.actions'
echo "::endgroup::"
- uses: actions/upload-artifact@v3
if: failure()
Expand Down
8 changes: 7 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
<module>server-adapters</module>
<module>resteasy-wadl</module>
<module>resteasy-wadl-undertow-connector</module>
<module>galleon-feature-pack</module>
<module>resteasy-feature-pack</module>
<module>arquillian</module>
<module>profiling-tests</module>
<module>testsuite</module>
Expand All @@ -181,6 +181,12 @@
<version>${version.org.wildfly}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-preview-feature-pack</artifactId>
<version>${version.org.wildfly}</version>
<type>zip</type>
</dependency>

<dependency>
<groupId>org.wildfly.galleon-plugins</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!--
~ JBoss, Home of Professional Open Source.
~
~ Copyright 2021 Red Hat, Inc., and individual contributors
~ Copyright 2022 Red Hat, Inc., and individual contributors
~ as indicated by the @author tags.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -23,35 +23,17 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs-all</artifactId>
<artifactId>resteasy-feature-pack</artifactId>
<version>6.2.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>galleon-feature-pack</artifactId>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>resteasy-dependencies</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<artifactId>resteasy-feature-pack-common</artifactId>
<name>RESTEasy: Common Feature Pack Common Resources</name>
<packaging>pom</packaging>

<dependencies>
<!-- Feature pack dependencies -->
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-ee-galleon-pack</artifactId>
<type>zip</type>
</dependency>

<!-- Other dependencies -->
<!-- Required dependencies -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
Expand Down Expand Up @@ -360,43 +342,4 @@
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<!-- Feature pack generation is vulnerable to leftover files in the target
folder from previous builds, so always clean even if the clean lifecycle is not invoked -->
<artifactId>maven-clean-plugin</artifactId>
<executions>
<execution>
<id>auto-clean</id>
<phase>initialize</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.wildfly.galleon-plugins</groupId>
<artifactId>wildfly-galleon-maven-plugin</artifactId>
<executions>
<execution>
<id>resteasy-galleon-feature-pack</id>
<goals>
<goal>build-feature-pack</goal>
</goals>
<phase>prepare-package</phase>
<configuration>
<fork-embedded>${galleon.fork.embedded}</fork-embedded>
<task-properties>
<!-- Disable transforming -->
<jakarta.transform.artifacts>false</jakarta.transform.artifacts>
<jakarta.transform.modules>false</jakarta.transform.modules>
</task-properties>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
</project>
123 changes: 123 additions & 0 deletions resteasy-feature-pack/galleon-feature-pack/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ JBoss, Home of Professional Open Source.
~
~ Copyright 2021 Red Hat, Inc., and individual contributors
~ as indicated by the @author tags.
~
~ 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">
<parent>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-feature-pack</artifactId>
<version>6.2.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>galleon-feature-pack</artifactId>
<name>RESEasy: Galleon Feature Pack</name>

<properties>
<common.resources.directory>${basedir}/../common/src/main/resources</common.resources.directory>
</properties>


<dependencies>
<!-- Feature pack dependencies -->
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-ee-galleon-pack</artifactId>
<type>zip</type>
</dependency>

<!-- Add the common dependency to inherit default required dependencies -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>resteasy-feature-pack-common</artifactId>
<version>${project.version}</version>
<type>pom</type>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<!-- Feature pack generation is vulnerable to leftover files in the target
folder from previous builds, so always clean even if the clean lifecycle is not invoked -->
<artifactId>maven-clean-plugin</artifactId>
<executions>
<execution>
<id>auto-clean</id>
<phase>initialize</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<!-- Copy the common resources -->
<execution>
<id>copy-common-feature-pack-resources</id>
<phase>process-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/target/resources</outputDirectory>
<resources>
<resource>
<directory>${common.resources.directory}</directory>
<excludes>
<exclude>modules/**/module.xml</exclude>
</excludes>
</resource>
<resource>
<directory>${common.resources.directory}</directory>
<includes>
<include>modules/**/module.xml</include>
</includes>
<filtering>true</filtering>
</resource>
</resources>
<overwrite>true</overwrite>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.wildfly.galleon-plugins</groupId>
<artifactId>wildfly-galleon-maven-plugin</artifactId>
<executions>
<execution>
<id>resteasy-galleon-feature-pack</id>
<goals>
<goal>build-feature-pack</goal>
</goals>
<phase>prepare-package</phase>
<configuration>
<fork-embedded>${galleon.fork.embedded}</fork-embedded>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<build xmlns="urn:wildfly:feature-pack-build:3.1" producer="org.jboss.resteasy:galleon-feature-pack">
<build xmlns="urn:wildfly:feature-pack-build:3.3" producer="org.jboss.resteasy:galleon-feature-pack">
<dependencies>
<dependency group-id="org.wildfly" artifact-id="wildfly-ee-galleon-pack" translate-to-fpl="true">
<name>org.wildfly:wildfly-ee-galleon-pack</name>
Expand Down

0 comments on commit b10bfb5

Please sign in to comment.