Skip to content

Commit 99c8d95

Browse files
ManuthorManuthor
committed
chore: merge branch 'release/v4.0.0'
2 parents 6a67e6a + 4cd0d22 commit 99c8d95

File tree

76 files changed

+2341
-3255
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+2341
-3255
lines changed

‎.classpath‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
4-
<attributes>
5-
<attribute name="maven.pomderived" value="true"/>
6-
</attributes>
7-
</classpathentry>
8-
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
9-
<attributes>
10-
<attribute name="maven.pomderived" value="true"/>
11-
</attributes>
12-
</classpathentry>
13-
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
14-
<attributes>
15-
<attribute name="maven.pomderived" value="true"/>
16-
<attribute name="test" value="true"/>
17-
</attributes>
18-
</classpathentry>
19-
<classpathentry kind="src" path="target/generated-sources/annotations">
20-
<attributes>
21-
<attribute name="optional" value="true"/>
22-
<attribute name="maven.pomderived" value="true"/>
23-
<attribute name="ignore_optional_problems" value="true"/>
24-
<attribute name="m2e-apt" value="true"/>
25-
</attributes>
26-
</classpathentry>
27-
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
28-
<attributes>
29-
<attribute name="maven.pomderived" value="true"/>
30-
</attributes>
31-
</classpathentry>
32-
<classpathentry kind="src" output="target/classes" path="src/main/java">
33-
<attributes>
34-
<attribute name="optional" value="true"/>
35-
<attribute name="maven.pomderived" value="true"/>
36-
</attributes>
37-
</classpathentry>
38-
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
39-
<attributes>
40-
<attribute name="optional" value="true"/>
41-
<attribute name="maven.pomderived" value="true"/>
42-
<attribute name="test" value="true"/>
43-
</attributes>
44-
</classpathentry>
45-
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
46-
<attributes>
47-
<attribute name="optional" value="true"/>
48-
<attribute name="maven.pomderived" value="true"/>
49-
<attribute name="ignore_optional_problems" value="true"/>
50-
<attribute name="m2e-apt" value="true"/>
51-
<attribute name="test" value="true"/>
52-
</attributes>
53-
</classpathentry>
54-
<classpathentry kind="output" path="target/classes"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
4+
<attributes>
5+
<attribute name="maven.pomderived" value="true"/>
6+
</attributes>
7+
</classpathentry>
8+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
9+
<attributes>
10+
<attribute name="maven.pomderived" value="true"/>
11+
</attributes>
12+
</classpathentry>
13+
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
14+
<attributes>
15+
<attribute name="maven.pomderived" value="true"/>
16+
<attribute name="test" value="true"/>
17+
</attributes>
18+
</classpathentry>
19+
<classpathentry kind="src" path="target/generated-sources/annotations">
20+
<attributes>
21+
<attribute name="optional" value="true"/>
22+
<attribute name="maven.pomderived" value="true"/>
23+
<attribute name="ignore_optional_problems" value="true"/>
24+
<attribute name="m2e-apt" value="true"/>
25+
</attributes>
26+
</classpathentry>
27+
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
28+
<attributes>
29+
<attribute name="maven.pomderived" value="true"/>
30+
</attributes>
31+
</classpathentry>
32+
<classpathentry kind="src" output="target/classes" path="src/main/java">
33+
<attributes>
34+
<attribute name="optional" value="true"/>
35+
<attribute name="maven.pomderived" value="true"/>
36+
</attributes>
37+
</classpathentry>
38+
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
39+
<attributes>
40+
<attribute name="optional" value="true"/>
41+
<attribute name="maven.pomderived" value="true"/>
42+
<attribute name="test" value="true"/>
43+
</attributes>
44+
</classpathentry>
45+
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
46+
<attributes>
47+
<attribute name="optional" value="true"/>
48+
<attribute name="maven.pomderived" value="true"/>
49+
<attribute name="ignore_optional_problems" value="true"/>
50+
<attribute name="m2e-apt" value="true"/>
51+
<attribute name="test" value="true"/>
52+
</attributes>
53+
</classpathentry>
54+
<classpathentry kind="output" path="target/classes"/>
5555
</classpath>

