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 2018/01/03 09:23:46 UTC
incubator-tamaya-sandbox git commit: Rewrite/adaptation based on JSR
API.
Repository: incubator-tamaya-sandbox
Updated Branches:
refs/heads/configjsr f7037fbdc -> f206ce19c
Rewrite/adaptation based on JSR API.
Signed-off-by: Anatole Tresch <an...@apache.org>
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/f206ce19
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/f206ce19
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/f206ce19
Branch: refs/heads/configjsr
Commit: f206ce19cdc2777101d2add8681e75603cd5ba3b
Parents: f7037fb
Author: Anatole Tresch <an...@apache.org>
Authored: Wed Jan 3 10:23:38 2018 +0100
Committer: Anatole Tresch <an...@apache.org>
Committed: Wed Jan 3 10:23:38 2018 +0100
----------------------------------------------------------------------
pom.xml | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 55 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/f206ce19/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ef0d1c3..5eac2bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,10 +40,11 @@ under the License.
</organization>
<properties>
- <tamaya.version>0.4-incubating-SNAPSHOT</tamaya.version>
+ <tamaya-apicore.version>${project.version}</tamaya-apicore.version>
+ <javaconfig.version>1.0-SNAPSHOT</javaconfig.version>
<commons-io.version>2.5</commons-io.version>
<findbugs.skip>false</findbugs.skip>
- <osgi.version>5.0.0</osgi.version>
+ <osgi.version>5.0.0</osgi.version>
<osgi.compendium.version>${osgi.version}</osgi.compendium.version>
<maven.compile.targetLevel>1.8</maven.compile.targetLevel>
<maven.compile.sourceLevel>1.8</maven.compile.sourceLevel>
@@ -81,6 +82,7 @@ under the License.
<!-- Dependencies for site generation -->
<reflow-skin.version>1.1.1</reflow-skin.version>
<released_version>0.3-incubating</released_version>
+ <assertj.version>3.8.0</assertj.version>
</properties>
<licenses>
@@ -189,6 +191,18 @@ under the License.
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>javax.config</groupId>
+ <artifactId>javaconfig-api</artifactId>
+ <version>${javaconfig.version}</version>
+ </dependency>
+ <!-- with mvn 3.3.9 this definition is not inherited among multiple parent-pom relationships -->
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>${assertj.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
@@ -297,9 +311,48 @@ under the License.
<version>${johnzon.version}</version>
</dependency>
+ <!-- OSGI support -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation</artifactId>
+ <scope>provided</scope>
+ <version>${osgi.annotation.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ <version>${osgi.compendium.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${osgi.version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+
</dependencies>
</dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>javax.config</groupId>
+ <artifactId>javaconfig-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.2_spec</artifactId>
+ <version>1.0-alpha-1</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ </dependencies>
+
<build>
<defaultGoal>clean install</defaultGoal>
<pluginManagement>