Skip to content

Commit cfdefd4

Browse files
authored
Fix/demo (#22)
* Make Link[] optional for KMIP Attributes * Update KMS version to 2.3.0
1 parent e0dd1c2 commit cfdefd4

17 files changed

Lines changed: 246 additions & 83 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ hs_err_*.log
44
.bloop/
55
project/
66
.settings/org.*
7+
.project

.gitlab-ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,15 @@ stages:
1515
build:
1616
stage: build
1717
services:
18-
- name: gitlab.cosmian.com:5000/core/kms:2.2.0_ci
18+
- name: gitlab.cosmian.com:5000/core/kms:2.3.0_ci
1919
alias: kms_ci
2020
- redis:latest
2121
script:
2222
- mvn package
2323
- mvn dependency:copy-dependencies
2424
- git archive --verbose --format=zip --output=${CI_PROJECT_NAME}.zip HEAD
2525
artifacts:
26+
name: '${CI_PROJECT_NAME}_${CI_COMMIT_TAG}'
2627
paths:
2728
- target/*.jar
2829
- target/dependency/*.jar

.project

Lines changed: 0 additions & 34 deletions
This file was deleted.

.settings/org.eclipse.jdt.core.prefs

Lines changed: 0 additions & 9 deletions
This file was deleted.

.vscode/codestyle-java.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true" />
5656
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="do not insert" />
5757
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert" />
58-
<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true" />
58+
<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="false" />
5959
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert" />
6060
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="20" />
6161
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert" />
@@ -289,4 +289,4 @@
289289
<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false" />
290290
<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false" />
291291
</profile>
292-
</profiles>
292+
</profiles>

.vscode/settings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"Cosmian",
66
"Deserialization",
77
"deserializers",
8+
"instanceof",
89
"Kmip",
910
"serializers"
1011
],

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,18 @@
22

33
All notable changes to this project will be documented in this file.
44

5+
---
6+
## [1.11.0] - 2022-10-13
7+
### Added
8+
- Native libraries for Windows and MacOs
9+
- Add Destroy method on Abe class
10+
### Changed
11+
- Update KMS version to 2.3
12+
- Add ABE Demo class to continuous integration
13+
### Fixed
14+
- Make Link[] optional for KMIP Attributes
15+
### Removed
16+
517
---
618
## [0.11.1]
719
### Added

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ This library free software and is available on Maven Central
3030
<dependency>
3131
<groupId>com.cosmian</groupId>
3232
<artifactId>cloudproof_java</artifactId>
33-
<version>0.11.1</version>
33+
<version>1.11.0</version>
3434
</dependency>
3535
```
3636

@@ -55,6 +55,7 @@ KMS Server | Java Lib | GPSW lib | CoverCrypt lib | Findex
5555
2.2.0 | 0.9.0 | 2.0.1 | 6.0.1 | 0.5.0
5656
2.2.0 | 0.10.1 | 2.0.1 | 6.0.1 | 0.6.1
5757
2.2.0 | 0.11.0 | 2.0.1 | 6.0.1 | 0.7.0
58+
2.3.0 | 1.11.0 | 2.0.1 | 6.0.1 | 0.7.0
5859

5960
## Update native libraries
6061

bump_version.sh

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#!/bin/sh
2+
3+
#
4+
# Example:
5+
#
6+
# bash bump_version.sh 0.11.1 0.11.2
7+
8+
set -exEu
9+
10+
OLD_VERSION=$1
11+
NEW_VERSION=$2
12+
DATE=$(date +%F)
13+
14+
# Update CHANGELOG.md
15+
sed -i "5 i ---" CHANGELOG.md
16+
sed -i "6 i ## [$NEW_VERSION] - $DATE" CHANGELOG.md
17+
sed -i "7 i ### Added" CHANGELOG.md
18+
sed -i "8 i ### Changed" CHANGELOG.md
19+
sed -i "9 i ### Fixed" CHANGELOG.md
20+
sed -i "10 i ### Removed" CHANGELOG.md
21+
sed -i "11 i \\\\" CHANGELOG.md
22+
23+
# Update version where it needs to be
24+
sed -i "s/<version>$OLD_VERSION/<version>$NEW_VERSION/" pom.xml
25+
sed -i "s/<version>$OLD_VERSION/<version>$NEW_VERSION/" README.md

docker-compose.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ services:
1212
- PGDATA=/tmp/postgres2
1313
kms:
1414
container_name: kms
15-
image: gitlab.cosmian.com:5000/core/kms:2.2.0_ci
15+
image: gitlab.cosmian.com:5000/core/kms:2.3.0_ci
1616
environment:
17-
- KMS_POSTGRES_URL=postgres://kms:kms@db/kms
1817
- KMS_HOSTNAME=0.0.0.0
1918
- KMS_PUBLIC_PATH=/tmp
2019
- KMS_PRIVATE_PATH=/tmp

0 commit comments

Comments
 (0)