Skip to content

Commit ab5572c

Browse files
authored
v1.2.0 (#76)
1 parent 20a8fe7 commit ab5572c

File tree

6 files changed

+47
-8
lines changed

6 files changed

+47
-8
lines changed

CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,22 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
55
and this project adheres to [Semantic Versioning](http://semver.org/).
66

77

8+
## [1.2.0] - 2019-11-22
9+
### Added
10+
- **vboard-ws**: support for AWS Cognito auth (#75)
11+
- **vboard-front**: allowed an $HTTP_PROXY to be injected in httpd.conf
12+
13+
### Changed
14+
- **vboard-ws**:
15+
* now compatibile with ElasticSearch 6
16+
* Maven build now done in Dockerfile pre-step
17+
- **vboard-ws**: npm build now done in Dockerfile pre-step
18+
- **vboard-batchs**: now uses logstash
19+
20+
### Fixed
21+
- **vboard-front**: config parsing was broken and ignored the default values of number of last months pins to retrieve
22+
23+
824
## [1.1.2] - 2018-01-19
925
### Fixed
1026
- Fixing `$VBOARD_WP_PUBLIC_HOST` injection in `vboard-front/run_http_server.sh`

CONTRIBUTING.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
* [Style guide](#style-guide)
1414
* [Continuous integration](#continuous-integration)
1515
* [Code reviews](#code-reviews)
16+
- [Publishing new releases](#publishing-new-releases)
1617
- [Credits](#credits)
1718

1819
<!-- tocstop -->
@@ -139,6 +140,12 @@ Code reviewers should follow those guidelines:
139140
- [Sebastien Charrier advices](https://www.youtube.com/watch?v=6aQK6GoTbxM)
140141

141142

143+
# Publishing new releases
144+
145+
1. Update version in `vboard-ws/pom.xml`, `vboard-front/package.json` & `vboard-front/bower.json`
146+
2. Update `CHANGELOG.md`
147+
3. Create a new release & tag on [GitHub](https://github.com/voyages-sncf-technologies/vboard/releases)
148+
142149
# Credits
143150

144151
- First off, thanks to all the past [contributors](CONTRIBUTORS.md) !

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ V.Board is made of the folling modules, launched as `docker-compose` services:
6969

7070
- `ws`: [SpringBoot](https://projects.spring.io/spring-boot/) REST web service (backend)
7171
- `front`: [AngularJS](https://angularjs.org) 1.5 web app served by Apache (front)
72-
- `batchs`: Java batch job to update the ElasticSearch index
72+
- `batchs`: [logstash](https://www.elastic.co/fr/products/logstash) cron to update the ElasticSearch index from the database
7373

7474
## Authentication
7575
There are 3 supported mode of authentication, that are activated in this order:

vboard-front/bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vboard-front-vendors",
3-
"version": "1.1.2",
3+
"version": "1.2.0",
44
"private": true,
55
"dependencies": {
66
"angular": "1.3.15",

vboard-front/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vboard-front",
3-
"version": "1.1.2",
3+
"version": "1.2.0",
44
"dependencies": {},
55
"devDependencies": {
66
"grunt": "^0.4.5",

vboard-ws/pom.xml

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.vsct.vboard</groupId>
88
<artifactId>vboard-ws</artifactId>
9-
<version>1.1.2</version>
9+
<version>1.2.0</version>
1010

1111
<name>V.Board WebService</name>
1212
<packaging>war</packaging>
@@ -24,12 +24,18 @@
2424
<buildDate>${maven.build.timestamp}</buildDate>
2525

2626
<java.version>1.8</java.version>
27-
<springboot.version>1.5.9.RELEASE</springboot.version>
28-
<commons-io.version>2.4</commons-io.version>
27+
<springboot.version>1.5.21.RELEASE</springboot.version>
28+
<commons-collections.version>3.2.2</commons-collections.version>
29+
<commons-io.version>2.6</commons-io.version>
30+
<commons-lang3.version>3.9</commons-lang3.version>
2931
<mockito.version>1.10.19</mockito.version>
3032
<restassured.version>2.4.1</restassured.version>
3133
<jest.version>6.3.1</jest.version>
32-
<keycloak.version>3.4.2.Final</keycloak.version>
34+
<keycloak.version>6.0.1</keycloak.version>
35+
<!-- Latest 8.0.0 version triggers this error during tests:
36+
NoSuchBeanDefinitionException: No qualifying bean of type 'org.keycloak.adapters.springboot.KeycloakSpringBootConfigResolver' available
37+
cf. https://issues.jboss.org/browse/KEYCLOAK-11218 & maybe https://github.com/keycloak/keycloak/commit/12d351ae
38+
-->
3339
</properties>
3440

3541
<build>
@@ -240,6 +246,16 @@
240246
<artifactId>commons-io</artifactId>
241247
<version>${commons-io.version}</version>
242248
</dependency>
249+
<dependency>
250+
<groupId>commons-collections</groupId>
251+
<artifactId>commons-collections</artifactId>
252+
<version>${commons-collections.version}</version>
253+
</dependency>
254+
<dependency>
255+
<groupId>org.apache.commons</groupId>
256+
<artifactId>commons-lang3</artifactId>
257+
<version>${commons-lang3.version}</version>
258+
</dependency>
243259
<dependency>
244260
<groupId>org.apache.httpcomponents</groupId>
245261
<artifactId>httpclient</artifactId>
@@ -298,7 +314,7 @@
298314
<dependency>
299315
<groupId>org.seleniumhq.selenium</groupId>
300316
<artifactId>selenium-java</artifactId>
301-
<version>2.53.1</version>
317+
<version>3.13.0</version>
302318
</dependency>
303319
<dependency>
304320
<groupId>xml-apis</groupId>

0 commit comments

Comments
 (0)