Skip to content

Commit 5f0fa2d

Browse files
LEDfanLEDfan
committed
Merge branch 'release/0.8.10'
2 parents 93ed0b0 + 81caec2 commit 5f0fa2d

File tree

100 files changed

+6351
-1133
lines changed

Some content is hidden

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

100 files changed

+6351
-1133
lines changed

‎.github/workflows/workflows.yaml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
strategy:
99
matrix:
1010
java: [ 8, 11 ]
11-
kubernetes: [ 'v1.20.1', 'v1.19.6', 'v1.18.14', 'v1.17.16', 'v1.16.14']
11+
kubernetes: [ 'v1.21.6', 'v1.20.12', 'v1.19.16', 'v1.18.20', 'v1.17.17', 'v1.16.15']
1212

1313
steps:
1414
- uses: actions/checkout@v2
@@ -29,20 +29,24 @@ jobs:
2929
kubernetes version: ${{ matrix.kubernetes }}
3030
- name: Setup Docker
3131
run: sudo apt-get -qq -y install conntrack socat ; nohup socat TCP-LISTEN:2375,reuseaddr,fork UNIX-CONNECT:/var/run/docker.sock &
32+
- name: Setup Docker Swarm
33+
run: docker swarm init
3234
- name: Pull Image
3335
run: docker pull openanalytics/shinyproxy-demo:latest
3436
- name: Build with Maven
35-
run: mvn -U clean install -DskipTests
37+
run: mvn -B -U clean install -DskipTests
38+
- name: Copy Artifact
39+
run: cp target/containerproxy-*-exec.jar target/containerproxy-app-recovery.jar
3640
- name: Run Tests
37-
run: mvn test
41+
run: mvn -B test
3842

3943
dependency:
4044
runs-on: ubuntu-latest
4145

4246
steps:
4347
- uses: actions/checkout@v2
4448
- name: Run Dependency Check
45-
run: mvn -Powasp-dependency-check verify -DskipTests
49+
run: mvn -B -Powasp-dependency-check verify -DskipTests
4650
- name: Archive code coverage results
4751
uses: actions/upload-artifact@v2
4852
with:

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ application.yml
33
logs
44

55
.idea
6-
*.iml
6+
*.iml
7+
*.log

