Merge branch 'master' into contentsync-3197

Adobe-Consulting-Services · Nov 12, 2023 · ff1679b · ff1679b
2 parents 84c2ad7 + e5b4df5
commit ff1679b
Show file tree

Hide file tree

Showing 10 changed files with 65 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com)
 
 ## Unreleased ([details][unreleased changes details])
 
+
+## 6.3.0 - 2023-10-25
+
 ## Added
 
 - #3197 - Encrypt user credentials in ACS Content Sync   

diff --git a/all/pom.xml b/all/pom.xml
@@ -17,16 +17,15 @@
   ~ limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <!-- ====================================================================== -->
     <!-- P A R E N T P R O J E C T D E S C R I P T I O N -->
     <!-- ====================================================================== -->
     <parent>
         <groupId>com.adobe.acs</groupId>
         <artifactId>acs-aem-commons</artifactId>
-        <version>6.2.1-SNAPSHOT</version>
+        <version>6.3.1-SNAPSHOT</version>
     </parent>
 
     <!-- ====================================================================== -->

diff --git a/bundle-cloud/pom.xml b/bundle-cloud/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>com.adobe.acs</groupId>
         <artifactId>acs-aem-commons</artifactId>
-        <version>6.2.1-SNAPSHOT</version>
+        <version>6.3.1-SNAPSHOT</version>
     </parent>
 
     <!-- ====================================================================== -->

diff --git a/bundle-cloud/src/main/java/com/adobe/acs/commons/CloudBundle.java b/bundle-cloud/src/main/java/com/adobe/acs/commons/CloudBundle.java
@@ -0,0 +1,30 @@
+package com.adobe.acs.commons;
+/*
+ * ACS AEM Commons
+ *
+ * Copyright (C) 2013 - 2023 Adobe
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.osgi.annotation.versioning.ProviderType;
+
+/**
+ * Marker interface for Cloud Bundles to allow Javadocs to be generated from the cloud fragment bundle required for deployment to Nexus.
+ * 
+ * This bundle contains only internal implementation classes so has no JavaDocs of its own.
+ */
+@ProviderType
+public interface CloudBundle {
+
+}
diff --git a/bundle-cloud/src/main/java/com/adobe/acs/commons/package-info.java b/bundle-cloud/src/main/java/com/adobe/acs/commons/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * ACS AEM Commons
+ *
+ * Copyright (C) 2013 - 2023 Adobe
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@org.osgi.annotation.versioning.Version("1.0.0")
+package com.adobe.acs.commons;
diff --git a/bundle/pom.xml b/bundle/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>com.adobe.acs</groupId>
         <artifactId>acs-aem-commons</artifactId>
-        <version>6.2.1-SNAPSHOT</version>
+        <version>6.3.1-SNAPSHOT</version>
     </parent>
 
     <!-- ====================================================================== -->

diff --git a/oakpal-checks/pom.xml b/oakpal-checks/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>com.adobe.acs</groupId>
         <artifactId>acs-aem-commons</artifactId>
-        <version>6.2.1-SNAPSHOT</version>
+        <version>6.3.1-SNAPSHOT</version>
     </parent>
 
     <!-- ====================================================================== -->

diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,7 @@
 
     <groupId>com.adobe.acs</groupId>
     <artifactId>acs-aem-commons</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.3.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ACS AEM Commons - Reactor Project</name>
@@ -49,7 +49,7 @@
         <connection>scm:git:[email protected]:Adobe-Consulting-Services/acs-aem-commons.git</connection>
         <developerConnection>scm:git:[email protected]:Adobe-Consulting-Services/acs-aem-commons.git</developerConnection>
         <url>https://github.com/Adobe-Consulting-Services/acs-aem-commons/tree/master</url>
-        <tag>acs-aem-commons-5.5.0</tag>
+        <tag>acs-aem-commons-6.3.0</tag>
     </scm>
 
     <!-- Do not remove developers section - this is required to release to maven central -->
@@ -93,7 +93,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <!-- for reproducible builds (https://maven.apache.org/guides/mini/guide-reproducible-builds.html), automatically adjusted during release -->
-        <project.build.outputTimestamp>1694702052</project.build.outputTimestamp>
+        <project.build.outputTimestamp>1698267085</project.build.outputTimestamp>
     </properties>
 
     <build>

diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml
@@ -17,16 +17,15 @@
   ~ limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <!-- ====================================================================== -->
     <!-- P A R E N T P R O J E C T D E S C R I P T I O N -->
     <!-- ====================================================================== -->
     <parent>
         <groupId>com.adobe.acs</groupId>
         <artifactId>acs-aem-commons</artifactId>
-        <version>6.2.1-SNAPSHOT</version>
+        <version>6.3.1-SNAPSHOT</version>
     </parent>
 
     <!-- ====================================================================== -->
@@ -119,8 +118,8 @@
                     </checks>
 
                     <websterTargets>
-                        <nodetypes/>
-                        <privileges/>
+                        <nodetypes />
+                        <privileges />
                     </websterTargets>
                 </configuration>
                 <executions>

diff --git a/ui.content/pom.xml b/ui.content/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>com.adobe.acs</groupId>
         <artifactId>acs-aem-commons</artifactId>
-        <version>6.2.1-SNAPSHOT</version>
+        <version>6.3.1-SNAPSHOT</version>
     </parent>
 
     <!-- ====================================================================== -->