Skip to content

Commit dc60694

Browse files
jiridanekjiridanek
authored
Include new subproject to retain src compatibility using Jakarta/Ecl… (#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.
1 parent be183e8 commit dc60694

File tree

13 files changed

+979
-5
lines changed

13 files changed

+979
-5
lines changed

‎bom/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
<plugin.shade.version>3.5.0</plugin.shade.version>
5757
<plugin.surefire.version>3.1.2</plugin.surefire.version>
5858
<plugin.versions.version>2.7</plugin.versions.version>
59+
<plugin.transformer-tools-mvn.version>1.0.15.Final</plugin.transformer-tools-mvn.version>
5960

6061
<annotations.version>24.0.1</annotations.version>
6162
<checker-qual.version>3.36.0</checker-qual.version>

‎cli-qpid-jms-1x/pom.xml

Lines changed: 196 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,196 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Copyright (c) 2017 Red Hat, Inc.
4+
~
5+
~ Licensed to the Apache Software Foundation (ASF) under one or more
6+
~ contributor license agreements. See the NOTICE file distributed with
7+
~ this work for additional information regarding copyright ownership.
8+
~ The ASF licenses this file to You under the Apache License, Version 2.0
9+
~ (the "License"); you may not use this file except in compliance with
10+
~ the License. You may obtain a copy of the License at
11+
~
12+
~ http://www.apache.org/licenses/LICENSE-2.0
13+
~
14+
~ Unless required by applicable law or agreed to in writing, software
15+
~ distributed under the License is distributed on an "AS IS" BASIS,
16+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17+
~ See the License for the specific language governing permissions and
18+
~ limitations under the License.
19+
-->
20+
21+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
22+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
23+
<modelVersion>4.0.0</modelVersion>
24+
25+
<parent>
26+
<groupId>com.redhat.cli-java</groupId>
27+
<artifactId>parent</artifactId>
28+
<version>1.2.2-SNAPSHOT</version>
29+
<relativePath>../parent/pom.xml</relativePath>
30+
</parent>
31+
32+
<artifactId>cli-qpid-jms-1x</artifactId>
33+
<packaging>jar</packaging>
34+
35+
<properties>
36+
<bundle.symbolic.name.suffix>jms</bundle.symbolic.name.suffix>
37+
<jar.main.class>com.redhat.mqe.jms.Main</jar.main.class>
38+
<qpid.jms.1x.client.version>1.9.0</qpid.jms.1x.client.version>
39+
<library.version>${qpid.jms.1x.client.version}</library.version>
40+
<tcnative.version>2.0.61.Final</tcnative.version>
41+
<tcnative.classifier>linux-x86_64-fedora</tcnative.classifier>
42+
<jaeger-client.version>1.8.1</jaeger-client.version>
43+
</properties>
44+
45+
<dependencyManagement>
46+
<dependencies>
47+
<dependency>
48+
<groupId>org.apache.qpid</groupId>
49+
<artifactId>qpid-jms-parent</artifactId>
50+
<version>${qpid.jms.1x.client.version}</version>
51+
<type>pom</type>
52+
<scope>import</scope>
53+
</dependency>
54+
</dependencies>
55+
</dependencyManagement>
56+
57+
<dependencies>
58+
<dependency>
59+
<groupId>org.junit-pioneer</groupId>
60+
<artifactId>junit-pioneer</artifactId>
61+
<scope>test</scope>
62+
</dependency>
63+
<dependency>
64+
<groupId>org.awaitility</groupId>
65+
<artifactId>awaitility</artifactId>
66+
<scope>test</scope>
67+
</dependency>
68+
69+
<dependency>
70+
<groupId>com.redhat.cli-java</groupId>
71+
<artifactId>jmslib</artifactId>
72+
</dependency>
73+
74+
<dependency>
75+
<groupId>org.apache.qpid</groupId>
76+
<artifactId>qpid-jms-client</artifactId>
77+
</dependency>
78+
<dependency>
79+
<groupId>org.apache.geronimo.specs</groupId>
80+
<artifactId>geronimo-jms_2.0_spec</artifactId>
81+
</dependency>
82+
83+
<dependency>
84+
<groupId>io.opentracing</groupId>
85+
<artifactId>opentracing-util</artifactId>
86+
<scope>compile</scope>
87+
</dependency>
88+
<dependency>
89+
<groupId>io.opentracing</groupId>
90+
<artifactId>opentracing-api</artifactId>
91+
<scope>compile</scope>
92+
</dependency>
93+
94+
<dependency>
95+
<groupId>io.jaegertracing</groupId>
96+
<artifactId>jaeger-client</artifactId>
97+
<version>${jaeger-client.version}</version>
98+
</dependency>
99+
100+
<dependency>
101+
<groupId>com.redhat.cli-java</groupId>
102+
<artifactId>tests</artifactId>
103+
<type>test-jar</type>
104+
<scope>test</scope>
105+
</dependency>
106+
<dependency>
107+
<groupId>com.redhat.cli-java</groupId>
108+
<artifactId>jmslib</artifactId>
109+
<type>test-jar</type>
110+
<scope>test</scope>
111+
</dependency>
112+
<dependency>
113+
<groupId>com.google.truth</groupId>
114+
<artifactId>truth</artifactId>
115+
<scope>test</scope>
116+
</dependency>
117+
118+
<dependency>
119+
<groupId>org.apache.activemq</groupId>
120+
<artifactId>artemis-amqp-protocol</artifactId>
121+
<scope>test</scope>
122+
</dependency>
123+
<dependency>
124+
<groupId>com.redhat.cli-java</groupId>
125+
<artifactId>broker</artifactId>
126+
<version>1.2.2-SNAPSHOT</version>
127+
<type>test-jar</type>
128+
<scope>test</scope>
129+
</dependency>
130+
</dependencies>
131+
132+
<build>
133+
<plugins>
134+
<!--https://github.com/wildfly-extras/batavia/blob/master/tools/mvn/src/main/java/org/wildfly/extras/transformer/tool/maven/MavenPluginTransformer.java-->
135+
<plugin>
136+
<groupId>org.wildfly.extras.batavia</groupId>
137+
<artifactId>transformer-tools-mvn</artifactId>
138+
<version>${plugin.transformer-tools-mvn.version}</version>
139+
<executions>
140+
<execution>
141+
<id>transform-sources</id>
142+
<phase>generate-sources</phase>
143+
<goals>
144+
<goal>transform-sources</goal>
145+
</goals>
146+
<configuration>
147+
<source-project>${project.basedir}/../cli-qpid-jms</source-project>
148+
<invert>true</invert>
149+
</configuration>
150+
</execution>
151+
</executions>
152+
<dependencies>
153+
<dependency>
154+
<groupId>org.wildfly.extras.batavia</groupId>
155+
<artifactId>transformer-impl-eclipse</artifactId>
156+
<version>${plugin.transformer-tools-mvn.version}</version>
157+
</dependency>
158+
</dependencies>
159+
</plugin>
160+
<plugin>
161+
<groupId>org.apache.maven.plugins</groupId>
162+
<artifactId>maven-shade-plugin</artifactId>
163+
</plugin>
164+
</plugins>
165+
</build>
166+
167+
<profiles>
168+
<profile>
169+
<id>tcnative-boringssl-static</id>
170+
<dependencies>
171+
<dependency>
172+
<groupId>io.netty</groupId>
173+
<artifactId>netty-tcnative-boringssl-static</artifactId>
174+
<version>${tcnative.version}</version>
175+
</dependency>
176+
</dependencies>
177+
</profile>
178+
<profile>
179+
<id>tcnative-openssl-dynamic</id>
180+
<activation>
181+
<property>
182+
<name>!disableTcnativeOpensslDynamic</name>
183+
</property>
184+
</activation>
185+
<dependencies>
186+
<dependency>
187+
<groupId>io.netty</groupId>
188+
<artifactId>netty-tcnative</artifactId>
189+
<version>${tcnative.version}</version>
190+
<classifier>${tcnative.classifier}</classifier>
191+
</dependency>
192+
</dependencies>
193+
</profile>
194+
</profiles>
195+
196+
</project>

‎cli-qpid-jms-1x/src/main/resources/log4j2.properties

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
#
2+
# Licensed to the Apache Software Foundation (ASF) under one
3+
# or more contributor license agreements. See the NOTICE file
4+
# distributed with this work for additional information
5+
# regarding copyright ownership. The ASF licenses this file
6+
# to you under the Apache License, Version 2.0 (the
7+
# "License"); you may not use this file except in compliance
8+
# with the License. You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing,
13+
# software distributed under the License is distributed on an
14+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
# KIND, either express or implied. See the License for the
16+
# specific language governing permissions and limitations
17+
# under the License.
18+
#
19+
rootLogger=WARN, console
20+
21+
logger.lib.name=com.redhat.mqe.lib
22+
logger.lib.level=INFO
23+
24+
logger.netty.name=io.netty
25+
logger.netty.level=WARN
26+
27+
# Log transport.traceBytes=true messages
28+
logger.NettyTcpTransport.name=org.apache.qpid.jms.transports.netty.NettyTcpTransport
29+
logger.NettyTcpTransport.level=DEBUG
30+
31+
# Uncomment this to get debug logs from qpid-jms
32+
#logger.qpid.name=org.slf4j.simpleLogger.log.org.apache.qpid
33+
#logger.qpid.level=DEBUG
34+
35+
# Console appender
36+
appender.console.type=Console
37+
appender.console.name=console
38+
appender.console.target=SYSTEM_ERR

0 commit comments

Comments
 (0)