Merge branch 'release/6.0.0'

README.md

@@ -4,7 +4,7 @@
 
 ## Overview
 
-OSGi bundle containing Groovy builders and metaclasses for AEM.  The bundle exposes an API to implement extension "provider" services to register additional Groovy metaclasses in the container.
+OSGi bundle containing Groovy builders and metaclasses for Adobe Experience Manager.  The bundle exposes an API to implement extension "provider" services to register additional Groovy metaclasses in the container.
 
 ```groovy
 new NodeBuilder(session).content {

aem-groovy-extension-bundle/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.icfolson.aem.groovy.extension</groupId>
         <artifactId>aem-groovy-extension</artifactId>
-        <version>5.0.0</version>
+        <version>6.0.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

aem-groovy-extension-bundle/src/main/groovy/com/icfolson/aem/groovy/extension/services/impl/DefaultMetaClassExtensionProvider.groovy

@@ -13,7 +13,6 @@ import javax.jcr.PropertyType
 import javax.jcr.Session
 import javax.jcr.Value
 import javax.servlet.ServletRequest
-import javax.servlet.jsp.JspContext
 
 /**
  * This default metaclass provider adds additional methods to all instances of the classes outlined below.
@@ -92,16 +91,6 @@ class DefaultMetaClassExtensionProvider implements MetaClassExtensionProvider {
         }
     }
 
-    static def JSP_CONTEXT_METACLASS = {
-        getAt { String attributeName ->
-            delegate.getAttribute(attributeName)
-        }
-
-        putAt { String attributeName, Object value ->
-            delegate.setAttribute(attributeName, value)
-        }
-    }
-
     static def SERVLET_REQUEST_METACLASS = {
         getAt { String parameterName ->
             def value = delegate.parameterMap[parameterName] as String[]
@@ -291,7 +280,6 @@ class DefaultMetaClassExtensionProvider implements MetaClassExtensionProvider {
 
     static def DEFAULT_METACLASSES = [
         (Optional): OPTIONAL_METACLASS,
-        (JspContext): JSP_CONTEXT_METACLASS,
         (ServletRequest): SERVLET_REQUEST_METACLASS,
         (Binary): BINARY_METACLASS,
         (Node): NODE_METACLASS,

aem-groovy-extension-package/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.icfolson.aem.groovy.extension</groupId>
         <artifactId>aem-groovy-extension</artifactId>
-        <version>5.0.0</version>
+        <version>6.0.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

aem-groovy-extension-tests/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.icfolson.aem.groovy.extension</groupId>
         <artifactId>aem-groovy-extension</artifactId>
-        <version>5.0.0</version>
+        <version>6.0.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -85,7 +85,7 @@
         <dependency>
             <groupId>com.icfolson.aem.prosper</groupId>
             <artifactId>prosper</artifactId>
-            <version>12.0.0</version>
+            <version>13.0.0</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>

aem-groovy-extension-tests/src/test/groovy/com/icfolson/aem/groovy/extension/services/impl/ServletRequestMetaClassSpec.groovy

@@ -1,35 +1,34 @@
 package com.icfolson.aem.groovy.extension.services.impl
 
 import com.icfolson.aem.groovy.extension.GroovyExtensionSpec
-import org.springframework.mock.web.MockHttpServletRequest
 
 class ServletRequestMetaClassSpec extends GroovyExtensionSpec {
 
     def "get parameter"() {
         setup:
-        def request = new MockHttpServletRequest()
-
-        request.setParameter("firstName", "Mark")
+        def request = requestBuilder.build {
+            setParameterMap(["firstName": "Mark"])
+        }
 
         expect:
         request["firstName"] == "Mark"
     }
 
     def "get parameter array"() {
         setup:
-        def request = new MockHttpServletRequest()
-
-        request.setParameter("languages", "Java", "Groovy")
+        def request = requestBuilder.build {
+            setParameterMap(["languages": ["Java", "Groovy"]])
+        }
 
         expect:
         request["languages"] == ["Java", "Groovy"]
     }
 
     def "non-existent parameter returns null"() {
         setup:
-        def request = new MockHttpServletRequest()
+        def request = requestBuilder.build()
 
         expect:
-        request["nonExistent"] == null
+        !request["nonExistent"]
     }
 }

pom.xml

@@ -3,16 +3,16 @@
     <parent>
         <groupId>com.icfolson.aem</groupId>
         <artifactId>aem-parent-uber-jar</artifactId>
-        <version>6.4.1</version>
+        <version>6.4.1.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.icfolson.aem.groovy.extension</groupId>
     <artifactId>aem-groovy-extension</artifactId>
     <packaging>pom</packaging>
-    <version>5.0.0</version>
+    <version>6.0.0</version>
     <name>AEM Groovy Extension</name>
-    <description>OSGi bundle containing Groovy builders and metaclasses for AEM (Adobe CQ).</description>
+    <description>OSGi bundle containing Groovy builders and metaclasses for Adobe Experience Manager.</description>
 
     <organization>
         <name>Olson Digital</name>
@@ -43,7 +43,7 @@
         <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.author>true</osgi.bundle.status.skip.author>
         <osgi.bundle.status.skip.publish>true</osgi.bundle.status.skip.publish>
     </properties>
@@ -119,7 +119,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.7.0</version>
+                    <version>3.8.0</version>
                     <configuration>
                         <compilerId>groovy-eclipse-compiler</compilerId>
                         <source>1.8</source>
@@ -244,7 +244,7 @@
             <dependency>
                 <groupId>org.codehaus.groovy</groupId>
                 <artifactId>groovy-all</artifactId>
-                <version>2.4.13</version>
+                <version>2.4.15</version>
                 <scope>provided</scope>
             </dependency>
         </dependencies>

src/site/site.xml

@@ -5,7 +5,7 @@
     <skin>
         <groupId>com.icfolson.maven</groupId>
         <artifactId>icfolson-maven-skin</artifactId>
-        <version>1.0.0</version>
+        <version>1.1.0</version>
     </skin>
 
     <bannerRight>