More accurate AEM6 jars

Fixes GH-41

Author: jdigger

.gitignore

@@ -4,6 +4,7 @@
 *.iml
 *.ipr
 *.iws
+*.jar
 .gradle
 .gradletasknamecache
 .project

README.md

@@ -16,7 +16,7 @@ Moreover, by doing a continuous stream, we avoid the latency issues. Depending o
 
 # Runtime Dependencies
 
-* AEM/CQ v5.6.1
+* AEM/CQ v6.1
 * To run Grabbit in your AEM/CQ instance, **you need to install a Fragment Bundle once per instance. It can be found [here](https://bintray.com/artifact/download/twcable/aem/dependencies/Sun-Misc-Fragment-Bundle-1.0.0.zip)**
 
 # Building #
@@ -47,6 +47,16 @@ brew link --force --overwrite protobuf241
 
 _For both Windows and Mac : To verify that installation was successful, `protoc --version` should display `2.4.1`_
 
+### Adding AEM dependent libraries ###
+
+#### Get workflow-console jar from AEM instance
+
+1. Go to http://localhost:4502/system/console/bundles
+2. Search for workflow-console and expand bundle when found.
+3. Notice `Bundle Location` and copy the path after jcrinstall: (/libs/cq/platform/install/cq-workflow-console-5.8.2.jar)
+4. From the top project directory, simply use the Sling download component to grab the data. For example:
+`curl -u admin:admin -o cq-workflow-console-5.8.2.jar "http://localhost:4502/crx/de/download.jsp?path=/libs/cq/platform/install/cq-workflow-console-5.8.2.jar/jcr:content/jcr:data"`
+
 # Running Grabbit #
 
 [This] (grabbit.sh) shell script can be used to initiate grabbit jobs for a given Grabbit configuration and to check the status of those jobs.

RELEASE_NOTES.md

@@ -1,5 +1,9 @@
 # RELEASE NOTES
 
+## 4.0.0
+
+* Updated for AEM 6.1
+
 ## 3.0.0
 
 * Added "excludePath" feature ( GH-23 )

build.gradle

@@ -33,9 +33,14 @@ allprojects {
         }
 
         //Provides all Adobe AEM specific repos (like cq-workflow-console)
+        //May no longer be needed since latest jar files are not on the public Adobe repo
         maven {
             url "http://repo.adobe.com/nexus/content/groups/public"
         }
+
+        // hack to allow getting to a working version of AEM 6.1 workflow-console jar
+        // without running afoul of licensing restrictions
+        flatDir { dirs rootProject.projectDir }
     }
 }
 

grabbit/build.gradle

