Skip to content

Commit

Permalink
Merge branch 'release/0.8.10'
Browse files Browse the repository at this point in the history
  • Loading branch information
@LEDfan
LEDfan committed Nov 5, 2021
2 parents 93ed0b0 + 81caec2 commit 5f0fa2d
Show file tree
Hide file tree
Showing 100 changed files with 6,351 additions and 1,133 deletions.
12 changes: 8 additions & 4 deletions .github/workflows/workflows.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
strategy:
matrix:
java: [ 8, 11 ]
kubernetes: [ 'v1.20.1', 'v1.19.6', 'v1.18.14', 'v1.17.16', 'v1.16.14']
kubernetes: [ 'v1.21.6', 'v1.20.12', 'v1.19.16', 'v1.18.20', 'v1.17.17', 'v1.16.15']

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

dependency:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Run Dependency Check
run: mvn -Powasp-dependency-check verify -DskipTests
run: mvn -B -Powasp-dependency-check verify -DskipTests
- name: Archive code coverage results
uses: actions/upload-artifact@v2
with:
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ application.yml
logs

.idea
*.iml
*.iml
*.log
16 changes: 8 additions & 8 deletions Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@ pipeline {
options {
buildDiscarder(logRotator(numToKeepStr: '3'))
}

stages {

stage('build and deploy to nexus'){

steps {

container('containerproxy-build') {

configFileProvider([configFile(fileId: 'maven-settings-rsb', variable: 'MAVEN_SETTINGS_RSB')]) {
sh 'mvn -s $MAVEN_SETTINGS_RSB -U clean install deploy -DskipTests=true'

sh 'mvn -B -s $MAVEN_SETTINGS_RSB -U clean install deploy -DskipTests=true'

}
}
}
Expand Down
148 changes: 126 additions & 22 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@

<groupId>eu.openanalytics</groupId>
<artifactId>containerproxy</artifactId>
<version>0.8.9</version>
<version>0.8.10</version>
<name>ContainerProxy</name>
<packaging>jar</packaging>

<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.4.RELEASE</version>
<version>2.3.12.RELEASE</version>
<relativePath />
</parent>

Expand All @@ -36,20 +36,38 @@
</distributionManagement>

<repositories>
<!-- Maven queries repositories in the order that they are defined here.
Usually, the Maven Central repository is the last one in this order, because it's defined in the super POM.
This means that for all dependencies which are downloaded from Maven Central, the custom repositories are
queried first, which slows down the build a lot.
Therefore we add central as the first repository in this list.
This reduces the time to download dependencies on a fresh machine from ~20-30min to 1min
See: https://maven.apache.org/ref/3.6.3/maven-model-builder/super-pom.html for the origin of this configuration
-->
<repository>
<id>central</id>
<name>Central Repository</name>
<url>https://repo.maven.apache.org/maven2</url>
<layout>default</layout>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<!-- Currently used only for the monetdb dependency -->
<id>clojars</id>
<url>https://clojars.org/repo/</url>
</repository>
<repository>
<!-- Currently used only for the opensaml 2.6.6 dependency -->
<id>alfresco</id>
<url>https://artifacts.alfresco.com/nexus/content/repositories/public/</url>
<id>shibboleth</id>
<url>https://build.shibboleth.net/nexus/content/repositories/releases/</url>
</repository>
<repository>
<!-- Currently used only for the spring-social-github 1.0.0.M4 dependency -->
<id>spring</id>
<url>https://repo.spring.io/plugins-release/</url>
</repository>
<repository>
<!-- Currently used only for the spring-social-github 1.0.0.M4 dependency -->
<id>spring</id>
<url>https://repo.spring.io/plugins-release/</url>
</repository>
</repositories>

<dependencies>
Expand Down Expand Up @@ -84,12 +102,23 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<scope>test</scope>
</dependency>

<!-- Additional Spring components -->
<dependency>
Expand All @@ -103,7 +132,7 @@
<dependency>
<groupId>org.springframework.security.oauth.boot</groupId>
<artifactId>spring-security-oauth2-autoconfigure</artifactId>
<version>2.3.3.RELEASE</version>
<version>2.3.12.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
Expand Down Expand Up @@ -154,7 +183,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-social-facebook</artifactId>
<version>1.5.14.RELEASE</version>
<version>1.5.22.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.social</groupId>
Expand All @@ -181,7 +210,7 @@
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-spring-security-adapter</artifactId>
<version>4.7.0.Final</version>
<version>13.0.1</version>
</dependency>

<!-- SAML -->
Expand Down Expand Up @@ -269,7 +298,28 @@
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery</artifactId>
<version>3.5.0</version>
<version>3.5.1</version>
</dependency>
<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>bootstrap-social</artifactId>
<version>5.1.1</version>
<exclusions>
<!-- These dependencies are already included and would otherwise produce some warnings -->
<exclusion>
<groupId>org.webjars.bower</groupId>
<artifactId>bootstrap</artifactId>
</exclusion>
<exclusion>
<groupId>org.webjars.bower</groupId>
<artifactId>font-awesome</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>fontawesome</artifactId>
<version>4.7.0</version>
</dependency>

<!-- Amazon S3 -->
Expand Down Expand Up @@ -311,16 +361,70 @@
<artifactId>commons-beanutils</artifactId>
<version>1.9.4</version>
</dependency>
<dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.7</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.13</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>25.0-jre</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>5.2.9.RELEASE</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>1.68</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-ext-jdk15on</artifactId>
<version>1.68</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<version>1.68</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
<version>2.3</version>
</dependency>

<dependency>
<groupId>io.undertow</groupId>
<artifactId>undertow-core</artifactId>
<version>2.2.8.Final</version>
</dependency>
<dependency>
<groupId>io.undertow</groupId>
<artifactId>undertow-servlet</artifactId>
<version>2.2.8.Final</version>
</dependency>
<dependency>
<groupId>io.undertow</groupId>
<artifactId>undertow-websockets-jsr</artifactId>
<version>2.2.8.Final</version>
</dependency>
<dependency>
<groupId>org.jboss.xnio</groupId>
<artifactId>xnio-nio</artifactId>
<version>3.8.4.Final</version>
</dependency>
<dependency>
<groupId>org.jboss.xnio</groupId>
<artifactId>xnio-api</artifactId>
<version>3.8.4.Final</version>
</dependency>



</dependencies>

<build>
Expand Down Expand Up @@ -416,9 +520,9 @@
<plugins>
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<version>6.0.2</version>
<executions>
<artifactId>dependency-check-maven</artifactId>
<version>6.1.6</version>
<executions>
<execution>
<goals>
<goal>check</goal>
Expand Down
Loading

0 comments on commit 5f0fa2d

Please sign in to comment.