Merge branch 'master' into JENKINS-52306

jenkinsci · Nov 5, 2022 · c2e23bb · c2e23bb
2 parents 4de2e58 + 92d9714
commit c2e23bb
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/crowdin.yml b/.github/workflows/crowdin.yml
@@ -22,6 +22,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: crowdin action
+        if: github.event.repository.fork == false
         uses: crowdin/github-action@1.4.16
         with:
           upload_translations: false

diff --git a/casc/Dockerfile b/casc/Dockerfile
@@ -2,7 +2,7 @@
 ARG JAVA_VERSION
 ARG JENKINS_SITE_NAME
 
-FROM jenkins/jenkins:2.303.1-jdk$JAVA_VERSION
+FROM jenkins/jenkins:2.346.1-jdk$JAVA_VERSION
 
 # use the value to set the ENV var default
 ENV JENKINS_SITE_NAME=$JENKINS_SITE_NAME

diff --git a/casc/docker-compose.yml b/casc/docker-compose.yml
@@ -23,7 +23,7 @@ services:
      - /var/run/docker.sock:/var/run/docker.sock
 
   crowd:
-    image: blacklabelops/crowd
+    image: atlassian/crowd:4.4.3-jdk11
     container_name: crowd
     networks:
       - crowd_net

diff --git a/pom.xml b/pom.xml
@@ -141,11 +141,10 @@
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
                 <artifactId>bom-2.346.x</artifactId>
-                <version>1500.ve4d05cd32975</version>
+                <version>1654.vcb_69d035fa_20</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
-
         </dependencies>
     </dependencyManagement>