Merged
diff --git a/.travis.yml b/.travis.yml
index 2edee3e..2f913e9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,19 @@
+// 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.
language: java
dist: xenial
sudo: required
diff --git a/NOTICE b/NOTICE
index 79491bc..612044f 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache Tamaya Extensions (incubating)
-Copyright 2014-2017 The Apache Software Foundation.
+Copyright 2014-2019 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/README.md b/README.md
index 05d5b8e..bbfb6b9 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,20 @@
+<!--
+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.
+-->
# Apache Tamaya (incubating)
Tamaya is a very powerful yet flexible configuration solution. Its core is built based on a few simple concepts.
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 6754987..50a0827 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -25,13 +25,17 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions-all</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-extension-distribution</artifactId>
<name>Apache Tamaya Extension Distribution</name>
<inceptionYear>2015</inceptionYear>
+ <properties>
+ <maven.deploy.skip>true</maven.deploy.skip>
+ </properties>
+
<scm>
<connection>
scm:git://git.apache.org/incubator-tamaya.git
@@ -79,4 +83,43 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>release-sign-artifacts</id>
+ <activation>
+ <property>
+ <name>performRelease</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>net.nicoulaj.maven.plugins</groupId>
+ <artifactId>checksum-maven-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>artifacts</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <individualFiles>true</individualFiles>
+ <attachChecksums>true</attachChecksums>
+ <failOnError>false</failOnError>
+ <algorithms>
+ <algorithm>MD5</algorithm>
+ <algorithm>SHA-1</algorithm>
+ <algorithm>SHA-256</algorithm>
+ <algorithm>SHA-512</algorithm>
+ </algorithms>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/01-resources-example/pom.xml b/examples/01-resources-example/pom.xml
index 2f8693c..9274ab5 100644
--- a/examples/01-resources-example/pom.xml
+++ b/examples/01-resources-example/pom.xml
@@ -25,12 +25,12 @@
<parent>
<groupId>org.apache.tamaya.ext.examples</groupId>
<artifactId>examples</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
<relativePath>..</relativePath>
</parent>
<artifactId>01-resources-example</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
<name>Apache Tamaya Resource Location Example</name>
<description>This project contains a simple example using the resource location module.</description>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-core</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
diff --git a/examples/02-resolver-example/pom.xml b/examples/02-resolver-example/pom.xml
index 60b98e5..5495f55 100644
--- a/examples/02-resolver-example/pom.xml
+++ b/examples/02-resolver-example/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.tamaya.ext.examples</groupId>
<artifactId>examples</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
<relativePath>..</relativePath>
</parent>
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-core</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
diff --git a/examples/02-resolver-example/src/main/resources/build.data b/examples/02-resolver-example/src/main/resources/build.data
index 274c005..970e337 100644
--- a/examples/02-resolver-example/src/main/resources/build.data
+++ b/examples/02-resolver-example/src/main/resources/build.data
@@ -1 +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.
1234
\ No newline at end of file
diff --git a/examples/03-injection-example/pom.xml b/examples/03-injection-example/pom.xml
index 03e3099..b300e3b 100644
--- a/examples/03-injection-example/pom.xml
+++ b/examples/03-injection-example/pom.xml
@@ -25,12 +25,12 @@
<parent>
<groupId>org.apache.tamaya.ext.examples</groupId>
<artifactId>examples</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
<relativePath>..</relativePath>
</parent>
<artifactId>03-injection-example</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
<name>Apache Tamaya Configuration Injection Example</name>
<description>This project contains a simple illustrating how configuration values can be injected.</description>
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-core</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
diff --git a/examples/04-events-example/pom.xml b/examples/04-events-example/pom.xml
index 12bc5ee..ab00208 100644
--- a/examples/04-events-example/pom.xml
+++ b/examples/04-events-example/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.tamaya.ext.examples</groupId>
<artifactId>examples</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
<relativePath>..</relativePath>
</parent>
@@ -47,7 +47,7 @@
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-core</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
diff --git a/examples/05-spring-example/README.md b/examples/05-spring-example/README.md
index 8c51a17..18f0e80 100644
--- a/examples/05-spring-example/README.md
+++ b/examples/05-spring-example/README.md
@@ -1,3 +1,20 @@
+<!--
+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.
+-->
# Spring Boot example integration of Tamaya
This example shows how Tamaya integrates with Spring Boot.
diff --git a/examples/05-spring-example/pom.xml b/examples/05-spring-example/pom.xml
index ef7b4a7..f9ea828 100644
--- a/examples/05-spring-example/pom.xml
+++ b/examples/05-spring-example/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.tamaya.ext.examples</groupId>
<artifactId>examples</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>05-spring-example</artifactId>
@@ -24,7 +24,7 @@
<properties>
<spring.version>5.1.2.RELEASE</spring.version>
<spring.boot.version>2.1.0.RELEASE</spring.boot.version>
- <tamaya-apicore.version>0.4-incubating-SNAPSHOT</tamaya-apicore.version>
+ <tamaya-apicore.version>${project.version}</tamaya-apicore.version>
</properties>
<name>Apache Tamaya Spring Example</name>
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-core</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
diff --git a/examples/06-distributed/pom.xml b/examples/06-distributed/pom.xml
index 9909cc4..b62c5fa 100644
--- a/examples/06-distributed/pom.xml
+++ b/examples/06-distributed/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tamaya.ext.examples</groupId>
<artifactId>examples</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>06-distributed-example</artifactId>
@@ -34,7 +34,7 @@
<maven.compile.sourceLevel>1.8</maven.compile.sourceLevel>
<maven.compile.optimize>false</maven.compile.optimize>
<maven.compile.deprecation>true</maven.compile.deprecation>
- <tamaya.version>0.4-incubating-SNAPSHOT</tamaya.version>
+ <tamaya.version>${project.version}</tamaya.version>
<vertx.version>3.5.4</vertx.version>
<junit.version>4.12</junit.version>
<javafx.version>11.0.2</javafx.version>
diff --git a/examples/pom.xml b/examples/pom.xml
index 87de37f..44af539 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions-all</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<groupId>org.apache.tamaya.ext.examples</groupId>
diff --git a/modules/collections/bnd.bnd b/modules/collections/bnd.bnd
index f9fb7f1..7e803e4 100644
--- a/modules/collections/bnd.bnd
+++ b/modules/collections/bnd.bnd
@@ -1,3 +1,19 @@
+# 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.
-buildpath: \
osgi.annotation; version=6.0.0,\
osgi.core; version=6.0,\
diff --git a/modules/collections/pom.xml b/modules/collections/pom.xml
index 1cb5b12..e80ad46 100644
--- a/modules/collections/pom.xml
+++ b/modules/collections/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-collections</artifactId>
diff --git a/modules/consul/bnd.bnd b/modules/consul/bnd.bnd
index d60c46c..cc39701 100644
--- a/modules/consul/bnd.bnd
+++ b/modules/consul/bnd.bnd
@@ -1,3 +1,19 @@
+# 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.
-buildpath: \
osgi.annotation; version=6.0.0,\
osgi.core; version=6.0,\
diff --git a/modules/consul/pom.xml b/modules/consul/pom.xml
index 39fe23c..ff643b6 100644
--- a/modules/consul/pom.xml
+++ b/modules/consul/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-consul</artifactId>
diff --git a/modules/etcd/bnd.bnd b/modules/etcd/bnd.bnd
index 4d1fc02..6c48372 100644
--- a/modules/etcd/bnd.bnd
+++ b/modules/etcd/bnd.bnd
@@ -1,3 +1,19 @@
+# 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.
-buildpath: \
osgi.annotation; version=6.0.0,\
osgi.core; version=6.0,\
diff --git a/modules/etcd/pom.xml b/modules/etcd/pom.xml
index 28c805e..4c6d0b7 100644
--- a/modules/etcd/pom.xml
+++ b/modules/etcd/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-etcd</artifactId>
diff --git a/modules/events/bnd.bnd b/modules/events/bnd.bnd
index c8099e3..8183a04 100644
--- a/modules/events/bnd.bnd
+++ b/modules/events/bnd.bnd
@@ -1,3 +1,19 @@
+# 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.
-buildpath: \
osgi.annotation; version=6.0.0,\
osgi.core; version=6.0,\
diff --git a/modules/events/pom.xml b/modules/events/pom.xml
index 9577c0c..444781b 100644
--- a/modules/events/pom.xml
+++ b/modules/events/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-events</artifactId>
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-api</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-core</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/modules/features/bnd.bnd b/modules/features/bnd.bnd
index e468706..2eec267 100644
--- a/modules/features/bnd.bnd
+++ b/modules/features/bnd.bnd
@@ -1,3 +1,19 @@
+# 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.
-buildpath: \
osgi.annotation; version=6.0.0,\
osgi.core; version=6.0,\
diff --git a/modules/features/pom.xml b/modules/features/pom.xml
index 0badfc6..84ee408 100644
--- a/modules/features/pom.xml
+++ b/modules/features/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-features</artifactId>
@@ -36,13 +36,13 @@
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-api</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-core</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/modules/filter/bnd.bnd b/modules/filter/bnd.bnd
index fd24b03..75801c2 100644
--- a/modules/filter/bnd.bnd
+++ b/modules/filter/bnd.bnd
@@ -1,3 +1,19 @@
+# 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.
-buildpath: \
osgi.annotation; version=6.0.0,\
osgi.core; version=6.0,\
diff --git a/modules/filter/pom.xml b/modules/filter/pom.xml
index dddd6ab..a23e49a 100644
--- a/modules/filter/pom.xml
+++ b/modules/filter/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-filter</artifactId>
@@ -53,18 +53,18 @@
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-api</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-spisupport</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-core</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/modules/formats/base/bnd.bnd b/modules/formats/base/bnd.bnd
index 67e1eee..b07882b 100644
--- a/modules/formats/base/bnd.bnd
+++ b/modules/formats/base/bnd.bnd
@@ -1,3 +1,19 @@
+# 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.
-buildpath: \
osgi.annotation; version=6.0.0,\
osgi.core; version=6.0,\
diff --git a/modules/formats/base/pom.xml b/modules/formats/base/pom.xml
index 329b64b..fda97ed 100644
--- a/modules/formats/base/pom.xml
+++ b/modules/formats/base/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-formats-all</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
<relativePath>..</relativePath>
</parent>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-api</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -58,7 +58,7 @@
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-core</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/modules/formats/hjson/pom.xml b/modules/formats/hjson/pom.xml
index a520417..c26f801 100644
--- a/modules/formats/hjson/pom.xml
+++ b/modules/formats/hjson/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-formats-all</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
<relativePath>..</relativePath>
</parent>
diff --git a/modules/formats/hocon/bnd.bnd b/modules/formats/hocon/bnd.bnd
index cccf60d..2a7773c 100644
--- a/modules/formats/hocon/bnd.bnd
+++ b/modules/formats/hocon/bnd.bnd
@@ -1,3 +1,19 @@
+# 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.
-buildpath: \
osgi.annotation; version=6.0.0,\
osgi.core; version=6.0,\
diff --git a/modules/formats/hocon/pom.xml b/modules/formats/hocon/pom.xml
index 41e7f7e..1a463cb 100644
--- a/modules/formats/hocon/pom.xml
+++ b/modules/formats/hocon/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-formats-all</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
<relativePath>..</relativePath>
</parent>
@@ -38,14 +38,14 @@
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-api</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-core</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/modules/formats/json/bnd.bnd b/modules/formats/json/bnd.bnd
index a3baef0..36581e8 100644
--- a/modules/formats/json/bnd.bnd
+++ b/modules/formats/json/bnd.bnd
@@ -1,3 +1,19 @@
+# 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.
-buildpath: \
osgi.annotation; version=6.0.0,\
osgi.core; version=6.0,\
diff --git a/modules/formats/json/pom.xml b/modules/formats/json/pom.xml
index 3ca7d5d..7a2b7a6 100644
--- a/modules/formats/json/pom.xml
+++ b/modules/formats/json/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-formats-all</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
<relativePath>..</relativePath>
</parent>
@@ -38,14 +38,14 @@
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-api</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-core</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/modules/formats/pom.xml b/modules/formats/pom.xml
index d35a3ba..79a0e6e 100644
--- a/modules/formats/pom.xml
+++ b/modules/formats/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-formats-all</artifactId>
diff --git a/modules/formats/yaml/bnd.bnd b/modules/formats/yaml/bnd.bnd
index 35fe9bb..0006abb 100644
--- a/modules/formats/yaml/bnd.bnd
+++ b/modules/formats/yaml/bnd.bnd
@@ -1,3 +1,19 @@
+# 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.
-buildpath: \
osgi.annotation; version=6.0.0,\
osgi.core; version=6.0,\
diff --git a/modules/formats/yaml/pom.xml b/modules/formats/yaml/pom.xml
index a70cf8a..841bab4 100644
--- a/modules/formats/yaml/pom.xml
+++ b/modules/formats/yaml/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-formats-all</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
<relativePath>..</relativePath>
</parent>
@@ -42,14 +42,14 @@
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-api</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-core</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/modules/functions/bnd.bnd b/modules/functions/bnd.bnd
index acee572..f2efffa 100644
--- a/modules/functions/bnd.bnd
+++ b/modules/functions/bnd.bnd
@@ -1,3 +1,19 @@
+# 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.
-buildpath: \
osgi.annotation; version=6.0.0,\
osgi.core; version=6.0,\
diff --git a/modules/functions/pom.xml b/modules/functions/pom.xml
index 9ac5332..0647478 100644
--- a/modules/functions/pom.xml
+++ b/modules/functions/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-functions</artifactId>
@@ -53,13 +53,13 @@
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-api</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
</dependency>
<!-- Test scope only, do not createObject a code dependency! -->
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-core</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/modules/hazelcast/bnd.bnd b/modules/hazelcast/bnd.bnd
index 215c958..f4db02a 100644
--- a/modules/hazelcast/bnd.bnd
+++ b/modules/hazelcast/bnd.bnd
@@ -1,3 +1,19 @@
+# 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.
-buildpath: \
osgi.annotation; version=6.0.0,\
osgi.core; version=6.0,\
diff --git a/modules/hazelcast/pom.xml b/modules/hazelcast/pom.xml
index 336c711..d63d9f9 100644
--- a/modules/hazelcast/pom.xml
+++ b/modules/hazelcast/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-hazelcast</artifactId>
diff --git a/modules/injection/cdi/bnd.bnd b/modules/injection/cdi/bnd.bnd
index bab895d..3e48b9b 100644
--- a/modules/injection/cdi/bnd.bnd
+++ b/modules/injection/cdi/bnd.bnd
@@ -1,3 +1,19 @@
+# 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.
-buildpath: \
osgi.annotation; version=6.0.0,\
osgi.core; version=6.0,\
diff --git a/modules/injection/cdi/pom.xml b/modules/injection/cdi/pom.xml
index 0eb0e8a..f8e5271 100644
--- a/modules/injection/cdi/pom.xml
+++ b/modules/injection/cdi/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-injection-all</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
<relativePath>..</relativePath>
</parent>
@@ -90,13 +90,13 @@
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-core</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-api</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/modules/injection/injection-api/bnd.bnd b/modules/injection/injection-api/bnd.bnd
index 1c9bb32..0df104b 100644
--- a/modules/injection/injection-api/bnd.bnd
+++ b/modules/injection/injection-api/bnd.bnd
@@ -1,3 +1,19 @@
+# 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.
-buildpath: \
osgi.annotation; version=6.0.0,\
osgi.core; version=6.0,\
diff --git a/modules/injection/injection-api/pom.xml b/modules/injection/injection-api/pom.xml
index e7e1918..b5ccffa 100644
--- a/modules/injection/injection-api/pom.xml
+++ b/modules/injection/injection-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-injection-all</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
<relativePath>..</relativePath>
</parent>
@@ -41,18 +41,18 @@
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-api</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-spisupport</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-core</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/modules/injection/pom.xml b/modules/injection/pom.xml
index d30e3f7..d202535 100644
--- a/modules/injection/pom.xml
+++ b/modules/injection/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-injection-all</artifactId>
diff --git a/modules/injection/standalone/bnd.bnd b/modules/injection/standalone/bnd.bnd
index 9b927ed..af1bf2a 100644
--- a/modules/injection/standalone/bnd.bnd
+++ b/modules/injection/standalone/bnd.bnd
@@ -1,3 +1,19 @@
+# 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.
-buildpath: \
osgi.annotation; version=6.0.0,\
osgi.core; version=6.0,\
diff --git a/modules/injection/standalone/pom.xml b/modules/injection/standalone/pom.xml
index 62a98f6..3c103f7 100644
--- a/modules/injection/standalone/pom.xml
+++ b/modules/injection/standalone/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-injection-all</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
<relativePath>..</relativePath>
</parent>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-api</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -47,7 +47,7 @@
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-core</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/modules/jndi/bnd.bnd b/modules/jndi/bnd.bnd
index 324dfb0..3da1b14 100644
--- a/modules/jndi/bnd.bnd
+++ b/modules/jndi/bnd.bnd
@@ -1,3 +1,19 @@
+# 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.
-buildpath: \
osgi.annotation; version=6.0.0,\
osgi.core; version=6.0,\
diff --git a/modules/jndi/pom.xml b/modules/jndi/pom.xml
index c75375d..81de63b 100644
--- a/modules/jndi/pom.xml
+++ b/modules/jndi/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-jndi</artifactId>
@@ -54,13 +54,13 @@
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-api</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-core</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/modules/microprofile/bnd.bnd b/modules/microprofile/bnd.bnd
index 8029932..7d4718a 100644
--- a/modules/microprofile/bnd.bnd
+++ b/modules/microprofile/bnd.bnd
@@ -1,3 +1,19 @@
+# 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.
-buildpath: \
osgi.annotation; version=6.0.0,\
osgi.core; version=6.0,\
diff --git a/modules/microprofile/pom.xml b/modules/microprofile/pom.xml
index 491a49a..e53ebae 100644
--- a/modules/microprofile/pom.xml
+++ b/modules/microprofile/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-microprofile</artifactId>
@@ -36,7 +36,7 @@
<geronimo-atinject-1.0-spec.version>1.0</geronimo-atinject-1.0-spec.version>
<geronimo-jcdi-1.1-spec.version>1.0</geronimo-jcdi-1.1-spec.version>
<version.shrinkwrap.resolvers>2.2.6</version.shrinkwrap.resolvers>
- <tamaya-version>0.4-incubating-SNAPSHOT</tamaya-version>
+ <tamaya-version>${project.version}</tamaya-version>
<arquillian.version>1.1.13.Final</arquillian.version>
<arquillian-weld-embedded.version>2.0.0.Final</arquillian-weld-embedded.version>
<cdi-api.version>2.0</cdi-api.version>
diff --git a/modules/mutable-config/bnd.bnd b/modules/mutable-config/bnd.bnd
index bcf0518..340f14c 100644
--- a/modules/mutable-config/bnd.bnd
+++ b/modules/mutable-config/bnd.bnd
@@ -1,3 +1,19 @@
+# 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.
-buildpath: \
osgi.annotation; version=6.0.0,\
osgi.core; version=6.0,\
diff --git a/modules/mutable-config/pom.xml b/modules/mutable-config/pom.xml
index f9fe497..5101945 100644
--- a/modules/mutable-config/pom.xml
+++ b/modules/mutable-config/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-mutable-config</artifactId>
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-api</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tamaya</groupId>
@@ -74,7 +74,7 @@
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-core</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
diff --git a/modules/optional/bnd.bnd b/modules/optional/bnd.bnd
index 25e8942..ebd6a83 100644
--- a/modules/optional/bnd.bnd
+++ b/modules/optional/bnd.bnd
@@ -1,3 +1,19 @@
+# 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.
-buildpath: \
osgi.annotation; version=6.0.0,\
osgi.core; version=6.0,\
diff --git a/modules/optional/pom.xml b/modules/optional/pom.xml
index da78259..2f20b36 100644
--- a/modules/optional/pom.xml
+++ b/modules/optional/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-optional</artifactId>
@@ -61,14 +61,14 @@
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-api</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-core</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
diff --git a/modules/osgi/common/bnd.bnd b/modules/osgi/common/bnd.bnd
index 47a1499..a178d4a 100644
--- a/modules/osgi/common/bnd.bnd
+++ b/modules/osgi/common/bnd.bnd
@@ -1,3 +1,19 @@
+# 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.
-buildpath: \
osgi.annotation; version=6.0.0,\
osgi.core; version=6.0,\
diff --git a/modules/osgi/common/pom.xml b/modules/osgi/common/pom.xml
index d946337..2849b58 100644
--- a/modules/osgi/common/pom.xml
+++ b/modules/osgi/common/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-osgi-all</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-osgi</artifactId>
diff --git a/modules/osgi/gogo-shell/bnd.bnd b/modules/osgi/gogo-shell/bnd.bnd
index bb23ee6..5addaf2 100644
--- a/modules/osgi/gogo-shell/bnd.bnd
+++ b/modules/osgi/gogo-shell/bnd.bnd
@@ -1,3 +1,19 @@
+# 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.
-buildpath: \
osgi.annotation; version=6.0.0,\
osgi.core; version=6.0,\
diff --git a/modules/osgi/gogo-shell/pom.xml b/modules/osgi/gogo-shell/pom.xml
index b43d30f..3614439 100644
--- a/modules/osgi/gogo-shell/pom.xml
+++ b/modules/osgi/gogo-shell/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-osgi-all</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-osgi-gogo-shell</artifactId>
diff --git a/modules/osgi/injection/bnd.bnd b/modules/osgi/injection/bnd.bnd
index e30b9bc..95ab95f 100644
--- a/modules/osgi/injection/bnd.bnd
+++ b/modules/osgi/injection/bnd.bnd
@@ -1,3 +1,19 @@
+# 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.
-buildpath: \
osgi.annotation; version=6.0.0,\
osgi.core; version=6.0,\
diff --git a/modules/osgi/injection/pom.xml b/modules/osgi/injection/pom.xml
index 256a244..9ad078d 100644
--- a/modules/osgi/injection/pom.xml
+++ b/modules/osgi/injection/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-osgi-all</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-osgi-injection</artifactId>
diff --git a/modules/osgi/karaf-features/pom.xml b/modules/osgi/karaf-features/pom.xml
index 8d8c2d4..e399153 100644
--- a/modules/osgi/karaf-features/pom.xml
+++ b/modules/osgi/karaf-features/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-osgi-all</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-karaf-features</artifactId>
diff --git a/modules/osgi/karaf-shell/bnd.bnd b/modules/osgi/karaf-shell/bnd.bnd
index 20bd813..3c158c5 100644
--- a/modules/osgi/karaf-shell/bnd.bnd
+++ b/modules/osgi/karaf-shell/bnd.bnd
@@ -1,3 +1,19 @@
+# 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.
-buildpath: \
osgi.annotation; version=6.0.0,\
osgi.core; version=6.0,\
diff --git a/modules/osgi/karaf-shell/pom.xml b/modules/osgi/karaf-shell/pom.xml
index 119b264..bf5c74b 100644
--- a/modules/osgi/karaf-shell/pom.xml
+++ b/modules/osgi/karaf-shell/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-osgi-all</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-osgi-karaf-shell</artifactId>
diff --git a/modules/osgi/pom.xml b/modules/osgi/pom.xml
index 1f604cd..f13d4c6 100644
--- a/modules/osgi/pom.xml
+++ b/modules/osgi/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-osgi-all</artifactId>
diff --git a/modules/osgi/updater/bnd.bnd b/modules/osgi/updater/bnd.bnd
index ffd2509..51fa36e 100644
--- a/modules/osgi/updater/bnd.bnd
+++ b/modules/osgi/updater/bnd.bnd
@@ -1,3 +1,19 @@
+# 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.
-buildpath: \
osgi.annotation; version=6.0.0,\
osgi.core; version=6.0,\
diff --git a/modules/osgi/updater/pom.xml b/modules/osgi/updater/pom.xml
index 8622676..d92c7c1 100644
--- a/modules/osgi/updater/pom.xml
+++ b/modules/osgi/updater/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-osgi-all</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-osgi-updater</artifactId>
diff --git a/modules/pom.xml b/modules/pom.xml
index 8481905..3e49b2d 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions-all</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-extensions</artifactId>
diff --git a/modules/resolver/bnd.bnd b/modules/resolver/bnd.bnd
index 84f4f10..9cdab47 100644
--- a/modules/resolver/bnd.bnd
+++ b/modules/resolver/bnd.bnd
@@ -1,3 +1,19 @@
+# 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.
-buildpath: \
osgi.annotation; version=6.0.0,\
osgi.core; version=6.0,\
diff --git a/modules/resolver/pom.xml b/modules/resolver/pom.xml
index b5d7fcc..518498d 100644
--- a/modules/resolver/pom.xml
+++ b/modules/resolver/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-resolver</artifactId>
@@ -58,12 +58,12 @@
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-api</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-core</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/modules/resolver/src/test/java/org/apache/tamaya/resolver/ManualSetupTest.java b/modules/resolver/src/test/java/org/apache/tamaya/resolver/ManualSetupTest.java
index b2ab10c..b08b236 100644
--- 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,13 @@
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{
diff --git a/modules/resources/README.md b/modules/resources/README.md
index e359656..6ce8a60 100644
--- a/modules/resources/README.md
+++ b/modules/resources/README.md
@@ -1,3 +1,20 @@
+<!--
+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.
+-->
Apache Tamaya Resources Module
------------------------------
diff --git a/modules/resources/bnd.bnd b/modules/resources/bnd.bnd
index 11a597e..0f6cbb3 100644
--- a/modules/resources/bnd.bnd
+++ b/modules/resources/bnd.bnd
@@ -1,3 +1,19 @@
+# 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.
-buildpath: \
osgi.annotation; version=6.0.0,\
osgi.core; version=6.0,\
diff --git a/modules/resources/pom.xml b/modules/resources/pom.xml
index 70403a9..a3c2a12 100644
--- a/modules/resources/pom.xml
+++ b/modules/resources/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-resources</artifactId>
@@ -58,12 +58,12 @@
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-api</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-core</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/modules/spring/bnd.bnd b/modules/spring/bnd.bnd
index bd44b5e..6a9c601 100644
--- a/modules/spring/bnd.bnd
+++ b/modules/spring/bnd.bnd
@@ -1,3 +1,19 @@
+# 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.
-buildpath: \
osgi.annotation; version=6.0.0,\
osgi.core; version=6.0,\
diff --git a/modules/spring/pom.xml b/modules/spring/pom.xml
index 3a7aecf..d99752e 100644
--- a/modules/spring/pom.xml
+++ b/modules/spring/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>tamaya-extensions</artifactId>
<groupId>org.apache.tamaya.ext</groupId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-spring</artifactId>
@@ -75,13 +75,13 @@
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-core</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-api</artifactId>
- <version>${tamaya-apicore.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 02f4ba3..038c250 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions-all</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
<packaging>pom</packaging>
<name>Apache Tamaya Extensions</name>
@@ -43,9 +43,6 @@
</organization>
<properties>
- <!-- Used version of Tamaya API&Core -->
- <tamaya-apicore.version>0.4-incubating-SNAPSHOT</tamaya-apicore.version>
-
<commons-io.version>2.5</commons-io.version>
<findbugs.skip>false</findbugs.skip>
<osgi.version>4.3.1</osgi.version>
