Skip to content

Commit

Permalink
Clean messaging-outside-container pom
Browse files Browse the repository at this point in the history 
One test needed to be adjusted for ManagedBean not longer existing.

Runner had wrong groupid and was adjusted
  • Loading branch information
@arjantijms
arjantijms committed Feb 5, 2025
1 parent f3a241b commit 9840464
Show file tree
Hide file tree
Showing 3 changed files with 121 additions and 26 deletions.
4 changes: 2 additions & 2 deletions glassfish-runner/messaging-tck/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0-M5</version>
<version>3.5.2</version>
<executions>
<execution>
<id>gf-tests</id>
Expand All @@ -532,7 +532,7 @@
<additionalClasspathElement>${glassfish.home}/mq/lib/jms.jar</additionalClasspathElement>
<additionalClasspathElement>${glassfish.home}/mq/lib/fscontext.jar</additionalClasspathElement>
</additionalClasspathElements>
<dependenciesToScan>jakartatck:jms-tck</dependenciesToScan>
<dependenciesToScan>jakarta.tck:jms-tck</dependenciesToScan>
<systemPropertyVariables>
<user>j2ee</user>
<password>j2ee</password>
Expand Down
137 changes: 116 additions & 21 deletions tcks/apis/messaging/messaging-outside-container/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,60 +21,97 @@
<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>jms-tck</artifactId>
<packaging>jar</packaging>
<version>11.0.0-SNAPSHOT</version>

<name>JMS Standalone</name>
<description>JMS Standalone TCK tests</description>
<name>Jakarta Messaging Outside container</name>
<description>
This TCK tests MQ implementations like OpenMQ, ActiveMQ etc directly
without an application server / container like GlassFish or Open Liberty.
</description>

<properties>
<junit.jupiter.version>5.11.4</junit.jupiter.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<tck.version>${project.version}</tck.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.3.Final</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>common</artifactId>
</dependency>
<dependency>
<groupId>jakarta.jms</groupId>
<artifactId>jakarta.jms-api</artifactId>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
<version>2.0.1</version>
</dependency>
<dependency>
<groupId>jakarta.ejb</groupId>
<artifactId>jakarta.ejb-api</artifactId>
<version>4.0.1</version>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${junit.jupiter.version}</version>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit5</groupId>
<artifactId>arquillian-junit5-container</artifactId>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit5</groupId>
<artifactId>arquillian-junit5-core</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>6.1.0</version>
</dependency>

<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>common</artifactId>
<version>11.0.0-RC4</version>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
</dependency>
</dependencies>

<build>
<!-- Include the container descriptors in the output artifact -->
<resources>
Expand All @@ -90,15 +127,37 @@
</resources>

<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>
<!-- Create Sources for the generated jar -->

<!-- Configure the jar with the sources. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
Expand All @@ -109,6 +168,42 @@
</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>
</project>
6 changes: 3 additions & 3 deletions ...side-container/src/main/java/com/sun/ts/tests/jms/ee20/cditests/ejbweb/MyManagedBean.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,26 +26,26 @@
import com.sun.ts.lib.util.RemoteLoggingInitException;
import com.sun.ts.lib.util.TestUtil;

import jakarta.annotation.ManagedBean;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.Resource;
import jakarta.inject.Inject;
import jakarta.inject.Named;
import jakarta.jms.JMSConnectionFactory;
import jakarta.jms.JMSConsumer;
import jakarta.jms.JMSContext;
import jakarta.jms.Queue;
import jakarta.jms.TextMessage;
import jakarta.jms.Topic;

@ManagedBean(value = "mybean")
@Named("mybean")
public class MyManagedBean implements Serializable {
private static final long serialVersionUID = 1L;

private Properties p = new Properties();

private long timeout;

private static final Logger logger = (Logger) System.getLogger(MyManagedBean.class.getName());
private static final Logger logger = System.getLogger(MyManagedBean.class.getName());

// JMSContext CDI injection specifying ConnectionFactory
@Inject
Expand Down

0 comments on commit 9840464

Please sign in to comment.