Skip to content

Commit b8e41f6

Browse files
dmatejdmatej
committed
Using released 2.0.0 OmniFish Arquillian artifacts in TCK
- Fixed also CDI TCK using wrong package Signed-off-by: David Matějček <[email protected]>
1 parent a3fcf62 commit b8e41f6

File tree

5 files changed

+30
-29
lines changed

5 files changed

+30
-29
lines changed

‎appserver/tests/tck/cdi/cdi-full/src/test/java/org/jboss/weld/tck/glassfish/GlassFishDeploymentExceptionTransformer.java‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation.
2+
* Copyright (c) 2022, 2025 Contributors to the Eclipse Foundation.
33
* Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
44
*
55
* This program and the accompanying materials are made available under the
@@ -35,16 +35,18 @@
3535
public class GlassFishDeploymentExceptionTransformer implements DeploymentExceptionTransformer {
3636

3737
private static final String[] DEPLOYMENT_EXCEPTION_FRAGMENTS = new String[] {
38-
"Only normal scopes can be passivating",
39-
"org.jboss.weld.exceptions.DeploymentException",
40-
"org.jboss.weld.exceptions.UnserializableDependencyException",
41-
"org.jboss.weld.exceptions.InconsistentSpecializationException",
42-
"CDI deployment failure:",
43-
"org.jboss.weld.exceptions.NullableDependencyException" };
38+
"Only normal scopes can be passivating",
39+
"org.jboss.weld.exceptions.DeploymentException",
40+
"org.jboss.weld.exceptions.UnserializableDependencyException",
41+
"org.jboss.weld.exceptions.InconsistentSpecializationException",
42+
"CDI deployment failure:",
43+
"org.jboss.weld.exceptions.NullableDependencyException"
44+
};
4445

45-
private static final String[] DEFINITION_EXCEPTION_FRAGMENTS = new String[]
46-
{ "CDI definition failure:",
47-
"org.jboss.weld.exceptions.DefinitionException" };
46+
private static final String[] DEFINITION_EXCEPTION_FRAGMENTS = new String[] {
47+
"CDI definition failure:",
48+
"org.jboss.weld.exceptions.DefinitionException"
49+
};
4850

