Skip to content

Commit 33702ae

Browse files
authored
Merge pull request #2153 from jakartaee/autoskip_specific_tck_tests_for_mojarra_4.1_csp_backport
Auto-skip CSP-backport-incompatible ITs for Mojarra 4.0.17+ / 4.1.8+
2 parents 29da42d + 9bd485d commit 33702ae

1 file changed

Lines changed: 44 additions & 1 deletion

File tree

tck/pom.xml

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ mvn clean install -pl :old-tck-run -Dglassfish.suspend
550550
<arquillian.glassfish.version>2.1.0</arquillian.glassfish.version>
551551
<slf4j.version>2.0.17</slf4j.version>
552552
<!-- Explicit version of Mojarra to test -->
553-
<mojarra.version>4.1.0</mojarra.version>
553+
<mojarra.version>4.1.8-SNAPSHOT</mojarra.version>
554554

555555
<!--
556556
By default this profile will copy the Mojarra version to test to GlassFish.
@@ -686,6 +686,49 @@ mvn clean install -pl :old-tck-run -Dglassfish.suspend
686686
</systemPropertyVariables>
687687
</configuration>
688688
</plugin>
689+
690+
<!--
691+
Auto-skip the IT tests that are incompatible with the CSP backport in Mojarra 4.0.17+ / 4.1.8+
692+
(#5606 — inline event-attribute assumptions that no longer hold once handlers are attached via
693+
mojarra.ael). Detection is by mojarra.version; only the 4.0.17+ and 4.1.8+ ranges trigger the
694+
exclusions — older Mojarra and any other (newer or non-Mojarra) versions run unfiltered.
695+
-->
696+
<plugin>
697+
<groupId>org.codehaus.gmavenplus</groupId>
698+
<artifactId>gmavenplus-plugin</artifactId>
699+
<version>3.0.2</version>
700+
<dependencies>
701+
<dependency>
702+
<groupId>org.apache.groovy</groupId>
703+
<artifactId>groovy</artifactId>
704+
<version>4.0.21</version>
705+
<scope>runtime</scope>
706+
</dependency>
707+
</dependencies>
708+
<executions>
709+
<execution>
710+
<id>compute-csp-backport-flags</id>
711+
<phase>validate</phase>
712+
<goals><goal>execute</goal></goals>
713+
<configuration>
714+
<scripts>
715+
<script><![CDATA[
716+
def raw = (project.properties['mojarra.version'] ?: '').replace('-SNAPSHOT', '')
717+
if (!(raw ==~ /\d+\.\d+\.\d+/)) return
718+
def (maj, min, inc) = raw.tokenize('.')*.toInteger()
719+
def cspBackport =
720+
(maj == 4 && min == 0 && inc >= 17) ||
721+
(maj == 4 && min == 1 && inc >= 8)
722+
if (cspBackport && !project.properties.containsKey('it.test')) {
723+
project.properties['it.test'] = '**/*IT.java,!**/Issue2439IT.java,!**/Issue2674IT.java,!**/Issue4331IT.java,!**/Spec1238IT.java,!**/CommandLinkTestsIT.java'
724+
project.properties['failsafe.failIfNoSpecifiedTests'] = 'false'
725+
}
726+
]]></script>
727+
</scripts>
728+
</configuration>
729+
</execution>
730+
</executions>
731+
</plugin>
689732
</plugins>
690733
</build>
691734
</profile>

0 commit comments

Comments
 (0)