You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2019/12/02 20:11:50 UTC
[tomee] branch master updated (7ccfa34 -> 6c5e012)
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git.
from 7ccfa34 Merge pull request #615 from Travelcompositor/master
add 12ac24f TOMEE-2734-Upgrade CXF to 3.3.4
new 84985ac Merge branch 'TOMEE-2734' of github.com:Daniel-Dos/tomee into TOMEE-2734
new a4599ac Merge remote-tracking branch 'apache/master' into TOMEE-2734
new c934d01 Update MicroProfile REST client version to match CXF
new d26c2a1 SSL tests not quite passing, but inching closer
new 6c5e012 Fix up failing REST client TCK tests
The 5 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:
pom.xml | 4 +-
tck/microprofile-tck/rest-client/pom.xml | 56 ++++++++++++++++++++++
...MicroProfileRestClientTCKArchiveProcessor.java} | 19 ++++++--
.../MicroProfileRestClientTCKExtension.java} | 6 +--
...org.jboss.arquillian.core.spi.LoadableExtension | 1 +
.../rest-client/src/test/resources/arquillian.xml | 6 +++
6 files changed, 82 insertions(+), 10 deletions(-)
copy tck/microprofile-tck/{config/src/test/java/org/apache/tomee/microprofile/tck/config/MicroProfileConfigTCKArchiveProcessor.java => rest-client/src/test/java/org/apache/tomee/microprofile/tck/restclient/MicroProfileRestClientTCKArchiveProcessor.java} (63%)
copy tck/microprofile-tck/{config/src/test/java/org/apache/tomee/microprofile/tck/config/MicroProfileConfigTCKExtension.java => rest-client/src/test/java/org/apache/tomee/microprofile/tck/restclient/MicroProfileRestClientTCKExtension.java} (85%)
create mode 100644 tck/microprofile-tck/rest-client/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
[tomee] 01/05: Merge branch 'TOMEE-2734' of
github.com:Daniel-Dos/tomee into TOMEE-2734
Posted by jg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 84985acecaa99d04a67fa379a16313414ce5d748
Merge: 4ec07ef 12ac24f
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Fri Nov 15 12:28:35 2019 +0000
Merge branch 'TOMEE-2734' of github.com:Daniel-Dos/tomee into TOMEE-2734
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[tomee] 02/05: Merge remote-tracking branch 'apache/master' into
TOMEE-2734
Posted by jg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit a4599ac8aa797c6c5337a4e11224f3adcf3a24a3
Merge: 84985ac 7ccfa34
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Thu Nov 28 11:00:31 2019 +0000
Merge remote-tracking branch 'apache/master' into TOMEE-2734
README.adoc | 2 +-
container/openejb-core/pom.xml | 6 +
.../core/security/AbstractSecurityService.java | 20 +-
examples/pom.xml | 1 +
examples/simple-jms/README.adoc | 251 ++++++++++++++++++++
examples/simple-jms/README_es.adoc | 253 +++++++++++++++++++++
examples/simple-jms/build.xml | 119 ++++++++++
examples/simple-jms/pom.xml | 156 +++++++++++++
.../java/org/superbiz/jms/CustomJmsService.java | 94 ++++++++
.../org/superbiz/jms/CustomJmsServiceTest.java | 68 ++++++
.../simple-jms/src/test/resources/arquillian.xml | 30 +++
pom.xml | 2 +-
tomee/tomee-embedded/pom.xml | 4 +-
tomee/tomee-plume-webapp/pom.xml | 5 -
tomee/tomee-plus-webapp/pom.xml | 5 -
tomee/tomee-webapp/pom.xml | 4 +-
16 files changed, 985 insertions(+), 35 deletions(-)
diff --cc pom.xml
index 20f07dd,abd5a5d..daa67b1
--- a/pom.xml
+++ b/pom.xml
@@@ -145,9 -145,9 +145,9 @@@
<version.shrinkwrap.descriptor>2.0.0</version.shrinkwrap.descriptor>
<version.shrinkwrap.shrinkwrap>1.2.6</version.shrinkwrap.shrinkwrap>
- <tomcat.version>9.0.27</tomcat.version>
+ <tomcat.version>9.0.29</tomcat.version>
- <cxf.version>3.3.2</cxf.version>
+ <cxf.version>3.3.4</cxf.version>
<ehcache.version>2.10.3</ehcache.version>
<!-- used by cxf for security (replay attack) -->
<jetty.version>7.5.3.v20111011</jetty.version>
[tomee] 03/05: Update MicroProfile REST client version to match CXF
Posted by jg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit c934d019bf24758bb811382199c5eb4cff1c61d9
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Thu Nov 28 11:57:28 2019 +0000
Update MicroProfile REST client version to match CXF
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index daa67b1..5c9d454 100644
--- a/pom.xml
+++ b/pom.xml
@@ -223,7 +223,7 @@
<microprofile.health.impl.version>1.0.1</microprofile.health.impl.version>
<microprofile.metrics.version>1.1.1</microprofile.metrics.version>
<microprofile.metrics.impl.version>1.0.2</microprofile.metrics.impl.version>
- <microprofile.rest-client.version>1.2.1</microprofile.rest-client.version>
+ <microprofile.rest-client.version>1.3.3</microprofile.rest-client.version>
<microprofile.rest-client.impl.version>${cxf.version}</microprofile.rest-client.impl.version>
<microprofile.openapi.version>1.0.1</microprofile.openapi.version>
<microprofile.openapi.impl.version>1.0.6</microprofile.openapi.impl.version>
[tomee] 04/05: SSL tests not quite passing, but inching closer
Posted by jg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit d26c2a1d15c8a246db1356ff52e717655a89f61a
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Fri Nov 29 21:49:06 2019 +0000
SSL tests not quite passing, but inching closer
---
tck/microprofile-tck/rest-client/pom.xml | 56 ++++++++++++++++++++++
.../rest-client/src/test/resources/arquillian.xml | 3 ++
2 files changed, 59 insertions(+)
diff --git a/tck/microprofile-tck/rest-client/pom.xml b/tck/microprofile-tck/rest-client/pom.xml
index 29e7763..b7840cf 100644
--- a/tck/microprofile-tck/rest-client/pom.xml
+++ b/tck/microprofile-tck/rest-client/pom.xml
@@ -152,7 +152,63 @@
<artifactId>wiremock</artifactId>
<version>2.10.1</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>9.2.22.v20170606</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ <version>9.2.22.v20170606</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-io</artifactId>
+ <version>9.2.22.v20170606</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ <version>9.2.22.v20170606</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>9.2.22.v20170606</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlets</artifactId>
+ <version>9.2.22.v20170606</version>
+ <scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <version>9.2.22.v20170606</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>9.2.22.v20170606</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.cxf</groupId>
diff --git a/tck/microprofile-tck/rest-client/src/test/resources/arquillian.xml b/tck/microprofile-tck/rest-client/src/test/resources/arquillian.xml
index e17f109..efbd165 100644
--- a/tck/microprofile-tck/rest-client/src/test/resources/arquillian.xml
+++ b/tck/microprofile-tck/rest-client/src/test/resources/arquillian.xml
@@ -33,6 +33,7 @@
<property name="cleanOnStartUp">true</property>
<property name="additionalLibs">
mvn:com.github.tomakehurst:wiremock-standalone:2.10.1
+ mvn:org.apache.httpcomponents:httpcore:4.4.6
</property>
</configuration>
</container>
@@ -48,6 +49,7 @@
<property name="cleanOnStartUp">true</property>
<property name="additionalLibs">
mvn:com.github.tomakehurst:wiremock-standalone:2.10.1
+ mvn:org.apache.httpcomponents:httpcore:4.4.6
</property>
<property name="properties">
tomee.mp.scan = all
@@ -66,6 +68,7 @@
<property name="cleanOnStartUp">true</property>
<property name="additionalLibs">
mvn:com.github.tomakehurst:wiremock-standalone:2.10.1
+ mvn:org.apache.httpcomponents:httpcore:4.4.6
</property>
<property name="properties">
tomee.mp.scan = all
[tomee] 05/05: Fix up failing REST client TCK tests
Posted by jg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 6c5e01294ccdd2815240953f86f16818f4f02f69
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Mon Dec 2 20:09:25 2019 +0000
Fix up failing REST client TCK tests
---
.../MicroProfileRestClientTCKArchiveProcessor.java | 45 ++++++++++++++++++++++
.../MicroProfileRestClientTCKExtension.java | 29 ++++++++++++++
...org.jboss.arquillian.core.spi.LoadableExtension | 1 +
.../rest-client/src/test/resources/arquillian.xml | 3 ++
4 files changed, 78 insertions(+)
diff --git a/tck/microprofile-tck/rest-client/src/test/java/org/apache/tomee/microprofile/tck/restclient/MicroProfileRestClientTCKArchiveProcessor.java b/tck/microprofile-tck/rest-client/src/test/java/org/apache/tomee/microprofile/tck/restclient/MicroProfileRestClientTCKArchiveProcessor.java
new file mode 100644
index 0000000..049bcb9
--- /dev/null
+++ b/tck/microprofile-tck/rest-client/src/test/java/org/apache/tomee/microprofile/tck/restclient/MicroProfileRestClientTCKArchiveProcessor.java
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+
+
+package org.apache.tomee.microprofile.tck.restclient;
+
+import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor;
+import org.jboss.arquillian.test.spi.TestClass;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ArchivePath;
+import org.jboss.shrinkwrap.api.Node;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.shrinkwrap.impl.base.path.BasicPath;
+
+import java.util.Map;
+
+public class MicroProfileRestClientTCKArchiveProcessor implements ApplicationArchiveProcessor {
+ @Override
+ public void process(final Archive<?> archive, final TestClass testClass) {
+ if (archive instanceof WebArchive) {
+
+ WebArchive webArchive = (WebArchive) archive;
+ final Map<ArchivePath, Node> content = webArchive.getContent();
+
+ final Node node = content.get(new BasicPath("META-INF/certificates-dir.txt"));
+ if (node != null) {
+ webArchive.addAsResource(node.getAsset(), "META-INF/certificates-dir.txt");
+ }
+ }
+ }
+}
diff --git a/tck/microprofile-tck/rest-client/src/test/java/org/apache/tomee/microprofile/tck/restclient/MicroProfileRestClientTCKExtension.java b/tck/microprofile-tck/rest-client/src/test/java/org/apache/tomee/microprofile/tck/restclient/MicroProfileRestClientTCKExtension.java
new file mode 100644
index 0000000..8aedfc6
--- /dev/null
+++ b/tck/microprofile-tck/rest-client/src/test/java/org/apache/tomee/microprofile/tck/restclient/MicroProfileRestClientTCKExtension.java
@@ -0,0 +1,29 @@
+/*
+ * 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.
+ */
+
+
+package org.apache.tomee.microprofile.tck.restclient;
+
+import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor;
+import org.jboss.arquillian.core.spi.LoadableExtension;
+
+public class MicroProfileRestClientTCKExtension implements LoadableExtension {
+ @Override
+ public void register(final ExtensionBuilder extensionBuilder) {
+ extensionBuilder.service(ApplicationArchiveProcessor.class, MicroProfileRestClientTCKArchiveProcessor.class);
+ }
+}
diff --git a/tck/microprofile-tck/rest-client/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/tck/microprofile-tck/rest-client/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
new file mode 100644
index 0000000..4ed3ae8
--- /dev/null
+++ b/tck/microprofile-tck/rest-client/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
@@ -0,0 +1 @@
+org.apache.tomee.microprofile.tck.restclient.MicroProfileRestClientTCKExtension
\ No newline at end of file
diff --git a/tck/microprofile-tck/rest-client/src/test/resources/arquillian.xml b/tck/microprofile-tck/rest-client/src/test/resources/arquillian.xml
index efbd165..7a0077f 100644
--- a/tck/microprofile-tck/rest-client/src/test/resources/arquillian.xml
+++ b/tck/microprofile-tck/rest-client/src/test/resources/arquillian.xml
@@ -34,6 +34,7 @@
<property name="additionalLibs">
mvn:com.github.tomakehurst:wiremock-standalone:2.10.1
mvn:org.apache.httpcomponents:httpcore:4.4.6
+ mvn:junit:junit:4.12
</property>
</configuration>
</container>
@@ -50,6 +51,7 @@
<property name="additionalLibs">
mvn:com.github.tomakehurst:wiremock-standalone:2.10.1
mvn:org.apache.httpcomponents:httpcore:4.4.6
+ mvn:junit:junit:4.12
</property>
<property name="properties">
tomee.mp.scan = all
@@ -69,6 +71,7 @@
<property name="additionalLibs">
mvn:com.github.tomakehurst:wiremock-standalone:2.10.1
mvn:org.apache.httpcomponents:httpcore:4.4.6
+ mvn:junit:junit:4.12
</property>
<property name="properties">
tomee.mp.scan = all