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

Jump to bottom

Updates for the 4.1.0-M1 release #504

Merged
merged 2 commits into from
Nov 30, 2023
Merged

Updates for the 4.1.0-M1 release #504

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
31c0f41
Updates for the 4.1.0-M1 release
starksm64 Nov 30, 2023
5549a96
Web tck dependencies require Java SE 17+
starksm64 Nov 30, 2023
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-actions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java: [11, 17]
java: [17, 21]
steps:
- uses: actions/checkout@v2
- name: Set up JDK ${{ matrix.java }}
Expand Down
2 changes: 1 addition & 1 deletion dist-build/jboss-runner.pom
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>weld-jboss-runner-tck</artifactId>
<name>CDI TCK runner (4.0) for Weld (WildFly)</name>
<name>CDI TCK runner (4.1) for Weld (WildFly)</name>
<description>Aggregates dependencies and runs the CDI TCK (both standalone and on WildFly)</description>

<licenses>
Expand Down
7 changes: 4 additions & 3 deletions dist-build/src/main/assembly/assembly.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
<id>dist</id>
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 https://maven.apache.org/xsd/assembly-2.2.0.xsd">
<id>bin</id>
<baseDirectory>cdi-tck-${cdi.tck.version}</baseDirectory>
<formats>
<format>zip</format>
Expand Down
5 changes: 3 additions & 2 deletions doc/reference/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,13 +122,14 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<phase>process-classes</phase>
<configuration>
<tasks>
<target>
<copy file="${basedir}/target/generated-docs-pdf/${pdf.name}" todir="${basedir}" />
</tasks>
</target>
</configuration>
<goals>
<goal>run</goal>
Expand Down
6 changes: 4 additions & 2 deletions doc/reference/src/main/assembly/assembly.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 https://maven.apache.org/xsd/assembly-2.2.0.xsd">
<id>bin</id>
<baseDirectory>cdi-tck-ref-guide</baseDirectory>
<formats>
<format>zip</format>
Expand Down
48 changes: 15 additions & 33 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.6</version>
<version>1.0.9</version>
</parent>

<!-- Metadata -->
Expand Down Expand Up @@ -97,25 +97,25 @@

<properties>
<!-- CDI API -->
<cdi.api.version>4.1.0.Alpha1</cdi.api.version>
<cdi.api.version>4.1.0-M1</cdi.api.version>
<maven.compiler.release>11</maven.compiler.release>
<!-- Jakarta EE APIs Core -->
<annotations.api.version>2.1.0</annotations.api.version>
<interceptors.api.version>2.2.0-RC1</interceptors.api.version>
<annotations.api.version>3.0.0-M1</annotations.api.version>
<interceptors.api.version>2.2.0-M1</interceptors.api.version>
<atinject.api.version>2.0.1</atinject.api.version>
<el.api.version>5.0.0</el.api.version>
<el.api.version>5.0.1</el.api.version>

<!-- Test tools/dependencies -->
<testng.version>7.4.0</testng.version>
<testng.version>7.7.0</testng.version>
<jboss.test.audit.version>2.0.0.Final</jboss.test.audit.version>
<arquillian.version>1.7.0.Alpha10</arquillian.version>
<arquillian.version>1.8.0.Final</arquillian.version>
<arquillian.container.se.api.version>1.0.1.Final</arquillian.container.se.api.version>
<apache.httpclient.version>3.1</apache.httpclient.version>
<htmlunit.version>2.50.0</htmlunit.version>
<selenium.version>4.7.2</selenium.version>
<selenium.version>4.7.2</selenium.version>
<!-- Required for distribution build, should be overriden for each build -->
<cdi.tck.version>${project.version}</cdi.tck.version>
<weld.version>5.0.0.SP2</weld.version>
<weld.version>5.1.2.Final</weld.version>
</properties>

<!-- Dependency management -->
Expand Down Expand Up @@ -252,26 +252,13 @@
<!-- Plugin versions since ee4j parent no longer declares them-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.1</version>
<configuration>
<doclint>none</doclint>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.6.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -297,12 +284,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.4.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
<version>3.4.1</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down Expand Up @@ -350,7 +332,7 @@
<configuration>
<rules>
<requireJavaVersion>
<version>1.8</version>
<version>[17,)</version>
</requireJavaVersion>
</rules>
</configuration>
Expand Down
9 changes: 4 additions & 5 deletions web/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,15 @@
<description>CDI Web TCK tests</description>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<!-- Jakarta EE APIs in Web Profile -->
<!-- Wave0 -->
<annotations.api.version>2.1.0</annotations.api.version>
<jpa.api.version>3.1.0</jpa.api.version>
<jpa.api.version>3.2.0-M1</jpa.api.version>
<jms.api.version>3.1.0</jms.api.version>
<!-- Wave1 -->
<atinject.api.version>2.0.1</atinject.api.version>
<interceptors.api.version>2.1.0</interceptors.api.version>
<interceptors.api.version>2.2.0-M1</interceptors.api.version>
<servlet.api.version>6.0.0</servlet.api.version>
<!-- Wave2 -->
<jsp.api.version>3.1.0</jsp.api.version>
Expand Down
Loading