Merge branch 'develop'

wcm-io · Jun 6, 2024 · 9a8d00b · 9a8d00b
2 parents 096d842 + 62d8265
commit 9a8d00b
Show file tree

Hide file tree

Showing 19 changed files with 1,268 additions and 17 deletions.
diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
@@ -28,7 +28,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: ${{ matrix.distribution }}
           java-version: ${{ matrix.java }}

diff --git a/.github/workflows/maven-deploy.yml b/.github/workflows/maven-deploy.yml
@@ -25,7 +25,7 @@ jobs:
           git config --global user.name "${{ secrets.GH_SITE_DEPLOY_NAME }}"
 
       - name: Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 11

diff --git a/6.5.0/update-aem-deps.groovy b/6.5.0/update-aem-deps.groovy
@@ -30,7 +30,8 @@ LOCAL_AEM_PASSWORD = 'admin'
 
 //----------------------------------------------------------------------
 
-@Grab('org.slf4j:slf4j-simple:1.7.30')
+@GrabConfig(systemClassLoader=true)
+@Grab('org.slf4j:slf4j-simple:2.0.12')
 @Grab('jaxen:jaxen:1.1.6')
 @GrabExclude('jdom:jdom')
 @Grab('org.jdom:jdom2:2.0.6.1')

diff --git a/6.5.10/update-aem-deps.groovy b/6.5.10/update-aem-deps.groovy
@@ -30,7 +30,8 @@ LOCAL_AEM_PASSWORD = 'admin'
 
 //----------------------------------------------------------------------
 
-@Grab('org.slf4j:slf4j-simple:1.7.30')
+@GrabConfig(systemClassLoader=true)
+@Grab('org.slf4j:slf4j-simple:2.0.12')
 @Grab('jaxen:jaxen:1.1.6')
 @GrabExclude('jdom:jdom')
 @Grab('org.jdom:jdom2:2.0.6.1')

diff --git a/6.5.11/update-aem-deps.groovy b/6.5.11/update-aem-deps.groovy
@@ -30,7 +30,8 @@ LOCAL_AEM_PASSWORD = 'admin'
 
 //----------------------------------------------------------------------
 
-@Grab('org.slf4j:slf4j-simple:1.7.30')
+@GrabConfig(systemClassLoader=true)
+@Grab('org.slf4j:slf4j-simple:2.0.12')
 @Grab('jaxen:jaxen:1.1.6')
 @GrabExclude('jdom:jdom')
 @Grab('org.jdom:jdom2:2.0.6.1')

diff --git a/6.5.12/update-aem-deps.groovy b/6.5.12/update-aem-deps.groovy
@@ -30,7 +30,8 @@ LOCAL_AEM_PASSWORD = 'admin'
 
 //----------------------------------------------------------------------
 
-@Grab('org.slf4j:slf4j-simple:1.7.30')
+@GrabConfig(systemClassLoader=true)
+@Grab('org.slf4j:slf4j-simple:2.0.12')
 @Grab('jaxen:jaxen:1.1.6')
 @GrabExclude('jdom:jdom')
 @Grab('org.jdom:jdom2:2.0.6.1')

diff --git a/6.5.13/update-aem-deps.groovy b/6.5.13/update-aem-deps.groovy
@@ -30,7 +30,8 @@ LOCAL_AEM_PASSWORD = 'admin'
 
 //----------------------------------------------------------------------
 
-@Grab('org.slf4j:slf4j-simple:1.7.30')
+@GrabConfig(systemClassLoader=true)
+@Grab('org.slf4j:slf4j-simple:2.0.12')
 @Grab('jaxen:jaxen:1.1.6')
 @GrabExclude('jdom:jdom')
 @Grab('org.jdom:jdom2:2.0.6.1')

diff --git a/6.5.14/update-aem-deps.groovy b/6.5.14/update-aem-deps.groovy
@@ -30,7 +30,8 @@ LOCAL_AEM_PASSWORD = 'admin'
 
 //----------------------------------------------------------------------
 
-@Grab('org.slf4j:slf4j-simple:1.7.30')
+@GrabConfig(systemClassLoader=true)
+@Grab('org.slf4j:slf4j-simple:2.0.12')
 @Grab('jaxen:jaxen:1.1.6')
 @GrabExclude('jdom:jdom')
 @Grab('org.jdom:jdom2:2.0.6.1')

