Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe
Commits:
-
0accc0b7
by Tony CHEMIT at 2018-07-05T13:56:33Z
1 changed file:
Changes:
| ... | ... | @@ -152,7 +152,7 @@ |
| 152 | 152 |
<maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format>
|
| 153 | 153 |
<buildDate>${maven.build.timestamp}</buildDate>
|
| 154 | 154 |
|
| 155 |
- <observeToolkitVersion>3.7</observeToolkitVersion>
|
|
| 155 |
+ <observeToolkitVersion>3.7.1</observeToolkitVersion>
|
|
| 156 | 156 |
|
| 157 | 157 |
<!--<lib.version.java4all.jaxx>3.0-alpha-31</lib.version.java4all.jaxx>-->
|
| 158 | 158 |
<!--<lib.version.nuiton.topia>3.4.2-SNAPSHOT</lib.version.nuiton.topia>-->
|
| ... | ... | @@ -163,7 +163,7 @@ |
| 163 | 163 |
<!--can't use 1.4.197 (date has changed + blob also-->
|
| 164 | 164 |
<lib.version.h2>1.4.196</lib.version.h2>
|
| 165 | 165 |
<lib.version.java4all.eugene>3.0-alpha-21</lib.version.java4all.eugene>
|
| 166 |
- |
|
| 166 |
+ <!--<lib.version.java4all.topia>1.1.2-SNAPSHOT</lib.version.java4all.topia>-->
|
|
| 167 | 167 |
<!-- license header configuration -->
|
| 168 | 168 |
<license.licenseName>gpl_v3</license.licenseName>
|
| 169 | 169 |
<license.organizationName>IRD, Code Lutin, Ultreia.io</license.organizationName>
|
| ... | ... | @@ -189,7 +189,7 @@ |
| 189 | 189 |
<!--<gitlab.fromMilestone>5.0</gitlab.fromMilestone>-->
|
| 190 | 190 |
<gitlab.stagingUrl>https://observe.ultreia.io/release</gitlab.stagingUrl>
|
| 191 | 191 |
|
| 192 |
- <!--jgitflow configuratio-->
|
|
| 192 |
+ <!--jgitflow configuration-->
|
|
| 193 | 193 |
<jgitflow.masterBranchName>master-7.x</jgitflow.masterBranchName>
|
| 194 | 194 |
<jgitflow.developBranchName>develop-7.x</jgitflow.developBranchName>
|
| 195 | 195 |
|