Skip to content

Commit

Permalink
Include new subproject to retain src compatibility using Jakarta/Ecl… (…
Browse files Browse the repository at this point in the history 
…#653)

* "Include new subproject to retain src compatibility using Jakarta/Eclipse EE4J nomenclature

This commit introduces a new subproject called cli-qpid-jms-1x that is a non-inverted (i.e., uses Jakarta/Eclipse EE4J nomenclature) variant of the cli-qpid-jms subproject. All classes and tests from cli-qpid-jms are copied into cli-qpid-jms-1x. This new subproject retains source compatibility with the old javax.jms API, which is necessary because some third-party libraries linked against the old javax.jms API can't be used with the new jakarta.jms API due to the package name change. It also includes some additional test documents."

* Remove redundant test cases and use wildfly plugin to generate them from 2.x version

Several test cases were removed from the project. These tests included ConnectWithoutPassword.java, ENTMQCL1860.java, QPIDJMS412Test.java, QPIDJMS451Test.java, and QPIDJMS484Test.java. The deletion was carried out because these tests had become redundant and were no longer necessary for validating the project's functionality. Maintaining them would require unnecessary resources without providing any added value to the overall test suite.
  • Loading branch information
@jiridanek
jiridanek authored Aug 1, 2023
1 parent be183e8 commit dc60694
Show file tree
Hide file tree
Showing 13 changed files with 979 additions and 5 deletions.
1 change: 1 addition & 0 deletions bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
<plugin.shade.version>3.5.0</plugin.shade.version>
<plugin.surefire.version>3.1.2</plugin.surefire.version>
<plugin.versions.version>2.7</plugin.versions.version>
<plugin.transformer-tools-mvn.version>1.0.15.Final</plugin.transformer-tools-mvn.version>

<annotations.version>24.0.1</annotations.version>
<checker-qual.version>3.36.0</checker-qual.version>
Expand Down
196 changes: 196 additions & 0 deletions cli-qpid-jms-1x/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,196 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2017 Red Hat, Inc.
~
~ Licensed to the Apache Software Foundation (ASF) under one or more
~ contributor license agreements. See the NOTICE file distributed with
~ this work for additional information regarding copyright ownership.
~ The ASF licenses this file to You under the Apache License, Version 2.0
~ (the "License"); you may not use this file except in compliance with
~ the License. You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.redhat.cli-java</groupId>
<artifactId>parent</artifactId>
<version>1.2.2-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>

<artifactId>cli-qpid-jms-1x</artifactId>
<packaging>jar</packaging>

<properties>
<bundle.symbolic.name.suffix>jms</bundle.symbolic.name.suffix>
<jar.main.class>com.redhat.mqe.jms.Main</jar.main.class>
<qpid.jms.1x.client.version>1.9.0</qpid.jms.1x.client.version>
<library.version>${qpid.jms.1x.client.version}</library.version>
<tcnative.version>2.0.61.Final</tcnative.version>
<tcnative.classifier>linux-x86_64-fedora</tcnative.classifier>
<jaeger-client.version>1.8.1</jaeger-client.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-parent</artifactId>
<version>${qpid.jms.1x.client.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.junit-pioneer</groupId>
<artifactId>junit-pioneer</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.redhat.cli-java</groupId>
<artifactId>jmslib</artifactId>
</dependency>

<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_2.0_spec</artifactId>
</dependency>

<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-util</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-api</artifactId>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>io.jaegertracing</groupId>
<artifactId>jaeger-client</artifactId>
<version>${jaeger-client.version}</version>
</dependency>

<dependency>
<groupId>com.redhat.cli-java</groupId>
<artifactId>tests</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.redhat.cli-java</groupId>
<artifactId>jmslib</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-amqp-protocol</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.redhat.cli-java</groupId>
<artifactId>broker</artifactId>
<version>1.2.2-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<!--https://github.com/wildfly-extras/batavia/blob/master/tools/mvn/src/main/java/org/wildfly/extras/transformer/tool/maven/MavenPluginTransformer.java-->
<plugin>
<groupId>org.wildfly.extras.batavia</groupId>
<artifactId>transformer-tools-mvn</artifactId>
<version>${plugin.transformer-tools-mvn.version}</version>
<executions>
<execution>
<id>transform-sources</id>
<phase>generate-sources</phase>
<goals>
<goal>transform-sources</goal>
</goals>
<configuration>
<source-project>${project.basedir}/../cli-qpid-jms</source-project>
<invert>true</invert>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.wildfly.extras.batavia</groupId>
<artifactId>transformer-impl-eclipse</artifactId>
<version>${plugin.transformer-tools-mvn.version}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>tcnative-boringssl-static</id>
<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
<version>${tcnative.version}</version>
</dependency>
</dependencies>
</profile>
<profile>
<id>tcnative-openssl-dynamic</id>
<activation>
<property>
<name>!disableTcnativeOpensslDynamic</name>
</property>
</activation>
<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative</artifactId>
<version>${tcnative.version}</version>
<classifier>${tcnative.classifier}</classifier>
</dependency>
</dependencies>
</profile>
</profiles>

</project>
38 changes: 38 additions & 0 deletions cli-qpid-jms-1x/src/main/resources/log4j2.properties
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
#
rootLogger=WARN, console

logger.lib.name=com.redhat.mqe.lib
logger.lib.level=INFO

logger.netty.name=io.netty
logger.netty.level=WARN

# Log transport.traceBytes=true messages
logger.NettyTcpTransport.name=org.apache.qpid.jms.transports.netty.NettyTcpTransport
logger.NettyTcpTransport.level=DEBUG

# Uncomment this to get debug logs from qpid-jms
#logger.qpid.name=org.slf4j.simpleLogger.log.org.apache.qpid
#logger.qpid.level=DEBUG

# Console appender
appender.console.type=Console
appender.console.name=console
appender.console.target=SYSTEM_ERR
Loading

0 comments on commit dc60694

Please sign in to comment.