Skip to content

Commit

Permalink
Merge pull request #1779 from arjantijms/pages_extra_src_parent
Browse files Browse the repository at this point in the history 
Give extra platform tests for Pages TCK source its own parent
  • Loading branch information
@arjantijms
arjantijms authored Jan 16, 2025
2 parents 420e9ea + 64086f3 commit 8ac21ac
Showing 1 changed file with 165 additions and 54 deletions.
219 changes: 165 additions & 54 deletions tcks/apis/pages/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation
Copyright (c) 2021, 2025 Contributors to the Eclipse Foundation
All rights reserved.
This program and the accompanying materials are made available under the
Expand All @@ -17,114 +17,225 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>jakarta.tck</groupId>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>11.0.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
<version>1.0.9</version>
<relativePath />
</parent>

<groupId>jakarta.tck</groupId>
<artifactId>pages-platform-tck</artifactId>
<version>11.0.0-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>Pages Tests</name>
<description>JSP Tests for Jakarta EE Platform</description>
<name>Jakarta Pages Tests</name>
<description>Jakarta Pages - Extra Tests for Jakarta EE Platform</description>

<properties>
<jakarta.annotation-api.version>3.0.0-M1</jakarta.annotation-api.version>
<jakarta.el-api.version>6.0.1</jakarta.el-api.version>
<jakarta.mail-api.version>2.1.3</jakarta.mail-api.version>
<jakarta.servlet-api.version>6.1.0-M2</jakarta.servlet-api.version>
<jms-api.version>3.1.0</jms-api.version>
<jsp-api.version>4.0.0-M2</jsp-api.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<jakarta.tck.tools.version>11.0.0-M2</jakarta.tck.tools.version>

<junit.jupiter.version>5.11.3</junit.jupiter.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.11.4</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
<version>1.9.1.Final</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<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>${project.groupId}</groupId>
<artifactId>signaturetest</artifactId>
<version>11.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>2.3</version>
</dependency>
<!-- Jakarta EE dependencies -->
<dependency>
<groupId>jakarta.servlet.jsp</groupId>
<artifactId>jakarta.servlet.jsp-api</artifactId>
<version>${jsp-api.version}</version>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${jakarta.servlet-api.version}</version>
<version>6.1.0</version>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>${jakarta.annotation-api.version}</version>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.jms</groupId>
<artifactId>jakarta.jms-api</artifactId>
<version>${jms-api.version}</version>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
<version>${jakarta.el-api.version}</version>
<version>6.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail-api</artifactId>
<version>${jakarta.mail-api.version}</version>
<version>2.1.3</version>
</dependency>

<!-- Jakarta TCK tools dependencies -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${junit.jupiter.version}</version>
<groupId>jakarta.tck</groupId>
<artifactId>common</artifactId>
<version>${jakarta.tck.tools.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit5</groupId>
<artifactId>arquillian-junit5-container</artifactId>
<groupId>jakarta.tck</groupId>
<artifactId>runtime</artifactId>
<version>${jakarta.tck.tools.version}</version>
</dependency>
<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>libutil</artifactId>
<version>${jakarta.tck.tools.version}</version>
</dependency>

<!-- JUnit and Arquillian dependencies-->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit5</groupId>
<artifactId>arquillian-junit5-core</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-container-test-api</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.test</groupId>
<artifactId>arquillian-test-api</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-api</artifactId>
<version>1.2.6</version>
</dependency>
</dependencies>

<build>
<finalName>${bundle-name}-${project.version}</finalName>
<plugins>
<!-- do not publish this artifact to Maven repositories -->
<!-- Sets minimal Maven version to 3.8.6 -->
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-maven</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>3.8.6</version>
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>

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

<!-- Configure the jar with the sources. -->
<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>

<!-- Create Javadoc for API jar -->
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<doclint>none</doclint>
</configuration>
</plugin>

<!-- Generate a "consumer pom" for the generated jar -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.6.0</version>
<configuration>
<flattenMode>ossrh</flattenMode>
</configuration>
<executions>
<!-- enable flattening -->
<execution>
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
</execution>
<!-- ensure proper cleanup -->
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>


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

0 comments on commit 8ac21ac

Please sign in to comment.