Skip to content

Commit

Permalink
Update jsp,EL signature files for EE11
Browse files Browse the repository at this point in the history
  • Loading branch information
@alwin-joseph
alwin-joseph committed Feb 9, 2024
1 parent 6bc82db commit a8bce17
Show file tree
Hide file tree
Showing 11 changed files with 1,720 additions and 97 deletions.
37 changes: 33 additions & 4 deletions el/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>signaturetest</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>common</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>jakarta.el</groupId>
Expand All @@ -80,6 +77,7 @@
<directory>src/main/resources</directory>
<includes>
<include>LICENSE_${license}.md</include>
<include>com/</include>
</includes>
</resource>
</resources>
Expand Down Expand Up @@ -151,6 +149,37 @@
<license>EPL</license>
</properties>
</profile>
<profile>
<id>record-signature</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<properties>
<bundle-name>jakarta-expression-language-tck</bundle-name>
<license>EFTL</license>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.netbeans.tools</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>1.4</version>
<configuration>
<FileName>${project.build.directory}/jakarta.el.sig_${project.parent.version}</FileName>
<packages>jakarta.el</packages>
</configuration>
<executions>
<execution>
<goals>
<goal>generate</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>

</profiles>

</project>
435 changes: 435 additions & 0 deletions el/src/main/resources/com/sun/ts/tests/signaturetest/el/jakarta.el.sig_6.0
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion el/src/main/resources/com/sun/ts/tests/signaturetest/el/sig-test.map
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@
# package that should be tested by the signature tests.
###############################################################

jakarta.el=5.0
jakarta.el=6.0
51 changes: 7 additions & 44 deletions glassfish-runner/el-tck/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<packaging>jar</packaging>

<properties>
<glassfish.container.version>8.0.0-M1</glassfish.container.version>
<glassfish.toplevel.dir>glassfish7</glassfish.toplevel.dir>
<junit.jupiter.version>5.9.1</junit.jupiter.version>
<tck.artifactId>jakarta-expression-language-tck</tck.artifactId>
Expand Down Expand Up @@ -58,11 +59,11 @@
<artifactId>${tck.artifactId}</artifactId>
<version>${tck.version}</version>
</dependency>
<!-- <dependency>
<dependency>
<groupId>org.glassfish.main.common</groupId>
<artifactId>simple-glassfish-api</artifactId>
<version>${glassfish.container.version}</version>
</dependency> -->
</dependency>
<dependency>
<groupId>org.netbeans.tools</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
Expand All @@ -77,44 +78,6 @@

<build>
<plugins>
<plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
<version>1.3.0</version>
<executions>
<execution>
<goals>
<goal>wget</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<url>https://github.com/eclipse-ee4j/glassfish/releases/download/8.0.0-M1/glassfish-8.0.0-M1.zip</url>
<outputFileName>glassfish.zip</outputFileName>
<outputDirectory>${project.build.directory}</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<goals>
<goal>run</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<tasks>
<echo message="unzipping file"></echo>
<unzip dest="target/" src="target/glassfish.zip"></unzip>
<chmod dir="target/glassfish7/glassfish/bin/asadmin" perm="777"></chmod>
</tasks>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
Expand Down Expand Up @@ -142,7 +105,7 @@
</executions>
</plugin>

<!-- <plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.2.0</version>
Expand All @@ -167,7 +130,7 @@
</configuration>
</execution>
</executions>
</plugin> -->
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down Expand Up @@ -318,7 +281,7 @@
</execution>
</executions>
</plugin>
<plugin>
<!-- <plugin>
<groupId>org.netbeans.tools</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>1.5</version>
Expand All @@ -337,7 +300,7 @@
<phase>verify</phase>
</execution>
</executions>
</plugin>
</plugin> -->

<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
Expand Down
91 changes: 46 additions & 45 deletions glassfish-runner/jsp-tck/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<packaging>jar</packaging>

<properties>
<glassfish.container.version>8.0.0-M1</glassfish.container.version>
<jakarta.platform.version>11.0.0-M1</jakarta.platform.version>
<junit.jupiter.version>5.9.1</junit.jupiter.version>
<tck.artifactId>jakarta-pages-tck</tck.artifactId>
Expand All @@ -45,11 +46,11 @@
<artifactId>${tck.artifactId}</artifactId>
<version>${tck.version}</version>
</dependency>
<!-- <dependency>
<dependency>
<groupId>org.glassfish.main.common</groupId>
<artifactId>simple-glassfish-api</artifactId>
<version>${glassfish.container.version}</version>
</dependency> -->
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit5</groupId>
<artifactId>arquillian-junit5-container</artifactId>
Expand Down Expand Up @@ -82,48 +83,20 @@
<version>1.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jakarta.servlet.jsp</groupId>
<artifactId>jakarta.servlet.jsp-api</artifactId>
<version>4.0.0-M1</version>
</dependency>
<dependency>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
<version>6.0.0-M1</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
<version>1.3.0</version>
<executions>
<execution>
<goals>
<goal>wget</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<url>https://github.com/eclipse-ee4j/glassfish/releases/download/8.0.0-M1/glassfish-8.0.0-M1.zip</url>
<outputFileName>glassfish.zip</outputFileName>
<outputDirectory>${project.build.directory}</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<goals>
<goal>run</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<tasks>
<echo message="unzipping file"></echo>
<unzip dest="target/" src="target/glassfish.zip"></unzip>
<chmod dir="target/glassfish7/glassfish/bin/asadmin" perm="777"></chmod>
</tasks>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
Expand Down Expand Up @@ -151,13 +124,13 @@
</executions>
</plugin>

