Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
This closes #3527
  • Loading branch information
clebertsuconic committed Apr 9, 2021
2 parents e5757c7 + b4789a8 commit e364961
Show file tree
Hide file tree
Showing 62 changed files with 817 additions and 340 deletions.
22 changes: 10 additions & 12 deletions artemis-cdi-client/pom.xml
Expand Up @@ -29,7 +29,6 @@

<properties>
<activemq.basedir>${project.basedir}/..</activemq.basedir>
<javax.annotation.version>1.3.2</javax.annotation.version>
</properties>

<artifactId>artemis-cdi-client</artifactId>
Expand Down Expand Up @@ -85,17 +84,16 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${javax.annotation.version}</version>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
Expand All @@ -106,8 +104,8 @@
<artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_2.0_spec</artifactId>
<groupId>jakarta.jms</groupId>
<artifactId>jakarta.jms-api</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap</groupId>
Expand Down Expand Up @@ -156,8 +154,8 @@
<artifactId>owb-arquillian-standalone</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.2_spec</artifactId>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</dependency>
</dependencies>
</profile>
Expand Down
18 changes: 12 additions & 6 deletions artemis-cli/pom.xml
Expand Up @@ -74,22 +74,28 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_2.0_spec</artifactId>
<groupId>jakarta.jms</groupId>
<artifactId>jakarta.jms-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-json_1.0_spec</artifactId>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-api</artifactId>
</dependency>
<!-- artemis producer and consumer can use amqp as the protocol -->
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
<version>${qpid.jms.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_2.0_spec</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
Expand Down
4 changes: 2 additions & 2 deletions artemis-commons/pom.xml
Expand Up @@ -81,8 +81,8 @@
<artifactId>commons-beanutils</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-json_1.0_spec</artifactId>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-api</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
4 changes: 2 additions & 2 deletions artemis-core-client/pom.xml
Expand Up @@ -87,8 +87,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-json_1.0_spec</artifactId>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.johnzon</groupId>
Expand Down
38 changes: 24 additions & 14 deletions artemis-distribution/pom.xml
Expand Up @@ -154,16 +154,20 @@
<groupId>io.airlift</groupId>
<artifactId>airline</artifactId>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-openwire-legacy</artifactId>
Expand All @@ -184,6 +188,12 @@
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
<version>${qpid.jms.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_2.0_spec</artifactId>
</exclusion>
</exclusions>
</dependency>


Expand Down Expand Up @@ -226,16 +236,16 @@
<artifactId>netty-all</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-json_1.0_spec</artifactId>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaspic_1.0_spec</artifactId>
<groupId>jakarta.security.auth.message</groupId>
<artifactId>jakarta.security.auth.message-api</artifactId>
</dependency>
</dependencies>

Expand Down
17 changes: 7 additions & 10 deletions artemis-distribution/src/main/assembly/dep.xml
Expand Up @@ -72,11 +72,8 @@
<include>io.micrometer:micrometer-core</include>

<!-- dependencies -->
<include>org.apache.geronimo.specs:geronimo-jms_2.0_spec</include>
<include>org.apache.geronimo.specs:geronimo-annotation_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
<include>org.apache.geronimo.specs:geronimo-ejb_3.0_spec</include>
<include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
<include>jakarta.jms:jakarta.jms-api</include>
<include>jakarta.transaction:jakarta.transaction-api</include>
<include>org.wildfly.common:wildfly-common</include>
<include>org.jboss.logmanager:jboss-logmanager</include>
<include>org.jboss.logging:jboss-logging</include>
Expand All @@ -91,7 +88,7 @@
<include>org.slf4j:slf4j-api</include>
<include>io.airlift:airline</include>
<include>com.google.guava:guava</include>
<include>javax.inject:javax.inject</include>
<include>jakarta.inject:jakarta.inject-api</include>
<include>org.eclipse.jetty.aggregate:jetty-all:jar:uber</include>
<include>org.apache.tomcat:tomcat-servlet-api</include>
<include>commons-beanutils:commons-beanutils</include>
Expand All @@ -102,13 +99,13 @@
<include>org.apache.commons:commons-lang3</include>
<include>org.fusesource.hawtbuf:hawtbuf</include>
<include>org.jgroups:jgroups</include>
<include>org.apache.geronimo.specs:geronimo-json_1.0_spec</include>
<include>jakarta.json:jakarta.json-api</include>
<include>org.apache.johnzon:johnzon-core</include>
<include>javax.xml.bind:jaxb-api</include>
<include>jakarta.xml.bind:jakarta.xml.bind-api</include>
<include>com.sun.xml.bind:jaxb-impl</include>
<include>com.sun.xml.bind:jaxb-core</include>
<include>javax.activation:activation</include>
<include>org.apache.geronimo.specs:geronimo-jaspic_1.0_spec</include>
<include>jakarta.activation:jakarta.activation-api</include>
<include>jakarta.security.auth.message:jakarta.security.auth.message-api</include>
</includes>
<!--excludes>
<exclude>org.apache.activemq:artemis-website</exclude>
Expand Down
38 changes: 37 additions & 1 deletion artemis-distribution/src/main/resources/licenses/bin/LICENSE
Expand Up @@ -243,6 +243,42 @@ Notice from author (Robert Harder, rob@iharder.net):

See: http://iharder.sourceforge.net/current/java/base64/

==============================================================================
For jakarta.activation-api:
==============================================================================
This product bundles jakarta.activation-api, which is available under the
Eclipse Distribution License (EDL) 1.0. For details, see licenses/EDL-1.0.txt

==============================================================================
For jakarta.jms-api:
==============================================================================
This product bundles jakarta.jms-api, which is available under the
Eclipse Public License (EPL) 2.0. For details, see licenses/EPL-2.0.txt

==============================================================================
For jakarta.json-api:
==============================================================================
This product bundles jakarta.json-api, which is available under the
Eclipse Public License (EPL) 2.0. For details, see licenses/EPL-2.0.txt

==============================================================================
For jakarta.security.auth.message-api:
==============================================================================
This product bundles jakarta.security.auth.message-api, which is available
under the Eclipse Public License (EPL) 2.0. For details, see
licenses/EPL-2.0.txt

==============================================================================
For jakarta.transaction-api:
==============================================================================
This product bundles jakarta.transaction-api, which is available under the
Eclipse Public License (EPL) 2.0. For details, see licenses/EPL-2.0.txt

==============================================================================
For jakarta.xml.bind-api:
==============================================================================
This product bundles jakarta.xml.bind-api, which is available under the
Eclipse Distribution License (EDL) 1.0. For details, see licenses/EDL-1.0.txt

==============================================================================
Apache ActiveMQ Artemis Subcomponents:
Expand Down Expand Up @@ -432,4 +468,4 @@ For Underscore:
==============================================================================
This product bundles Underscore, which is available under a
"MIT" license. For details, see
https://github.com/jashkenas/underscore/blob/master/LICENSE
https://github.com/jashkenas/underscore/blob/master/LICENSE
@@ -0,0 +1,11 @@
Eclipse Distribution License - v 1.0
Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors.

All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
Neither the name of the Eclipse Foundation, Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

0 comments on commit e364961

Please sign in to comment.