You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by an...@apache.org on 2017/10/12 10:27:32 UTC
[2/4] incubator-tamaya-sandbox git commit: TAMAYA-260 Merged
conflicts.
TAMAYA-260 Merged conflicts.
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/7d463e32
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/7d463e32
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/7d463e32
Branch: refs/heads/master
Commit: 7d463e32d57a3c77b2abc8d48e13f5e35022f9f3
Parents: 9f79a5a
Author: Anatole Tresch <an...@apache.org>
Authored: Thu Oct 12 12:25:57 2017 +0200
Committer: Anatole Tresch <an...@apache.org>
Committed: Thu Oct 12 12:25:57 2017 +0200
----------------------------------------------------------------------
microprofile/pom.xml | 2 +-
.../imported/OptionalValuesBean.java | 64 --------------------
2 files changed, 1 insertion(+), 65 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/7d463e32/microprofile/pom.xml
----------------------------------------------------------------------
diff --git a/microprofile/pom.xml b/microprofile/pom.xml
index a7639a6..e3bad3e 100644
--- a/microprofile/pom.xml
+++ b/microprofile/pom.xml
@@ -92,7 +92,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.jboss.weld.se</groupId>
- <artifactId>weld-se</artifactId>
+ <artifactId>weld-se-shaded</artifactId>
<version>${weld.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/7d463e32/microprofile/src/test/java/org/apache/tamaya/microprofile/imported/OptionalValuesBean.java
----------------------------------------------------------------------
diff --git a/microprofile/src/test/java/org/apache/tamaya/microprofile/imported/OptionalValuesBean.java b/microprofile/src/test/java/org/apache/tamaya/microprofile/imported/OptionalValuesBean.java
deleted file mode 100644
index b962f21..0000000
--- a/microprofile/src/test/java/org/apache/tamaya/microprofile/imported/OptionalValuesBean.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * 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;
-/**
- * Declare a bean for config property injections.
- * @author <a href="mailto:struberg@apache.org">Mark Struberg</a>
- * @author <a href="mailto:emijiang@uk.ibm.com">Emily Jiang</a>
- */
-
-import org.eclipse.microprofile.config.inject.ConfigProperty;
-
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import java.util.Optional;
-
-@Singleton
-public class OptionalValuesBean {
- @Inject
- @ConfigProperty(name="my.optional.int.property")
- private Optional<Integer> intProperty;
-
- @Inject
- @ConfigProperty(name="my.notexisting.property")
- private Optional<Integer> notexistingProperty;
-
- private Optional<String> notAnnotatedStringValue;
-
- private Optional<String> stringValue;
-
- @Inject
- public void setStringValue(@ConfigProperty(name="my.optional.string.property") Optional<String> stringValue) {
- this.stringValue = stringValue;
- }
-
- public Optional<String> getStringValue() {
- return stringValue;
- }
-
- public Optional<Integer> getIntProperty() {
- return intProperty;
- }
-
- public Optional<Integer> getNotexistingProperty() {
- return notexistingProperty;
- }
-}
\ No newline at end of file