diff --git a/6.5.15/update-aem-deps.groovy b/6.5.15/update-aem-deps.groovy
@@ -30,7 +30,8 @@ LOCAL_AEM_PASSWORD = 'admin'
 
 //----------------------------------------------------------------------
 
-@Grab('org.slf4j:slf4j-simple:1.7.30')
+@GrabConfig(systemClassLoader=true)
+@Grab('org.slf4j:slf4j-simple:2.0.12')
 @Grab('jaxen:jaxen:1.1.6')
 @GrabExclude('jdom:jdom')
 @Grab('org.jdom:jdom2:2.0.6.1')

diff --git a/6.5.16/update-aem-deps.groovy b/6.5.16/update-aem-deps.groovy
@@ -30,7 +30,8 @@ LOCAL_AEM_PASSWORD = 'admin'
 
 //----------------------------------------------------------------------
 
-@Grab('org.slf4j:slf4j-simple:1.7.30')
+@GrabConfig(systemClassLoader=true)
+@Grab('org.slf4j:slf4j-simple:2.0.12')
 @Grab('jaxen:jaxen:1.1.6')
 @GrabExclude('jdom:jdom')
 @Grab('org.jdom:jdom2:2.0.6.1')

diff --git a/6.5.17/update-aem-deps.groovy b/6.5.17/update-aem-deps.groovy
@@ -30,7 +30,8 @@ LOCAL_AEM_PASSWORD = 'admin'
 
 //----------------------------------------------------------------------
 
-@Grab('org.slf4j:slf4j-simple:1.7.30')
+@GrabConfig(systemClassLoader=true)
+@Grab('org.slf4j:slf4j-simple:2.0.12')
 @Grab('jaxen:jaxen:1.1.6')
 @GrabExclude('jdom:jdom')
 @Grab('org.jdom:jdom2:2.0.6.1')

diff --git a/6.5.18/update-aem-deps.groovy b/6.5.18/update-aem-deps.groovy
@@ -30,7 +30,8 @@ LOCAL_AEM_PASSWORD = 'admin'
 
 //----------------------------------------------------------------------
 
-@Grab('org.slf4j:slf4j-simple:1.7.30')
+@GrabConfig(systemClassLoader=true)
+@Grab('org.slf4j:slf4j-simple:2.0.12')
 @Grab('jaxen:jaxen:1.1.6')
 @GrabExclude('jdom:jdom')
 @Grab('org.jdom:jdom2:2.0.6.1')

diff --git a/6.5.19/update-aem-deps.groovy b/6.5.19/update-aem-deps.groovy
@@ -30,7 +30,8 @@ LOCAL_AEM_PASSWORD = 'admin'
 
 //----------------------------------------------------------------------
 
-@Grab('org.slf4j:slf4j-simple:1.7.30')
+@GrabConfig(systemClassLoader=true)
+@Grab('org.slf4j:slf4j-simple:2.0.12')
 @Grab('jaxen:jaxen:1.1.6')
 @GrabExclude('jdom:jdom')
 @Grab('org.jdom:jdom2:2.0.6.1')

diff --git a/6.5.20/pom.xml b/6.5.20/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>io.wcm.maven</groupId>
   <artifactId>io.wcm.maven.aem-dependencies</artifactId>
-  <version>6.5.20.0000</version>
+  <version>6.5.20.0001-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>io.wcm.maven.aem-dependencies</name>

diff --git a/6.5.20/update-aem-deps.groovy b/6.5.20/update-aem-deps.groovy
@@ -30,7 +30,8 @@ LOCAL_AEM_PASSWORD = 'admin'
 
 //----------------------------------------------------------------------
 
-@Grab('org.slf4j:slf4j-simple:1.7.30')
+@GrabConfig(systemClassLoader=true)
+@Grab('org.slf4j:slf4j-simple:2.0.12')
 @Grab('jaxen:jaxen:1.1.6')
 @GrabExclude('jdom:jdom')
 @Grab('org.jdom:jdom2:2.0.6.1')