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

Tags tck updates for runner and bundle #1894

Merged
merged 2 commits into from
Feb 8, 2025
Merged

Tags tck updates for runner and bundle #1894

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
51ee50d
tags tck updates for runner and bundle
alwin-joseph Feb 7, 2025
44e3f44
Merge branch 'main' into tags_runner
alwin-joseph Feb 7, 2025
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
1 change: 0 additions & 1 deletion glassfish-runner/tags-tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
</parent>

<artifactId>tags-tck</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<modules>
Expand Down
11 changes: 6 additions & 5 deletions glassfish-runner/tags-tck/tags-tck-install/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,14 @@
</parent>

<artifactId>tags-tck-install</artifactId>
<version>11.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>TCK: Install Jakarta tags TCK</name>

<properties>
<tck.test.tags.file>jakarta-tags-tck-${tck.test.tags.version}.zip</tck.test.tags.file>
<tck.test.tags.file>jakartaeetck-${tck.test.tags.version}-dist.zip</tck.test.tags.file>
<tck.test.tags.url>https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee11/staged/eftl/${tck.test.tags.file}</tck.test.tags.url>
<tck.test.tags.version>11.0.0-M2</tck.test.tags.version>
<tck.test.tags.version>${project.version}</tck.test.tags.version>
</properties>

<build>
Expand Down Expand Up @@ -69,10 +70,10 @@
</goals>
<phase>process-resources</phase>
<configuration>
<file>${project.build.directory}/jakarta-tags-tck-${tck.test.tags.version}.jar</file>
<sources>${project.build.directory}/jakarta-tags-tck-${tck.test.tags.version}-sources.jar</sources>
<file>${project.build.directory}/jakartaeetck/artifacts/tags-tck-${tck.test.tags.version}.jar</file>
<sources>${project.build.directory}/jakartaeetck/artifacts/tags-tck-${tck.test.tags.version}-sources.jar</sources>
<groupId>jakarta.tck</groupId>
<artifactId>jakarta-tags-tck</artifactId>
<artifactId>tags-tck</artifactId>
<version>${tck.test.tags.version}</version>
<packaging>jar</packaging>
</configuration>
Expand Down
12 changes: 5 additions & 7 deletions glassfish-runner/tags-tck/tags-tck-run/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,16 @@
<relativePath />
</parent>

<groupId>jakarta</groupId>
<artifactId>glassfish.jstl-tck</artifactId>
<artifactId>glassfish.tags-tck</artifactId>
<version>11.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
<glassfish.home>${glassfish.root}/glassfish${glassfish.version.main}</glassfish.home>
<glassfish.root>${project.build.directory}</glassfish.root>
<glassfish.version>8.0.0-JDK17-M9</glassfish.version>
<glassfish.version.main>8</glassfish.version.main>
<jakarta.platform.version>11.0.0-M4</jakarta.platform.version>
<tck.version>11.0.0-M2</tck.version>
<jakarta.tck.tags.version>${project.version}</jakarta.tck.tags.version>
</properties>

<dependencies>
Expand All @@ -50,8 +48,8 @@
<!-- The actual TCK containing the tests -->
<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>jakarta-tags-tck</artifactId>
<version>${tck.version}</version>
<artifactId>tags-tck</artifactId>
<version>${jakarta.tck.tags.version}</version>
</dependency>

<!-- Junit -->
Expand Down Expand Up @@ -129,7 +127,7 @@
</goals>
<configuration>
<groups>${testGroups}</groups>
<dependenciesToScan>jakarta.tck:jakarta-tags-tck</dependenciesToScan>
<dependenciesToScan>jakarta.tck:tags-tck</dependenciesToScan>
<systemPropertyVariables>
<glassfish.home>${project.build.directory}/${glassfish.toplevel.dir}</glassfish.home>

Expand Down
15 changes: 15 additions & 0 deletions release/artifact-install.pom
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,21 @@
<generatePom>false</generatePom>
</configuration>
</execution>
<execution>
<id>install-tags-tck</id>
<phase>package</phase>
<goals>
<goal>install-file</goal>
</goals>
<configuration>
<groupId>jakarta.tck</groupId>
<artifactId>tags-tck</artifactId>
<version>${project.version}</version>
<packaging>jar</packaging>
<file>tags-tck-${project.version}.jar</file>
<generatePom>false</generatePom>
</configuration>
</execution>

<execution>
<id>install-signaturetest</id>
Expand Down
11 changes: 11 additions & 0 deletions release/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,17 @@
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>tags-tck</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>tags-tck</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>signaturetest</artifactId>
Expand Down
1 change: 1 addition & 0 deletions release/src/main/assembly/assembly.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@
<include>${project.groupId}:jsonp-platform-tck</include>
<include>${project.groupId}:pages-platform-tck</include>
<include>${project.groupId}:transactions-tck</include>
<include>${project.groupId}:tags-tck</include>
<include>${project.groupId}:signaturetest</include>
<include>${project.groupId}:websocket-tck-platform-tests</include>
<include>${project.groupId}:xa</include>
Expand Down
60 changes: 6 additions & 54 deletions tcks/apis/tags/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,35 +26,18 @@
<relativePath />
</parent>

<artifactId>jakarta-tags-tck</artifactId>
<groupId>jakarta.tck</groupId>
<artifactId>tags-tck</artifactId>
<version>11.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>Jakarta Tags TCK</name>
<description>This module contains all the tests for the Jakarta Tags TCK</description>
<url>https://github.com/jakartaee/platform-tck</url>

<licenses>
<license>
<name>EPL 2.0</name>
<url>http://www.eclipse.org/legal/epl-2.0</url>
<distribution>repo</distribution>
</license>
</licenses>

<developers>
<developer>
<id>jakarta-platform-tck-develeopers</id>
<name>Platform TCK Developers</name>
<organization>Eclipse Foundation</organization>
<email>[email protected]</email>
</developer>
</developers>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<jakarta.tck.tools.version>11.0.0-RC4</jakarta.tck.tools.version>
</properties>

Expand Down Expand Up @@ -87,7 +70,6 @@
<artifactId>common</artifactId>
<version>${jakarta.tck.tools.version}</version>
</dependency>

<dependency>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-api</artifactId>
Expand Down Expand Up @@ -127,16 +109,6 @@
</dependencies>

<build>
<finalName>${bundle-name}-${project.version}</finalName>

<resources>
<resource>
<directory>src/main/resources</directory>
<includes>
<include>com/</include>
</includes>
</resource>
</resources>
<plugins>
<!-- Sets minimal Maven version to 3.8.6 -->
<plugin>
Expand All @@ -157,15 +129,15 @@
</execution>
</executions>
</plugin>

<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<configuration>
<release>17</release>
</configuration>
</plugin>

<!-- Configure the jar with the sources. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -179,7 +151,7 @@
</execution>
</executions>
</plugin>

<!-- Create Javadoc for API jar -->
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
Expand All @@ -195,7 +167,7 @@
</execution>
</executions>
</plugin>

<!-- Generate a "consumer pom" for the generated jar -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down Expand Up @@ -226,24 +198,4 @@
</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>
Loading