Skip to content

Commit

Permalink
Merge pull request #1302 from alwin-joseph/jstl_versionJdk17fixes
Browse files Browse the repository at this point in the history 
JSTL Tests: Fix compilation error, Update versions
  • Loading branch information
@scottmarlow
scottmarlow authored May 10, 2024
2 parents 58c7eed + 030364b commit ffcd438
Show file tree
Hide file tree
Showing 3 changed files with 74 additions and 57 deletions.
12 changes: 6 additions & 6 deletions glassfish-runner/jstl-tck/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
<parent>
<groupId>org.glassfish</groupId>
<artifactId>standalone-tck</artifactId>
<version>10.0.0-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>jakarta</groupId>
<artifactId>glassfish.jstl-tck</artifactId>
<version>10.0.0-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
Expand All @@ -45,7 +45,7 @@
<jstl.db.url>jdbc:derby://${jstl.db.server}:${jstl.db.port}/${jstl.db.name};create=true</jstl.db.url>
<jstl.db.user>cts1</jstl.db.user>
<junit.jupiter.version>5.9.1</junit.jupiter.version>
<tck.artifactId>jstl-tck</tck.artifactId>
<tck.artifactId>jakarta-tags-tck</tck.artifactId>
<tck.version>4.0.0</tck.version>
</properties>

Expand All @@ -57,8 +57,8 @@
</dependency>
<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>jstl-tck</artifactId>
<version>11.0.0-SNAPSHOT</version>
<artifactId>${tck.artifactId}</artifactId>
<version>${tck.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.main.common</groupId>
Expand Down Expand Up @@ -422,7 +422,7 @@
<additionalClasspathElement>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.servlet.jsp-api.jar</additionalClasspathElement>
<additionalClasspathElement>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.servlet.jsp.jstl-api.jar</additionalClasspathElement>
</additionalClasspathElements>
<dependenciesToScan>jakartatck:jstl-tck</dependenciesToScan>
<dependenciesToScan>jakarta.tck:${tck.artifactId}</dependenciesToScan>
<systemPropertyVariables>
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
<glassfish.home>${project.build.directory}/${glassfish.toplevel.dir}</glassfish.home>
Expand Down
117 changes: 67 additions & 50 deletions jstl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
<version>11.0.0-SNAPSHOT</version>
</parent>

<artifactId>jstl-tck</artifactId>
<artifactId>jakarta-tags-tck</artifactId>
<version>4.0.0</version>
<packaging>jar</packaging>

<name>JSTL</name>
Expand All @@ -37,14 +38,27 @@
<jakarta.servlet.api.version>6.1.0-M2</jakarta.servlet.api.version>
<jakarta.servlet.jsp-api.version>4.0.0-M2</jakarta.servlet.jsp-api.version>
<junit.jupiter.version>5.9.1</junit.jupiter.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
</properties>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>common</artifactId>
<version>11.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>runtime</artifactId>
<version>11.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>libutil</artifactId>
<version>11.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>javatest</groupId>
<artifactId>javatest</artifactId>
</dependency>
<dependency>
<groupId>jakarta.servlet.jsp</groupId>
Expand All @@ -59,10 +73,12 @@
<dependency>
<groupId>jakarta.servlet.jsp.jstl</groupId>
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
<version>2.0.1</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand All @@ -81,54 +97,16 @@
</dependency>
</dependencies>

<profiles>
<profile>
<id>tck-build</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
<configuration>
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
</resource>
</resources>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<build>
<finalName>${bundle-name}-${project.version}</finalName>
<resources>
<resource>
<directory>src/main/resources</directory>
<includes>
<include>com/</include>
</includes>
</resource>
</resources>
<plugins>
<!-- do not publish this artifact to Maven repositories -->
<plugin>
Expand All @@ -137,6 +115,45 @@
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<doclint>none</doclint>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>EFTL</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<bundle-name>jakarta-tags-tck</bundle-name>
<license>EFTL</license>
</properties>
</profile>
<profile>
<id>EPL</id>
<properties>
<bundle-name>tags-tck</bundle-name>
<license>EPL</license>
</properties>
</profile>
</profiles>

</project>
2 changes: 1 addition & 1 deletion jstl/src/main/java/com/sun/ts/tests/jstl/common/tags/ExceptionCheckTag.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ public void doCatch(java.lang.Throwable t) {
sb.append("</strong> was thrown!");

if (t instanceof JspException && _checkRootCause) {
Throwable rt = ((JspException) t).getRootCause();
Throwable rt = ((JspException) t).getCause();
if (rt != null) {
if (_rootException == null) {
sb.append("<br>\nThe root cause of Exception defined");
Expand Down

0 comments on commit ffcd438

Please sign in to comment.