<!-- <plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.2.0</version>
<executions>
<execution>
<id>unpack</id>
<id>download-gf</id>
<goals>
<goal>unpack</goal>
</goals>
Expand All @@ -175,8 +148,33 @@
</artifactItems>
</configuration>
</execution>
<execution>
<id>update-jars</id>
<goals>
<goal>copy</goal>
</goals>
<phase>pre-integration-test</phase>
<configuration>
<artifactItems>
<artifactItem>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules</outputDirectory>
<destFileName>jakarta.el-api.jar</destFileName>
</artifactItem>
<artifactItem>
<groupId>jakarta.servlet.jsp</groupId>
<artifactId>jakarta.servlet.jsp-api</artifactId>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules</outputDirectory>
<destFileName>jakarta.servlet.jsp-api.jar</destFileName>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin> -->
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down Expand Up @@ -337,6 +335,9 @@
<goal>verify</goal>
</goals>
<configuration>
<includes>
<include>com/sun/ts/tests/signaturetest/jsp/JSPSigTestIT.java</include>
</includes>
<additionalClasspathElements>
<additionalClasspathElement>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.servlet-api.jar</additionalClasspathElement>
<additionalClasspathElement>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.el-api.jar</additionalClasspathElement>
Expand All @@ -351,7 +352,7 @@
<impl.vi>glassfish</impl.vi>
<impl.vi.deploy.dir>${webServerHome}/domains/domain1/autodeploy</impl.vi.deploy.dir>
<impl.deploy.timeout.multiplier>30</impl.deploy.timeout.multiplier>
<el.classes>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.el-api.jar:${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.el.jar</el.classes>
<el.classes>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.el-api.jar</el.classes>
<jspservlet.classes>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.servlet-api.jar:${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.servlet.jsp-api.jar</jspservlet.classes>
<jstl.classes>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.servlet.jsp.jstl.jar:${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.servlet.jsp.jstl-api.jar</jstl.classes>
<junit.log.traceflag>true</junit.log.traceflag>
Expand All @@ -363,7 +364,7 @@
<cts.harness.debug>true</cts.harness.debug>
<porting.ts.url.class.1>com.sun.ts.tests.jsp.lib.implementation.sun.common.SunRIURL</porting.ts.url.class.1>
<jimage.dir>${project.build.directory}/jdk11-bundle</jimage.dir>
<sigTestClasspath>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.servlet-api.jar:${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.servlet.jsp-api.jar:${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.el-api.jar:${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.el.jar:${project.build.directory}/jdk11-bundle/java.base:${project.build.directory}/jdk11-bundle/java.rmi:${project.build.directory}/jdk11-bundle/java.sql:${project.build.directory}/jdk11-bundle/java.naming</sigTestClasspath>
<sigTestClasspath>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.servlet-api.jar:${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.servlet.jsp-api.jar:${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.el-api.jar:${project.build.directory}/jdk11-bundle/java.base:${project.build.directory}/jdk11-bundle/java.rmi:${project.build.directory}/jdk11-bundle/java.sql:${project.build.directory}/jdk11-bundle/java.naming</sigTestClasspath>
</systemPropertyVariables>
<environmentVariables>
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
Expand Down
31 changes: 31 additions & 0 deletions jsp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>signaturetest</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.netbeans.tools</groupId>
Expand Down Expand Up @@ -219,6 +220,36 @@
<license>EPL</license>
</properties>
</profile>
<profile>
<id>record-signature</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<properties>
<bundle-name>jakarta-pages-tck</bundle-name>
<license>EFTL</license>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.netbeans.tools</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>1.4</version>
<configuration>
<FileName>${project.build.directory}/jakarta.servlet.jsp.sig_${project.version}</FileName>
<packages>jakarta.servlet.jsp,jakarta.servlet.jsp.el,jakarta.servlet.jsp.tagext</packages>
</configuration>
<executions>
<execution>
<goals>
<goal>generate</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
4 changes: 2 additions & 2 deletions jsp/src/main/assembly/assembly.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
<destName>LICENSE.md</destName>
</file>
<file>
<source>${project.basedir}/src/main/resources/jakarta.servlet.jsp.sig_3.0</source>
<destName>jakarta.servlet.jsp.sig_3.0</destName>
<source>${project.basedir}/src/main/resources/jakarta.servlet.jsp.sig_4.0</source>
<destName>jakarta.servlet.jsp.sig_4.0</destName>
</file>
</files>
<fileSets>
Expand Down
Loading

0 comments on commit a8bce17

Please sign in to comment.