Skip to content

Commit 921fd58

Browse files
marcuslinkemarcuslinke
committed
Merge pull request docker-java#54 from marcuslinke/master
Integration of @alexec changes
2 parents e796c76 + 88b06be commit 921fd58

36 files changed

Lines changed: 2011 additions & 1740 deletions

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,6 @@ target
1919

2020
# Ignore all log files
2121
*.log
22+
23+
#Ignore Test Output
24+
test-output

‎README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
Java API client for [Docker](http://docs.docker.io/ "Docker")
44

5-
Supports a subset of the Docker Client API v1.8, Docker Server version 0.8.1
5+
Supports a subset of the Docker Client API v1.11, Docker Server version 0.11
6+
7+
Developer forum for [docker-java](https://groups.google.com/forum/?hl=de#!forum/docker-java-dev "docker-java")
68

79
## Build with Maven
810

‎pom.xml‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
<connection>scm:git:git@github.com:kpelykh/docker-java.git</connection>
2929
<url>git@github.com:kpelykh/docker-java.git</url>
3030
<developerConnection>scm:git:git@github.com:kpelykh/docker-java.git</developerConnection>
31-
<tag>HEAD</tag>
3231
</scm>
3332

3433
<developers>
@@ -138,6 +137,12 @@
138137
<version>${slf4j-api.version}</version>
139138
</dependency>
140139

140+
<dependency>
141+
<groupId>org.slf4j</groupId>
142+
<artifactId>jul-to-slf4j</artifactId>
143+
<version>${slf4j-api.version}</version>
144+
</dependency>
145+
141146
<!-- /// Test /////////////////////////// -->
142147
<dependency>
143148
<groupId>ch.qos.logback</groupId>
@@ -187,6 +192,21 @@
187192
<scope>test</scope>
188193
</dependency>
189194
</dependencies>
195+
<dependencyManagement>
196+
<dependencies>
197+
<dependency>
198+
<groupId>com.github.jnr</groupId>
199+
<artifactId>jffi</artifactId>
200+
<version>1.2.7</version>
201+
</dependency>
202+
<dependency>
203+
<groupId>com.github.jnr</groupId>
204+
<artifactId>jffi</artifactId>
205+
<classifier>native</classifier>
206+
<version>1.2.7</version>
207+
</dependency>
208+
</dependencies>
209+
</dependencyManagement>
190210

191211

192212
<build>

0 commit comments

Comments
 (0)