Skip to content

Commit

Permalink
Merge branch 'master' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
vladbailescu committed Jul 21, 2020
2 parents 3225b47 + 0bc50a9 commit b179741
Show file tree
Hide file tree
Showing 32 changed files with 142 additions and 41 deletions.
4 changes: 3 additions & 1 deletion README.md
Expand Up @@ -96,7 +96,9 @@ For existing projects, take example from the [AEM Project Archetype](https://git

Core Components | AEM as a Cloud Service | AEM 6.5 | AEM 6.4 | Java SE | Maven
----------------|------------------------|---------|---------|---------|---------
[2.10.0](https://github.com/adobe/aem-core-wcm-components/releases/tag/core.wcm.components.reactor-2.10.0) | Continual | 6.5.5.0+ | 6.4.8.1+ | 8, 11 | 3.3.9+
[2.11.0](https://github.com/adobe/aem-core-wcm-components/releases/tag/core.wcm.components.reactor-2.11.0) | Continual | 6.5.5.0+ (*) | 6.4.8.1+ (*) | 8, 11 | 3.3.9+

(*) - Version 2.11.0 requires `org.apache.sling.models.impl` version 1.4.12 or higher (because of [SLING-8781](https://issues.apache.org/jira/browse/SLING-8781)). This will be provided for AEM 6.4 and 6.5 in a future Service Pack. Until then, the Sling Models bundle is included in the `core.wcm.components.all` package.

For the requirements from previous Core Component releases, see [Historical System Requirements](VERSIONS.md).

Expand Down
1 change: 1 addition & 0 deletions VERSIONS.md
Expand Up @@ -4,6 +4,7 @@ See below for a full list of system requirements for historical versions of the

Core Components | Extension | AEM 6.5 | AEM 6.4 | AEM 6.3 | Java
----------------|-----------|---------|---------|---------|------
[2.11.0](https://github.com/adobe/aem-core-wcm-components/releases/tag/core.wcm.components.reactor-2.11.0) | Continual | 6.5.5.0+ | 6.4.8.1+ | 8, 11 | 3.3.9+
[2.10.0](https://github.com/adobe/aem-core-wcm-components/releases/tag/core.wcm.components.reactor-2.10.0) | - | 6.5.5.0+ | 6.4.8.1+ | - | 8, 11
[2.9.0](https://github.com/adobe/aem-core-wcm-components/releases/tag/core.wcm.components.reactor-2.9.0) | - | 6.5.4.0+ | 6.4.8.0+ | - | 8, 11
[2.8.0](https://github.com/adobe/aem-core-wcm-components/releases/tag/core.wcm.components.reactor-2.8.0) | - | 6.5.0.0+ | 6.4.4.0+ | 6.3.3.4+ | 8, 11
Expand Down
14 changes: 12 additions & 2 deletions all/pom.xml
Expand Up @@ -23,15 +23,15 @@
<parent>
<artifactId>core.wcm.components.parent</artifactId>
<groupId>com.adobe.cq</groupId>
<version>2.10.1-SNAPSHOT</version>
<version>2.11.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>

<!-- ====================================================================== -->
<!-- P R O J E C T D E S C R I P T I O N -->
<!-- ====================================================================== -->
<artifactId>core.wcm.components.all</artifactId>
<version>2.10.1-SNAPSHOT</version>
<version>2.11.1-SNAPSHOT</version>
<packaging>content-package</packaging>

<name>Adobe Experience Manager Core WCM Components Full Package</name>
Expand All @@ -56,6 +56,11 @@
<artifactId>core.wcm.components.extensions.amp</artifactId>
<target>/apps/core/wcm/install</target>
</embedded>
<embedded>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.models.impl</artifactId>
<target>/apps/core/wcm/install</target>
</embedded>
</embeddeds>
<subPackages>
<subPackage>
Expand Down Expand Up @@ -179,5 +184,10 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.models.impl</artifactId>
<version>1.4.12</version>
</dependency>
</dependencies>
</project>
4 changes: 2 additions & 2 deletions bundles/core/pom.xml
Expand Up @@ -23,12 +23,12 @@
<parent>
<groupId>com.adobe.cq</groupId>
<artifactId>core.wcm.components.parent</artifactId>
<version>2.10.1-SNAPSHOT</version>
<version>2.11.1-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>

<artifactId>core.wcm.components.core</artifactId>
<version>2.10.1-SNAPSHOT</version>
<version>2.11.1-SNAPSHOT</version>
<packaging>bundle</packaging>

<name>Adobe Experience Manager Core WCM Components Core Bundle</name>
Expand Down
4 changes: 2 additions & 2 deletions config/pom.xml
Expand Up @@ -23,15 +23,15 @@
<parent>
<groupId>com.adobe.cq</groupId>
<artifactId>core.wcm.components.parent</artifactId>
<version>2.10.1-SNAPSHOT</version>
<version>2.11.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>

<!-- ====================================================================== -->
<!-- P R O J E C T D E S C R I P T I O N -->
<!-- ====================================================================== -->
<artifactId>core.wcm.components.config</artifactId>
<version>2.10.1-SNAPSHOT</version>
<version>2.11.1-SNAPSHOT</version>
<packaging>content-package</packaging>

<name>Adobe Experience Manager Core WCM Components Configurations</name>
Expand Down
2 changes: 1 addition & 1 deletion config/src/content/META-INF/vault/filter.xml
Expand Up @@ -15,6 +15,6 @@
~ limitations under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
<workspaceFilter version="1.0">
<filter root="/apps/core/wcm/config" mode="merge"/>
<filter root="/apps/core/wcm/config"/>
<filter root="/apps/core/wcm/config.author"/>
</workspaceFilter>
2 changes: 1 addition & 1 deletion content/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion content/package.json
@@ -1,6 +1,6 @@
{
"name": "com.adobe.cq.core.wcm.components.content",
"version": "2.10.1-SNAPSHOT",
"version": "2.11.1-SNAPSHOT",
"description": "Adobe Experience Manager Core WCM Components Content Package",
"license": "Apache-2.0",
"private": false,
Expand Down
4 changes: 2 additions & 2 deletions content/pom.xml
Expand Up @@ -23,15 +23,15 @@
<parent>
<groupId>com.adobe.cq</groupId>
<artifactId>core.wcm.components.parent</artifactId>
<version>2.10.1-SNAPSHOT</version>
<version>2.11.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>

<!-- ====================================================================== -->
<!-- P R O J E C T D E S C R I P T I O N -->
<!-- ====================================================================== -->
<artifactId>core.wcm.components.content</artifactId>
<version>2.10.1-SNAPSHOT</version>
<version>2.11.1-SNAPSHOT</version>
<packaging>content-package</packaging>
<name>Adobe Experience Manager Core WCM Components Content Package</name>

Expand Down
4 changes: 2 additions & 2 deletions examples/pom.xml
Expand Up @@ -23,12 +23,12 @@
<parent>
<groupId>com.adobe.cq</groupId>
<artifactId>core.wcm.components.parent</artifactId>
<version>2.10.1-SNAPSHOT</version>
<version>2.11.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>

<artifactId>core.wcm.components.examples</artifactId>
<version>2.10.1-SNAPSHOT</version>
<version>2.11.1-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Adobe Experience Manager Core WCM Components Examples Reactor</name>
Expand Down
4 changes: 2 additions & 2 deletions examples/ui.apps/pom.xml
Expand Up @@ -23,15 +23,15 @@
<parent>
<groupId>com.adobe.cq</groupId>
<artifactId>core.wcm.components.parent</artifactId>
<version>2.10.1-SNAPSHOT</version>
<version>2.11.1-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>

<!-- ====================================================================== -->
<!-- P R O J E C T D E S C R I P T I O N -->
<!-- ====================================================================== -->
<artifactId>core.wcm.components.examples.ui.apps</artifactId>
<version>2.10.1-SNAPSHOT</version>
<version>2.11.1-SNAPSHOT</version>
<packaging>content-package</packaging>
<name>Adobe Experience Manager Core WCM Components Examples Application Package</name>

Expand Down
Expand Up @@ -18,5 +18,5 @@
jcr:description="PDF Viewer Component for the Core Components Library"
jcr:primaryType="cq:Component"
jcr:title="PDF Viewer"
sling:resourceSuperType="core/wcm/components/pdfviewer/v1/pdfviewer"
sling:resourceSuperType="core/wcm/extensions/amp/components/pdfviewer/v1/pdfviewer"
componentGroup="Core Components Examples"/>
4 changes: 2 additions & 2 deletions examples/ui.content/pom.xml
Expand Up @@ -23,15 +23,15 @@
<parent>
<groupId>com.adobe.cq</groupId>
<artifactId>core.wcm.components.parent</artifactId>
<version>2.10.1-SNAPSHOT</version>
<version>2.11.1-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>

<!-- ====================================================================== -->
<!-- P R O J E C T D E S C R I P T I O N -->
<!-- ====================================================================== -->
<artifactId>core.wcm.components.examples.ui.content</artifactId>
<version>2.10.1-SNAPSHOT</version>
<version>2.11.1-SNAPSHOT</version>
<packaging>content-package</packaging>
<name>Adobe Experience Manager Core WCM Components Examples Content Package</name>

Expand Down
Expand Up @@ -141,7 +141,7 @@
jcr:lastModifiedBy="admin"
jcr:primaryType="nt:unstructured"
sling:resourceType="core/wcm/components/text/v2/text"
text="&lt;p>Built with &lt;a href=&quot;https://github.com/adobe/aem-core-wcm-components/releases/tag/core.wcm.components.reactor-2.10.0&quot;>Core Components 2.10.0&lt;/a>.&lt;/p>&#xa;"
text="&lt;p>Built with &lt;a href=&quot;https://github.com/adobe/aem-core-wcm-components/releases/tag/core.wcm.components.reactor-2.11.0&quot;>Core Components 2.11.0&lt;/a>.&lt;/p>&#xa;"
textIsRich="true"/>
</responsivegrid_2176569853>
</root>
Expand Down
Expand Up @@ -26,7 +26,7 @@
jcr:lastModifiedBy="admin"
jcr:primaryType="nt:unstructured"
sling:resourceType="core/wcm/components/text/v2/text"
text="&lt;h1>Component Library &lt;a href=&quot;https://github.com/adobe/aem-core-wcm-components/releases/tag/core.wcm.components.reactor-2.10.0&quot;>2.10.0&lt;/a>&lt;/h1>&#xa;"
text="&lt;h1>Component Library &lt;a href=&quot;https://github.com/adobe/aem-core-wcm-components/releases/tag/core.wcm.components.reactor-2.11.0&quot;>2.11.0&lt;/a>&lt;/h1>&#xa;"
textIsRich="true"/>
<text
cq:styleIds="[1544762734201]"
Expand Down
14 changes: 10 additions & 4 deletions extensions/amp/bundle/pom.xml
Expand Up @@ -23,12 +23,12 @@
<parent>
<groupId>com.adobe.cq</groupId>
<artifactId>core.wcm.components.parent</artifactId>
<version>2.10.1-SNAPSHOT</version>
<version>2.11.1-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>

<artifactId>core.wcm.components.extensions.amp</artifactId>
<version>2.10.1-SNAPSHOT</version>
<version>2.11.1-SNAPSHOT</version>
<packaging>bundle</packaging>

<name>Adobe Experience Manager Core WCM Components AMP Extension Bundle</name>
Expand Down Expand Up @@ -66,12 +66,18 @@
<configuration>
<exportScr>true</exportScr>
<instructions>
<!-- Enable registration of Sling Models classes via bnd plugin -->
<_plugin>org.apache.sling.bnd.models.ModelsScannerPlugin</_plugin>
<_plugin>
<!-- Enable registration of Sling Models classes via bnd plugin -->
org.apache.sling.bnd.models.ModelsScannerPlugin
</_plugin>
<!-- Enable processing of OSGI DS component annotations -->
<_dsannotations>*</_dsannotations>
<!-- Enable processing of OSGI metatype annotations -->
<_metatypeannotations>*</_metatypeannotations>
<Import-Package>
javax.annotation;version=0.0.0,
*
</Import-Package>
</instructions>
</configuration>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp/content/package.json
@@ -1,6 +1,6 @@
{
"name": "core.wcm.components.extensions.amp-content",
"version": "2.9.1-SNAPSHOT",
"version": "2.11.1-SNAPSHOT",
"description": "Adobe Experience Manager Core WCM Components AMP Extension Content Package",
"license": "Apache-2.0",
"private": false,
Expand Down
4 changes: 2 additions & 2 deletions extensions/amp/content/pom.xml
Expand Up @@ -23,15 +23,15 @@
<parent>
<groupId>com.adobe.cq</groupId>
<artifactId>core.wcm.components.parent</artifactId>
<version>2.10.1-SNAPSHOT</version>
<version>2.11.1-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>

<!-- ====================================================================== -->
<!-- P R O J E C T D E S C R I P T I O N -->
<!-- ====================================================================== -->
<artifactId>core.wcm.components.extensions.amp.content</artifactId>
<version>2.10.1-SNAPSHOT</version>
<version>2.11.1-SNAPSHOT</version>
<packaging>content-package</packaging>
<name>Adobe Experience Manager Core WCM Components AMP Extension Content Package</name>

Expand Down
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
jcr:mixinTypes="[rep:AccessControllable]"
jcr:primaryType="sling:Folder"/>
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
cq:icon="adobeDocumentCloud"
jcr:description="Embed PDF Viewer for Document Cloud."
jcr:primaryType="cq:Component"
jcr:title="PDF Viewer (AMP v1)"
sling:resourceSuperType="core/wcm/components/pdfviewer/v1/pdfviewer"
componentGroup=".core-wcm-ext-amp"/>
@@ -0,0 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
jcr:primaryType="sling:Folder"/>
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
jcr:primaryType="cq:ClientLibraryFolder"
allowProxy="{Boolean}true"
categories="[core.wcm.components.pdfviewer.v1.amp]"/>
@@ -0,0 +1,19 @@
###############################################################################
# Copyright 2020 Adobe
#
# 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.
###############################################################################

#base=css

pdfviewer.less
@@ -0,0 +1,28 @@
/*
* Copyright 2020 Adobe
*
* 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.
*/

.cmp-pdfviewer__content {
height: 500px;
}

.cmp-pdfviewer__full-window-borderless {
height: 100vh;
position: fixed;
width: 100vw;
top: 0;
left: 0;
z-index: 9999;
}
@@ -0,0 +1,16 @@
<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ Copyright 2020 Adobe
~
~ 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.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
<sly data-sly-use.clientlibs="${'com.adobe.cq.wcm.core.components.models.ClientLibraries' @ categories='core.wcm.components.pdfviewer.v1', async=true}">${clientlibs.jsIncludes @ context="unsafe"}</sly>
4 changes: 2 additions & 2 deletions extensions/amp/pom.xml
Expand Up @@ -23,12 +23,12 @@
<parent>
<groupId>com.adobe.cq</groupId>
<artifactId>core.wcm.components.parent</artifactId>
<version>2.10.1-SNAPSHOT</version>
<version>2.11.1-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>

<artifactId>core.wcm.components.extensions.amp.reactor</artifactId>
<version>2.10.1-SNAPSHOT</version>
<version>2.11.1-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Adobe Experience Manager Core WCM Components AMP Extension Reactor</name>
Expand Down
2 changes: 1 addition & 1 deletion parent/pom.xml
Expand Up @@ -19,7 +19,7 @@
<groupId>com.adobe.cq</groupId>
<artifactId>core.wcm.components.parent</artifactId>
<packaging>pom</packaging>
<version>2.10.1-SNAPSHOT</version>
<version>2.11.1-SNAPSHOT</version>

<name>Adobe Experience Manager Core WCM Components Parent</name>
<description>A set of standardized components for AEM 6.3+ that can be used to speed up development of websites.</description>
Expand Down

0 comments on commit b179741

Please sign in to comment.