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 2018/12/07 17:25:45 UTC
[01/12] tomee git commit: Added mp-jwt to the quick profile.
Repository: tomee
Updated Branches:
refs/heads/master 6b2e7118e -> 42605b790
Added mp-jwt to the quick profile.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f9323626
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f9323626
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f9323626
Branch: refs/heads/master
Commit: f93236265bf9d72280fed29d49376fa8dc39f856
Parents: 2691ad0
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Mon Dec 3 22:41:12 2018 +0000
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Tue Dec 4 11:16:27 2018 +0000
----------------------------------------------------------------------
pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/f9323626/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 93d571e..4c99419 100644
--- a/pom.xml
+++ b/pom.xml
@@ -563,6 +563,7 @@
<module>gradle</module>
<module>container</module>
<module>server</module>
+ <module>mp-jwt</module>
<module>assembly</module>
<module>arquillian</module>
<module>utils</module>
[04/12] tomee git commit: Release plugin auto version submodules.
Posted by jl...@apache.org.
Release plugin auto version submodules.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/2e7f85ce
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/2e7f85ce
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/2e7f85ce
Branch: refs/heads/master
Commit: 2e7f85ce30ff966f8c29f9d6590daadb66394271
Parents: 7ff618f
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Sat Oct 13 19:59:00 2018 +0100
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Tue Dec 4 11:16:27 2018 +0000
----------------------------------------------------------------------
pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/2e7f85ce/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9348d10..390ff92 100644
--- a/pom.xml
+++ b/pom.xml
@@ -380,6 +380,7 @@
<localCheckout>true</localCheckout>
<pushChanges>false</pushChanges>
<releaseProfiles></releaseProfiles>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
</plugin>
[10/12] tomee git commit: Added notes on missing MP updates to
support 2.0.
Posted by jl...@apache.org.
Added notes on missing MP updates to support 2.0.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/0952c993
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/0952c993
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/0952c993
Branch: refs/heads/master
Commit: 0952c9939b09d1a7c7afe4b1b8d4dab179d3df48
Parents: 70b9eb6
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Wed Nov 21 16:37:00 2018 +0000
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Tue Dec 4 11:16:27 2018 +0000
----------------------------------------------------------------------
pom.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/0952c993/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9a4a271..93d571e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -200,8 +200,10 @@
<microprofile.version>2.0</microprofile.version>
<microprofile.config.version>1.3</microprofile.config.version>
<microprofile.config.impl.version>1.2</microprofile.config.impl.version>
+ <!-- 1.1 Implementation ongoing in TOMEE-2247 -->
<microprofile.jwt.version>1.0</microprofile.jwt.version>
<microprofile.jwt.impl.version>${project.version}</microprofile.jwt.impl.version>
+ <!-- 1.1 Implementation not started yet -->
<microprofile.fault-tolerance.version>1.0</microprofile.fault-tolerance.version>
<microprofile.fault-tolerance.impl.version>1.1-SNAPSHOT</microprofile.fault-tolerance.impl.version>
<microprofile.health.version>1.0</microprofile.health.version>
[02/12] tomee git commit: Removed workaround to include missing
classes in MP Config TCK.
Posted by jl...@apache.org.
Removed workaround to include missing classes in MP Config TCK.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/42fe9301
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/42fe9301
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/42fe9301
Branch: refs/heads/master
Commit: 42fe9301ecedc9f670bf9821a83541f8a3d817ec
Parents: 7226736
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Thu Nov 22 21:30:26 2018 +0000
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Tue Dec 4 11:16:27 2018 +0000
----------------------------------------------------------------------
.../config/MicroProfileConfigTCKArchiveProcessor.java | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/42fe9301/tck/microprofile-tck/config/src/test/java/org/apache/tomee/microprofile/tck/config/MicroProfileConfigTCKArchiveProcessor.java
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/config/src/test/java/org/apache/tomee/microprofile/tck/config/MicroProfileConfigTCKArchiveProcessor.java b/tck/microprofile-tck/config/src/test/java/org/apache/tomee/microprofile/tck/config/MicroProfileConfigTCKArchiveProcessor.java
index c2368f3..903668d 100644
--- a/tck/microprofile-tck/config/src/test/java/org/apache/tomee/microprofile/tck/config/MicroProfileConfigTCKArchiveProcessor.java
+++ b/tck/microprofile-tck/config/src/test/java/org/apache/tomee/microprofile/tck/config/MicroProfileConfigTCKArchiveProcessor.java
@@ -1,12 +1,9 @@
package org.apache.tomee.microprofile.tck.config;
-import org.eclipse.microprofile.config.tck.converters.UpperCaseDuckConverter;
import org.hamcrest.object.HasToString;
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.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import static org.apache.openejb.loader.JarLocation.jarLocation;
@@ -15,14 +12,7 @@ public class MicroProfileConfigTCKArchiveProcessor implements ApplicationArchive
@Override
public void process(final Archive<?> archive, final TestClass testClass) {
if (archive instanceof WebArchive) {
- final WebArchive war = WebArchive.class.cast(archive);
-
- // TODO - this could be fixed in the TCK by adding UpperCaseDuckConverter into org.eclipse.microprofile.config.tck.ConverterTest
- final JavaArchive configJar = ShrinkWrap.create(JavaArchive.class, "config-tck-additional.jar")
- .addClass(UpperCaseDuckConverter.class);
-
- war.addAsLibraries(configJar);
- war.addAsLibrary(jarLocation(HasToString.class));
+ WebArchive.class.cast(archive).addAsLibrary(jarLocation(HasToString.class));
}
}
}
[07/12] tomee git commit: TOMEE-2282 - Upgrade to MicroProfile REST
Client 1.1.
Posted by jl...@apache.org.
TOMEE-2282 - Upgrade to MicroProfile REST Client 1.1.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/70b9eb63
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/70b9eb63
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/70b9eb63
Branch: refs/heads/master
Commit: 70b9eb63d2e219f6b383e2801a38133ac9673bbc
Parents: 6577a4f
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Wed Nov 21 15:46:34 2018 +0000
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Tue Dec 4 11:16:27 2018 +0000
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/70b9eb63/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index aeb4bcc..9a4a271 100644
--- a/pom.xml
+++ b/pom.xml
@@ -208,7 +208,7 @@
<microprofile.health.impl.version>1.0.0</microprofile.health.impl.version>
<microprofile.metrics.version>1.1</microprofile.metrics.version>
<microprofile.metrics.impl.version>1.0.0</microprofile.metrics.impl.version>
- <microprofile.rest-client.version>1.0</microprofile.rest-client.version>
+ <microprofile.rest-client.version>1.1</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.1</microprofile.openapi.impl.version>
[06/12] tomee git commit: TOMEE-2281 - Upgrade to MicroProfile
Configuration 1.3.
Posted by jl...@apache.org.
TOMEE-2281 - Upgrade to MicroProfile Configuration 1.3.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/6577a4f6
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/6577a4f6
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/6577a4f6
Branch: refs/heads/master
Commit: 6577a4f6067922d37eb16510a35af3f5827465b7
Parents: e38b13e
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Wed Nov 21 15:21:15 2018 +0000
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Tue Dec 4 11:16:27 2018 +0000
----------------------------------------------------------------------
pom.xml | 3 +--
tck/microprofile-tck/config/pom.xml | 6 ++++++
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/6577a4f6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 36d7ac1..aeb4bcc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -198,8 +198,7 @@
<!-- Micro Profile -->
<microprofile.version>2.0</microprofile.version>
- <microprofile.config.version>1.2</microprofile.config.version>
- <!-- Already supports MP Config 1.3, but compatible to 1.2. Updated to fix GERONIMO-6600 -->
+ <microprofile.config.version>1.3</microprofile.config.version>
<microprofile.config.impl.version>1.2</microprofile.config.impl.version>
<microprofile.jwt.version>1.0</microprofile.jwt.version>
<microprofile.jwt.impl.version>${project.version}</microprofile.jwt.impl.version>
http://git-wip-us.apache.org/repos/asf/tomee/blob/6577a4f6/tck/microprofile-tck/config/pom.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/config/pom.xml b/tck/microprofile-tck/config/pom.xml
index e8bdafc..aef424a 100644
--- a/tck/microprofile-tck/config/pom.xml
+++ b/tck/microprofile-tck/config/pom.xml
@@ -38,6 +38,12 @@
<dependenciesToScan>
<dependency>org.eclipse.microprofile.config:microprofile-config-tck</dependency>
</dependenciesToScan>
+ <environmentVariables>
+ <my_int_property>45</my_int_property>
+ <MY_BOOLEAN_PROPERTY>true</MY_BOOLEAN_PROPERTY>
+ <my_string_property>haha</my_string_property>
+ <MY_STRING_PROPERTY>woohoo</MY_STRING_PROPERTY>
+ </environmentVariables>
</configuration>
</plugin>
</plugins>
[11/12] tomee git commit: This closes apache/tomee#212
Posted by jl...@apache.org.
This closes apache/tomee#212
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/36483071
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/36483071
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/36483071
Branch: refs/heads/master
Commit: 3648307180acc5a368393900f71f564324ec9d64
Parents: afe7539 f932362
Author: Jean-Louis Monteiro <je...@gmail.com>
Authored: Fri Dec 7 18:25:08 2018 +0100
Committer: Jean-Louis Monteiro <je...@gmail.com>
Committed: Fri Dec 7 18:25:08 2018 +0100
----------------------------------------------------------------------
.../microprofile/jwt/cdi/MPJWTCDIExtension.java | 7 +-
.../META-INF/org.apache.openejb.extension | 1 -
pom.xml | 10 +--
tck/microprofile-tck/config/pom.xml | 6 ++
.../MicroProfileConfigTCKArchiveProcessor.java | 12 +---
...croProfileRestClientTCKArchiveProcessor.java | 71 --------------------
.../MicroProfileRestClientTCKExtension.java | 27 --------
....jboss.arquillian.core.spi.LoadableExtension | 1 -
.../microprofile/config/TomEEConfigSource.java | 64 ++++++++++++++++++
...eclipse.microprofile.config.spi.ConfigSource | 17 +++++
10 files changed, 100 insertions(+), 116 deletions(-)
----------------------------------------------------------------------
[03/12] tomee git commit: Removed workaround to include missing
classes in REST Client TCK.
Posted by jl...@apache.org.
Removed workaround to include missing classes in REST Client TCK.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/72267364
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/72267364
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/72267364
Branch: refs/heads/master
Commit: 72267364b3cec7ff15141dadaf0ca8b57b01ffed
Parents: 0952c99
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Thu Nov 22 21:05:01 2018 +0000
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Tue Dec 4 11:16:27 2018 +0000
----------------------------------------------------------------------
...croProfileRestClientTCKArchiveProcessor.java | 71 --------------------
.../MicroProfileRestClientTCKExtension.java | 27 --------
....jboss.arquillian.core.spi.LoadableExtension | 1 -
3 files changed, 99 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/72267364/tck/microprofile-tck/rest-client/src/test/java/com/apache/tomee/microprofile/tck/rest.client/MicroProfileRestClientTCKArchiveProcessor.java
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/rest-client/src/test/java/com/apache/tomee/microprofile/tck/rest.client/MicroProfileRestClientTCKArchiveProcessor.java b/tck/microprofile-tck/rest-client/src/test/java/com/apache/tomee/microprofile/tck/rest.client/MicroProfileRestClientTCKArchiveProcessor.java
deleted file mode 100644
index db55416..0000000
--- a/tck/microprofile-tck/rest-client/src/test/java/com/apache/tomee/microprofile/tck/rest.client/MicroProfileRestClientTCKArchiveProcessor.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * 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 com.apache.tomee.microprofile.tck.rest.client;
-
-import org.eclipse.microprofile.rest.client.tck.WiremockArquillianTest;
-import org.eclipse.microprofile.rest.client.tck.interfaces.BaseClient;
-import org.eclipse.microprofile.rest.client.tck.interfaces.ChildClient;
-import org.eclipse.microprofile.rest.client.tck.interfaces.CustomHttpMethod;
-import org.eclipse.microprofile.rest.client.tck.interfaces.InterfaceUsingBeanParam;
-import org.eclipse.microprofile.rest.client.tck.interfaces.MissingPathParam;
-import org.eclipse.microprofile.rest.client.tck.interfaces.MissingPathParamSub;
-import org.eclipse.microprofile.rest.client.tck.interfaces.MissingUriTemplate;
-import org.eclipse.microprofile.rest.client.tck.interfaces.MultipleHTTPMethodAnnotations;
-import org.eclipse.microprofile.rest.client.tck.interfaces.MyBean;
-import org.eclipse.microprofile.rest.client.tck.interfaces.RootResource;
-import org.eclipse.microprofile.rest.client.tck.interfaces.SubResource;
-import org.eclipse.microprofile.rest.client.tck.interfaces.TemplateMismatch;
-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.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-
-public class MicroProfileRestClientTCKArchiveProcessor implements ApplicationArchiveProcessor {
- @Override
- public void process(final Archive<?> archive, final TestClass testClass) {
- if (archive instanceof WebArchive) {
- final WebArchive war = WebArchive.class.cast(archive);
-
- // TODO - this could be fixed in the TCK by adding the missing classes in the test archives
- JavaArchive restClientJar = ShrinkWrap
- .create(JavaArchive.class, "rest-client-tck-additional.jar")
- .addClass(WiremockArquillianTest.class)
- // missing in BeanParamTest
- .addClass(MyBean.class)
- .addClass(InterfaceUsingBeanParam.class)
- // missing in CustomHttpMethodTest
- .addClass(CustomHttpMethod.class)
- // missing in InheritanceTest
- .addClass(BaseClient.class)
- .addClass(ChildClient.class)
- // missing in InvalidInterfaceTest
- .addClass(MultipleHTTPMethodAnnotations.class)
- .addClass(MissingPathParam.class)
- .addClass(MissingPathParamSub.class)
- .addClass(MissingUriTemplate.class)
- .addClass(TemplateMismatch.class)
- // missing in SubResourceTest
- .addClass(RootResource.class)
- .addClass(SubResource.class)
- ;
-
- war.addAsLibraries(restClientJar);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/tomee/blob/72267364/tck/microprofile-tck/rest-client/src/test/java/com/apache/tomee/microprofile/tck/rest.client/MicroProfileRestClientTCKExtension.java
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/rest-client/src/test/java/com/apache/tomee/microprofile/tck/rest.client/MicroProfileRestClientTCKExtension.java b/tck/microprofile-tck/rest-client/src/test/java/com/apache/tomee/microprofile/tck/rest.client/MicroProfileRestClientTCKExtension.java
deleted file mode 100644
index 56fe764..0000000
--- a/tck/microprofile-tck/rest-client/src/test/java/com/apache/tomee/microprofile/tck/rest.client/MicroProfileRestClientTCKExtension.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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 com.apache.tomee.microprofile.tck.rest.client;
-
-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 LoadableExtension.ExtensionBuilder extensionBuilder) {
- extensionBuilder.service(ApplicationArchiveProcessor.class, MicroProfileRestClientTCKArchiveProcessor.class);
- }
-}
http://git-wip-us.apache.org/repos/asf/tomee/blob/72267364/tck/microprofile-tck/rest-client/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
----------------------------------------------------------------------
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
deleted file mode 100644
index 1edb9bf..0000000
--- a/tck/microprofile-tck/rest-client/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
+++ /dev/null
@@ -1 +0,0 @@
-com.apache.tomee.microprofile.tck.rest.client.MicroProfileRestClientTCKExtension
[05/12] tomee git commit: TOMEE-2280 - Upgrade to MicroProfile 2.0.
Posted by jl...@apache.org.
TOMEE-2280 - Upgrade to MicroProfile 2.0.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/e38b13ec
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/e38b13ec
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/e38b13ec
Branch: refs/heads/master
Commit: e38b13ec79d3283979e7d7cd6844f8e2ccb19728
Parents: 2e7f85c
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Wed Nov 21 15:13:16 2018 +0000
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Tue Dec 4 11:16:27 2018 +0000
----------------------------------------------------------------------
pom.xml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/e38b13ec/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 390ff92..36d7ac1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -197,7 +197,7 @@
<version.shrinkwrap.resolver.bom>2.1.0</version.shrinkwrap.resolver.bom>
<!-- Micro Profile -->
- <microprofile.version>1.3</microprofile.version>
+ <microprofile.version>2.0</microprofile.version>
<microprofile.config.version>1.2</microprofile.config.version>
<!-- Already supports MP Config 1.3, but compatible to 1.2. Updated to fix GERONIMO-6600 -->
<microprofile.config.impl.version>1.2</microprofile.config.impl.version>
@@ -380,7 +380,6 @@
<localCheckout>true</localCheckout>
<pushChanges>false</pushChanges>
<releaseProfiles></releaseProfiles>
- <autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
</plugin>
[09/12] tomee git commit: Fixed issue with MP OpenTracing being
loaded for built in apps.
Posted by jl...@apache.org.
Fixed issue with MP OpenTracing being loaded for built in apps.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/9fddfc0b
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/9fddfc0b
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/9fddfc0b
Branch: refs/heads/master
Commit: 9fddfc0b868e054716509b1322d20f210e82bcb9
Parents: 42fe930
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Mon Dec 3 18:47:24 2018 +0000
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Tue Dec 4 11:16:27 2018 +0000
----------------------------------------------------------------------
.../microprofile/config/TomEEConfigSource.java | 64 ++++++++++++++++++++
...eclipse.microprofile.config.spi.ConfigSource | 17 ++++++
2 files changed, 81 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/9fddfc0b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/config/TomEEConfigSource.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/config/TomEEConfigSource.java b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/config/TomEEConfigSource.java
new file mode 100644
index 0000000..2f87cbf
--- /dev/null
+++ b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/config/TomEEConfigSource.java
@@ -0,0 +1,64 @@
+/*
+ * 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.config;
+
+import org.apache.openejb.AppContext;
+import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.util.AppFinder;
+import org.eclipse.microprofile.config.spi.ConfigSource;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static java.util.Arrays.asList;
+
+public class TomEEConfigSource implements ConfigSource {
+ private final Map<String, String> configuration = new HashMap<>();
+
+ public TomEEConfigSource() {
+ final AppContext appContextOrWeb =
+ AppFinder.findAppContextOrWeb(Thread.currentThread().getContextClassLoader(),
+ AppFinder.AppContextTransformer.INSTANCE);
+
+ if (appContextOrWeb != null) {
+ final List<String> mpIgnoredApps =
+ asList(SystemInstance.get()
+ .getProperty("mp.ignored.apps", "ROOT,docs,host-manager,manager")
+ .split(","));
+
+ if (mpIgnoredApps.stream().anyMatch(s -> s.equalsIgnoreCase(appContextOrWeb.getId()))) {
+ configuration.put("geronimo.opentracing.filter.active", "false");
+ }
+ }
+ }
+
+ @Override
+ public Map<String, String> getProperties() {
+ return configuration;
+ }
+
+ @Override
+ public String getValue(final String propertyName) {
+ return configuration.get(propertyName);
+ }
+
+ @Override
+ public String getName() {
+ return TomEEConfigSource.class.getSimpleName();
+ }
+}
http://git-wip-us.apache.org/repos/asf/tomee/blob/9fddfc0b/tomee/tomee-microprofile/mp-common/src/main/resources/META-INF/services/org.eclipse.microprofile.config.spi.ConfigSource
----------------------------------------------------------------------
diff --git a/tomee/tomee-microprofile/mp-common/src/main/resources/META-INF/services/org.eclipse.microprofile.config.spi.ConfigSource b/tomee/tomee-microprofile/mp-common/src/main/resources/META-INF/services/org.eclipse.microprofile.config.spi.ConfigSource
new file mode 100644
index 0000000..2928028
--- /dev/null
+++ b/tomee/tomee-microprofile/mp-common/src/main/resources/META-INF/services/org.eclipse.microprofile.config.spi.ConfigSource
@@ -0,0 +1,17 @@
+#
+# 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.
+#
+org.apache.tomee.microprofile.config.TomEEConfigSource
[08/12] tomee git commit: Fixed multiple registrations of MPJWTFilter.
Posted by jl...@apache.org.
Fixed multiple registrations of MPJWTFilter.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/2691ad0a
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/2691ad0a
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/2691ad0a
Branch: refs/heads/master
Commit: 2691ad0a9d4c07fc0115b5593fe89efebc6b0088
Parents: 9fddfc0
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Mon Dec 3 22:40:57 2018 +0000
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Tue Dec 4 11:16:27 2018 +0000
----------------------------------------------------------------------
.../apache/tomee/microprofile/jwt/cdi/MPJWTCDIExtension.java | 7 ++++++-
.../src/main/resources/META-INF/org.apache.openejb.extension | 1 -
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/2691ad0a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/cdi/MPJWTCDIExtension.java
----------------------------------------------------------------------
diff --git a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/cdi/MPJWTCDIExtension.java b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/cdi/MPJWTCDIExtension.java
index ca69b0a..f93fab4 100644
--- a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/cdi/MPJWTCDIExtension.java
+++ b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/cdi/MPJWTCDIExtension.java
@@ -16,8 +16,10 @@
*/
package org.apache.tomee.microprofile.jwt.cdi;
+import org.apache.openejb.loader.SystemInstance;
import org.apache.tomee.microprofile.jwt.MPJWTFilter;
import org.apache.tomee.microprofile.jwt.MPJWTInitializer;
+import org.apache.tomee.microprofile.jwt.jaxrs.MPJWPProviderRegistration;
import org.eclipse.microprofile.jwt.Claim;
import javax.enterprise.event.Observes;
@@ -100,4 +102,7 @@ public class MPJWTCDIExtension implements Extension {
bbd.addAnnotatedType(beanManager.createAnnotatedType(MPJWTProducer.class));
}
-}
\ No newline at end of file
+ static {
+ SystemInstance.get().addObserver(new MPJWPProviderRegistration());
+ }
+}
http://git-wip-us.apache.org/repos/asf/tomee/blob/2691ad0a/mp-jwt/src/main/resources/META-INF/org.apache.openejb.extension
----------------------------------------------------------------------
diff --git a/mp-jwt/src/main/resources/META-INF/org.apache.openejb.extension b/mp-jwt/src/main/resources/META-INF/org.apache.openejb.extension
deleted file mode 100644
index 9734019..0000000
--- a/mp-jwt/src/main/resources/META-INF/org.apache.openejb.extension
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.tomee.microprofile.jwt.jaxrs.MPJWPProviderRegistration
\ No newline at end of file
[12/12] tomee git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/tomee
Posted by jl...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tomee
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/42605b79
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/42605b79
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/42605b79
Branch: refs/heads/master
Commit: 42605b7902124bff923f6a3f1fd0881106475e6b
Parents: 3648307 6b2e711
Author: Jean-Louis Monteiro <je...@gmail.com>
Authored: Fri Dec 7 18:25:27 2018 +0100
Committer: Jean-Louis Monteiro <je...@gmail.com>
Committed: Fri Dec 7 18:25:27 2018 +0100
----------------------------------------------------------------------
.../arquillian/tests/cmp/CmpMappingTest.java | 58 --------------------
.../arquillian/tests/cmp/CmpServlet.java | 2 +-
2 files changed, 1 insertion(+), 59 deletions(-)
----------------------------------------------------------------------