Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rc/5.6.0 #316

Merged
merged 15 commits into from
Aug 4, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ spec:
image: docker:18.06-dind
securityContext:
privileged: true
runAsUser: 0
volumeMounts:
- name: docker-graph-storage
mountPath: /var/lib/docker
Expand All @@ -60,14 +61,14 @@ spec:
- name: docker
image: docker:18-git
tty: true
volumeMounts:
- mountPath: /var/run/docker.sock
name: docker-sock
env:
- name: DOCKER_HOST
value: tcp://localhost:2375
- name: HOME
value: /home/jenkins/agent
securityContext:
runAsUser: 1000
volumes:
- name: docker-sock
hostPath:
path: /var/run/docker.sock
type: File
- name: docker-graph-storage
emptyDir: {}
- name: maven-cache
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S

<groupId>bio.overture</groupId>
<artifactId>score</artifactId>
<version>5.5.0</version>
<version>5.6.0</version>
<packaging>pom</packaging>

<name>${project.artifactId}</name>
Expand Down Expand Up @@ -239,7 +239,7 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S
<!-- Versions - Amazon -->
<aws-java-sdk.version>1.11.219</aws-java-sdk.version>

<azure-storage.version>4.4.0</azure-storage.version>
<azure-storage.version>8.6.6</azure-storage.version>

<!-- Versions - Utilities -->
<jcommander.version>1.69</jcommander.version>
Expand Down
2 changes: 1 addition & 1 deletion score-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S
<parent>
<groupId>bio.overture</groupId>
<artifactId>score</artifactId>
<version>5.5.0</version>
<version>5.6.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
5 changes: 4 additions & 1 deletion score-client/src/main/bin/score-client
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,10 @@ BASE_DIR=`dirname $0`/..; export BASE_DIR
# Installation directory
CLIENT_DIR="$(cd ${BASE_DIR} && pwd -P)"

exec java -Xmx3G --illegal-access=deny \
exec java -Xmx3G \
--add-opens=java.base/jdk.internal.ref=ALL-UNNAMED \
--add-opens=java.base/java.nio=ALL-UNNAMED \
--illegal-access=deny \
-Dlogging.path=${BASE_DIR}/logs \
-Dspring.config.additional-location=${CLIENT_DIR}/conf/ \
-Dlogging.config=${CLIENT_DIR}/conf/logback.xml \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ public void eventOccurred(RetryingEvent eventArg) {

val options = new BlobRequestOptions();
options.setConcurrentRequestCount(parallelUploads);
blob.setStreamWriteSizeInBytes(BLOCK_SIZE);

progress.start();
progress.startTransfer();
Expand Down
2 changes: 1 addition & 1 deletion score-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S
<parent>
<groupId>bio.overture</groupId>
<artifactId>score</artifactId>
<version>5.5.0</version>
<version>5.6.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion score-fs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S
<parent>
<groupId>bio.overture</groupId>
<artifactId>score</artifactId>
<version>5.5.0</version>
<version>5.6.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion score-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S
<parent>
<groupId>bio.overture</groupId>
<artifactId>score</artifactId>
<version>5.5.0</version>
<version>5.6.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion score-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S
<parent>
<groupId>bio.overture</groupId>
<artifactId>score</artifactId>
<version>5.5.0</version>
<version>5.6.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down