Preparing changes for release 2.0.0

* Merged changes from `development` branch
adobe · Jan 10, 2018 · 5a942c5 · 5a942c5 · yakub3k · Jun 19, 2018
1 parent c1d6a1f
commit 5a942c5
Show file tree

Hide file tree

Showing 578 changed files with 26,686 additions and 5,344 deletions.
diff --git a/Guidelines.md b/Guidelines.md
@@ -120,7 +120,6 @@ Whether the component will fit into a project that follows best practice and wil
 
 #### 5.ii. Lean
 
-- [ ] No page reload required when being dropped into a paragraph system.
 - [ ] No functionality that isn’t deemed necessary.
 - [ ] No abstraction layers that aren’t absolutely necessary.
 - [ ] No styles or scripts that are design or site specific (keep them to the bare minimum).

diff --git a/README.md b/README.md
@@ -23,19 +23,22 @@ Contributions are welcome! Read the [Contributing Guide](CONTRIBUTING.md) for mo
 ## Available Components
 
 * Page authoring components:
-  * [Page component](content/src/content/jcr_root/apps/core/wcm/components/page/v1/page)
-  * [Breadcrumb component](content/src/content/jcr_root/apps/core/wcm/components/breadcrumb/v1/breadcrumb)
-  * [Title component](content/src/content/jcr_root/apps/core/wcm/components/title/v1/title)
-  * [Text component](content/src/content/jcr_root/apps/core/wcm/components/text/v1/text)
-  * [Image component](content/src/content/jcr_root/apps/core/wcm/components/image/v1/image)
-  * [List component](content/src/content/jcr_root/apps/core/wcm/components/list/v1/list)
+  * [Page component](content/src/content/jcr_root/apps/core/wcm/components/page/v2/page)
+  * [Breadcrumb component](content/src/content/jcr_root/apps/core/wcm/components/breadcrumb/v2/breadcrumb)
+  * [Title component](content/src/content/jcr_root/apps/core/wcm/components/title/v2/title)
+  * [Text component](content/src/content/jcr_root/apps/core/wcm/components/text/v2/text)
+  * [Image component](content/src/content/jcr_root/apps/core/wcm/components/image/v2/image)
+  * [List component](content/src/content/jcr_root/apps/core/wcm/components/list/v2/list)
   * [Sharing component](content/src/content/jcr_root/apps/core/wcm/components/sharing/v1/sharing)
+  * [Navigation](content/src/content/jcr_root/apps/core/wcm/components/navigation/v1/navigation)
+  * [Language Navigation](content/src/content/jcr_root/apps/core/wcm/components/languagenavigation/v1/languagenavigation)
+  * [Quick Search](content/src/content/jcr_root/apps/core/wcm/components/search/v1/search)
 * Form components:
