Skip to content

Commit

Permalink
1.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@interair
interair committed May 14, 2017
1 parent 48fa080 commit 066a7f8
Show file tree
Hide file tree
Showing 12 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion agent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<artifactId>dm-parent</artifactId>
<groupId>com.codeabovelab.dm</groupId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion balancer-web/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>dm-parent</artifactId>
<groupId>com.codeabovelab.dm</groupId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion cluster-manager/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>dm-parent</artifactId>
<groupId>com.codeabovelab.dm</groupId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion common/common-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>common</artifactId>
<groupId>com.codeabovelab.dm</groupId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion common/common-utils/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>common</artifactId>
<groupId>com.codeabovelab.dm</groupId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>common-utils</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion common/gateway-balancer-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>common</artifactId>
<groupId>com.codeabovelab.dm</groupId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>gateway-balancer-common</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion common/gateway-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>common</artifactId>
<groupId>com.codeabovelab.dm</groupId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>gateway-common</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion common/mail/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>common</artifactId>
<groupId>com.codeabovelab.dm</groupId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
</parent>
<packaging>jar</packaging>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion common/platform-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>common</artifactId>
<groupId>com.codeabovelab.dm</groupId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.codeabovelab.dm</groupId>
<artifactId>dm-parent</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
</parent>
<packaging>pom</packaging>
<modules>
Expand Down
2 changes: 1 addition & 1 deletion doc/agent.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ agent connect with docker through unix socket and expose it on 8771 port with ss
(credentials admin:password, see 'dm.auth.adminPassword' option of agent)

Command for run agent on node:
```docker run --name agent -d --restart=unless-stopped -p 8771:8771 -v /run/docker.sock:/run/docker.sock codeabovelab/agent:1.2.1-SNAPSHOT```
```docker run --name agent -d --restart=unless-stopped -p 8771:8771 -v /run/docker.sock:/run/docker.sock codeabovelab/agent:1.2.1```

Note taht agent is built with self-signed certificate, cluster-manager use same certificate too. [Certificate generated on each build](https://github.com/codeabovelab/haven-platform/blob/dc38ed2ed9368fa4436b411400f4b20cd92457a2/pom.xml#L121), therefore when you use agent with cluster-manager of different verision, you will get error. It can be fixed by usage of same version, or option 'dm.ssl.check=false' to cluster-manager.

Expand Down
14 changes: 7 additions & 7 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<groupId>com.codeabovelab.dm</groupId>
<artifactId>dm-parent</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
<packaging>pom</packaging>
<name>Haven platform</name>

Expand Down Expand Up @@ -241,32 +241,32 @@
<dependency>
<groupId>com.codeabovelab.dm</groupId>
<artifactId>cluster-manager</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
</dependency>
<dependency>
<groupId>com.codeabovelab.dm</groupId>
<artifactId>common-utils</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
</dependency>
<dependency>
<groupId>com.codeabovelab.dm</groupId>
<artifactId>common-core</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
</dependency>
<dependency>
<groupId>com.codeabovelab.dm</groupId>
<artifactId>gateway-common</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
</dependency>
<dependency>
<groupId>com.codeabovelab.dm</groupId>
<artifactId>platform-common</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
</dependency>
<dependency>
<groupId>com.codeabovelab.dm</groupId>
<artifactId>mail</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
</dependency>

<!-- SPRING -->
Expand Down

0 comments on commit 066a7f8

Please sign in to comment.