‎.github/workflows/maven.yml‎

Lines changed: 92 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
target
3030
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
3131
restore-keys: |
32-
${{ runner.os }}-maven-
32+
${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
3333
3434
- name: Set up JDK 8
3535
uses: actions/setup-java@v3
@@ -46,8 +46,97 @@ jobs:
4646
- name: Build with Maven
4747
run: mvn -B package --file pom.xml
4848

49+
build_in_docker:
50+
services:
51+
kms:
52+
image: cosmian/kms:4.2.0
53+
env:
54+
COSMIAN_SERVER_URL: http://localhost:9998
55+
KMS_PUBLIC_PATH: /tmp
56+
KMS_PRIVATE_PATH: /tmp
57+
KMS_SHARED_PATH: /tmp
58+
ports:
59+
- 9998:9998
60+
61+
redis:
62+
image: redis
63+
options: >-
64+
--health-cmd "redis-cli ping"
65+
--health-interval 10s
66+
--health-timeout 5s
67+
--health-retries 5
68+
ports:
69+
- 6379:6379
70+
71+
runs-on: ${{ matrix.os }}
72+
container: centos:centos7.4.1708
73+
strategy:
74+
fail-fast: false
75+
matrix:
76+
include:
77+
- os: ubuntu-20.04
78+
79+
steps:
80+
- uses: actions/checkout@v3
81+
82+
- name: Cache build
83+
uses: actions/cache@v3
84+
continue-on-error: false
85+
with:
86+
path: |
87+
~/.m2/repository
88+
target
89+
key: ${{ runner.os }}-maven-docker-${{ hashFiles('**/pom.xml') }}
90+
restore-keys: |
91+
${{ runner.os }}-maven-docker-${{ hashFiles('**/pom.xml') }}
92+
93+
- run: yum -y install java-1.8.0-openjdk maven python3 python3-pip
94+
- run: python3 scripts/get_native_libraries.py
95+
96+
- name: Build with Maven
97+
run: mvn package
98+
env:
99+
COSMIAN_SERVER_URL: http://kms:9998
100+
REDIS_HOSTNAME: redis
101+
REDIS_PORT: 6379
102+
LANG: en_US.UTF-8
103+
LANGUAGE: en_US:en
104+
LC_ALL: en_US.UTF-8
105+
106+
maven_deploy:
107+
needs:
108+
- build
109+
- build_in_docker
110+
runs-on: ubuntu-20.04
111+
112+
steps:
113+
- uses: actions/checkout@v3
114+
115+
- name: Cache build
116+
uses: actions/cache@v3
117+
continue-on-error: false
118+
with:
119+
path: |
120+
~/.m2/repository
121+
target
122+
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
123+
restore-keys: |
124+
${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
125+
126+
- name: Set up JDK 8
127+
uses: actions/setup-java@v3
128+
with:
129+
java-version: 8
130+
distribution: temurin
131+
cache: maven
132+
133+
- uses: actions/setup-python@v3
134+
with:
135+
python-version: 3.7
136+
- run: python scripts/get_native_libraries.py
137+
49138
- name: Maven deploy
50-
if: contains(runner.os, 'Linux') && github.event_name == 'push' && contains(github.ref, 'refs/tags/')
139+
if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
51140
run: |
52141
sudo apt-get update
53142
sudo apt-get install -y gnupg2
@@ -62,7 +151,7 @@ jobs:
62151

63152
release:
64153
needs:
65-
- build
154+
- maven_deploy
66155
name: release
67156
runs-on: ubuntu-latest
68157
steps:

‎.vscode/launch.json‎

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

‎CHANGELOG.md‎

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

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

5+
## [4.0.0] - 2023-01-31
6+
7+
### Documentation
8+
9+
- Update how to build native libraries
10+
11+
### Features
12+
13+
- Use CoverCrypt v9
14+
- `Findex.search` core function only returns `Location`s
15+
16+
---
17+
518
## [3.0.3] - 2023-01-16
619

720
### Deleted

0 commit comments

Comments
 (0)