4951
@Override
5052
public Throwable transform(Throwable throwable) {
@@ -53,11 +55,11 @@ public Throwable transform(Throwable throwable) {
5355
// exception and sometimes AS7 exception itself
5456
@SuppressWarnings("unchecked")
5557
List<Throwable> throwableList = ExceptionUtils.getThrowableList(throwable);
56-
if (throwableList.size() < 1)
58+
if (throwableList.isEmpty()) {
5759
return throwable;
60+
}
5861

59-
Throwable root = null;
60-
62+
final Throwable root;
6163
if (throwableList.size() == 1) {
6264
root = throwable;
6365
} else {
@@ -84,5 +86,4 @@ private boolean isFragmentFound(String[] fragments, Throwable rootException) {
8486
}
8587
return false;
8688
}
87-
8889
}

‎appserver/tests/tck/cdi/cdi-full/src/test/java/org/jboss/weld/tck/glassfish/GlassFishExtension.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/*
2+
* Copyright (c) 2025 Contributors to the Eclipse Foundation.
23
* Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
34
*
45
* This program and the accompanying materials are made available under the
@@ -26,13 +27,9 @@
2627
*/
2728
public class GlassFishExtension implements LoadableExtension {
2829

29-
private static final String GLASSFISH_CLIENTUTILS_CLASS = "org.omnifaces.arquillian.container.glassfish.clientutils.GlassFishClientUtil";
30-
3130
@Override
3231
public void register(ExtensionBuilder builder) {
33-
if (Validate.classExists(GLASSFISH_CLIENTUTILS_CLASS)) {
34-
builder.service(DeploymentExceptionTransformer.class, GlassFishDeploymentExceptionTransformer.class);
35-
}
32+
builder.service(DeploymentExceptionTransformer.class, GlassFishDeploymentExceptionTransformer.class);
3633
}
3734

3835
}

‎appserver/tests/tck/faces/pom.xml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@
3535

3636
<properties>
3737
<faces.version>4.0.1</faces.version>
38+
<faces.tck.version>4.0.3</faces.tck.version>
3839
<tck.root>${project.build.directory}</tck.root>
39-
<tck.parentPomFile>${tck.root}/faces-tck-4.0.3/tck/pom.xml</tck.parentPomFile>
40+
<tck.parentPomFile>${tck.root}/faces-tck-${faces.tck.version}/tck/pom.xml</tck.parentPomFile>
4041
<maven.executable>${maven.home}/bin/mvn</maven.executable>
4142
<maven.settings.xml>${user.home}/.m2/settings.xml</maven.settings.xml>
4243
</properties>
@@ -147,9 +148,9 @@
147148
<pom-replace file="${tck.parentPomFile}"
148149
element="version" value="1.0.7" replacement="${project.version}" />
149150
<pom-replace file="${tck.parentPomFile}"
150-
element="version" value="1.4" replacement="2.0.0-M1" />
151+
element="version" value="1.4" replacement="${omnifish.arquillian.version}" />
151152
<pom-replace file="${tck.parentPomFile}"
152-
element="version" value="4.0.3" replacement="${project.parent.version}" />
153+
element="version" value="${faces.tck.version}" replacement="${project.parent.version}" />
153154
<replace file="${tck.parentPomFile}">
154155
<replacetoken><![CDATA[<relativePath />]]></replacetoken>
155156
<replacevalue><![CDATA[<relativePath>../../..</relativePath>]]></replacevalue>
@@ -161,13 +162,13 @@
161162
replace="">
162163
</replaceregexp>
163164

164-
<replace dir="${tck.root}/faces-tck-4.0.3/tck">
165+
<replace dir="${tck.root}/faces-tck-${faces.tck.version}/tck">
165166
<include name="**/pom.xml"/>
166167
<exclude name="pom.xml"/>
167-
<replacetoken><![CDATA[<version>4.0.3</version>]]></replacetoken>
168+
<replacetoken><![CDATA[<version>${faces.tck.version}</version>]]></replacetoken>
168169
<replacevalue><![CDATA[<version>${project.version}</version>]]></replacevalue>
169170
</replace>
170-
<replace dir="${tck.root}/faces-tck-4.0.3/tck">
171+
<replace dir="${tck.root}/faces-tck-${faces.tck.version}/tck">
171172
<include name="**/pom.xml"/>
172173
<replacetoken><![CDATA[<groupId>org.omnifaces.arquillian</groupId>]]></replacetoken>
173174
<replacevalue><![CDATA[<groupId>ee.omnifish.arquillian</groupId>]]></replacevalue>

‎appserver/tests/tck/pom.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@
7979
<port.orb.mutual>13920</port.orb.mutual>
8080
<port.orb.ssl>13820</port.orb.ssl>
8181
<port.harness.log>12000</port.harness.log>
82+
83+
<omnifish.arquillian.version>2.0.0</omnifish.arquillian.version>
8284
</properties>
8385

8486
<dependencyManagement>
@@ -111,13 +113,13 @@
111113
<dependency>
112114
<groupId>ee.omnifish.arquillian</groupId>
113115
<artifactId>glassfish-client-ee10</artifactId>
114-
<version>2.0.0-M1</version>
116+
<version>${omnifish.arquillian.version}</version>
115117
<scope>test</scope>
116118
</dependency>
117119
<dependency>
118120
<groupId>ee.omnifish.arquillian</groupId>
119121
<artifactId>arquillian-glassfish-server-managed</artifactId>
120-
<version>2.0.0-M1</version>
122+
<version>${omnifish.arquillian.version}</version>
121123
<scope>test</scope>
122124
</dependency>
123125
<!-- See defaultProtocol type in arquillian.xml in microprofile module -->

‎appserver/tests/tck/tck-download/jakarta-platform-tck/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@
3333

3434
<properties>
3535
<!-- Be patient, it is over 500 MB -->
36-
<!-- TODO Wait for the release -->
36+
<!-- TODO Wait for the release, temporarily you have to download one of "snapshots" opr build your own -->
3737
<!-- <tck.artifactFileName>jakarta-jakartaeetck-10.0.7.zip</tck.artifactFileName>-->
3838
<!-- <tck.artifactUrl>https://download.eclipse.org/jakartaee/platform/10/${tck.test.jee.file}</tck.artifactUrl>-->
3939
<tck.artifactFileName>jakartaeetck-10.0.7.zip</tck.artifactFileName>
40-
<tck.artifactUrl>https://ci.eclipse.org/jakartaee-tck/job/jakartaee-tck/job/10.0.x/lastSuccessfulBuild/artifact/jakartaeetck-bundles/${tck.artifactFileName}</tck.artifactUrl>
40+
<tck.artifactUrl>https://ci.eclipse.org/jakartaee-tck/job/jakartaee-tck/job/10.0.x/228/artifact/jakartaeetck-bundles/${tck.artifactFileName}</tck.artifactUrl>
4141
</properties>
4242

4343
<build>

0 commit comments

Comments
 (0)