Skip to content

Commit cffa325

Browse files
author
jvanmalder
committed
feat: release 1.6.1
1 parent 260ef43 commit cffa325

File tree

11 files changed

+1417
-57
lines changed

11 files changed

+1417
-57
lines changed

‎app/src/main/resources/liquibase-changeLog.xml‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
1-
<databaseChangeLog
2-
xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
3-
xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
4-
xmlns:pro="http://www.liquibase.org/xml/ns/pro"
5-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
6-
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext
7-
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd
8-
http://www.liquibase.org/xml/ns/pro
9-
http://www.liquibase.org/xml/ns/pro/liquibase-pro-4.0.xsd
10-
http://www.liquibase.org/xml/ns/dbchangelog
11-
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.0.xsd
12-
">
13-
14-
<includeAll path="schema/" relativeToChangelogFile="true"/>
1+
<databaseChangeLog
2+
xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog schema/dbchangelog-4.0.xsd">
5+
6+
<includeAll path="schema/" relativeToChangelogFile="true"/>
157

168
</databaseChangeLog>

‎app/src/main/resources/schema/01_schema.xml‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
1-
<databaseChangeLog
2-
xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
3-
xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
4-
xmlns:pro="http://www.liquibase.org/xml/ns/pro"
5-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
6-
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext
7-
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd
8-
http://www.liquibase.org/xml/ns/pro
9-
http://www.liquibase.org/xml/ns/pro/liquibase-pro-4.0.xsd
10-
http://www.liquibase.org/xml/ns/dbchangelog
11-
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.0.xsd
12-
">
13-
1+
<databaseChangeLog
2+
xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog-4.0.xsd">
5+
146
<changeSet id="01_01_package_maintainer_table" author="pgleska">
157
<preConditions onFail="MARK_RAN">
168
<not>

‎app/src/main/resources/schema/02_api_token.xml‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
11
<databaseChangeLog
22
xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
3-
xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
4-
xmlns:pro="http://www.liquibase.org/xml/ns/pro"
5-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
6-
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext
7-
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd
8-
http://www.liquibase.org/xml/ns/pro
9-
http://www.liquibase.org/xml/ns/pro/liquibase-pro-4.0.xsd
10-
http://www.liquibase.org/xml/ns/dbchangelog
11-
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.0.xsd
12-
">
13-
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog-4.0.xsd">
5+
146
<changeSet id="02_01_api_token_table" author="pgleska">
157
<preConditions onFail="MARK_RAN">
168
<not>
@@ -26,8 +18,8 @@
2618
</column>
2719
<column name="user_login" type="character varying(255)">
2820
<constraints unique="true" nullable="false"/>
29-
</column>
30-
</createTable>
21+
</column>
22+
</createTable>
3123
<rollback/>
3224
</changeSet>
3325
</databaseChangeLog>

‎app/src/main/resources/schema/dbchangelog-4.0.xsd‎

Lines changed: 1383 additions & 0 deletions
Large diffs are not rendered by default.

