Merge branch 'release/10.0.0'

icfnext · Feb 6, 2017 · 96985fd · 96985fd
2 parents b43d8b5 + 94c6421
commit 96985fd
Show file tree

Hide file tree

Showing 31 changed files with 221 additions and 305 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,5 +1,3 @@
-Copyright 2016 ICF Olson
-
 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

diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ The AEM Groovy Console provides an interface for running [Groovy](http://groovy.
 
 ## Installation
 
-1. [Download the console package](https://github.com/Citytechinc/cq-groovy-console/releases).  For previous versions, tags can be checked out from GitHub and built directly from the source (e.g. `mvn install`).
+1. [Download the console package](https://github.com/OlsonDigital/aem-groovy-console/releases/download/10.0.0/aem-groovy-console-10.0.0.zip).  For previous versions, tags can be checked out from GitHub and built directly from the source (e.g. `mvn install`).
 
 2.  [Verify](http://localhost:4502/etc/groovyconsole.html) the installation.
 
@@ -48,4 +48,4 @@ Sample scripts can be found in the src/main/scripts directory.
 
 ## Versioning
 
-Follows [Semantic Versioning](http://semver.org/) guidelines.
+Follows [Semantic Versioning](http://semver.org/) guidelines.
diff --git a/pom.xml b/pom.xml
@@ -3,15 +3,15 @@
 
     <parent>
         <groupId>com.icfolson.aem</groupId>
-        <artifactId>parent</artifactId>
-        <version>6.2.1</version>
+        <artifactId>aem-parent-uber-jar</artifactId>
+        <version>6.2.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.icfolson.aem.groovy.console</groupId>
     <artifactId>aem-groovy-console</artifactId>
     <packaging>jar</packaging>
-    <version>9.1.0</version>
+    <version>10.0.0</version>
     <name>AEM Groovy Console</name>
     <description>
         The AEM Groovy Console provides an interface for running Groovy scripts in the AEM (Adobe CQ) container. Scripts
@@ -33,30 +33,16 @@
     </licenses>
 
     <scm>
-        <connection>scm:git:git@github.com:Citytechinc/cq-groovy-console.git</connection>
-        <developerConnection>scm:git:git@github.com:Citytechinc/cq-groovy-console.git</developerConnection>
-        <url>https://github.com/Citytechinc/cq-groovy-console</url>
+        <connection>scm:git:git@github.com:OlsonDigital/aem-groovy-console.git</connection>
+        <developerConnection>scm:git:git@github.com:OlsonDigital/aem-groovy-console.git</developerConnection>
+        <url>https://github.com/OlsonDigital/aem-groovy-console</url>
     </scm>
 
     <issueManagement>
         <system>GitHub</system>
-        <url>https://github.com/Citytechinc/cq-groovy-console/issues</url>
+        <url>https://github.com/OlsonDigital/aem-groovy-console/issues</url>
     </issueManagement>
 
-    <repositories>
-        <repository>
-            <id>citytech-public</id>
-            <url>http://nexus.citytech.ctmsp.com/content/groups/public</url>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>citytech-public</id>
-            <url>http://nexus.citytech.ctmsp.com/content/groups/public</url>
-        </pluginRepository>
-    </pluginRepositories>
-
     <distributionManagement>
         <repository>
             <id>sonatype-nexus-staging</id>
@@ -68,24 +54,16 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss.SSSZ</maven.build.timestamp.format>
         <timestamp>${maven.build.timestamp}</timestamp>
+        <aem.package.skip>true</aem.package.skip>
         <aem.package.goal>install</aem.package.goal>
         <aem.username>admin</aem.username>
-        <aem.context.path />
+        <aem.context.path/>
+        <osgi.bundle.status.skip>true</osgi.bundle.status.skip>
         <osgi.bundle.status.skip.publish>true</osgi.bundle.status.skip.publish>
         <assembly.descriptor.name>zip.xml</assembly.descriptor.name>
     </properties>
 
     <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <aem.package.skip>true</aem.package.skip>
-                <osgi.bundle.status.skip>true</osgi.bundle.status.skip>
-            </properties>
-        </profile>
         <profile>
             <id>exclude-groovy-bundle</id>
             <activation>
@@ -95,6 +73,7 @@
             </activation>
             <properties>
                 <assembly.descriptor.name>zip-exclude-groovy-bundle.xml</assembly.descriptor.name>
+                <aem.package.fileName>${project.build.directory}/${project.build.finalName}-exclude-groovy-bundle.zip</aem.package.fileName>
             </properties>
         </profile>
         <profile>
@@ -105,11 +84,13 @@
                 </property>
             </activation>
             <properties>
+                <aem.package.skip>false</aem.package.skip>
                 <aem.host>localhost</aem.host>
                 <aem.port.author>4502</aem.port.author>
                 <aem.port.publish>4503</aem.port.publish>
                 <aem.username>admin</aem.username>
                 <aem.password>admin</aem.password>
+                <osgi.bundle.status.skip>false</osgi.bundle.status.skip>
             </properties>
         </profile>
         <profile>
@@ -206,6 +187,8 @@
                         <Bundle-Name>${project.name}</Bundle-Name>
                         <Bundle-Vendor>${project.organization.name}</Bundle-Vendor>
                         <Export-Package>!*.impl,com.icfolson.aem.groovy.console.*</Export-Package>
+                        <Require-Bundle>org.apache.sling.models.api</Require-Bundle>
+                        <Sling-Model-Packages>com.icfolson.aem.groovy.console.components</Sling-Model-Packages>
                         <DynamicImport-Package>*</DynamicImport-Package>
                     </instructions>
                 </configuration>
@@ -223,7 +206,20 @@
                         <configuration>
                             <appendAssemblyId>false</appendAssemblyId>
                             <descriptors>
-                                <descriptor>src/main/assembly/${assembly.descriptor.name}</descriptor>
+                                <descriptor>src/main/assembly/zip.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>package-exclude-groovy-bundle</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <appendAssemblyId>true</appendAssemblyId>
+                            <descriptors>
+                                <descriptor>src/main/assembly/zip-exclude-groovy-bundle.xml</descriptor>
                             </descriptors>
                         </configuration>
                     </execution>
@@ -242,9 +238,9 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>com.citytechinc.maven.plugins</groupId>
-                <artifactId>cq-package-maven-plugin</artifactId>
-                <version>0.3.0</version>
+                <groupId>com.icfolson.maven.plugins</groupId>
+                <artifactId>aem-package-maven-plugin</artifactId>
+                <version>0.6.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -263,9 +259,9 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>com.citytechinc.maven.plugins</groupId>
+                <groupId>com.icfolson.maven.plugins</groupId>
                 <artifactId>osgi-bundle-status-maven-plugin</artifactId>
-                <version>1.3.0</version>
+                <version>2.0.1</version>
                 <executions>
                     <execution>
                         <id>status-author</id>
@@ -276,7 +272,7 @@
                         <configuration>
                             <bundleNames>
                                 <bundleName>aem-groovy-extension-bundle</bundleName>
-                                <bundleName>aem-groovy-console</bundleName>
+                                <bundleName>aem-groovy-console;${project.version}</bundleName>
                             </bundleNames>
                             <host>${aem.host}</host>
                             <port>${aem.port.author}</port>
@@ -294,7 +290,7 @@
                         <configuration>
                             <bundleNames>
                                 <bundleName>aem-groovy-extension-bundle</bundleName>
-                                <bundleName>aem-groovy-console</bundleName>
+                                <bundleName>aem-groovy-console;${project.version}</bundleName>
                             </bundleNames>
                             <host>${aem.host}</host>
                             <port>${aem.port.publish}</port>
@@ -348,6 +344,11 @@
 
     <dependencies>
         <!-- inherited -->
+        <dependency>
+            <groupId>com.adobe.aem</groupId>
+            <artifactId>uber-jar</artifactId>
+            <classifier>apis</classifier>
+        </dependency>
         <dependency>
             <groupId>javax.jcr</groupId>
             <artifactId>jcr</artifactId>
@@ -361,64 +362,24 @@
             <artifactId>jsp-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.jcr.api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.adobe.granite.sling</groupId>
-            <artifactId>org.apache.sling.jcr.resource</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.scripting.jsp.taglib</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.day.cq.wcm</groupId>
-            <artifactId>cq-wcm-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.day.cq</groupId>
-            <artifactId>cq-commons</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.day.commons</groupId>
-            <artifactId>day-commons-text</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.day.cq</groupId>
-            <artifactId>cq-search</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.day.cq</groupId>
-            <artifactId>cq-mailer</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.day.cq.wcm</groupId>
-            <artifactId>cq-wcm-taglib</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.adobe.granite</groupId>
-            <artifactId>com.adobe.granite.replication.core</artifactId>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.day.commons.osgi.wrapper</groupId>
-            <artifactId>com.day.commons.osgi.wrapper.commons-email</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-email</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
@@ -442,15 +403,15 @@
         <dependency>
             <groupId>com.icfolson.aem.groovy.extension</groupId>
             <artifactId>aem-groovy-extension-bundle</artifactId>
-            <version>2.0.0</version>
+            <version>3.0.0</version>
             <scope>provided</scope>
         </dependency>
 
         <!-- test -->
         <dependency>
             <groupId>com.icfolson.aem.prosper</groupId>
             <artifactId>prosper</artifactId>
-            <version>8.0.0</version>
+            <version>9.0.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/src/main/assembly/zip-exclude-groovy-bundle.xml b/src/main/assembly/zip-exclude-groovy-bundle.xml
@@ -3,7 +3,7 @@
     xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-    <id>zip</id>
+    <id>exclude-groovy-bundle</id>
     <formats>
         <format>zip</format>
     </formats>

diff --git a/src/main/content/jcr_root/apps/groovyconsole/components/console/.content.xml b/src/main/content/jcr_root/apps/groovyconsole/components/console/.content.xml
@@ -4,4 +4,4 @@
           xmlns:jcr="http://www.jcp.org/jcr/1.0"
           cq:isContainer="{Boolean}false"
           jcr:primaryType="cq:Component"
-          sling:resourceSuperType="foundation/components/page" />
+          sling:resourceSuperType="wcm/foundation/components/page" />
diff --git a/...roovyconsole/components/console/about.jsp → ...oovyconsole/components/console/about.html b/...roovyconsole/components/console/about.jsp → ...oovyconsole/components/console/about.html
@@ -1,5 +1,3 @@
-<%@include file="/libs/foundation/global.jsp" %>
-
 <div class="panel panel-default">
     <div class="panel-heading">
         <h4 class="panel-title">
@@ -10,9 +8,9 @@ <h4 class="panel-title">
         <div class="panel-body">
             <ul>
                 <li>Inspired by Guillaume Laforge's <a href="http://groovyconsole.appspot.com" target="_blank">Groovy Web Console</a>.</li>
-                <li>Implemented with <a href="http://groovy.codehaus.org" target="_blank">Groovy</a> version <%= groovy.lang.GroovySystem.getVersion() %> and <a href="http://getbootstrap.com/" target="_blank">Bootstrap</a>.</li>
+                <li>Implemented with <a href="http://www.groovy-lang.org" target="_blank">Groovy</a> version <%= groovy.lang.GroovySystem.getVersion() %> and <a href="http://getbootstrap.com/" target="_blank">Bootstrap</a>.</li>
                 <li>Code editing capabilities provided by <a href="http://ace.c9.io/" target="_blank">Ace</a>.</li>
-                <li>Project hosted on <a href="https://github.com/Citytechinc/cq-groovy-console" target="_blank">GitHub</a> for <a href="http://www.icfolson.com" target="_blank">ICF Olson</a></li>
+                <li>Project hosted on <a href="https://github.com/OlsonDigital/aem-groovy-console" target="_blank">GitHub</a> for <a href="http://www.olsondigital.com" target="_blank">Olson Digital</a></li>
             </ul>
         </div>
     </div>

diff --git a/...vyconsole/components/console/bindings.jsp → ...yconsole/components/console/bindings.html b/...vyconsole/components/console/bindings.jsp → ...yconsole/components/console/bindings.html
@@ -1,5 +1,3 @@
-<%@include file="/libs/foundation/global.jsp" %>
-
 <div class="panel panel-default">
     <div class="panel-heading">
         <h4 class="panel-title">