Merge pull request #11 from orbinson/feature/support-aem-on-prem

Support AEM 6.5.10+ and AEMaaCS
orbinson · Dec 25, 2022 · be8df17 · be8df17
2 parents f8c0d73 + e3965ed
commit be8df17
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -17,8 +17,9 @@ scripts are included in the package for reference.
 
 ## Compatibility
 
-We only support AEM as a Cloud Service. For AEM on premises, check the original [aem-groovy-console](https://github.com/CID15/aem-groovy-console)
+Supported AEM versions are AEM 6.5.10+ and AEM as a Cloud Service latest SDK version.
 
+To install the AEM Groovy Console on older AEM versions check the original project [aem-groovy-console](https://github.com/CID15/aem-groovy-console)
 ## Installation
 
 1. [Download the console package](https://github.com/orbinson/aem-groovy-console/releases/download/18.0.0/aem-groovy-console-all-17.0.0.zip).

diff --git a/bundle/pom.xml b/bundle/pom.xml
@@ -215,7 +215,8 @@
         <!-- SDK included last to allow other dependencies to override included versions -->
         <dependency>
             <groupId>com.adobe.aem</groupId>
-            <artifactId>aem-sdk-api</artifactId>
+            <artifactId>uber-jar</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -87,8 +87,8 @@
         <vault.password>admin</vault.password>
         <package.group>aem-groovy-console</package.group>
 
-        <!-- versions -->
-        <aem.sdk.version>2022.10.9398.20221020T071514Z-220800</aem.sdk.version>
+        <!-- AEM minimum version -->
+        <aem.version>6.5.10</aem.version>
     </properties>
 
     <profiles>
@@ -435,11 +435,10 @@
 
             <!-- SDK included last to allow other dependencies to override included versions -->
             <dependency>
-                <groupId>io.wcm.maven</groupId>
-                <artifactId>io.wcm.maven.aem-cloud-dependencies</artifactId>
-                <version>${aem.sdk.version}.0000</version>
-                <type>pom</type>
-                <scope>import</scope>
+                <groupId>com.adobe.aem</groupId>
+                <artifactId>uber-jar</artifactId>
+                <version>${aem.version}</version>
+                <scope>provided</scope>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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>
 
     <parent>
@@ -62,7 +63,7 @@
         </dependency>
         <dependency>
             <groupId>com.adobe.aem</groupId>
-            <artifactId>aem-sdk-api</artifactId>
+            <artifactId>uber-jar</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/ui.content/pom.xml b/ui.content/pom.xml
@@ -67,7 +67,7 @@
         </dependency>
         <dependency>
             <groupId>com.adobe.aem</groupId>
-            <artifactId>aem-sdk-api</artifactId>
+            <artifactId>uber-jar</artifactId>
         </dependency>
     </dependencies>
 </project>