Repository: aries-rsa Updated Branches: refs/heads/master 69bb901e9 -> 46b74ebd5
Using fully qualified artifact names Project: http://git-wip-us.apache.org/repos/asf/aries-rsa/repo Commit: http://git-wip-us.apache.org/repos/asf/aries-rsa/commit/46b74ebd Tree: http://git-wip-us.apache.org/repos/asf/aries-rsa/tree/46b74ebd Diff: http://git-wip-us.apache.org/repos/asf/aries-rsa/diff/46b74ebd Branch: refs/heads/master Commit: 46b74ebd59e1b5db70f046a35de7ec5ab465ec15 Parents: 69bb901 Author: Christian Schneider <[email protected]> Authored: Mon Mar 14 18:38:44 2016 +0100 Committer: Christian Schneider <[email protected]> Committed: Mon Mar 14 18:38:44 2016 +0100 ---------------------------------------------------------------------- api/bnd.bnd | 6 +++ api/pom.xml | 40 ++++++++++++++++++++ discovery/local/pom.xml | 6 +-- discovery/pom.xml | 4 +- discovery/zookeeper/pom.xml | 8 ++-- examples/echotcp/api/pom.xml | 1 + examples/echotcp/consumer/pom.xml | 1 + examples/echotcp/pom.xml | 2 +- examples/echotcp/service/pom.xml | 1 + examples/pom.xml | 4 +- features/pom.xml | 2 +- features/src/main/resources/features.xml | 14 +++---- itests/felix/pom.xml | 16 ++++---- .../aries/rsa/itests/felix/RsaTestBase.java | 11 +++--- itests/pom.xml | 4 +- parent/pom.xml | 4 +- pom.xml | 3 +- provider/pom.xml | 4 +- provider/tcp/pom.xml | 6 +-- rsa-api/bnd.bnd | 6 --- rsa-api/pom.xml | 40 -------------------- rsa/pom.xml | 6 +-- spi/pom.xml | 38 +------------------ topology-manager/pom.xml | 6 +-- 24 files changed, 101 insertions(+), 132 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/46b74ebd/api/bnd.bnd ---------------------------------------------------------------------- diff --git a/api/bnd.bnd b/api/bnd.bnd new file mode 100644 index 0000000..d756067 --- /dev/null +++ b/api/bnd.bnd @@ -0,0 +1,6 @@ +Import-Package:\ + org.osgi.service.remoteserviceadmin,\ + org.osgi.service.event +Export-Package:\ + org.osgi.service.remoteserviceadmin,\ + org.osgi.service.event http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/46b74ebd/api/pom.xml ---------------------------------------------------------------------- diff --git a/api/pom.xml b/api/pom.xml new file mode 100644 index 0000000..412df18 --- /dev/null +++ b/api/pom.xml @@ -0,0 +1,40 @@ +<?xml version='1.0' encoding='UTF-8' ?> +<!-- + 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> + + <parent> + <groupId>org.apache.aries.rsa</groupId> + <artifactId>org.apache.aries.rsa.parent</artifactId> + <version>1.8-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + + <artifactId>org.apache.aries.rsa.api</artifactId> + <packaging>bundle</packaging> + <name>Aries Remote Service Admin Compendium APIs</name> + + <description> + The minimal set of OSGi Compendium APIs required by DOSGi. + This bundle should be deployed instead of the full OSGi Compendium bundle to prevent issues + caused by multiple exports of other OSGi APIs that are not used by DOSGi. See DOSGI-208. + </description> + +</project> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/46b74ebd/discovery/local/pom.xml ---------------------------------------------------------------------- diff --git a/discovery/local/pom.xml b/discovery/local/pom.xml index a3a0805..05bd581 100644 --- a/discovery/local/pom.xml +++ b/discovery/local/pom.xml @@ -23,13 +23,13 @@ <parent> <groupId>org.apache.aries.rsa</groupId> - <artifactId>parent</artifactId> + <artifactId>org.apache.aries.rsa.parent</artifactId> <version>1.8-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.apache.aries.rsa.discovery</groupId> - <artifactId>local</artifactId> + <artifactId>org.apache.aries.rsa.discovery.local</artifactId> <packaging>bundle</packaging> <name>Aries Remote Service Admin Discovery Local</name> @@ -40,7 +40,7 @@ <dependencies> <dependency> <groupId>org.apache.aries.rsa</groupId> - <artifactId>spi</artifactId> + <artifactId>org.apache.aries.rsa.spi</artifactId> <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/46b74ebd/discovery/pom.xml ---------------------------------------------------------------------- diff --git a/discovery/pom.xml b/discovery/pom.xml index 9fc449b..4297c26 100644 --- a/discovery/pom.xml +++ b/discovery/pom.xml @@ -22,12 +22,12 @@ <parent> <groupId>org.apache.aries.rsa</groupId> - <artifactId>parent</artifactId> + <artifactId>org.apache.aries.rsa.parent</artifactId> <version>1.8-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> - <artifactId>discovery</artifactId> + <artifactId>org.apache.aries.rsa.discovery</artifactId> <packaging>pom</packaging> <name>Aries Remote Service Admin Discovery</name> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/46b74ebd/discovery/zookeeper/pom.xml ---------------------------------------------------------------------- diff --git a/discovery/zookeeper/pom.xml b/discovery/zookeeper/pom.xml index 0613323..b259ee1 100644 --- a/discovery/zookeeper/pom.xml +++ b/discovery/zookeeper/pom.xml @@ -22,13 +22,13 @@ <parent> <groupId>org.apache.aries.rsa</groupId> - <artifactId>parent</artifactId> + <artifactId>org.apache.aries.rsa.parent</artifactId> <version>1.8-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.apache.aries.rsa.discovery</groupId> - <artifactId>zookeeper</artifactId> + <artifactId>org.apache.aries.rsa.discovery.zookeeper</artifactId> <packaging>bundle</packaging> <name>Aries Remote Service Admin Discovery Zookeeper</name> @@ -39,7 +39,7 @@ <dependencies> <dependency> <groupId>org.apache.aries.rsa</groupId> - <artifactId>spi</artifactId> + <artifactId>org.apache.aries.rsa.spi</artifactId> <scope>provided</scope> </dependency> <dependency> @@ -50,7 +50,7 @@ <dependency> <groupId>org.apache.aries.rsa.discovery</groupId> - <artifactId>local</artifactId> + <artifactId>org.apache.aries.rsa.discovery.local</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/46b74ebd/examples/echotcp/api/pom.xml ---------------------------------------------------------------------- diff --git a/examples/echotcp/api/pom.xml b/examples/echotcp/api/pom.xml index e24452f..436a033 100644 --- a/examples/echotcp/api/pom.xml +++ b/examples/echotcp/api/pom.xml @@ -4,6 +4,7 @@ <groupId>org.apache.aries.rsa.examples</groupId> <artifactId>org.apache.aries.rsa.examples.echotcp</artifactId> <version>1.8-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.aries.rsa.examples.echotcp</groupId> <artifactId>org.apache.aries.rsa.examples.echotcp.api</artifactId> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/46b74ebd/examples/echotcp/consumer/pom.xml ---------------------------------------------------------------------- diff --git a/examples/echotcp/consumer/pom.xml b/examples/echotcp/consumer/pom.xml index a479018..94cde91 100644 --- a/examples/echotcp/consumer/pom.xml +++ b/examples/echotcp/consumer/pom.xml @@ -24,6 +24,7 @@ <groupId>org.apache.aries.rsa.examples</groupId> <artifactId>org.apache.aries.rsa.examples.echotcp</artifactId> <version>1.8-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.aries.rsa.examples.echotcp</groupId> <artifactId>org.apache.aries.rsa.examples.echotcp.consumer</artifactId> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/46b74ebd/examples/echotcp/pom.xml ---------------------------------------------------------------------- diff --git a/examples/echotcp/pom.xml b/examples/echotcp/pom.xml index f12604b..021f2d0 100644 --- a/examples/echotcp/pom.xml +++ b/examples/echotcp/pom.xml @@ -14,7 +14,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.aries.rsa</groupId> - <artifactId>examples</artifactId> + <artifactId>org.apache.aries.rsa.examples</artifactId> <version>1.8-SNAPSHOT</version> </parent> <groupId>org.apache.aries.rsa.examples</groupId> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/46b74ebd/examples/echotcp/service/pom.xml ---------------------------------------------------------------------- diff --git a/examples/echotcp/service/pom.xml b/examples/echotcp/service/pom.xml index 50506ac..dbfb604 100644 --- a/examples/echotcp/service/pom.xml +++ b/examples/echotcp/service/pom.xml @@ -24,6 +24,7 @@ <groupId>org.apache.aries.rsa.examples</groupId> <artifactId>org.apache.aries.rsa.examples.echotcp</artifactId> <version>1.8-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.aries.rsa.examples.echotcp</groupId> <artifactId>org.apache.aries.rsa.examples.echotcp.service</artifactId> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/46b74ebd/examples/pom.xml ---------------------------------------------------------------------- diff --git a/examples/pom.xml b/examples/pom.xml index ba60a97..4c51496 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -23,12 +23,12 @@ <parent> <groupId>org.apache.aries.rsa</groupId> - <artifactId>parent</artifactId> + <artifactId>org.apache.aries.rsa.parent</artifactId> <version>1.8-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> - <artifactId>examples</artifactId> + <artifactId>org.apache.aries.rsa.examples</artifactId> <packaging>pom</packaging> <name>Aries Remote Service Admin Examples</name> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/46b74ebd/features/pom.xml ---------------------------------------------------------------------- diff --git a/features/pom.xml b/features/pom.xml index dea4060..a38df9a 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.apache.aries.rsa</groupId> - <artifactId>parent</artifactId> + <artifactId>org.apache.aries.rsa.parent</artifactId> <version>1.8-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/46b74ebd/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml index efa8ff2..2249369 100644 --- a/features/src/main/resources/features.xml +++ b/features/src/main/resources/features.xml @@ -2,26 +2,26 @@ <features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0"; name="aries-rsa-${project.version}"> <feature name="aries-rsa-core" version="${project.version}"> - <bundle>mvn:org.apache.aries.rsa/spi/${project.version}</bundle> - <bundle>mvn:org.apache.aries.rsa/core/${project.version}</bundle> - <bundle>mvn:org.apache.aries.rsa/topology-manager/${project.version}</bundle> + <bundle>mvn:org.apache.aries.rsa/org.apache.aries.rsa.spi/${project.version}</bundle> + <bundle>mvn:org.apache.aries.rsa/org.apache.aries.rsa.core/${project.version}</bundle> + <bundle>mvn:org.apache.aries.rsa/org.apache.aries.rsa.topology-manager/${project.version}</bundle> </feature> <feature name="aries-rsa-provider-tcp" version="${project.version}"> <feature>aries-rsa-core</feature> - <bundle>mvn:org.apache.aries.rsa.provider/tcp/${project.version}</bundle> + <bundle>mvn:org.apache.aries.rsa.provider/org.apache.aries.rsa.provider.tcp/${project.version}</bundle> </feature> <feature name="aries-rsa-discovery-local" version="${project.version}"> <feature>aries-rsa-core</feature> - <bundle>mvn:org.apache.aries.rsa.discovery/local/${project.version}</bundle> + <bundle>mvn:org.apache.aries.rsa.discovery/org.apache.aries.rsa.discovery.local/${project.version}</bundle> </feature> <feature name="aries-rsa-discovery-zookeeper" version="${project.version}"> <feature>aries-rsa-core</feature> <bundle>mvn:org.apache.zookeeper/zookeeper/${zookeeper.version}</bundle> - <bundle>mvn:org.apache.aries.rsa.discovery/local/${project.version}</bundle> - <bundle>mvn:org.apache.aries.rsa.discovery/zookeeper/${project.version}</bundle> + <bundle>mvn:org.apache.aries.rsa.discovery/org.apache.aries.rsa.discovery.local/${project.version}</bundle> + <bundle>mvn:org.apache.aries.rsa.discovery/org.apache.aries.rsa.discovery.zookeeper/${project.version}</bundle> </feature> </features> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/46b74ebd/itests/felix/pom.xml ---------------------------------------------------------------------- diff --git a/itests/felix/pom.xml b/itests/felix/pom.xml index bf82d9c..327401e 100644 --- a/itests/felix/pom.xml +++ b/itests/felix/pom.xml @@ -16,13 +16,13 @@ <parent> <groupId>org.apache.aries.rsa</groupId> - <artifactId>itests</artifactId> + <artifactId>org.apache.aries.rsa.itests</artifactId> <version>1.8-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.aries.rsa.itests</groupId> - <artifactId>felix</artifactId> + <artifactId>org.apache.aries.rsa.itests.felix</artifactId> <packaging>jar</packaging> <name>Aries Remote Service Admin itests felix</name> @@ -41,31 +41,31 @@ <dependency> <groupId>org.apache.aries.rsa</groupId> - <artifactId>core</artifactId> + <artifactId>org.apache.aries.rsa.core</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.aries.rsa</groupId> - <artifactId>spi</artifactId> + <artifactId>org.apache.aries.rsa.spi</artifactId> </dependency> <dependency> <groupId>org.apache.aries.rsa</groupId> - <artifactId>topology-manager</artifactId> + <artifactId>org.apache.aries.rsa.topology-manager</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.aries.rsa.discovery</groupId> - <artifactId>local</artifactId> + <artifactId>org.apache.aries.rsa.discovery.local</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.aries.rsa.discovery</groupId> - <artifactId>zookeeper</artifactId> + <artifactId>org.apache.aries.rsa.discovery.zookeeper</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.aries.rsa.provider</groupId> - <artifactId>tcp</artifactId> + <artifactId>org.apache.aries.rsa.provider.tcp</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/46b74ebd/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java ---------------------------------------------------------------------- diff --git a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java index 90856ff..f1f2d8f 100644 --- a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java +++ b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java @@ -107,12 +107,13 @@ public class RsaTestBase { systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"), systemProperty("zkPort").value("15201"), mvn("org.apache.felix", "org.apache.felix.configadmin"), - mvn("org.apache.aries.rsa", "core"), mvn("org.apache.aries.rsa", "spi"), - mvn("org.apache.aries.rsa", "topology-manager"), - mvn("org.apache.aries.rsa.provider", "tcp"), - mvn("org.apache.aries.rsa.discovery", "local"), + mvn("org.apache.aries.rsa", "org.apache.aries.rsa.core"), + mvn("org.apache.aries.rsa", "org.apache.aries.rsa.spi"), + mvn("org.apache.aries.rsa", "org.apache.aries.rsa.topology-manager"), + mvn("org.apache.aries.rsa.provider", "org.apache.aries.rsa.provider.tcp"), + mvn("org.apache.aries.rsa.discovery", "org.apache.aries.rsa.discovery.local"), mvn("org.apache.zookeeper", "zookeeper"), - mvn("org.apache.aries.rsa.discovery", "zookeeper") + mvn("org.apache.aries.rsa.discovery", "org.apache.aries.rsa.discovery.zookeeper") //CoreOptions.vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005") ); } http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/46b74ebd/itests/pom.xml ---------------------------------------------------------------------- diff --git a/itests/pom.xml b/itests/pom.xml index 7a6b227..6ec1d53 100644 --- a/itests/pom.xml +++ b/itests/pom.xml @@ -16,12 +16,12 @@ <parent> <groupId>org.apache.aries.rsa</groupId> - <artifactId>parent</artifactId> + <artifactId>org.apache.aries.rsa.parent</artifactId> <version>1.8-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> - <artifactId>itests</artifactId> + <artifactId>org.apache.aries.rsa.itests</artifactId> <packaging>pom</packaging> <name>Aries Remote Service Admin itests</name> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/46b74ebd/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 0a9683b..75bb1c3 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -21,7 +21,7 @@ </parent> <groupId>org.apache.aries.rsa</groupId> - <artifactId>parent</artifactId> + <artifactId>org.apache.aries.rsa.parent</artifactId> <version>1.8-SNAPSHOT</version> <packaging>pom</packaging> <name>Aries Remote Service Admin Parent</name> @@ -102,7 +102,7 @@ </dependency> <dependency> <groupId>org.apache.aries.rsa</groupId> - <artifactId>spi</artifactId> + <artifactId>org.apache.aries.rsa.spi</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/46b74ebd/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index eb898cb..6543dec 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ <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> <groupId>org.apache.aries.rsa</groupId> - <artifactId>main</artifactId> + <artifactId>org.apache.aries.rsa.main</artifactId> <version>1.8-SNAPSHOT</version> <packaging>pom</packaging> @@ -71,7 +71,6 @@ <modules> <module>parent</module> - <module>rsa-api</module> <module>spi</module> <module>rsa</module> <module>topology-manager</module> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/46b74ebd/provider/pom.xml ---------------------------------------------------------------------- diff --git a/provider/pom.xml b/provider/pom.xml index ffee5b4..56f655e 100644 --- a/provider/pom.xml +++ b/provider/pom.xml @@ -23,12 +23,12 @@ <parent> <groupId>org.apache.aries.rsa</groupId> - <artifactId>parent</artifactId> + <artifactId>org.apache.aries.rsa.parent</artifactId> <version>1.8-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> - <artifactId>provider</artifactId> + <artifactId>org.apache.aries.rsa.provider</artifactId> <packaging>pom</packaging> <name>Aries Remote Service Admin Provider</name> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/46b74ebd/provider/tcp/pom.xml ---------------------------------------------------------------------- diff --git a/provider/tcp/pom.xml b/provider/tcp/pom.xml index e14a39b..1c464ab 100644 --- a/provider/tcp/pom.xml +++ b/provider/tcp/pom.xml @@ -2,13 +2,13 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.aries.rsa</groupId> - <artifactId>parent</artifactId> + <artifactId>org.apache.aries.rsa.parent</artifactId> <version>1.8-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.apache.aries.rsa.provider</groupId> - <artifactId>tcp</artifactId> + <artifactId>org.apache.aries.rsa.provider.tcp</artifactId> <packaging>bundle</packaging> <name>Aries Remote Service Admin provider TCP</name> <description>Provider for Java Serialization over TCP</description> @@ -20,7 +20,7 @@ <dependencies> <dependency> <groupId>org.apache.aries.rsa</groupId> - <artifactId>spi</artifactId> + <artifactId>org.apache.aries.rsa.spi</artifactId> <scope>provided</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/46b74ebd/rsa-api/bnd.bnd ---------------------------------------------------------------------- diff --git a/rsa-api/bnd.bnd b/rsa-api/bnd.bnd deleted file mode 100644 index d756067..0000000 --- a/rsa-api/bnd.bnd +++ /dev/null @@ -1,6 +0,0 @@ -Import-Package:\ - org.osgi.service.remoteserviceadmin,\ - org.osgi.service.event -Export-Package:\ - org.osgi.service.remoteserviceadmin,\ - org.osgi.service.event http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/46b74ebd/rsa-api/pom.xml ---------------------------------------------------------------------- diff --git a/rsa-api/pom.xml b/rsa-api/pom.xml deleted file mode 100644 index e0dd296..0000000 --- a/rsa-api/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> -<!-- - 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> - - <parent> - <groupId>org.apache.aries.rsa</groupId> - <artifactId>parent</artifactId> - <version>1.8-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - - <artifactId>rsa-api</artifactId> - <packaging>bundle</packaging> - <name>Aries Remote Service Admin Compendium APIs</name> - - <description> - The minimal set of OSGi Compendium APIs required by DOSGi. - This bundle should be deployed instead of the full OSGi Compendium bundle to prevent issues - caused by multiple exports of other OSGi APIs that are not used by DOSGi. See DOSGI-208. - </description> - -</project> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/46b74ebd/rsa/pom.xml ---------------------------------------------------------------------- diff --git a/rsa/pom.xml b/rsa/pom.xml index d2359c0..308b873 100644 --- a/rsa/pom.xml +++ b/rsa/pom.xml @@ -3,11 +3,11 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.aries.rsa</groupId> - <artifactId>parent</artifactId> + <artifactId>org.apache.aries.rsa.parent</artifactId> <version>1.8-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> - <artifactId>core</artifactId> + <artifactId>org.apache.aries.rsa.core</artifactId> <packaging>bundle</packaging> <name>Aries Remote Service Admin Core</name> <description>The Remote Service Admin as described in the OSGi Remote Service Admin specification</description> @@ -19,7 +19,7 @@ <dependencies> <dependency> <groupId>org.apache.aries.rsa</groupId> - <artifactId>spi</artifactId> + <artifactId>org.apache.aries.rsa.spi</artifactId> <scope>provided</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/46b74ebd/spi/pom.xml ---------------------------------------------------------------------- diff --git a/spi/pom.xml b/spi/pom.xml index 3f3b8a7..6664db2 100644 --- a/spi/pom.xml +++ b/spi/pom.xml @@ -23,11 +23,11 @@ <parent> <groupId>org.apache.aries.rsa</groupId> - <artifactId>parent</artifactId> + <artifactId>org.apache.aries.rsa.parent</artifactId> <version>1.8-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> - <artifactId>spi</artifactId> + <artifactId>org.apache.aries.rsa.spi</artifactId> <packaging>bundle</packaging> <name>Aries Remote Service Admin Service Provider Interface</name> @@ -35,38 +35,4 @@ <topDirectoryLocation>../..</topDirectoryLocation> </properties> - <dependencies> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymockclassextension</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jdk14</artifactId> - <version>1.7.14</version> - <scope>test</scope> - </dependency> - </dependencies> - </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/46b74ebd/topology-manager/pom.xml ---------------------------------------------------------------------- diff --git a/topology-manager/pom.xml b/topology-manager/pom.xml index 015798d..04ba817 100644 --- a/topology-manager/pom.xml +++ b/topology-manager/pom.xml @@ -23,12 +23,12 @@ <parent> <groupId>org.apache.aries.rsa</groupId> - <artifactId>parent</artifactId> + <artifactId>org.apache.aries.rsa.parent</artifactId> <version>1.8-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> - <artifactId>topology-manager</artifactId> + <artifactId>org.apache.aries.rsa.topology-manager</artifactId> <packaging>bundle</packaging> <name>Aries Remote Service Admin Topology Manager</name> @@ -39,7 +39,7 @@ <dependencies> <dependency> <groupId>org.apache.aries.rsa</groupId> - <artifactId>spi</artifactId> + <artifactId>org.apache.aries.rsa.spi</artifactId> <scope>provided</scope> </dependency> <dependency>
