Skip to content
This repository was archived by the owner on Oct 26, 2022. It is now read-only.

[PREVIEW] Build a WildFly patch file for WildFly 12 too, not only WildFly 11 #12

Closed
wants to merge 1 commit into from
Closed

[PREVIEW] Build a WildFly patch file for WildFly 12 too, not only WildFly 11 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
128 changes: 109 additions & 19 deletions modules/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,18 @@
<description>Patch file for WildFly to upgrade its JPA API version to 2.2</description>

<properties>
<patchdef.xml>src/main/patchdef/wildfly-current-patch.xml</patchdef.xml>

<wildfly.original.parent-dir>${project.build.directory}/wildfly-original</wildfly.original.parent-dir>
<wildfly.patched.parent-dir>${project.build.directory}/wildfly-patched</wildfly.patched.parent-dir>
<!-- WildFly current -->
<wildfly.original.target-dir>${project.build.directory}/wildfly-original/wildfly-${wildfly.version}</wildfly.original.target-dir>
<wildfly.patched.target-dir>${project.build.directory}/wildfly-patched/wildfly-${wildfly.version}</wildfly.patched.target-dir>
<wildfly.patch-file>${project.build.directory}/wildfly-jpa-2.2-patch.zip</wildfly.patch-file>
<patchdef.xml>src/main/patchdef/wildfly-current-patch.xml</patchdef.xml>
<wildfly.original.target-dir>${wildfly.original.parent-dir}/wildfly-${wildfly.version}</wildfly.original.target-dir>
<wildfly.patched.target-dir>${wildfly.patched.parent-dir}/wildfly-${wildfly.version}</wildfly.patched.target-dir>
<wildfly.patch-file>${project.build.directory}/wildfly-${wildfly.version}-jpa-2.2-patch.zip</wildfly.patch-file>
<!-- WildFly next -->
<patchdef-next.xml>src/main/patchdef/wildfly-current-patch.xml</patchdef-next.xml>
<wildfly-next.original.target-dir>${project.build.directory}/wildfly-original/wildfly-${wildfly-next.version}</wildfly-next.original.target-dir>
<wildfly-next.patched.target-dir>${project.build.directory}/wildfly-patched/wildfly-${wildfly-next.version}</wildfly-next.patched.target-dir>
<wildfly-next.patch-file>${project.build.directory}/wildfly-${wildfly-next.version}-jpa-2.2-patch.zip</wildfly-next.patch-file>
</properties>

<dependencies>
Expand All @@ -28,13 +34,6 @@
<artifactId>javax.persistence-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-dist</artifactId>
<version>${wildfly.version}</version>
<scope>provided</scope>
<type>tar.gz</type>
</dependency>
</dependencies>