‎Jenkinsfile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@ pipeline {
99
options {
1010
buildDiscarder(logRotator(numToKeepStr: '3'))
1111
}
12-
12+
1313
stages {
14-
14+
1515
stage('build and deploy to nexus'){
16-
16+
1717
steps {
18-
18+
1919
container('containerproxy-build') {
20-
20+
2121
configFileProvider([configFile(fileId: 'maven-settings-rsb', variable: 'MAVEN_SETTINGS_RSB')]) {
22-
23-
sh 'mvn -s $MAVEN_SETTINGS_RSB -U clean install deploy -DskipTests=true'
24-
22+
23+
sh 'mvn -B -s $MAVEN_SETTINGS_RSB -U clean install deploy -DskipTests=true'
24+
2525
}
2626
}
2727
}

‎pom.xml‎

Lines changed: 126 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
<groupId>eu.openanalytics</groupId>
77
<artifactId>containerproxy</artifactId>
8-
<version>0.8.9</version>
8+
<version>0.8.10</version>
99
<name>ContainerProxy</name>
1010
<packaging>jar</packaging>
1111

1212
<parent>
1313
<groupId>org.springframework.boot</groupId>
1414
<artifactId>spring-boot-starter-parent</artifactId>
15-
<version>2.3.4.RELEASE</version>
15+
<version>2.3.12.RELEASE</version>
1616
<relativePath />
1717
</parent>
1818

@@ -36,20 +36,38 @@
3636
</distributionManagement>
3737

3838
<repositories>
39+
<!-- Maven queries repositories in the order that they are defined here.
40+
Usually, the Maven Central repository is the last one in this order, because it's defined in the super POM.
41+
This means that for all dependencies which are downloaded from Maven Central, the custom repositories are
42+
queried first, which slows down the build a lot.
43+
Therefore we add central as the first repository in this list.
44+
This reduces the time to download dependencies on a fresh machine from ~20-30min to 1min
45+
See: https://maven.apache.org/ref/3.6.3/maven-model-builder/super-pom.html for the origin of this configuration
46+
-->
3947
<repository>
48+
<id>central</id>
49+
<name>Central Repository</name>
50+
<url>https://repo.maven.apache.org/maven2</url>
51+
<layout>default</layout>
52+
<snapshots>
53+
<enabled>false</enabled>
54+
</snapshots>
55+
</repository>
56+
<repository>
57+
<!-- Currently used only for the monetdb dependency -->
4058
<id>clojars</id>
4159
<url>https://clojars.org/repo/</url>
4260
</repository>
4361
<repository>
4462
<!-- Currently used only for the opensaml 2.6.6 dependency -->
45-
<id>alfresco</id>
46-
<url>https://artifacts.alfresco.com/nexus/content/repositories/public/</url>
63+
<id>shibboleth</id>
64+
<url>https://build.shibboleth.net/nexus/content/repositories/releases/</url>
65+
</repository>
66+
<repository>
67+
<!-- Currently used only for the spring-social-github 1.0.0.M4 dependency -->
68+
<id>spring</id>
69+
<url>https://repo.spring.io/plugins-release/</url>
4770
</repository>
48-
<repository>
49-
<!-- Currently used only for the spring-social-github 1.0.0.M4 dependency -->
50-
<id>spring</id>
51-
<url>https://repo.spring.io/plugins-release/</url>
52-
</repository>
5371
</repositories>
5472

5573
<dependencies>
@@ -84,12 +102,23 @@
84102
<groupId>org.springframework.boot</groupId>
85103
<artifactId>spring-boot-starter-test</artifactId>
86104
<scope>test</scope>
105+
<exclusions>
106+
<exclusion>
107+
<groupId>org.junit.vintage</groupId>
108+
<artifactId>junit-vintage-engine</artifactId>
109+
</exclusion>
110+
</exclusions>
87111
</dependency>
88112
<dependency>
89113
<groupId>org.springframework.boot</groupId>
90114
<artifactId>spring-boot-starter-webflux</artifactId>
91115
<scope>test</scope>
92116
</dependency>
117+
<dependency>
118+
<groupId>org.junit.platform</groupId>
119+
<artifactId>junit-platform-launcher</artifactId>
120+
<scope>test</scope>
121+
</dependency>
93122

94123
<!-- Additional Spring components -->
95124
<dependency>
@@ -103,7 +132,7 @@
103132
<dependency>
104133
<groupId>org.springframework.security.oauth.boot</groupId>
105134
<artifactId>spring-security-oauth2-autoconfigure</artifactId>
106-
<version>2.3.3.RELEASE</version>
135+
<version>2.3.12.RELEASE</version>
107136
</dependency>
108137
<dependency>
109138
<groupId>org.springframework.security</groupId>
@@ -154,7 +183,7 @@
154183
<dependency>
155184
<groupId>org.springframework.boot</groupId>
156185
<artifactId>spring-boot-starter-social-facebook</artifactId>
157-
<version>1.5.14.RELEASE</version>
186+
<version>1.5.22.RELEASE</version>
158187
</dependency>
159188
<dependency>
160189
<groupId>org.springframework.social</groupId>
@@ -181,7 +210,7 @@
181210
<dependency>
182211
<groupId>org.keycloak</groupId>
183212
<artifactId>keycloak-spring-security-adapter</artifactId>
184-
<version>4.7.0.Final</version>
213+
<version>13.0.1</version>
185214
</dependency>
186215

187216
<!-- SAML -->
@@ -269,7 +298,28 @@
269298
<dependency>
270299
<groupId>org.webjars</groupId>
271300
<artifactId>jquery</artifactId>
272-
<version>3.5.0</version>
301+
<version>3.5.1</version>
302+
</dependency>
303+
<dependency>
304+
<groupId>org.webjars.bower</groupId>
305+
<artifactId>bootstrap-social</artifactId>
306+
<version>5.1.1</version>
307+
<exclusions>
308+
<!-- These dependencies are already included and would otherwise produce some warnings -->
309+
<exclusion>
310+
<groupId>org.webjars.bower</groupId>
311+
<artifactId>bootstrap</artifactId>
312+
</exclusion>
313+
<exclusion>
314+
<groupId>org.webjars.bower</groupId>
315+
<artifactId>font-awesome</artifactId>
316+
</exclusion>
317+
</exclusions>
318+
</dependency>
319+
<dependency>
320+
<groupId>org.webjars.bower</groupId>
321+
<artifactId>fontawesome</artifactId>
322+
<version>4.7.0</version>
273323
</dependency>
274324

275325
<!-- Amazon S3 -->
@@ -311,16 +361,70 @@
311361
<artifactId>commons-beanutils</artifactId>
312362
<version>1.9.4</version>
313363
</dependency>
314-
<dependency>
364+
<dependency>
365+
<groupId>commons-io</groupId>
366+
<artifactId>commons-io</artifactId>
367+
<version>2.7</version>
368+
</dependency>
369+
<dependency>
370+
<groupId>org.apache.httpcomponents</groupId>
371+
<artifactId>httpclient</artifactId>
372+
<version>4.5.13</version>
373+
</dependency>
374+
<dependency>
315375
<groupId>com.google.guava</groupId>
316376
<artifactId>guava</artifactId>
317377
<version>25.0-jre</version>
318378
</dependency>
319-
<dependency>
320-
<groupId>org.springframework</groupId>
321-
<artifactId>spring-core</artifactId>
322-
<version>5.2.9.RELEASE</version>
323-
</dependency>
379+
<dependency>
380+
<groupId>org.bouncycastle</groupId>
381+
<artifactId>bcprov-jdk15on</artifactId>
382+
<version>1.68</version>
383+
</dependency>
384+
<dependency>
385+
<groupId>org.bouncycastle</groupId>
386+
<artifactId>bcprov-ext-jdk15on</artifactId>
387+
<version>1.68</version>
388+
</dependency>
389+
<dependency>
390+
<groupId>org.bouncycastle</groupId>
391+
<artifactId>bcpkix-jdk15on</artifactId>
392+
<version>1.68</version>
393+
</dependency>
394+
<dependency>
395+
<groupId>org.apache.velocity</groupId>
396+
<artifactId>velocity-engine-core</artifactId>
397+
<version>2.3</version>
398+
</dependency>
399+
400+
<dependency>
401+
<groupId>io.undertow</groupId>
402+
<artifactId>undertow-core</artifactId>
403+
<version>2.2.8.Final</version>
404+
</dependency>
405+
<dependency>
406+
<groupId>io.undertow</groupId>
407+
<artifactId>undertow-servlet</artifactId>
408+
<version>2.2.8.Final</version>
409+
</dependency>
410+
<dependency>
411+
<groupId>io.undertow</groupId>
412+
<artifactId>undertow-websockets-jsr</artifactId>
413+
<version>2.2.8.Final</version>
414+
</dependency>
415+
<dependency>
416+
<groupId>org.jboss.xnio</groupId>
417+
<artifactId>xnio-nio</artifactId>
418+
<version>3.8.4.Final</version>
419+
</dependency>
420+
<dependency>
421+
<groupId>org.jboss.xnio</groupId>
422+
<artifactId>xnio-api</artifactId>
423+
<version>3.8.4.Final</version>
424+
</dependency>
425+
426+
427+
324428
</dependencies>
325429

326430
<build>
@@ -416,9 +520,9 @@
416520
<plugins>
417521
<plugin>
418522
<groupId>org.owasp</groupId>
419-
<artifactId>dependency-check-maven</artifactId>
420-
<version>6.0.2</version>
421-
<executions>
523+
<artifactId>dependency-check-maven</artifactId>
524+
<version>6.1.6</version>
525+
<executions>
422526
<execution>
423527
<goals>
424528
<goal>check</goal>

0 commit comments

Comments
 (0)