‎app/src/test/java/eu/openanalytics/rdepot/test/unit/UserEventServiceTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ public void testDeleteUser() {
152152
User creator = new User(2, new Role(1, 2, "admin", "Administrator"), "tesla", "tesla@example.org", "tesla", true, false);
153153

154154
Mockito.when(userService.findById(123)).thenReturn(null);
155-
UserEvent expectedEvent = new UserEvent(0, new Date(), creator, user, event, "deleted", "", new Date().toString(), new Date());
156155

157156
Mockito.when(userEventRepository.save(Mockito.any())).thenAnswer(new Answer<UserEvent>() {
158157
@Override
@@ -162,6 +161,8 @@ public UserEvent answer(InvocationOnMock invocation) throws Throwable {
162161
}
163162
});
164163

164+
Date expectedDate = new Date();
165+
UserEvent expectedEvent = new UserEvent(0, expectedDate, creator, user, event, "deleted", "", expectedDate.toString(), expectedDate);
165166
List<UserEvent> events = userEventService.create(event, creator, user);
166167
UserEvent deleteEvent = events.get(0);
167168

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ ext.buildTime = {
4141
}
4242

4343
group = 'eu.openanalytics'
44-
ext.versionNumber = '1.6.0'
44+
ext.versionNumber = '1.6.1'
4545
ext.baseVersion = versionNumber
4646
version = versionNumber
4747
description = """rdepot"""
@@ -119,7 +119,7 @@ allprojects {
119119
ext.year = Calendar.getInstance().get(Calendar.YEAR)
120120
ext.company = 'Open Analytics NV'
121121
excludes(['**/*.html', '**/*.Rmd', '**/*.tar.gz', '**/DESCRIPTION', '**/DESCRIPTION_NEWLINES', '**/*.properties', '**/*.ttf', '**/*.eot', '**/*.woff', '**/*.css', '**/*.js', '**/*.svg', '**/*.png', '**/*.ico', '**/*.old', '**/*.sql', '**/*.yaml', '**/*.xml', '**/*.json',
122-
'**/*.yml', '**/NEWS', '**/LICENSE', '**/*.txt' , '**/NAMESPACE', '**/*.Rd', '**/*.pdf', '**/*.R', '**/*.c', '**/*.cpp', '**/*.h', '**/*.tex', '**/*.sh', '**/*.rda', '**/*.ldif', '**/*.gz', '**/*.bk*', '**/*.gradle' ])
122+
'**/*.yml', '**/NEWS', '**/LICENSE', '**/*.txt' , '**/NAMESPACE', '**/*.Rd', '**/*.pdf', '**/*.R', '**/*.c', '**/*.cpp', '**/*.h', '**/*.tex', '**/*.sh', '**/*.rda', '**/*.ldif', '**/*.gz', '**/*.bk*', '**/*.gradle', '**/*.xsd' ])
123123
//the above exclusions are for integration testing purposes
124124
}
125125
}

‎docker-compose.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ services:
3131
networks:
3232
- oa-rdepot
3333
app:
34-
image: openanalytics/rdepot-app:1.6.0
34+
image: openanalytics/rdepot-app:1.6.1
3535
restart: unless-stopped
3636
hostname: oa-rdepot-app
3737
container_name: oa-rdepot-app
@@ -55,7 +55,7 @@ services:
5555
timeout: 10s
5656
retries: 10
5757
repo:
58-
image: openanalytics/rdepot-repo:1.6.0
58+
image: openanalytics/rdepot-repo:1.6.1
5959
restart: unless-stopped
6060
hostname: oa-rdepot-repo
6161
container_name: oa-rdepot-repo

‎docker/build/app-standalone/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
FROM openanalytics/rdepot-app-it:1.6.0
1+
FROM openanalytics/rdepot-app-it:1.6.1
22

33
COPY rdepot-app-*application.war /opt/rdepot/rdepot.war

‎docker/build/repo-standalone/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
FROM openanalytics/rdepot-repo-it:1.6.0
1+
FROM openanalytics/rdepot-repo-it:1.6.1
22

33
COPY rdepot-repo-*application.jar /opt/repo/rdepot-repo.jar

‎src/integration-test/resources/docker-compose-dev.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ services:
1919

2020
app:
2121
# build: ./docker/app
22-
image: openanalytics/rdepot-app-it:1.6.0
22+
image: openanalytics/rdepot-app-it:1.6.1
2323
restart: always
2424
hostname: oa-rdepot-app
2525
container_name: oa-rdepot-app
@@ -52,7 +52,7 @@ services:
5252
- oa-rdepot
5353

5454
repo:
55-
image: openanalytics/rdepot-repo-it:1.6.0
55+
image: openanalytics/rdepot-repo-it:1.6.1
5656
restart: always
5757
hostname: oa-rdepot-repo
5858
container_name: oa-rdepot-repo
@@ -118,7 +118,7 @@ services:
118118
#ipv4_address: 192.168.49.17
119119

120120
ldap:
121-
image: openanalytics/rdepot-ldap-it:1.6.0
121+
image: openanalytics/rdepot-ldap-it:1.6.1
122122
restart: unless-stopped
123123
hostname: oa-rdepot-ldap
124124
container_name: oa-rdepot-ldap

0 commit comments

Comments
 (0)