incubator-tamaya-sandbox git commit: Adding profile for Weld3 to run tests with. Removed o.e.mp code to instead pull in artifact
Repository: incubator-tamaya-sandbox
Updated Branches:
refs/heads/mp-config-support [created] 6f41fd3b1
Adding profile for Weld3 to run tests with. Removed o.e.mp code to instead
pull in artifact
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/commit/6f41fd3b
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/6f41fd3b
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/6f41fd3b
Branch: refs/heads/mp-config-support
Commit: 6f41fd3b17f3883ccc1a4bc3a5199a263f7e8d12
Parents: 22cdc84
Author: John D. Ament
Authored: Wed Aug 9 06:31:44 2017 -0400
Committer: John D. Ament
Committed: Wed Aug 9 06:31:44 2017 -0400
--
microprofile/pom.xml| 108
.../microprofile/MicroprofileConfigBuilder.java | 12 ++
.../org/eclipse/microprofile/config/Config.java | 126 --
.../microprofile/config/ConfigProvider.java | 102
.../config/inject/ConfigProperty.java | 112 -
.../config/inject/package-info.java | 40 -
.../microprofile/config/package-info.java | 75 -
.../microprofile/config/spi/ConfigBuilder.java | 83 --
.../config/spi/ConfigProviderResolver.java | 164 ---
.../microprofile/config/spi/ConfigSource.java | 107
.../config/spi/ConfigSourceProvider.java| 58 ---
.../microprofile/config/spi/Converter.java | 77 -
.../microprofile/config/spi/package-info.java | 30
13 files changed, 87 insertions(+), 1007 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/6f41fd3b/microprofile/pom.xml
--
diff --git a/microprofile/pom.xml b/microprofile/pom.xml
index 1b5d808..4d65714 100644
--- a/microprofile/pom.xml
+++ b/microprofile/pom.xml
@@ -36,26 +36,12 @@ under the License.
1.0
1.0
1.0
+1.1.13.Final
+
2.0.0.Beta5
+2.0
+3.0.0.Final
-
-
-
-org.apache.maven.plugins
-maven-compiler-plugin
-
-true
-${maven.compile.optimize}
-${maven.compile.sourceLevel}
-${maven.compile.targetLevel}
-${project.build.sourceEncoding}
-
${maven.compile.deprecation}
-
-
-
-
-
-
junit
@@ -85,24 +71,80 @@ under the License.
${project.parent.version}
-org.apache.geronimo.specs
-geronimo-atinject_1.0_spec
-${geronimo-atinject-1.0-spec.version}
-provided
-true
+org.eclipse.microprofile.config
+microprofile-config-api
+${microprofile.version}
-org.apache.geronimo.specs
-geronimo-jcdi_1.1_spec
-${geronimo-jcdi-1.1-spec.version}
-provided
-true
+org.eclipse.microprofile.config
+microprofile-config-tck
+${microprofile.version}
+test
+
+
+org.jboss.arquillian.testng
+arquillian-testng-container
+${arquillian.version}
+test
+
+
+org.testng
+testng
+6.9.9
+test
-
-
-
-
-
+
+
+
+org.apache.maven.plugins
+maven-surefire-plugin
+2.20
+
+
org.eclipse.microprofile.config:microprofile-config-tck
+
+
+
+org.apache.maven.plugins
+maven-compiler-plugin
+
+true
+${maven.compile.optimize}
+${maven.compile.sourceLevel}
+${maven.compile.targetLevel}
+${project.build.sourceEncoding}
+
${maven.compile.deprecation}
+
+
+
+
+
+
+
+Weld3
+
+true
+
+
+
+org.jboss.weld.se
+weld-se-shaded
+${weld.version}
+test
+
+
+org.jboss.arquillian.container
+arquillian-weld-embedded
+${arquillian-weld-embedded.version}
+
[incubator-tamaya-sandbox] Git Push Summary
Repository: incubator-tamaya-sandbox Updated Branches: refs/heads/mp-config-support [deleted] 6f41fd3b1
[2/2] incubator-tamaya-sandbox git commit: TAMAYA-260: Added missing artifacts.
TAMAYA-260: Added missing artifacts.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/commit/41305de4
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/41305de4
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/41305de4
Branch: refs/heads/java8
Commit: 41305de4381b34b7f9d664ce10812d767cd3977d
Parents: c9676a8
Author: anatole
Authored: Thu Aug 10 01:00:03 2017 +0200
Committer: anatole
Committed: Thu Aug 10 01:00:03 2017 +0200
--
.../imported/CdiOptionalInjectionTest.java | 71
.../imported/base/AbstractTest.java | 42
.../src/test/resources/sampleconfig.yaml| 18 +
3 files changed, 131 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/41305de4/microprofile/src/test/java/org/apache/tamaya/microprofile/imported/CdiOptionalInjectionTest.java
--
diff --git
a/microprofile/src/test/java/org/apache/tamaya/microprofile/imported/CdiOptionalInjectionTest.java
b/microprofile/src/test/java/org/apache/tamaya/microprofile/imported/CdiOptionalInjectionTest.java
new file mode 100644
index 000..ee6d158
--- /dev/null
+++
b/microprofile/src/test/java/org/apache/tamaya/microprofile/imported/CdiOptionalInjectionTest.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2016-2017 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * Licensed 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.tamaya.microprofile.imported;
+
+import org.eclipse.microprofile.config.tck.OptionalValuesBean;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.testng.Arquillian;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import javax.inject.Inject;
+
+/**
+ * Verify injection of {@code Optional} fields.
+ *
+ * @author mailto:strub...@apache.org";>Mark Struberg
+ */
+public class CdiOptionalInjectionTest extends Arquillian{
+
+private @Inject OptionalValuesBean optionalValuesBean;
+
+@Deployment
+public static WebArchive deploy() {
+JavaArchive testJar = ShrinkWrap
+.create(JavaArchive.class, "cdiOptionalInjectionTest.jar")
+
.addClasses(org.eclipse.microprofile.config.tck.CdiOptionalInjectionTest.class,
OptionalValuesBean.class)
+.addAsManifestResource(new
StringAsset("my.optional.int.property=1234\nmy.optional.string.property=hello"),
+"microprofile-config.properties")
+.addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")
+.as(JavaArchive.class);
+
+WebArchive war = ShrinkWrap
+.create(WebArchive.class, "cdiOptionalInjectionTest.war")
+.addAsLibrary(testJar);
+return war;
+}
+
+
+@Test
+public void testOptionalInjection() {
+Assert.assertTrue(optionalValuesBean.getIntProperty().isPresent());
+Assert.assertEquals(optionalValuesBean.getIntProperty().get(),
Integer.valueOf(1234));
+
+
Assert.assertFalse(optionalValuesBean.getNotexistingProperty().isPresent());
+
+Assert.assertTrue(optionalValuesBean.getStringValue().isPresent());
+Assert.assertEquals(optionalValuesBean.getStringValue().get(),
"hello");
+}
+}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/41305de4/microprofile/src/test/java/org/apache/tamaya/microprofile/imported/base/AbstractTest.java
--
diff --git
a/microprofile/src/test/java/org/apache/tamaya/microprofile/imported/base/AbstractTest.java
b/microprofile/src/test/java/org/apache/tamaya/microprofile/imported/base/AbstractTest.java
new file mode 100644
index 000..0c9d3cc
--- /dev/null
+++
b/microprofile/src/test/java/org
[1/2] incubator-tamaya-sandbox git commit: TAMAYA-260: Fixed CDI integration for almost any aspects of MP.
Repository: incubator-tamaya-sandbox
Updated Branches:
refs/heads/java8 f30884f9e -> 41305de43
TAMAYA-260: Fixed CDI integration for almost any aspects of MP.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/commit/c9676a85
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/c9676a85
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/c9676a85
Branch: refs/heads/java8
Commit: c9676a8533a953887fe1d8c42872151beac48cff
Parents: f30884f
Author: anatole
Authored: Thu Aug 10 00:58:44 2017 +0200
Committer: anatole
Committed: Thu Aug 10 00:58:44 2017 +0200
--
microprofile/pom.xml| 90 +-
.../MicroprofileConfigurationProducer.java | 104
.../microprofile/cdi/ConfiguredField.java | 65 +++
.../microprofile/cdi/ConfiguredMethod.java | 65 +++
.../tamaya/microprofile/cdi/ConfiguredType.java | 86 ++
.../cdi/MicroprofileCDIExtension.java | 169 +++
.../cdi/MicroprofileConfigurationProducer.java | 103 +++
.../converter/ProviderConverter.java| 63 +++
.../javax.enterprise.inject.spi.Extension | 20 +++
.../org.apache.tamaya.spi.PropertyConverter | 20 +++
.../AutoDiscoveredConfigSourceTest.java | 4 +-
.../imported/ConfigProviderTest.java| 6 +-
.../microprofile/imported/ConverterTest.java| 14 +-
.../tck/TamayaConfigArchiveProcessor.java | 10 +-
14 files changed, 657 insertions(+), 162 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/c9676a85/microprofile/pom.xml
--
diff --git a/microprofile/pom.xml b/microprofile/pom.xml
index 89f29c3..4795d36 100644
--- a/microprofile/pom.xml
+++ b/microprofile/pom.xml
@@ -39,6 +39,10 @@ under the License.
2.2.6
6.0.53
0.4-incubating-SNAPSHOT
+1.1.13.Final
+
2.0.0.Beta5
+2.0
+3.0.0.Final
@@ -69,20 +73,18 @@ under the License.
tamaya-functions
${tamaya-version}
-
-org.apache.geronimo.specs
-geronimo-atinject_1.0_spec
-${geronimo-atinject-1.0-spec.version}
-provided
-true
-
-
-org.apache.geronimo.specs
-geronimo-jcdi_1.1_spec
-${geronimo-jcdi-1.1-spec.version}
-provided
-true
-
+
+
+
+
+
+
+
+
+
+
+
+
org.eclipse.microprofile.config
microprofile-config-api
@@ -95,6 +97,12 @@ under the License.
test
+org.jboss.arquillian.testng
+arquillian-testng-container
+${arquillian.version}
+test
+
+
org.testng
testng
6.9.9
@@ -107,48 +115,40 @@ under the License.
test
pom
-
-
-org.jboss.arquillian.container
-arquillian-glassfish-embedded-3.1
-1.0.1
-test
-
-
-org.glassfish.main.extras
-glassfish-embedded-all
-4.1.2
-test
-
-
-com.sun
-tools-jar
-
-
-
-
-com.google.guava
-guava
-21.0
-test
-
-tck
+Weld3
-
-runTCK
-
+true
+
+
+org.jboss.weld.se
+weld-se-shaded
+${weld.version}
+test
+
+
+org.jboss.arquillian.container
+arquillian-weld-embedded
+${arquillian-weld-embedded.version}
+test
+
+
+javax.enterprise
+cdi-api
+${cdi2-api.version}
+
+
+
org.apache.maven.plugins
maven-surefire-plugin
-2.19.1
+2.20
src/test/tck-suite.xml
http://g