@@ -70,6 +70,7 @@ jar.manifest {
     instruction 'Import-Package', 'org.springframework.aop.scope; version="[3.1,4.0)"'
     instruction 'Import-Package', 'org.springframework.scheduling.concurrent; version="[3.1,4.0)"'
     instruction 'Import-Package', "org.aopalliance.aop;version=1.0.0"
+    instruction 'Import-Package', "sun.misc"
     instruction 'Import-Package', '*'
 
 
@@ -90,17 +91,22 @@ configurations.cq_package {
     exclude group: 'ch.qos.logback', module: 'logback-classic'
     exclude group: 'ch.qos.logback', module: 'logback-core'
 
-    // excluding Joda Time too as AEM5.6 provides its own in com.day.commons.osgi.wrapper.joda-time
+    // excluding Joda Time too as AEM provides its own in com.day.commons.osgi.wrapper.joda-time
     exclude group: 'joda-time', module: 'joda-time'
-    
+
     exclude group: 'com.google.code.findbugs', module: 'jsr305'
 
     exclude group: 'com.day.cq.workflow', module: 'cq-workflow-console'
 
     exclude group: 'org.apache.felix', module: 'org.apache.felix.scr.annotations'
 
     exclude group: 'org.apache.commons', module: 'commons-lang3'
-    exclude group: 'org.apache.commons', module: 'commons-lang'
+
+    // 6.x exclude bundles
+    exclude group: 'com.google.guava', module: 'guava'
+    exclude group: 'org.apache.httpcomponents', module: 'httpclient-osgi'
+    exclude group: 'org.apache.httpcomponents', module: 'httpcore-osgi'
+    exclude module: 'cq-workflow-console'
 }
 
 bundle.installPath = '/apps/grabbit/install/${nativeStartLevel}'

gradle.properties

@@ -11,39 +11,38 @@ version = 3.0.0
 cglib_nodep_version = 2.2.2
 commons_collections_version = 3.2.1
 commons_io_version = 1.4
-commons_lang_version = 3.0.1
+commons_lang_version = 3.3.2
 commons_text_version = 1.1.8
-cq_version_workflow_console = 5.6.6
+cq_workflow_console_version = 5.8.2
 felix_osgi_version = 1.4.0
 gradle_plugins_version = 2.1.0
 granite_version = 5.12.2
 groovy_version = 2.3.6
 guava_version = 15.0
+httpcomponents_version = 4.3.4
 httpcomponents_client_version = 4.3.6
 httpcomponents_core_version = 4.3.2
 jackalope_version = 2.0.0
 jackrabbit_ocm_version = 1.5.3
-jackrabbit_version = 2.6.2
+jackrabbit_version = 2.10.0
 jcr_version = 2.0
 jms_version = 3.1.1
-joda_time_version = 1.6.2
 jsr305_version = 2.0.0
 logback_version = 1.0.4
 objenesis_version = 2.1
 protobuf_gradle_plugin_version = 0.9.1
 scr_annotations_version = 1.7.0
 servicemix_protobuf_java_version = 2.4.1_1
 servlet_api_version = 2.5
-slf4j_version = 1.6.6
-sling_api_version = 2.4.0
+sling_api_version = 2.9.0
 sling_commons_testing_version = 2.0.12
-sling_commons_version = 2.1.0
+sling_commons_version = 2.2.0
 sling_event_version = 3.1.4
-sling_jcr_api_version = 2.1.2
+sling_jcr_api_version = 2.5.0
+sling_jcr_resource_version = 2.5.0
 sling_resourceresolver_version = 1.0.6
 sling_rewriter_version = 1.0.4
 spock_version = 0.7-groovy-2.0
 spring_batch_version = 2.2.7.RELEASE
 spring_osgi_version = 2.0.0.M1
-spring_version = 3.1.4.RELEASE
 woodstox_version = 4.2.0

gradle/dependencies.gradle

@@ -1,3 +1,5 @@
+ext.spring_version = "3.2.9.RELEASE_1"
+
 //noinspection GroovyAssignabilityCheck
 dependencies {
     // Library for Groovy
@@ -6,32 +8,36 @@ dependencies {
     // Used as part of the build to create the OSGI-INF/serviceComponents.xml file
     compile "org.apache.felix:org.apache.felix.scr.annotations:${scr_annotations_version}"
 
-    compile "com.day.cq.workflow:cq-workflow-console:${cq_version_workflow_console}"
-
     //Google libraries
     compile "com.google.guava:guava:${guava_version}"
 
     //For annotations like @Nonnull, etc.
     compile "com.google.code.findbugs:jsr305:${jsr305_version}"
 
+    // Adobe AEM API jar files
+    compile ":cq-workflow-console:${cq_workflow_console_version}" // install into the top-level dir of project
+
     // Apache Sling libraries
     compile "org.apache.sling:org.apache.sling.api:${sling_api_version}"
-    compile "org.apache.sling:org.apache.sling.jcr.api:${sling_commons_version}"
+    // compile "org.apache.sling:org.apache.sling.jcr.api:${sling_commons_version}"
+    compile "org.apache.sling:org.apache.sling.jcr.resource:${sling_jcr_resource_version}"
 
     // Apache Felix libraries
     compile "org.apache.felix:org.osgi.core:${felix_osgi_version}"
     compile "org.apache.felix:org.osgi.compendium:${felix_osgi_version}"
 
-    compile "joda-time:joda-time:${joda_time_version}"
+    compile "joda-time:joda-time:1.6.2"
 
     // Need the "javax.jms" library for Spring JMS
     compile "org.glassfish:javax.jms:${jms_version}"
 
     // Working with the JCR
     compile "javax.jcr:jcr:${jcr_version}"
     compile "org.apache.jackrabbit:jackrabbit-jcr-commons:${jackrabbit_version}"
+    compile "org.apache.sling:org.apache.sling.jcr.api:${sling_commons_version}"
 
     // Logging
+    def slf4j_version = "1.7.6"
     compile "org.slf4j:slf4j-api:${slf4j_version}"
     compile "org.slf4j:jcl-over-slf4j:${slf4j_version}"
     runtime "ch.qos.logback:logback-classic:${logback_version}"
@@ -42,17 +48,7 @@ dependencies {
     // Servlet/JSP libraries
     compile "javax.servlet:servlet-api:${servlet_api_version}"
 
-    // Spring libraries
-    compile "org.springframework.osgi:spring-osgi-core:${spring_osgi_version}"
-    compile "org.springframework:org.springframework.context:${spring_version}"
-    compile "org.springframework:spring-oxm:${spring_version}"
-    compile "org.springframework:org.springframework.jms:${spring_version}"
-    compile "org.springframework:org.springframework.jdbc:${spring_version}"
-    compile "org.springframework.osgi:spring-osgi-extender:${spring_osgi_version}"
-
-    //This version of Spring Batch brings in transitive dependencies of Spring 3.2.9
-    //Though, the Manifest for spring-batch-core and spring-batch-infrastructure
-    //Has a range of [3.1.2, 4.0.0). Thus, excluding these transitive dependencies
+    // This version of Spring Batch brings in non-OSGi transitive dependencies, so they need to be overrriden
     compile "org.springframework.batch:spring-batch-core:${spring_batch_version}", {
         exclude group: "org.springframework", module: "spring-core"
         exclude group: "org.springframework", module: "spring-beans"
@@ -63,6 +59,23 @@ dependencies {
         exclude group: "com.thoughtworks.xstream", module: "xstream"
     }
 
+    // Spring libraries
+    compile "org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-aop:${spring_version}"
+    compile "org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-beans:${spring_version}"
+    compile "org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-core:${spring_version}"
+    compile "org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-context:${spring_version}"
+    compile "org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-tx:${spring_version}"
+    compile "org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-expression:${spring_version}"
+    compile "org.aopalliance:com.springsource.org.aopalliance:1.0.0"
+    compile "org.springframework.osgi:spring-osgi-extender:${spring_osgi_version}", {
+        exclude group: "org.springframework", module: "org.springframework.core"
+        exclude group: "org.springframework", module: "org.springframework.context"
+        exclude group: "org.springframework", module: "org.springframework.beans"
+        exclude group: "org.springframework", module: "org.springframework.asm"
+        exclude group: "org.springframework", module: "org.springframework.expression"
+        exclude group: "org.springframework", module: "org.springframework.aop"
+    }
+
     compile "org.apache.commons:commons-lang3:${commons_lang_version}"
     compile "commons-io:commons-io:${commons_io_version}"
 
@@ -83,7 +96,6 @@ dependencies {
     }
 
     compile "org.apache.servicemix.bundles:org.apache.servicemix.bundles.protobuf-java:${servicemix_protobuf_java_version}"
-
     //For cleaner mocking
     testCompile "org.objenesis:objenesis:${objenesis_version}"
 

testutils/build.gradle

@@ -12,8 +12,6 @@ dependencies {
     compile "org.codehaus.groovy:groovy-all:${groovy_version}"
     compile "org.spockframework:spock-core:${spock_version}"
 
-    compile "com.adobe.granite:com.adobe.granite.replication.core:${granite_version}"
-
     compile "javax.servlet:servlet-api:${servlet_api_version}"
 
   compile "org.apache.sling:org.apache.sling.commons.testing:${sling_commons_testing_version}", {
@@ -24,11 +22,9 @@ dependencies {
     exclude group: 'org.jmock', module: 'jmock-junit4'
     exclude group: 'rhino', module: 'js'
   }
-  compile "com.day.cq.wcm:cq-wcm-api:${cq_version}"
-  compile "com.day.cq:cq-commons:${cq_version}", {
-    exclude group: 'org.apache.commons', module: 'commons-email'
-  }
-  compile "com.day.cq:cq-tagging:${cq_version}"
+
+  compile ":cq-workflow-console:${cq_workflow_console_version}"
+
   compile "org.slf4j:slf4j-api:${slf4j_version}"
   compile "org.mockito:mockito-all:${mockito_version}"
   compile "org.apache.commons:commons-lang3:${commons_lang_version}"

testutils/gradle/testing.gradle

@@ -23,7 +23,7 @@ dependencies {
     testCompile "org.spockframework:spock-core:${spock_version}"
     testCompile "org.spockframework:spock-spring:${spock_version}"
     testCompile "org.springframework.batch:spring-batch-test:${spring_batch_version}"
-    testCompile "org.springframework:spring-test:${spring_version}"
+    testCompile "org.springframework:spring-test:3.2.9.RELEASE"
 
 
     testCompile "com.twcable.jackalope:jackalope:${jackalope_version}"