Merge branch 'develop'

scireum · Jun 7, 2021 · 2059e92 · 2059e92
2 parents df191b4 + 271d8e4
commit 2059e92
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -17,7 +17,7 @@ clone:
 
 steps:
   - name: compile
-    image: hub.scireum.com/scireum/sirius-build:latest
+    image: hub.scireum.com/scireum/sirius-build-jdk16:latest
     commands:
       - mvn clean compile
     volumes: *scireum_volumes
@@ -26,7 +26,7 @@ steps:
       - push
 
   - name: test
-    image: hub.scireum.com/scireum/sirius-build:latest
+    image: hub.scireum.com/scireum/sirius-build-jdk16:latest
     commands:
       - mvn clean test
     volumes: *scireum_volumes
@@ -35,7 +35,7 @@ steps:
       - pull_request
 
   - name: sonar
-    image: hub.scireum.com/scireum/sirius-build:latest
+    image: hub.scireum.com/scireum/sirius-build-jdk16:latest
     commands:
       - "sed -i 's/DEVELOPMENT-SNAPSHOT/${DRONE_TAG}/g' pom.xml"
       - "mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent test sonar:sonar -Dsonar.projectKey=${DRONE_REPO_NAME}"
@@ -45,7 +45,7 @@ steps:
       - tag
 
   - name: package
-    image: hub.scireum.com/scireum/sirius-build:latest
+    image: hub.scireum.com/scireum/sirius-build-jdk16:latest
     commands:
       - "sed -i 's/DEVELOPMENT-SNAPSHOT/${DRONE_TAG}/g' pom.xml"
       - mvn clean package -DskipTests
@@ -71,7 +71,7 @@ steps:
         - tag
 
   - name: site
-    image: hub.scireum.com/scireum/sirius-build:latest
+    image: hub.scireum.com/scireum/sirius-build-jdk16:latest
     commands:
       - "echo \"$SSH_KEY\" > /tmp/sshkey"
       - chmod 600 /tmp/sshkey

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.scireum</groupId>
         <artifactId>sirius-parent</artifactId>
-        <version>7.0.1</version>
+        <version>8.0.1</version>
     </parent>
     <artifactId>s3ninja</artifactId>
     <version>DEVELOPMENT-SNAPSHOT</version>
@@ -16,8 +16,8 @@
     <url>http://s3ninja.net</url>
 
     <properties>
-        <sirius.kernel>ga-1.0.1</sirius.kernel>
-        <sirius.web>ga-1.1.0</sirius.web>
+        <sirius.kernel>dev-23.0.0</sirius.kernel>
+        <sirius.web>dev-35.0.0</sirius.web>
     </properties>
 
     <repositories>
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-java-sdk-s3</artifactId>
-            <version>1.11.921</version>
+            <version>1.11.1034</version>
             <scope>test</scope>
         </dependency>
     </dependencies>