Updated all poms.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@882976 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/core/pom.xml b/dependencymanager/core/pom.xml
index 9012544..ca470c4 100644
--- a/dependencymanager/core/pom.xml
+++ b/dependencymanager/core/pom.xml
@@ -20,7 +20,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>1.0.4</version>
- <relativePath>../pom/pom.xml</relativePath>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
@@ -40,27 +40,6 @@
<version>1.2.0</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam</artifactId>
- <version>1.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-container-default</artifactId>
- <version>1.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-junit</artifactId>
- <version>1.2.0</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.7</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
@@ -81,31 +60,6 @@
</instructions>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <id>default-testCompile</id>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>maven-paxexam-plugin</artifactId>
- <version>1.2.0</version>
- <executions>
- <execution>
- <id>generate-config</id>
- <goals>
- <goal>generate-depends-file</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
<scm>
diff --git a/dependencymanager/pom.xml b/dependencymanager/pom.xml
new file mode 100644
index 0000000..d564320
--- /dev/null
+++ b/dependencymanager/pom.xml
@@ -0,0 +1,40 @@
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <packaging>pom</packaging>
+
+ <parent>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>felix</artifactId>
+ <version>1.0.4</version>
+ <relativePath>../pom/pom.xml</relativePath>
+ </parent>
+
+ <name>Apache Felix Dependency Manager Projects</name>
+ <artifactId>dependencymanager-reactor</artifactId>
+ <version>1</version>
+
+ <modules>
+ <module>core</module>
+ <module>shell</module>
+ <module>test</module>
+ </modules>
+</project>
diff --git a/dependencymanager/shell/pom.xml b/dependencymanager/shell/pom.xml
index 0337a586..089e026 100644
--- a/dependencymanager/shell/pom.xml
+++ b/dependencymanager/shell/pom.xml
@@ -22,12 +22,12 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>1.0.4</version>
- <relativePath>../pom/pom.xml</relativePath>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>Apache Felix Dependency Manager Shell</name>
- <version>2.0.2-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<artifactId>org.apache.felix.dependencymanager.shell</artifactId>
<dependencies>
<dependency>
@@ -45,12 +45,12 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.shell</artifactId>
- <version>1.0.2</version>
+ <version>1.4.1</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.dependencymanager</artifactId>
- <version>2.0.1</version>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
diff --git a/dependencymanager/test/pom.xml b/dependencymanager/test/pom.xml
index 9012544..a55a11b 100644
--- a/dependencymanager/test/pom.xml
+++ b/dependencymanager/test/pom.xml
@@ -20,13 +20,12 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>1.0.4</version>
- <relativePath>../pom/pom.xml</relativePath>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <packaging>bundle</packaging>
- <name>Apache Felix Dependency Manager</name>
+ <name>Apache Felix Dependency Manager Integration Tests</name>
<version>3.0.0-SNAPSHOT</version>
- <artifactId>org.apache.felix.dependencymanager</artifactId>
+ <artifactId>org.apache.felix.dependencymanager.test</artifactId>
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
@@ -41,6 +40,12 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>org.apache.felix.dependencymanager</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam</artifactId>
<version>1.2.0</version>
@@ -65,23 +70,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>org.apache.felix.dependencymanager</Bundle-SymbolicName>
- <Bundle-Name>Apache Felix Dependency Manager</Bundle-Name>
- <Bundle-Description>A bundle that provides a run-time
- service dependency manager.</Bundle-Description>
- <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
- <Export-Package>org.apache.felix.dependencymanager</Export-Package>
- <Import-Package>!org.apache.felix.dependencymanager,*</Import-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
@@ -108,9 +96,4 @@
</plugin>
</plugins>
</build>
- <scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.dependencymanager-3.0.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.dependencymanager-3.0.0</developerConnection>
- <url>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.dependencymanager-3.0.0</url>
- </scm>
</project>