Repository: incubator-tamaya-sandbox Updated Branches: refs/heads/master 048dca9cb -> 738be50e5
Fix project structure: disable injection Since pom.xml is missing, disable module in build. 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/738be50e Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/738be50e Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/738be50e Branch: refs/heads/master Commit: 738be50e54acb64b65492a3b7620c6500041ed97 Parents: 048dca9 Author: Phil Ottlinger <[email protected]> Authored: Mon Oct 9 21:38:28 2017 +0200 Committer: Phil Ottlinger <[email protected]> Committed: Mon Oct 9 21:38:28 2017 +0200 ---------------------------------------------------------------------- collections/pom.xml | 2 +- osgi/pom.xml | 3 +++ pom.xml | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/738be50e/collections/pom.xml ---------------------------------------------------------------------- diff --git a/collections/pom.xml b/collections/pom.xml index b11c807..b840f11 100644 --- a/collections/pom.xml +++ b/collections/pom.xml @@ -23,7 +23,7 @@ under the License. <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-extensions</artifactId> <version>0.4-incubating-SNAPSHOT</version> - <relativePath>..</relativePath> + <relativePath/> </parent> <artifactId>tamaya-collections</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/738be50e/osgi/pom.xml ---------------------------------------------------------------------- diff --git a/osgi/pom.xml b/osgi/pom.xml index b0089b8..29b9b77 100644 --- a/osgi/pom.xml +++ b/osgi/pom.xml @@ -25,6 +25,7 @@ <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> <version>0.4-incubating-SNAPSHOT</version> + <relativePath/> </parent> <artifactId>tamaya-osgi-all</artifactId> @@ -100,7 +101,9 @@ <module>karaf-shell</module> <module>karaf-features</module> <module>gogo-shell</module> + <!-- Enable if pom is properly checked in <module>injection</module> + --> </modules> </project> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/738be50e/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index ac0d4c6..5c4b2d5 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ under the License. <tamaya.version>0.4-incubating-SNAPSHOT</tamaya.version> <commons-io.version>2.5</commons-io.version> <findbugs.skip>false</findbugs.skip> - <osgi.version>5.0.0</osgi.version> <!-- 4.3.1 --> + <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>
