You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by da...@apache.org on 2017/05/26 13:16:28 UTC
aries-containers git commit: Some cleanup on the docker-local
implementation.
Repository: aries-containers
Updated Branches:
refs/heads/master f912dc052 -> 42aa5485b
Some cleanup on the docker-local implementation.
Project: http://git-wip-us.apache.org/repos/asf/aries-containers/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-containers/commit/42aa5485
Tree: http://git-wip-us.apache.org/repos/asf/aries-containers/tree/42aa5485
Diff: http://git-wip-us.apache.org/repos/asf/aries-containers/diff/42aa5485
Branch: refs/heads/master
Commit: 42aa5485b9298e569caa4f4564452dac605977b2
Parents: f912dc0
Author: David Bosschaert <da...@apache.org>
Authored: Fri May 26 14:14:44 2017 +0100
Committer: David Bosschaert <da...@apache.org>
Committed: Fri May 26 14:14:44 2017 +0100
----------------------------------------------------------------------
containers-docker-local/pom.xml | 2 +-
.../aries/containers/docker/local/impl/ContainerImpl.java | 2 +-
.../containers/docker/local/impl/LocalDockerController.java | 3 +--
.../aries/containers/docker/local/impl/ServiceImpl.java | 2 +-
containers-parent/pom.xml | 8 +++++++-
5 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-containers/blob/42aa5485/containers-docker-local/pom.xml
----------------------------------------------------------------------
diff --git a/containers-docker-local/pom.xml b/containers-docker-local/pom.xml
index 6c78d4f..c2d97d6 100644
--- a/containers-docker-local/pom.xml
+++ b/containers-docker-local/pom.xml
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/aries-containers/blob/42aa5485/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/ContainerImpl.java
----------------------------------------------------------------------
diff --git a/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/ContainerImpl.java b/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/ContainerImpl.java
index b092d60..73e85ce 100644
--- a/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/ContainerImpl.java
+++ b/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/ContainerImpl.java
@@ -25,7 +25,7 @@ import java.util.Map;
import org.apache.aries.containers.Container;
import org.apache.aries.containers.Service;
-public class ContainerImpl implements Container {
+class ContainerImpl implements Container {
private final String id;
private final String ip;
private final Map<Integer, Integer> ports;
http://git-wip-us.apache.org/repos/asf/aries-containers/blob/42aa5485/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/LocalDockerController.java
----------------------------------------------------------------------
diff --git a/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/LocalDockerController.java b/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/LocalDockerController.java
index 78b74b8..1b89f93 100644
--- a/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/LocalDockerController.java
+++ b/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/LocalDockerController.java
@@ -23,8 +23,7 @@ import java.io.StringReader;
import java.util.ArrayList;
import java.util.List;
-public class LocalDockerController {
-
+class LocalDockerController {
public String kill(String id) throws Exception {
return kill(id, "KILL");
}
http://git-wip-us.apache.org/repos/asf/aries-containers/blob/42aa5485/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/ServiceImpl.java
----------------------------------------------------------------------
diff --git a/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/ServiceImpl.java b/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/ServiceImpl.java
index cace802..4f2acd6 100644
--- a/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/ServiceImpl.java
+++ b/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/ServiceImpl.java
@@ -26,7 +26,7 @@ import org.apache.aries.containers.Container;
import org.apache.aries.containers.Service;
import org.apache.aries.containers.ServiceConfig;
-public class ServiceImpl implements Service {
+class ServiceImpl implements Service {
private final ServiceConfig config;
private final List<ContainerImpl> containers;
private final LocalDockerContainerFactory factory;
http://git-wip-us.apache.org/repos/asf/aries-containers/blob/42aa5485/containers-parent/pom.xml
----------------------------------------------------------------------
diff --git a/containers-parent/pom.xml b/containers-parent/pom.xml
index 3cd7b42..2149d4e 100644
--- a/containers-parent/pom.xml
+++ b/containers-parent/pom.xml
@@ -66,7 +66,13 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
+ <version>6.0.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.cmpn</artifactId>
<version>6.0.0</version>
</dependency>
</dependencies>