-  * [Form container](content/src/content/jcr_root/apps/core/wcm/components/form/container/v1/container)
-  * [Form text field](content/src/content/jcr_root/apps/core/wcm/components/form/text/v1/text)
-  * [Form options field](content/src/content/jcr_root/apps/core/wcm/components/form/options/v1/options)
-  * [Form hidden field](content/src/content/jcr_root/apps/core/wcm/components/form/hidden/v1/hidden)
-  * [Form button](content/src/content/jcr_root/apps/core/wcm/components/form/button/v1/button)
+  * [Form container](content/src/content/jcr_root/apps/core/wcm/components/form/container/v2/container)
+  * [Form text field](content/src/content/jcr_root/apps/core/wcm/components/form/text/v2/text)
+  * [Form options field](content/src/content/jcr_root/apps/core/wcm/components/form/options/v2/options)
+  * [Form hidden field](content/src/content/jcr_root/apps/core/wcm/components/form/hidden/v2/hidden)
+  * [Form button](content/src/content/jcr_root/apps/core/wcm/components/form/button/v2/button)
 
 The components' versioning scheme is documented on the [AEM Core WCM Components' versioning policies](https://github.com/Adobe-Marketing-Cloud/aem-core-wcm-components/wiki/Versioning-policies) wiki page
 
@@ -46,6 +49,7 @@ Core Components | AEM                       | Java
 1.0.0, 1.0.2    | AEM 6.3                   | 1.7
 1.0.4, 1.0.6    | AEM 6.3                   | 1.8
 1.1.0           | AEM 6.3 + FP19614 or SP 1 | 1.8
+2.0.0           | AEM 6.3 + SP1 + FP20593   | 1.8
 
 ## Installation
 
@@ -100,7 +104,7 @@ core components package into your own project maven build you can add the depend
      <groupId>com.adobe.cq</groupId>
      <artifactId>core.wcm.components.all</artifactId>
      <type>zip</type>
-     <version>1.0.4</version>
+     <version>2.0.0</version>
  </dependency>
  ```
 

diff --git a/all/pom.xml b/all/pom.xml
@@ -46,14 +46,12 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.day.jcr.vault</groupId>
-                <artifactId>content-package-maven-plugin</artifactId>
+                <groupId>org.apache.jackrabbit</groupId>
+                <artifactId>filevault-package-maven-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
-                    <verbose>true</verbose>
-                    <group>adobe/cq60</group>
-                    <failOnError>true</failOnError>
-                    <builtContentDirectory>target/${project.artifactId}</builtContentDirectory>
+                    <showImportPackageReport>false</showImportPackageReport>
+                    <embeddedTarget>/apps/core/wcm/install</embeddedTarget>
                     <embeddeds>
                         <embedded>
                             <groupId>${project.groupId}</groupId>
@@ -62,7 +60,6 @@
                             <filter>true</filter>
                         </embedded>
                     </embeddeds>
-                    <failOnMissingEmbed>true</failOnMissingEmbed>
                     <subPackages>
                         <subPackage>
                             <groupId>${project.groupId}</groupId>
@@ -77,6 +74,10 @@
                     </subPackages>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>com.day.jcr.vault</groupId>
+                <artifactId>content-package-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 

diff --git a/all/src/content/META-INF/vault/definition/.content.xml b/all/src/content/META-INF/vault/definition/.content.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Copyright 2017 Adobe Systems Incorporated
+  ~
+  ~ 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.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0"
+          jcr:primaryType="vlt:PackageDefinition"
+          providerLink="https://github.com/Adobe-Marketing-Cloud/aem-core-wcm-components/releases"
+          providerName="Adobe Systems Inc."
+          providerUrl="https://www.adobe.com"
+          testedWith="AEM 6.3">
+</jcr:root>
diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml
@@ -52,17 +52,24 @@
                 <extensions>true</extensions>
                 <executions>
                     <execution>
-                        <id>bundle-manifest</id>
-                        <phase>process-classes</phase>
+                        <id>scr-metadata</id>
                         <goals>
                             <goal>manifest</goal>
                         </goals>
+                        <configuration>
+                            <supportIncrementalBuild>true</supportIncrementalBuild>
+                        </configuration>
                     </execution>
                 </executions>
                 <configuration>
+                    <exportScr>true</exportScr>
                     <instructions>
                         <!-- The Sling-Model-Packages instruction needs to point to the implementation package -->
                         <Sling-Model-Packages>com.adobe.cq.wcm.core.components.internal.models</Sling-Model-Packages>
+                        <!-- Enable processing of OSGI DS component annotations -->
+                        <_dsannotations>*</_dsannotations>
+                        <!-- Enable processing of OSGI metatype annotations -->
+                        <_metatypeannotations>*</_metatypeannotations>
                     </instructions>
                 </configuration>
             </plugin>
@@ -116,6 +123,8 @@
                                 <!-- private enum; cannot test valueOf / values -->
                                 <exclude>**/SocialMediaHelperImpl$WebsiteMetadata$Type.class</exclude>
                                 <exclude>**/AdaptiveImageServlet$Source.class</exclude>
+                                <!-- this class has only a constant -->
+                                <exclude>**/AbstractImageDelegatingModel.class</exclude>
                             </excludes>
                         </configuration>
                     </execution>
@@ -211,11 +220,11 @@
     <dependencies>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>osgi.core</artifactId>
+            <groupId>javax.jcr</groupId>
+            <artifactId>jcr</artifactId>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
@@ -226,54 +235,75 @@
             <artifactId>osgi.annotation</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.service.metatype.annotations</artifactId>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
         </dependency>
+        <!-- javax.inject 1 -->
         <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.service.component.annotations</artifactId>
+            <artifactId>geronimo-atinject_1.0_spec</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
         </dependency>
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
         </dependency>
         <dependency>
-            <groupId>biz.aQute</groupId>
-            <artifactId>bndlib</artifactId>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
+            <groupId>org.apache.jackrabbit</groupId>
+            <artifactId>jackrabbit-jcr-commons</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.models.api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4</artifactId>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.commons.osgi</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.adobe.cq</groupId>
+            <artifactId>com.adobe.cq.export.json</artifactId>
+            <version>0.0.12</version>
+            <scope>provided</scope>
         </dependency>
 
+        <!-- Testing dependencies -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>core.wcm.components.junit.core</artifactId>
+            <scope>test</scope>
+            <version>${project.version}</version>
+        </dependency>
         <!-- for testing we need the new ResourceTypeBasedResourcePicker -->
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.models.impl</artifactId>
             <version>1.4.4</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>io.wcm</groupId>
             <artifactId>io.wcm.testing.aem-mock</artifactId>
@@ -284,29 +314,17 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.models.api</artifactId>
-            <version>1.3.6</version>
-            <scope>provided</scope>
+            <artifactId>org.apache.sling.testing.sling-mock</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.models.jacksonexporter</artifactId>
-            <version>1.0.4</version>
-            <scope>provided</scope>
+            <artifactId>org.apache.sling.servlet-helpers</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.i18n</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -315,20 +333,41 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>core.wcm.components.junit.core</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
             <scope>test</scope>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>javax.servlet.jsp</groupId>
-            <artifactId>jsp-api</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>20.0</version>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+        </dependency>
         <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.10</version>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-junit4</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-mockito</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.javassist</groupId>
+            <artifactId>javassist</artifactId>
+            <version>3.18.2-GA</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -339,9 +378,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.2</version>
+            <groupId>javax.servlet.jsp</groupId>
+            <artifactId>jsp-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -350,23 +388,11 @@
             <version>1.1.0</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.testing.clients</artifactId>
-            <version>1.1.4</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.adobe.aem</groupId>
             <artifactId>uber-jar</artifactId>
             <classifier>apis</classifier>
         </dependency>
-        <dependency>
-            <groupId>com.adobe.cq</groupId>
-            <artifactId>com.adobe.cq.export.json</artifactId>
-            <version>0.0.12</version>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 
 </project>