<build>
Expand All @@ -44,7 +43,7 @@
<executions>
<!-- Extract WildFly -->
<execution>
<id>unpack-wildfly</id>
<id>unpack-wildfly-current</id>
<phase>generate-resources</phase>
<goals>
<goal>unpack</goal>
Expand All @@ -57,7 +56,26 @@
<version>${wildfly.version}</version>
<type>tar.gz</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/wildfly-original</outputDirectory>
<outputDirectory>${wildfly.original.parent-dir}</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
<execution>
<id>unpack-wildfly-next</id>
<phase>generate-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-dist</artifactId>
<version>${wildfly-next.version}</version>
<type>tar.gz</type>
<overWrite>false</overWrite>
<outputDirectory>${wildfly.original.parent-dir}</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
Expand All @@ -66,7 +84,7 @@
WildFly copy will be created later below, at this point we're only copying
the new jar into the right structure -->
<execution>
<id>prepare-patch-jars</id>
<id>prepare-wildfly-current-patch-jars</id>
<phase>prepare-package</phase>
<goals>
<goal>copy</goal>
Expand All @@ -85,32 +103,70 @@
</artifactItems>
</configuration>
</execution>
<execution>
<id>prepare-wildfly-next-patch-jars</id>
<phase>prepare-package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>javax.persistence</groupId>
<artifactId>javax.persistence-api</artifactId>
<version>${jpa-api.version}</version>
<overWrite>false</overWrite>
<outputDirectory>${wildfly-next.patched.target-dir}/modules/system/layers/base/javax/persistence/api/main</outputDirectory>
<!-- Specifying name to avoid breaking the module if the pattern changes -->
<destFileName>javax.persistence-api-${jpa-api.version}.jar</destFileName>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>create-patched-wildfly-dist</id>
<id>create-patched-wildfly-current-dist</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<resources>
<resource>
<directory>${project.build.directory}/wildfly-original</directory>
<directory>${wildfly.original.target-dir}</directory>
<excludes>
<exclude>**/modules/system/layers/base/javax/persistence/api/main/*</exclude>
</excludes>
</resource>
</resources>
<outputDirectory>${project.build.directory}/wildfly-patched</outputDirectory>
<outputDirectory>${wildfly.patched.target-dir}</outputDirectory>
</configuration>
</execution>
<execution>
<id>modules</id>
<id>create-patched-wildfly-next-dist</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<resources>
<resource>
<directory>${wildfly-next.original.target-dir}</directory>
<excludes>
<exclude>**/modules/system/layers/base/javax/persistence/api/main/*</exclude>
</excludes>
</resource>
</resources>
<outputDirectory>${wildfly-next.patched.target-dir}</outputDirectory>
</configuration>
</execution>
<execution>
<id>add-overridden-modules-to-patched-wildfly-current-dist</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-resources</goal>
Expand All @@ -125,6 +181,22 @@
<outputDirectory>${wildfly.patched.target-dir}/modules/system/layers/base/javax/persistence/api/main</outputDirectory>
</configuration>
</execution>
<execution>
<id>add-overridden-modules-to-patched-wildfly-next-dist</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<resources>
<resource>
<directory>src/main/module</directory>
<filtering>true</filtering>
</resource>
</resources>
<outputDirectory>${wildfly-next.patched.target-dir}/modules/system/layers/base/javax/persistence/api/main</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>

Expand All @@ -146,6 +218,19 @@
<outputFile>${wildfly.patch-file}</outputFile>
</configuration>
</execution>
<execution>
<id>create-wildfly-next-patch-file</id>
<phase>prepare-package</phase>
<goals>
<goal>generate-patch</goal>
</goals>
<configuration>
<appliesToDist>${wildfly-next.original.target-dir}</appliesToDist>
<patchConfig>${patchdef-next.xml}</patchConfig>
<updatedDist>${wildfly-next.patched.target-dir}</updatedDist>
<outputFile>${wildfly-next.patch-file}</outputFile>
</configuration>
</execution>
</executions>
</plugin>

Expand All @@ -167,6 +252,11 @@
<type>zip</type>
<classifier>wildfly-${wildfly.version}-patch</classifier>
</artifact>
<artifact>
<file>${wildfly-next.patch-file}</file>
<type>zip</type>
<classifier>wildfly-${wildfly-next.version}-patch</classifier>
</artifact>
</artifacts>
</configuration>
</execution>
Expand Down
15 changes: 15 additions & 0 deletions modules/src/main/patchdef/wildfly-next-patch.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version='1.0' encoding='UTF-8'?>
<patch-config xmlns="urn:jboss:patch-config:1.0">
<name>wildfly-12.0.0.Alpha1-SNAPSHOT-persistence-api-2.2-1.0.0-SNAPSHOT</name>
<description>This patch upgrades a WildFly 12.0.0.Alpha1-SNAPSHOT installation to JPA 2.2 APIs</description>
<element patch-id="layer-base-wildfly-12.0.0.Alpha1-SNAPSHOT-persistence-api-2.2-1.0.0-SNAPSHOT">
<one-off name="base" />
<description>This patch upgrades a WildFly 12.0.0.Alpha1-SNAPSHOT installation to JPA 2.2 APIs</description>
<specified-content>
<modules>
<updated name="javax.persistence.api" />
</modules>
</specified-content>
</element>
<specified-content/>
</patch-config>
5 changes: 3 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,17 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<!-- Target WildFly version to produce a patch file -->
<!-- Target WildFly versions to produce patch files -->
<wildfly.version>11.0.0.Final</wildfly.version>
<wildfly-next.version>12.0.0.Final</wildfly-next.version>

<jpa-api.version>2.2</jpa-api.version>

<!-- WildFly patching infrastructure -->
<wildfly-patch-gen-maven-plugin.version>2.0.1.Alpha5</wildfly-patch-gen-maven-plugin.version>
<wildfly-patch-gen-maven-plugin.woodstox.version>5.0.3</wildfly-patch-gen-maven-plugin.woodstox.version>
<wildfly-maven-plugin.version>1.2.1.Final</wildfly-maven-plugin.version>
<wildfly-core.version>3.0.10.Final</wildfly-core.version>
<wildfly-core.version>4.0.0.Final</wildfly-core.version>

<!-- Test dependencies -->
<arquillian.version>1.1.11.Final</arquillian.version>
Expand Down