Skip to content

Commit

Permalink
Introduce a profile allowing to patch CDI and interceptors API jars i…
Browse files Browse the repository at this point in the history 
…n WFLY. Use this in CI jobs.
  • Loading branch information
@manovotn
manovotn committed Oct 25, 2023
1 parent f960e99 commit 6c82f5b
Show file tree
Hide file tree
Showing 2 changed files with 105 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-actions.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
run: |
JBOSS_HOME=`pwd`'/container/*'
export JBOSS_HOME=`echo $JBOSS_HOME`
mvn clean package -Pupdate-jboss-as -Dtck -f jboss-as/pom.xml
mvn clean package -Pupdate-jboss-as -Pupdate-jakarta-apis -Dtck -f jboss-as/pom.xml
- name: Zip Patched WildFly
run: |
cd container/
Expand Down
105 changes: 104 additions & 1 deletion jboss-as/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@
<!-- We have to explicitly state the project version. We cannot use ${project.version}
as the release plugin won't deal with double evaluation -->
<weld.update.version>6.0.0-SNAPSHOT</weld.update.version>
<!-- These are *NOT* automatically updated and should be reviewed if the relevant profile is to be used -->
<cdi.update.version>4.1.0.Alpha1</cdi.update.version>
<interceptors.update.version>2.2.0-RC1</interceptors.update.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -69,6 +72,21 @@
<artifactId>cdi-tck-ext-lib</artifactId>
<version>${cdi.tck-4-0.version}</version>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<version>${cdi.update.version}</version>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.lang-model</artifactId>
<version>${cdi.update.version}</version>
</dependency>
<dependency>
<groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId>
<version>2.2.0-RC1</version>
</dependency>
</dependencies>
<profiles>
<profile>
Expand Down Expand Up @@ -188,6 +206,91 @@
</plugins>
</build>
</profile>
<profile>
<!-- Updates CDI API and Interceptors API in target WFLY distribution -->
<!-- This is mainly useful when developing against early CDI versions adding new APIs that aren't in WFLY -->
<id>update-jakarta-apis</id>
<build>
<defaultGoal>package</defaultGoal>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>update-jakarta-apis</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<property file="${basedir}/local.build.properties" />
<property file="${basedir}/build.properties" />
<property name="jboss.home" value="${env.JBOSS_HOME}" />

<echo>

=========================================================================

Updating CDI module and Interceptors API module

CDI version: ${cdi.update.version}
Interceptors version: ${interceptors.update.version}

JBOSS_HOME: ${jboss.home}

=========================================================================

</echo>

<available file="${jboss.home}/modules/system" property="module.dir" value="${jboss.home}/modules/system/layers/base/jakarta/enterprise/api" />
<available file="${jboss.home}/modules/system" property="module.interceptor.dir" value="${jboss.home}/modules/system/layers/base/jakarta/interceptor/api" />

<property name="module.dir" value="${jboss.home}/modules//system/layers/base/jakarta/enterprise/api" />
<property name="module.interceptor.dir" value="${jboss.home}/modules//system/layers/base/jakarta/interceptor/api" />

<property name="cdi.api.file" value="jakarta.enterprise.cdi-api-${cdi.update.version}.jar" />
<property name="cdi.lang.model.file" value="jakarta.enterprise.lang-model-${cdi.update.version}.jar" />
<property name="interceptor.api.file" value="jakarta.interceptor-api-${interceptors.update.version}.jar" />

<delete>
<fileset dir="${module.dir}/main" includes="*.jar" />
<fileset dir="${module.interceptor.dir}/main" includes="*.jar" />
</delete>

<copy todir="${module.dir}/main" overwrite="true">
<fileset dir="target/dependency/lib">
<include name="${cdi.api.file}" />
<include name="${cdi.lang.model.file}" />
</fileset>
</copy>

<copy todir="${module.interceptor.dir}/main" overwrite="true">
<fileset dir="target/dependency/lib">
<include name="${interceptor.api.file}" />
</fileset>
</copy>


<replaceregexp file="${module.dir}/main/module.xml" match="path=&quot;jakarta.enterprise.cdi-api.*?&quot;" replace="path=&quot;${cdi.api.file}&quot;" byline="true" />
<replaceregexp file="${module.dir}/main/module.xml" match="path=&quot;jakarta.enterprise.lang-model.*?&quot;" replace="path=&quot;${cdi.lang.model.file}&quot;" byline="true" />
<replaceregexp file="${module.interceptor.dir}/main/module.xml" match="path=&quot;jakarta.interceptor-api.*?&quot;" replace="path=&quot;${interceptor.api.file}&quot;" byline="true" />
</target>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>install-cdi-tck-ext-lib</id>
<activation>
Expand Down Expand Up @@ -239,7 +342,7 @@
<configuration>
<outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
<overWriteSnapshots>true</overWriteSnapshots>
<includeArtifactIds>cdi-api,weld-api,weld-core-impl,weld-lite-extension-translator,weld-jsf,weld-ejb,weld-jta,weld-web,weld-spi,cdi-tck-ext-lib</includeArtifactIds>
<includeArtifactIds>jakarta.enterprise.cdi-api,jakarta.enterprise.lang-model,jakarta.interceptor-api,weld-api,weld-core-impl,weld-lite-extension-translator,weld-jsf,weld-ejb,weld-jta,weld-web,weld-spi,cdi-tck-ext-lib</includeArtifactIds>
</configuration>
</execution>
</executions>
Expand Down

0 comments on commit 6c82f5b

Please sign in to comment.