Extract OSGi OBR service API to a non-bundle jar to avoid circular build problems
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@578934 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundlerepository/pom.xml b/bundlerepository/pom.xml
index d53fd59..8722f33 100644
--- a/bundlerepository/pom.xml
+++ b/bundlerepository/pom.xml
@@ -32,7 +32,7 @@
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>org.osgi.service.obr</artifactId>
<version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/maven-obr-plugin/pom.xml b/maven-obr-plugin/pom.xml
index b6244a3..6f8e3e7 100644
--- a/maven-obr-plugin/pom.xml
+++ b/maven-obr-plugin/pom.xml
@@ -47,14 +47,9 @@
<version>2.2.2</version>
</dependency>
<dependency>
- <groupId>${groupId}</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>org.apache.felix.bundlerepository</artifactId>
- <version>1.0.0</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.service.obr</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
diff --git a/org.osgi.service.obr/pom.xml b/org.osgi.service.obr/pom.xml
new file mode 100644
index 0000000..5c3bb82
--- /dev/null
+++ b/org.osgi.service.obr/pom.xml
@@ -0,0 +1,43 @@
+<!--
+ 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>
+ <parent>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>felix</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <relativePath>../pom/pom.xml</relativePath>
+ </parent>
+ <organization>
+ <name>OSGi Alliance</name>
+ <url>http://www.osgi.org/</url>
+ </organization>
+ <modelVersion>4.0.0</modelVersion>
+ <name>OSGi OBR Service API</name>
+ <description>OSGi OBR Service API</description>
+ <artifactId>org.osgi.service.obr</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi_R4_core</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/bundlerepository/src/main/java/org/osgi/service/obr/Capability.java b/org.osgi.service.obr/src/main/java/org/osgi/service/obr/Capability.java
similarity index 100%
rename from bundlerepository/src/main/java/org/osgi/service/obr/Capability.java
rename to org.osgi.service.obr/src/main/java/org/osgi/service/obr/Capability.java
diff --git a/bundlerepository/src/main/java/org/osgi/service/obr/CapabilityProvider.java b/org.osgi.service.obr/src/main/java/org/osgi/service/obr/CapabilityProvider.java
similarity index 100%
rename from bundlerepository/src/main/java/org/osgi/service/obr/CapabilityProvider.java
rename to org.osgi.service.obr/src/main/java/org/osgi/service/obr/CapabilityProvider.java
diff --git a/bundlerepository/src/main/java/org/osgi/service/obr/Repository.java b/org.osgi.service.obr/src/main/java/org/osgi/service/obr/Repository.java
similarity index 100%
rename from bundlerepository/src/main/java/org/osgi/service/obr/Repository.java
rename to org.osgi.service.obr/src/main/java/org/osgi/service/obr/Repository.java
diff --git a/bundlerepository/src/main/java/org/osgi/service/obr/RepositoryAdmin.java b/org.osgi.service.obr/src/main/java/org/osgi/service/obr/RepositoryAdmin.java
similarity index 100%
rename from bundlerepository/src/main/java/org/osgi/service/obr/RepositoryAdmin.java
rename to org.osgi.service.obr/src/main/java/org/osgi/service/obr/RepositoryAdmin.java
diff --git a/bundlerepository/src/main/java/org/osgi/service/obr/RepositoryPermission.java b/org.osgi.service.obr/src/main/java/org/osgi/service/obr/RepositoryPermission.java
similarity index 100%
rename from bundlerepository/src/main/java/org/osgi/service/obr/RepositoryPermission.java
rename to org.osgi.service.obr/src/main/java/org/osgi/service/obr/RepositoryPermission.java
diff --git a/bundlerepository/src/main/java/org/osgi/service/obr/Requirement.java b/org.osgi.service.obr/src/main/java/org/osgi/service/obr/Requirement.java
similarity index 100%
rename from bundlerepository/src/main/java/org/osgi/service/obr/Requirement.java
rename to org.osgi.service.obr/src/main/java/org/osgi/service/obr/Requirement.java
diff --git a/bundlerepository/src/main/java/org/osgi/service/obr/Resolver.java b/org.osgi.service.obr/src/main/java/org/osgi/service/obr/Resolver.java
similarity index 100%
rename from bundlerepository/src/main/java/org/osgi/service/obr/Resolver.java
rename to org.osgi.service.obr/src/main/java/org/osgi/service/obr/Resolver.java
diff --git a/bundlerepository/src/main/java/org/osgi/service/obr/Resource.java b/org.osgi.service.obr/src/main/java/org/osgi/service/obr/Resource.java
similarity index 100%
rename from bundlerepository/src/main/java/org/osgi/service/obr/Resource.java
rename to org.osgi.service.obr/src/main/java/org/osgi/service/obr/Resource.java
diff --git a/pom/pom.xml b/pom/pom.xml
index 2f9c116..74593e1 100644
--- a/pom/pom.xml
+++ b/pom/pom.xml
@@ -96,8 +96,9 @@
</property>
</activation>
<modules>
- <module>../bundleplugin</module>
+ <module>../org.osgi.service.obr</module>
<module>../maven-obr-plugin</module>
+ <module>../bundleplugin</module>
<module>../scrplugin</module>
<module>../tools/maven2/maven-osgi-plugin</module>
<module>../ipojo/plugin</module>