You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2022/06/21 15:28:05 UTC
[tomee] branch master updated (c021e553f2 -> e6db358313)
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
from c021e553f2 Add a couple of fixes in examples and TCK
new 4bc45084d4 Cleanup and comment non jakarta ready examples
new 9357ce167c Update REST client API
new e6db358313 Make sure there is no port conflict on our CI (ActiveMQ 61616 port)
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
examples/mp-rest-client/pom.xml | 2 +-
examples/mvc-cxf/pom.xml | 1 +
examples/pom.xml | 3 +++
examples/simple-jms-context/pom.xml | 25 ++++++++++++++++++++++
.../src/test/resources/arquillian.xml | 9 ++++++++
examples/simple-jms/pom.xml | 25 ++++++++++++++++++++++
.../simple-jms/src/test/resources/arquillian.xml | 10 +++++++++
7 files changed, 74 insertions(+), 1 deletion(-)
[tomee] 02/03: Update REST client API
Posted by jl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 9357ce167c42d47f9a2086bde036267ff91bf0c2
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Tue Jun 21 17:27:35 2022 +0200
Update REST client API
---
examples/mp-rest-client/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/mp-rest-client/pom.xml b/examples/mp-rest-client/pom.xml
index 0ab5d12952..a7199284cf 100755
--- a/examples/mp-rest-client/pom.xml
+++ b/examples/mp-rest-client/pom.xml
@@ -24,7 +24,7 @@
<packaging>war</packaging>
<name>TomEE :: Examples :: Microprofile REST Client</name>
<properties>
- <microprofile.rest-client.version>1.1</microprofile.rest-client.version>
+ <microprofile.rest-client.version>3.0</microprofile.rest-client.version>
<version.jakartaee-api>9.1-M2-SNAPSHOT</version.jakartaee-api>
<version.arquillian.bom>1.7.0.Alpha10</version.arquillian.bom>
<junit.version>4.13.2</junit.version>
[tomee] 01/03: Cleanup and comment non jakarta ready examples
Posted by jl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 4bc45084d4ead47b686e64665803939e9d964953
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Tue Jun 21 17:27:23 2022 +0200
Cleanup and comment non jakarta ready examples
---
examples/mvc-cxf/pom.xml | 1 +
examples/pom.xml | 3 +++
2 files changed, 4 insertions(+)
diff --git a/examples/mvc-cxf/pom.xml b/examples/mvc-cxf/pom.xml
index daf2d4d651..437b9730a1 100644
--- a/examples/mvc-cxf/pom.xml
+++ b/examples/mvc-cxf/pom.xml
@@ -128,6 +128,7 @@
<groupId>org.apache.tomee</groupId>
<artifactId>arquillian-tomee-remote</artifactId>
<version>${tomee.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.graphene</groupId>
diff --git a/examples/pom.xml b/examples/pom.xml
index 82c717b21c..512e126ad6 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -206,8 +206,11 @@
<module>resources-jmx-example</module>
<module>websocket-tls-basic-auth</module>
<module>concurrency-utils</module>
+ <!-- Deltaspike and others not jakarta compliant
+ Too many to relocate for an example
<module>mvc-cxf</module>
<module>mvc-cxf-hibernate</module>
+ -->
<module>mp-rest-client</module>
<module>mvc-resteasy</module>
<module>mp-custom-healthcheck</module>
[tomee] 03/03: Make sure there is no port conflict on our CI (ActiveMQ 61616 port)
Posted by jl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit e6db358313c38512a64b182bb5c2d3c1c909fa35
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Tue Jun 21 17:27:56 2022 +0200
Make sure there is no port conflict on our CI (ActiveMQ 61616 port)
---
examples/simple-jms-context/pom.xml | 25 ++++++++++++++++++++++
.../src/test/resources/arquillian.xml | 9 ++++++++
examples/simple-jms/pom.xml | 25 ++++++++++++++++++++++
.../simple-jms/src/test/resources/arquillian.xml | 10 +++++++++
4 files changed, 69 insertions(+)
diff --git a/examples/simple-jms-context/pom.xml b/examples/simple-jms-context/pom.xml
index 71fbe223ad..a8b7f43cab 100644
--- a/examples/simple-jms-context/pom.xml
+++ b/examples/simple-jms-context/pom.xml
@@ -31,10 +31,35 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.arquillian>1.7.0.Alpha10</version.arquillian>
<tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
+ <activemq.port>61616</activemq.port>
</properties>
<build>
<defaultGoal>install</defaultGoal>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
<plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>reserve-activemq-port</id>
+ <goals>
+ <goal>reserve-network-port</goal>
+ </goals>
+ <phase>compile</phase>
+ <configuration>
+ <portNames>
+ <portName>activemq.port</portName>
+ </portNames>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
diff --git a/examples/simple-jms-context/src/test/resources/arquillian.xml b/examples/simple-jms-context/src/test/resources/arquillian.xml
index 60dbed2cc6..301ec0fe06 100644
--- a/examples/simple-jms-context/src/test/resources/arquillian.xml
+++ b/examples/simple-jms-context/src/test/resources/arquillian.xml
@@ -25,6 +25,15 @@
<property name="classifier">plus</property>
<property name="dir">target/apache-tomee-remote</property>
<property name="appWorkingDir">target/arquillian-test-working-dir</property>
+ <!-- make sure it runs on our CI without ActiveMQ default 61616 conflict -->
+ <property name="properties">
+ AMQResourceAdapter = new://Resource?type=ActiveMQResourceAdapter
+ AMQResourceAdapter.BrokerXmlConfig = broker:(tcp://localhost:${activemq.port}?useJmx=false)
+ AMQMessageContainer = new://Container?type=MESSAGE
+ AMQMessageContainer.ResourceAdapter = AMQResourceAdapter
+ AMQConnectionFactory = new://Resource?type=jakarta.jms.ConnectionFactory
+ AMQConnectionFactory.ResourceAdapter = AMQResourceAdapter
+ </property>
</configuration>
</container>
</arquillian>
\ No newline at end of file
diff --git a/examples/simple-jms/pom.xml b/examples/simple-jms/pom.xml
index 363a2a5c33..09c85214f0 100644
--- a/examples/simple-jms/pom.xml
+++ b/examples/simple-jms/pom.xml
@@ -28,10 +28,35 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.arquillian>1.7.0.Alpha10</version.arquillian>
<tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
+ <activemq.port>61616</activemq.port>
</properties>
<build>
<defaultGoal>install</defaultGoal>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
<plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>reserve-activemq-port</id>
+ <goals>
+ <goal>reserve-network-port</goal>
+ </goals>
+ <phase>compile</phase>
+ <configuration>
+ <portNames>
+ <portName>activemq.port</portName>
+ </portNames>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
diff --git a/examples/simple-jms/src/test/resources/arquillian.xml b/examples/simple-jms/src/test/resources/arquillian.xml
index 60dbed2cc6..c43ec5a70a 100644
--- a/examples/simple-jms/src/test/resources/arquillian.xml
+++ b/examples/simple-jms/src/test/resources/arquillian.xml
@@ -23,8 +23,18 @@
<property name="httpPort">-1</property>
<property name="stopPort">-1</property>
<property name="classifier">plus</property>
+ <property name="debug">false</property>
<property name="dir">target/apache-tomee-remote</property>
<property name="appWorkingDir">target/arquillian-test-working-dir</property>
+ <!-- make sure it runs on our CI without ActiveMQ default 61616 conflict -->
+ <property name="properties">
+ AMQResourceAdapter = new://Resource?type=ActiveMQResourceAdapter
+ AMQResourceAdapter.BrokerXmlConfig = broker:(tcp://localhost:${activemq.port}?useJmx=false)
+ AMQMessageContainer = new://Container?type=MESSAGE
+ AMQMessageContainer.ResourceAdapter = AMQResourceAdapter
+ AMQConnectionFactory = new://Resource?type=jakarta.jms.ConnectionFactory
+ AMQConnectionFactory.ResourceAdapter = AMQResourceAdapter
+ </property>
</configuration>
</container>
</arquillian>
\ No newline at end of file