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 2019/11/11 18:48:48 UTC
[incubator-tamaya-extensions] branch master updated (464bead ->
b617211)
This is an automated email from the ASF dual-hosted git repository.
anatole pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tamaya-extensions.git.
from 464bead Fixed test.
add f710eb8 TAMAYA-408 Preparing release.
add 4cf6800 TAMAYA-408 Preparing release, excluded distribution from default build, since the dist is not needed anymore for releases and leads regularly to build issues.
add e21e55b TAMAYA-408 Preparing release, excluded distribution from default build, since the dist is not needed anymore for releases and leads regularly to build issues.
add 73f6f56 TAMAYA-408 Preparing release, removing snapshoz refs.
add c273cc9 Added missing license headers.
add ef5b1e9 TAMAYA-408 Added sha1/md5 checksum generation to dist projects.
add 0b461a9 TAMAYA-408 Added sha1/md5 checksum generation to dist projects.
add a397bf7 TAMAYA-408 Added checksums and updated copyright years in NOTICE.
new b617211 Merged
The 1 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:
.travis.yml | 16 ++++++++
NOTICE | 2 +-
README.md | 17 ++++++++
distribution/pom.xml | 45 +++++++++++++++++++++-
examples/01-resources-example/pom.xml | 6 +--
examples/02-resolver-example/pom.xml | 4 +-
.../src/main/resources/build.data | 16 ++++++++
examples/03-injection-example/pom.xml | 6 +--
examples/04-events-example/pom.xml | 4 +-
examples/05-spring-example/README.md | 17 ++++++++
examples/05-spring-example/pom.xml | 6 +--
examples/06-distributed/pom.xml | 4 +-
examples/pom.xml | 2 +-
modules/collections/bnd.bnd | 16 ++++++++
modules/collections/pom.xml | 2 +-
modules/consul/bnd.bnd | 16 ++++++++
modules/consul/pom.xml | 2 +-
modules/etcd/bnd.bnd | 16 ++++++++
modules/etcd/pom.xml | 2 +-
modules/events/bnd.bnd | 16 ++++++++
modules/events/pom.xml | 6 +--
modules/features/bnd.bnd | 16 ++++++++
modules/features/pom.xml | 6 +--
modules/filter/bnd.bnd | 16 ++++++++
modules/filter/pom.xml | 8 ++--
modules/formats/base/bnd.bnd | 16 ++++++++
modules/formats/base/pom.xml | 6 +--
modules/formats/hjson/pom.xml | 2 +-
modules/formats/hocon/bnd.bnd | 16 ++++++++
modules/formats/hocon/pom.xml | 6 +--
modules/formats/json/bnd.bnd | 16 ++++++++
modules/formats/json/pom.xml | 6 +--
modules/formats/pom.xml | 2 +-
modules/formats/yaml/bnd.bnd | 16 ++++++++
modules/formats/yaml/pom.xml | 6 +--
modules/functions/bnd.bnd | 16 ++++++++
modules/functions/pom.xml | 6 +--
modules/hazelcast/bnd.bnd | 16 ++++++++
modules/hazelcast/pom.xml | 2 +-
modules/injection/cdi/bnd.bnd | 16 ++++++++
modules/injection/cdi/pom.xml | 6 +--
modules/injection/injection-api/bnd.bnd | 16 ++++++++
modules/injection/injection-api/pom.xml | 8 ++--
modules/injection/pom.xml | 2 +-
modules/injection/standalone/bnd.bnd | 16 ++++++++
modules/injection/standalone/pom.xml | 6 +--
modules/jndi/bnd.bnd | 16 ++++++++
modules/jndi/pom.xml | 6 +--
modules/microprofile/bnd.bnd | 16 ++++++++
modules/microprofile/pom.xml | 4 +-
modules/mutable-config/bnd.bnd | 16 ++++++++
modules/mutable-config/pom.xml | 6 +--
modules/optional/bnd.bnd | 16 ++++++++
modules/optional/pom.xml | 6 +--
modules/osgi/common/bnd.bnd | 16 ++++++++
modules/osgi/common/pom.xml | 2 +-
modules/osgi/gogo-shell/bnd.bnd | 16 ++++++++
modules/osgi/gogo-shell/pom.xml | 2 +-
modules/osgi/injection/bnd.bnd | 16 ++++++++
modules/osgi/injection/pom.xml | 2 +-
modules/osgi/karaf-features/pom.xml | 2 +-
modules/osgi/karaf-shell/bnd.bnd | 16 ++++++++
modules/osgi/karaf-shell/pom.xml | 2 +-
modules/osgi/pom.xml | 2 +-
modules/osgi/updater/bnd.bnd | 16 ++++++++
modules/osgi/updater/pom.xml | 2 +-
modules/pom.xml | 2 +-
modules/resolver/bnd.bnd | 16 ++++++++
modules/resolver/pom.xml | 6 +--
.../apache/tamaya/resolver/ManualSetupTest.java | 5 +++
modules/resources/README.md | 17 ++++++++
modules/resources/bnd.bnd | 16 ++++++++
modules/resources/pom.xml | 6 +--
modules/spring/bnd.bnd | 16 ++++++++
modules/spring/pom.xml | 6 +--
pom.xml | 5 +--
76 files changed, 652 insertions(+), 92 deletions(-)
[incubator-tamaya-extensions] 01/01: Merged
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
anatole pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tamaya-extensions.git
commit b6172119cf6cbae7707bd6e1aee3755bb19a1dda
Merge: 464bead a397bf7
Author: Anatole <an...@apache.org>
AuthorDate: Mon Nov 11 19:48:19 2019 +0100
Merged
.travis.yml | 16 ++++++++
NOTICE | 2 +-
README.md | 17 ++++++++
distribution/pom.xml | 45 +++++++++++++++++++++-
examples/01-resources-example/pom.xml | 6 +--
examples/02-resolver-example/pom.xml | 4 +-
.../src/main/resources/build.data | 16 ++++++++
examples/03-injection-example/pom.xml | 6 +--
examples/04-events-example/pom.xml | 4 +-
examples/05-spring-example/README.md | 17 ++++++++
examples/05-spring-example/pom.xml | 6 +--
examples/06-distributed/pom.xml | 4 +-
examples/pom.xml | 2 +-
modules/collections/bnd.bnd | 16 ++++++++
modules/collections/pom.xml | 2 +-
modules/consul/bnd.bnd | 16 ++++++++
modules/consul/pom.xml | 2 +-
modules/etcd/bnd.bnd | 16 ++++++++
modules/etcd/pom.xml | 2 +-
modules/events/bnd.bnd | 16 ++++++++
modules/events/pom.xml | 6 +--
modules/features/bnd.bnd | 16 ++++++++
modules/features/pom.xml | 6 +--
modules/filter/bnd.bnd | 16 ++++++++
modules/filter/pom.xml | 8 ++--
modules/formats/base/bnd.bnd | 16 ++++++++
modules/formats/base/pom.xml | 6 +--
modules/formats/hjson/pom.xml | 2 +-
modules/formats/hocon/bnd.bnd | 16 ++++++++
modules/formats/hocon/pom.xml | 6 +--
modules/formats/json/bnd.bnd | 16 ++++++++
modules/formats/json/pom.xml | 6 +--
modules/formats/pom.xml | 2 +-
modules/formats/yaml/bnd.bnd | 16 ++++++++
modules/formats/yaml/pom.xml | 6 +--
modules/functions/bnd.bnd | 16 ++++++++
modules/functions/pom.xml | 6 +--
modules/hazelcast/bnd.bnd | 16 ++++++++
modules/hazelcast/pom.xml | 2 +-
modules/injection/cdi/bnd.bnd | 16 ++++++++
modules/injection/cdi/pom.xml | 6 +--
modules/injection/injection-api/bnd.bnd | 16 ++++++++
modules/injection/injection-api/pom.xml | 8 ++--
modules/injection/pom.xml | 2 +-
modules/injection/standalone/bnd.bnd | 16 ++++++++
modules/injection/standalone/pom.xml | 6 +--
modules/jndi/bnd.bnd | 16 ++++++++
modules/jndi/pom.xml | 6 +--
modules/microprofile/bnd.bnd | 16 ++++++++
modules/microprofile/pom.xml | 4 +-
modules/mutable-config/bnd.bnd | 16 ++++++++
modules/mutable-config/pom.xml | 6 +--
modules/optional/bnd.bnd | 16 ++++++++
modules/optional/pom.xml | 6 +--
modules/osgi/common/bnd.bnd | 16 ++++++++
modules/osgi/common/pom.xml | 2 +-
modules/osgi/gogo-shell/bnd.bnd | 16 ++++++++
modules/osgi/gogo-shell/pom.xml | 2 +-
modules/osgi/injection/bnd.bnd | 16 ++++++++
modules/osgi/injection/pom.xml | 2 +-
modules/osgi/karaf-features/pom.xml | 2 +-
modules/osgi/karaf-shell/bnd.bnd | 16 ++++++++
modules/osgi/karaf-shell/pom.xml | 2 +-
modules/osgi/pom.xml | 2 +-
modules/osgi/updater/bnd.bnd | 16 ++++++++
modules/osgi/updater/pom.xml | 2 +-
modules/pom.xml | 2 +-
modules/resolver/bnd.bnd | 16 ++++++++
modules/resolver/pom.xml | 6 +--
.../apache/tamaya/resolver/ManualSetupTest.java | 5 +++
modules/resources/README.md | 17 ++++++++
modules/resources/bnd.bnd | 16 ++++++++
modules/resources/pom.xml | 6 +--
modules/spring/bnd.bnd | 16 ++++++++
modules/spring/pom.xml | 6 +--
pom.xml | 5 +--
76 files changed, 652 insertions(+), 92 deletions(-)
diff --cc modules/resolver/src/test/java/org/apache/tamaya/resolver/ManualSetupTest.java
index b2ab10c,d8f323f..b08b236
--- a/modules/resolver/src/test/java/org/apache/tamaya/resolver/ManualSetupTest.java
+++ b/modules/resolver/src/test/java/org/apache/tamaya/resolver/ManualSetupTest.java
@@@ -43,8 -43,8 +43,13 @@@ public class ManualSetupTest
PropertyValue unfiltered = reolverFilter.filterProperty(PropertyValue.createValue("foo", "${url:cccabABabbaaaba}"), null);
assertThat(filtered).isNotNull();
assertThat(unfiltered).isNotNull();
++<<<<<<< HEAD
+ assertThat(filtered.getValue()).isNotNull().isEqualTo("CCCBBABBBBBBBBB");
+ assertThat(unfiltered.getValue()).isNotNull().isEqualTo("?{url:cccabABabbaaaba}");
++=======
+ assertThat(filtered.getValue()).isEqualTo("CCCBBABBBBBBBBB");
+ assertThat(unfiltered.getValue()).isEqualTo("?{url:cccabABabbaaaba}");
++>>>>>>> release-0.4-incubating
}
private static final class CustomResolver implements ExpressionResolver{