Merged.
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/9fdd5dae Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/9fdd5dae Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/9fdd5dae Branch: refs/heads/master Commit: 9fdd5dae7995cb98ed501566049ad4a7010dee51 Parents: 2c031dc d0e9a65 Author: Anatole Tresch <[email protected]> Authored: Thu Sep 28 22:09:26 2017 +0200 Committer: Anatole Tresch <[email protected]> Committed: Thu Sep 28 22:09:26 2017 +0200 ---------------------------------------------------------------------- apache-commons/bnd.bnd | 27 +- apache-commons/pom.xml | 1 + camel/bnd.bnd | 25 +- camel/pom.xml | 4 + collections/bnd.bnd | 26 ++ collections/pom.xml | 53 +++ .../collections/AdaptiveCombinationPolicy.java | 122 +++++++ .../tamaya/collections/ArrayListConverter.java | 62 ++++ .../tamaya/collections/CollectionConverter.java | 63 ++++ .../collections/ConcurrentHashMapConverter.java | 63 ++++ .../tamaya/collections/HashMapConverter.java | 63 ++++ .../tamaya/collections/HashSetConverter.java | 62 ++++ .../tamaya/collections/ItemTokenizer.java | 171 ++++++++++ .../tamaya/collections/LinkedListConverter.java | 63 ++++ .../tamaya/collections/ListConverter.java | 55 +++ .../apache/tamaya/collections/MapConverter.java | 58 ++++ .../apache/tamaya/collections/SetConverter.java | 55 +++ .../tamaya/collections/SortedMapConverter.java | 36 ++ .../tamaya/collections/SortedSetConverter.java | 36 ++ .../tamaya/collections/TreeMapConverter.java | 62 ++++ .../tamaya/collections/TreeSetConverter.java | 63 ++++ .../org.apache.tamaya.spi.PropertyConverter | 31 ++ ...he.tamaya.spi.PropertyValueCombinationPolicy | 19 ++ .../collections/CollectionAdvancedTests.java | 117 +++++++ .../collections/CollectionsBaseTests.java | 227 ++++++++++++ .../CollectionsTypedReadOnlyTests.java | 173 ++++++++++ .../collections/CollectionsTypedTests.java | 208 +++++++++++ .../collections/MyUpperCaseConverter.java | 33 ++ .../META-INF/javaconfiguration.properties | 73 ++++ configured-sysprops/bnd.bnd | 25 +- configured-sysprops/pom.xml | 14 +- consul/bnd.bnd | 30 +- consul/pom.xml | 4 + etcd/bnd.bnd | 30 +- etcd/pom.xml | 4 + hazelcast/bnd.bnd | 27 +- hazelcast/pom.xml | 4 + jodatime/bnd.bnd | 27 +- jodatime/pom.xml | 4 + management/bnd.bnd | 27 +- management/pom.xml | 8 +- metamodel/bnd.bnd | 35 +- metamodel/pom.xml | 8 +- .../internal/CombinationPolicyReader.java | 2 + .../internal/ComponentConfigurator.java | 4 + .../DSLLoadingConfigurationProviderSpi.java | 2 + .../metamodel/internal/MetaContextReader.java | 2 + .../internal/PropertyConverterReader.java | 2 + .../internal/PropertyFilterOrderingReader.java | 2 + .../internal/PropertyFilterReader.java | 2 + .../internal/PropertySourceOrderingReader.java | 2 + .../internal/PropertySourceReader.java | 2 + .../internal/factories/CLIArgumentsFactory.java | 2 + .../factories/EnvPropertiesFactory.java | 2 + .../factories/FilePropertySourceFactory.java | 2 + .../ResourcePropertySourceFactory.java | 2 + .../ResourcePropertySourceProviderFactory.java | 2 + .../factories/SysPropertiesFactory.java | 2 + .../factories/URLPropertySourceFactory.java | 2 + .../internal/resolver/JavaResolver.java | 2 + .../internal/resolver/PropertiesResolver.java | 2 + .../internal/resolver/LoggingReader.java | 79 +++++ .../resources/IntegrationTests/context-test.xml | 2 +- ...tamaya.metamodel.spi.MetaConfigurationReader | 19 ++ metamodel/src/test/resources/tamaya-config.xml | 4 +- microprofile/bnd.bnd | 34 ++ microprofile/pom.xml | 160 +++++++-- .../microprofile/MicroprofileAdapter.java | 39 ++- .../tamaya/microprofile/MicroprofileConfig.java | 20 +- .../microprofile/MicroprofileConfigBuilder.java | 57 +++- .../MicroprofileConfigProviderResolver.java | 8 +- .../MicroprofileDefaultProperties.java | 33 ++ .../microprofile/TamayaPropertySource.java | 4 +- .../microprofile/cdi/BridgingConfigBean.java | 95 ++++++ .../microprofile/cdi/ConfiguredField.java | 65 ++++ .../microprofile/cdi/ConfiguredMethod.java | 65 ++++ .../tamaya/microprofile/cdi/ConfiguredType.java | 86 +++++ .../cdi/MicroprofileCDIExtension.java | 99 ++++++ .../cdi/MicroprofileConfigurationProducer.java | 156 +++++++++ .../converter/BooleanAsIntegerConverterFix.java | 61 ++++ .../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 -- .../javax.enterprise.inject.spi.Extension | 20 ++ .../org.apache.tamaya.spi.PropertyConverter | 20 ++ .../org.apache.tamaya.spi.PropertySource | 20 ++ microprofile/src/main/resources/beans.xml | 25 ++ .../MicroprofileConfigBuilderTest.java | 3 +- .../MicroprofileConfigProviderTest.java | 2 +- .../microprofile/MicroprofileConfigTest.java | 11 +- .../MPSystemPropertiesConfigSource.java | 34 -- .../AutoDiscoveredConfigSourceTest.java | 66 ++++ .../imported/CDIPlainInjectionTest.java | 261 ++++++++++++++ .../imported/CdiOptionalInjectionTest.java | 69 ++++ .../imported/ConfigProviderTest.java | 122 +++++++ .../microprofile/imported/ConverterTest.java | 233 +++++++++++++ .../imported/CustomConfigSourceTest.java | 40 +++ .../imported/OptionalValuesBean.java | 62 ++++ .../imported/broken/ConfigOwner.java | 39 +++ .../imported/broken/CustomConverterBean.java | 46 +++ .../CustomConfigSourceProvider.java | 53 +++ .../configsources/CustomDbConfigSource.java | 69 ++++ .../configsources/SampleYamlConfigSource.java | 58 ++++ .../microprofile/imported/converters/Duck.java | 36 ++ .../imported/converters/DuckConverter.java | 33 ++ .../microprofile/imported/converters/Pizza.java | 42 +++ .../imported/converters/PizzaConverter.java | 34 ++ .../imported/matchers/AdditionalMatchers.java | 61 ++++ .../tck/TamayaConfigArchiveProcessor.java | 77 +++++ .../microprofile/tck/TamayaConfigExtension.java | 36 ++ .../src/test/resources/META-INF/beans.xml | 24 ++ .../META-INF/microprofile-config.properties | 102 ++++++ ...eclipse.microprofile.config.spi.ConfigSource | 2 +- ...microprofile.config.spi.ConfigSourceProvider | 18 + ...rg.eclipse.microprofile.config.spi.Converter | 18 + ....jboss.arquillian.core.spi.LoadableExtension | 19 ++ .../src/test/resources/sampleconfig.yaml | 18 + microprofile/src/test/tck-suite.xml | 29 ++ osgi/common/bnd.bnd | 32 +- osgi/common/pom.xml | 69 ++-- .../java/org/apache/tamaya/osgi/Activator.java | 52 ++- .../java/org/apache/tamaya/osgi/Backups.java | 157 +++++++++ .../org/apache/tamaya/osgi/ConfigChanger.java | 217 ++++++++++++ .../org/apache/tamaya/osgi/ConfigHistory.java | 267 +++++++++++++++ .../tamaya/osgi/OSGIConfigRootMapper.java | 36 -- .../org/apache/tamaya/osgi/OperationMode.java | 31 ++ .../tamaya/osgi/TamayaConfigAdminImpl.java | 170 --------- .../apache/tamaya/osgi/TamayaConfigPlugin.java | 342 +++++++++++++++++++ .../tamaya/osgi/TamayaOSGIConfiguration.java | 139 -------- .../tamaya/osgi/commands/BackupCommands.java | 133 ++++++++ .../tamaya/osgi/commands/ConfigCommands.java | 237 +++++++++++++ .../tamaya/osgi/commands/HistoryCommands.java | 96 ++++++ .../apache/tamaya/osgi/commands/StringUtil.java | 46 +++ .../apache/tamaya/osgi/AbstractOSGITest.java | 89 +++++ .../org/apache/tamaya/osgi/BackupsTest.java | 107 ++++++ .../apache/tamaya/osgi/ConfigHistoryTest.java | 148 ++++++++ .../org/apache/tamaya/osgi/OSGIBasicTests.java | 84 +++++ .../tamaya/osgi/TamayaConfigAdminImplTest.java | 75 ---- .../tamaya/osgi/TamayaConfigPluginTest.java | 109 ++++++ osgi/common/src/test/resources/arquillian.xml | 27 -- osgi/common/src/test/resources/felix.properties | 23 -- osgi/gogo-shell/bnd.bnd | 34 ++ osgi/gogo-shell/pom.xml | 73 ++++ .../org/apache/tamaya/gogo/shell/Activator.java | 92 +++++ .../tamaya/gogo/shell/BackupCommands.java | 72 ++++ .../tamaya/gogo/shell/ConfigCommands.java | 89 +++++ .../tamaya/gogo/shell/HistoryCommands.java | 77 +++++ .../tamaya/gogo/shell/SettingsCommands.java | 83 +++++ osgi/karaf-features/pom.xml | 130 +------ .../src/main/features/features.xml | 101 ++++-- .../test/java/org/apache/tamaya/osgi/Hello.java | 10 - .../java/org/apache/tamaya/osgi/HelloImpl.java | 17 - .../apache/tamaya/osgi/InjectionKarafTest.java | 149 -------- .../org/apache/tamaya/osgi/OSGIKarafTest.java | 188 ---------- .../src/test/resources/META-INF/OSGIResource | 17 - .../META-INF/javaconfiguration.properties | 21 -- .../test/resources/org.ops4j.pax.logging.cfg | 48 --- osgi/karaf-shell/bnd.bnd | 38 +++ osgi/karaf-shell/pom.xml | 76 +++++ .../karaf/shell/ApplyTamayaConfigCommand.java | 55 +++ .../tamaya/karaf/shell/BackupCreateCommand.java | 51 +++ .../tamaya/karaf/shell/BackupDeleteCommand.java | 42 +++ .../tamaya/karaf/shell/BackupListCommand.java | 42 +++ .../karaf/shell/BackupRestoreCommand.java | 46 +++ .../karaf/shell/DefaultEnableCommand.java | 68 ++++ .../karaf/shell/DefaultEnabledCommand.java | 63 ++++ .../tamaya/karaf/shell/GetPolicyCommand.java | 42 +++ .../karaf/shell/HistoryDeleteAllCommand.java | 38 +++ .../karaf/shell/HistoryDeleteCommand.java | 40 +++ .../tamaya/karaf/shell/HistoryGetCommand.java | 69 ++++ .../karaf/shell/HistoryMaxsizeCommand.java | 37 ++ .../karaf/shell/HistoryMaxsizeSetCommand.java | 47 +++ .../apache/tamaya/karaf/shell/InfoCommand.java | 44 +++ .../tamaya/karaf/shell/OSGIConfigCommand.java | 51 +++ .../tamaya/karaf/shell/PolicyGetCommand.java | 42 +++ .../tamaya/karaf/shell/PolicySetCommand.java | 68 ++++ .../karaf/shell/PropagateUpdatesCommand.java | 46 +++ .../karaf/shell/PropagateUpdatesSetCommand.java | 56 +++ .../tamaya/karaf/shell/PropertyGetCommand.java | 53 +++ .../karaf/shell/PropertySourceCommand.java | 45 +++ .../karaf/shell/PropertySourcesCommand.java | 39 +++ .../tamaya/karaf/shell/TamayaConfigCommand.java | 54 +++ .../org/apache/tamaya/karaf/shell/commands | 44 +++ osgi/pom.xml | 176 ++-------- osgi/updater/bnd.bnd | 34 ++ osgi/updater/pom.xml | 145 ++++++++ .../apache/tamaya/osgi/updater/Activator.java | 76 +++++ .../tamaya/osgi/updater/EventListener.java | 79 +++++ pom.xml | 26 +- propertysources/bnd.bnd | 26 +- propertysources/pom.xml | 4 + remote/bnd.bnd | 25 +- remote/pom.xml | 8 +- server/bnd.bnd | 27 +- server/pom.xml | 5 +- tamaya-sandbox.iml | 12 + ui/base/bnd.bnd | 38 ++- ui/base/pom.xml | 4 + ui/events/bnd.bnd | 31 +- ui/events/pom.xml | 4 + ui/mutableconfig/bnd.bnd | 31 +- ui/mutableconfig/pom.xml | 4 + ui/pom.xml | 3 - uom/bnd.bnd | 29 +- usagetracker/bnd.bnd | 33 +- usagetracker/pom.xml | 8 +- validation/bnd.bnd | 33 +- validation/pom.xml | 8 +- vertx/bnd.bnd | 26 +- vertx/pom.xml | 7 +- .../META-INF/javaconfiguration.properties | 19 ++ 219 files changed, 9891 insertions(+), 2411 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9fdd5dae/camel/pom.xml ---------------------------------------------------------------------- diff --cc camel/pom.xml index a3831a8,f4324bb..38800d4 --- a/camel/pom.xml +++ b/camel/pom.xml @@@ -23,6 -23,7 +23,10 @@@ under the License <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> <version>0.4-incubating-SNAPSHOT</version> ++<<<<<<< HEAD ++======= + <relativePath>..</relativePath> ++>>>>>>> java8 </parent> <artifactId>tamaya-camel_beta</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9fdd5dae/configured-sysprops/pom.xml ---------------------------------------------------------------------- diff --cc configured-sysprops/pom.xml index 283e349,28ce175..d568d79 --- a/configured-sysprops/pom.xml +++ b/configured-sysprops/pom.xml @@@ -24,6 -24,7 +24,10 @@@ under the License <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> <version>0.4-incubating-SNAPSHOT</version> ++<<<<<<< HEAD ++======= + <relativePath>..</relativePath> ++>>>>>>> java8 </parent> <artifactId>tamaya-sysprops_beta</artifactId> <name>Apache Tamaya Modules - Configured System Properties</name> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9fdd5dae/consul/pom.xml ---------------------------------------------------------------------- diff --cc consul/pom.xml index 67c8d29,47ce340..4de66e5 --- a/consul/pom.xml +++ b/consul/pom.xml @@@ -23,6 -23,7 +23,10 @@@ under the License <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> <version>0.4-incubating-SNAPSHOT</version> ++<<<<<<< HEAD ++======= + <relativePath>..</relativePath> ++>>>>>>> java8 </parent> <artifactId>tamaya-consul_beta</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9fdd5dae/etcd/pom.xml ---------------------------------------------------------------------- diff --cc etcd/pom.xml index a5fb0c3,31ea349..600375a --- a/etcd/pom.xml +++ b/etcd/pom.xml @@@ -23,6 -23,7 +23,10 @@@ under the License <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> <version>0.4-incubating-SNAPSHOT</version> ++<<<<<<< HEAD ++======= + <relativePath>..</relativePath> ++>>>>>>> java8 </parent> <artifactId>tamaya-etcd_beta</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9fdd5dae/hazelcast/pom.xml ---------------------------------------------------------------------- diff --cc hazelcast/pom.xml index 9e10c64,1052787..adedf5f --- a/hazelcast/pom.xml +++ b/hazelcast/pom.xml @@@ -23,6 -23,7 +23,10 @@@ <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> <version>0.4-incubating-SNAPSHOT</version> ++<<<<<<< HEAD ++======= + <relativePath>..</relativePath> ++>>>>>>> java8 </parent> <artifactId>tamaya-hazelcast_beta</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9fdd5dae/jodatime/pom.xml ---------------------------------------------------------------------- diff --cc jodatime/pom.xml index 0b573db,7ffbf23..3dbc582 --- a/jodatime/pom.xml +++ b/jodatime/pom.xml @@@ -26,6 -26,7 +26,10 @@@ under the License <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> <version>0.4-incubating-SNAPSHOT</version> ++<<<<<<< HEAD ++======= + <relativePath>..</relativePath> ++>>>>>>> java8 </parent> <artifactId>tamaya-jodatime_beta</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9fdd5dae/management/pom.xml ---------------------------------------------------------------------- diff --cc management/pom.xml index 5313a82,81f64c9..6bcac03 --- a/management/pom.xml +++ b/management/pom.xml @@@ -23,6 -23,7 +23,10 @@@ under the License <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> <version>0.4-incubating-SNAPSHOT</version> ++<<<<<<< HEAD ++======= + <relativePath>..</relativePath> ++>>>>>>> java8 </parent> <artifactId>tamaya-management_alpha</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9fdd5dae/metamodel/pom.xml ---------------------------------------------------------------------- diff --cc metamodel/pom.xml index 63a0db4,b462590..40e56de --- a/metamodel/pom.xml +++ b/metamodel/pom.xml @@@ -23,6 -23,7 +23,10 @@@ <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> <version>0.4-incubating-SNAPSHOT</version> ++<<<<<<< HEAD ++======= + <relativePath>..</relativePath> ++>>>>>>> java8 </parent> <artifactId>tamaya-metamodel_alpha</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9fdd5dae/microprofile/pom.xml ---------------------------------------------------------------------- diff --cc microprofile/pom.xml index aadfab7,37bbb2b..b4724a0 --- a/microprofile/pom.xml +++ b/microprofile/pom.xml @@@ -23,6 -23,7 +23,10 @@@ under the License <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> <version>0.4-incubating-SNAPSHOT</version> ++<<<<<<< HEAD ++======= + <relativePath>..</relativePath> ++>>>>>>> java8 </parent> <artifactId>tamaya-microprofile_alpha</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9fdd5dae/osgi/pom.xml ---------------------------------------------------------------------- diff --cc osgi/pom.xml index 5ee5044,9f0edf9..1451957 --- a/osgi/pom.xml +++ b/osgi/pom.xml @@@ -25,6 -25,7 +25,10 @@@ <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> <version>0.4-incubating-SNAPSHOT</version> ++<<<<<<< HEAD ++======= + <relativePath>..</relativePath> ++>>>>>>> java8 </parent> <artifactId>tamaya-osgi-all</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9fdd5dae/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9fdd5dae/propertysources/pom.xml ---------------------------------------------------------------------- diff --cc propertysources/pom.xml index c3f47a1,e9d64ac..a96fcc0 --- a/propertysources/pom.xml +++ b/propertysources/pom.xml @@@ -24,6 -24,7 +24,10 @@@ under the License <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> <version>0.4-incubating-SNAPSHOT</version> ++<<<<<<< HEAD ++======= + <relativePath>..</relativePath> ++>>>>>>> java8 </parent> <artifactId>tamaya-propertysources_alpha</artifactId> <name>Apache Tamaya Modules - PropertySources</name> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9fdd5dae/remote/pom.xml ---------------------------------------------------------------------- diff --cc remote/pom.xml index 49aa089,37f2bf5..ff08eb9 --- a/remote/pom.xml +++ b/remote/pom.xml @@@ -24,6 -24,7 +24,10 @@@ under the License <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> <version>0.4-incubating-SNAPSHOT</version> ++<<<<<<< HEAD ++======= + <relativePath>..</relativePath> ++>>>>>>> java8 </parent> <artifactId>tamaya-remote_alpha</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9fdd5dae/server/pom.xml ---------------------------------------------------------------------- diff --cc server/pom.xml index 4d63770,ab40526..0f872dd --- a/server/pom.xml +++ b/server/pom.xml @@@ -23,6 -23,7 +23,10 @@@ under the License <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> <version>0.4-incubating-SNAPSHOT</version> ++<<<<<<< HEAD ++======= + <relativePath>..</relativePath> ++>>>>>>> java8 </parent> <artifactId>tamaya-server_alpha</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9fdd5dae/ui/base/pom.xml ---------------------------------------------------------------------- diff --cc ui/base/pom.xml index ebad135,3807cc5..9f297aa --- a/ui/base/pom.xml +++ b/ui/base/pom.xml @@@ -25,6 -25,7 +25,10 @@@ under the License <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-ui-parent</artifactId> <version>0.4-incubating-SNAPSHOT</version> ++<<<<<<< HEAD ++======= + <relativePath>..</relativePath> ++>>>>>>> java8 </parent> <packaging>jar</packaging> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9fdd5dae/ui/events/pom.xml ---------------------------------------------------------------------- diff --cc ui/events/pom.xml index 3ee1b0d,4cf01d9..73d5dd0 --- a/ui/events/pom.xml +++ b/ui/events/pom.xml @@@ -25,6 -25,7 +25,10 @@@ <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-ui-parent</artifactId> <version>0.4-incubating-SNAPSHOT</version> ++<<<<<<< HEAD ++======= + <relativePath>..</relativePath> ++>>>>>>> java8 </parent> <packaging>jar</packaging> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9fdd5dae/ui/mutableconfig/pom.xml ---------------------------------------------------------------------- diff --cc ui/mutableconfig/pom.xml index 9752654,6468719..d7122f9 --- a/ui/mutableconfig/pom.xml +++ b/ui/mutableconfig/pom.xml @@@ -25,6 -25,7 +25,10 @@@ under the License <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-ui-parent</artifactId> <version>0.4-incubating-SNAPSHOT</version> ++<<<<<<< HEAD ++======= + <relativePath>..</relativePath> ++>>>>>>> java8 </parent> <packaging>jar</packaging> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9fdd5dae/usagetracker/pom.xml ---------------------------------------------------------------------- diff --cc usagetracker/pom.xml index d35c348,57dce21..6790a1a --- a/usagetracker/pom.xml +++ b/usagetracker/pom.xml @@@ -23,6 -23,7 +23,10 @@@ under the License <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> <version>0.4-incubating-SNAPSHOT</version> ++<<<<<<< HEAD ++======= + <relativePath>..</relativePath> ++>>>>>>> java8 </parent> <artifactId>tamaya-usagetracker_beta</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9fdd5dae/validation/pom.xml ---------------------------------------------------------------------- diff --cc validation/pom.xml index 9bc5c55,e3d9b79..a803edb --- a/validation/pom.xml +++ b/validation/pom.xml @@@ -23,6 -23,7 +23,10 @@@ <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> <version>0.4-incubating-SNAPSHOT</version> ++<<<<<<< HEAD ++======= + <relativePath>..</relativePath> ++>>>>>>> java8 </parent> <artifactId>tamaya-validation_alpha</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9fdd5dae/vertx/pom.xml ---------------------------------------------------------------------- diff --cc vertx/pom.xml index 48ae036,ede9c64..a85b263 --- a/vertx/pom.xml +++ b/vertx/pom.xml @@@ -23,6 -23,7 +23,10 @@@ <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> <version>0.4-incubating-SNAPSHOT</version> ++<<<<<<< HEAD ++======= + <relativePath>..</relativePath> ++>>>>>>> java8 </parent> <artifactId>tamaya-vertx-alpha</artifactId>
