Merge pull request #772 from adobe/develop

v2.3.4 release merge

Author: davidjgonzalez

.github/workflows/snapshot-deploy.yaml

@@ -67,7 +67,7 @@ jobs:
           MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
 
       - name: Upload CodeCov
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v3
         with:
           file: ./target/site/jacoco/jacoco.xml
           flags: unittests

.github/workflows/verify.yaml

@@ -43,7 +43,7 @@ jobs:
         run: mvn -U clean verify
 
       - name: Upload CodeCov
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v3
         with:
           file: ./target/site/jacoco/jacoco.xml
           flags: unittests

pom.xml

@@ -75,7 +75,7 @@
         <frontend-maven-plugin.version>1.9.0</frontend-maven-plugin.version>
         <node.version>v13.7.0</node.version>
         <npm.version>6.13.1</npm.version>
-        <bnd.version>6.2.0</bnd.version>
+        <bnd.version>6.3.1</bnd.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.target>1.8</maven.compiler.target>
@@ -134,7 +134,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.1.0</version>
                 <executions>
                     <execution>
                         <id>enforce-maven</id>
@@ -502,7 +502,7 @@
                 <plugin>
                     <groupId>org.sonatype.plugins</groupId>
                     <artifactId>nexus-staging-maven-plugin</artifactId>
-                    <version>1.6.8</version>
+                    <version>1.6.13</version>
                 </plugin>
                 <!-- checks for vulnerabilities in dependencies -->
                 <plugin>
@@ -870,7 +870,7 @@
             <!-- JDK 11 -->
             <dependency>
                 <artifactId>org.apache.sling.javax.activation</artifactId>
-                <version>0.1.0</version>
+                <version>0.3.0</version>
                 <groupId>org.apache.sling</groupId>
                 <scope>provided</scope>
             </dependency>
@@ -896,7 +896,7 @@
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>
-                <version>3.2.4</version>
+                <version>4.6.1</version>
                 <scope>test</scope>
             </dependency>
             <dependency>

ui.apps/src/main/content/META-INF/vault/filter.xml

@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <workspaceFilter version="1.0">
     <!-- Enumerate all folders under /apps/asset-share-commons in this package, since there is now overlap from ui.config /apps/asset-share-commons/osgiconfig -->
+    <!-- remove legacy configuration from prior version 2.3.0 -->
+    <filter root="/apps/asset-share-commons/config.author" type="cleanup" />
+    <filter root="/apps/asset-share-commons/config.prod" type="cleanup" />
+    <filter root="/apps/asset-share-commons/config.publish" type="cleanup" />
+    <filter root="/apps/asset-share-commons/config.stage" type="cleanup" />
+    <filter root="/apps/asset-share-commons/config" type="cleanup" />
     <filter root="/apps/asset-share-commons/authoring"/>
     <filter root="/apps/asset-share-commons/clientlibs"/>
     <filter root="/apps/asset-share-commons/components"/>