Skip to content

Commit

Permalink
Merge branch 'master' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
@jckautzmann
jckautzmann committed Feb 23, 2021
2 parents 7936034 + a712f27 commit 786d85d
Show file tree
Hide file tree
Showing 21 changed files with 36 additions and 36 deletions.
4 changes: 2 additions & 2 deletions all/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
<parent>
<artifactId>core.wcm.components.parent</artifactId>
<groupId>com.adobe.cq</groupId>
<version>2.14.1-SNAPSHOT</version>
<version>2.15.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.14.1-SNAPSHOT</version>
<version>2.15.1-SNAPSHOT</version>
<packaging>content-package</packaging>

<name>Adobe Experience Manager Core WCM Components Full Package</name>
Expand Down
4 changes: 2 additions & 2 deletions bundles/core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
<parent>
<groupId>com.adobe.cq</groupId>
<artifactId>core.wcm.components.parent</artifactId>
<version>2.14.1-SNAPSHOT</version>
<version>2.15.1-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>

<artifactId>core.wcm.components.core</artifactId>
<version>2.14.1-SNAPSHOT</version>
<version>2.15.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
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
<parent>
<groupId>com.adobe.cq</groupId>
<artifactId>core.wcm.components.parent</artifactId>
<version>2.14.1-SNAPSHOT</version>
<version>2.15.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.14.1-SNAPSHOT</version>
<version>2.15.1-SNAPSHOT</version>
<packaging>content-package</packaging>

<name>Adobe Experience Manager Core WCM Components Configurations</name>
Expand Down
2 changes: 1 addition & 1 deletion content/package-lock.json
View file

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
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "com.adobe.cq.core.wcm.components.content",
"version": "2.14.1-SNAPSHOT",
"version": "2.15.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
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
<parent>
<groupId>com.adobe.cq</groupId>
<artifactId>core.wcm.components.parent</artifactId>
<version>2.14.1-SNAPSHOT</version>
<version>2.15.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.14.1-SNAPSHOT</version>
<version>2.15.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
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
<parent>
<groupId>com.adobe.cq</groupId>
<artifactId>core.wcm.components.parent</artifactId>
<version>2.14.1-SNAPSHOT</version>
<version>2.15.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>

<artifactId>core.wcm.components.examples</artifactId>
<version>2.14.1-SNAPSHOT</version>
<version>2.15.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
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
<parent>
<groupId>com.adobe.cq</groupId>
<artifactId>core.wcm.components.parent</artifactId>
<version>2.14.1-SNAPSHOT</version>
<version>2.15.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.14.1-SNAPSHOT</version>
<version>2.15.1-SNAPSHOT</version>
<packaging>content-package</packaging>
<name>Adobe Experience Manager Core WCM Components Examples Application Package</name>

Expand Down
4 changes: 2 additions & 2 deletions examples/ui.content/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
<parent>
<groupId>com.adobe.cq</groupId>
<artifactId>core.wcm.components.parent</artifactId>
<version>2.14.1-SNAPSHOT</version>
<version>2.15.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.14.1-SNAPSHOT</version>
<version>2.15.1-SNAPSHOT</version>
<packaging>content-package</packaging>
<name>Adobe Experience Manager Core WCM Components Examples Content Package</name>

Expand Down
4 changes: 2 additions & 2 deletions extensions/amp/bundle/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
<parent>
<groupId>com.adobe.cq</groupId>
<artifactId>core.wcm.components.parent</artifactId>
<version>2.14.1-SNAPSHOT</version>
<version>2.15.1-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>

<artifactId>core.wcm.components.extensions.amp</artifactId>
<version>2.14.1-SNAPSHOT</version>
<version>2.15.1-SNAPSHOT</version>
<packaging>bundle</packaging>

<name>Adobe Experience Manager Core WCM Components AMP Extension Bundle</name>
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp/content/package-lock.json
View file

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

2 changes: 1 addition & 1 deletion extensions/amp/content/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "core.wcm.components.extensions.amp-content",
"version": "2.14.1-SNAPSHOT",
"version": "2.15.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
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
<parent>
<groupId>com.adobe.cq</groupId>
<artifactId>core.wcm.components.parent</artifactId>
<version>2.14.1-SNAPSHOT</version>
<version>2.15.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.14.1-SNAPSHOT</version>
<version>2.15.1-SNAPSHOT</version>
<packaging>content-package</packaging>
<name>Adobe Experience Manager Core WCM Components AMP Extension Content Package</name>

Expand Down
4 changes: 2 additions & 2 deletions extensions/amp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
<parent>
<groupId>com.adobe.cq</groupId>
<artifactId>core.wcm.components.parent</artifactId>
<version>2.14.1-SNAPSHOT</version>
<version>2.15.1-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>

<artifactId>core.wcm.components.extensions.amp.reactor</artifactId>
<version>2.14.1-SNAPSHOT</version>
<version>2.15.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
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<groupId>com.adobe.cq</groupId>
<artifactId>core.wcm.components.parent</artifactId>
<packaging>pom</packaging>
<version>2.14.1-SNAPSHOT</version>
<version>2.15.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
4 changes: 2 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
<parent>
<groupId>com.adobe.cq</groupId>
<artifactId>core.wcm.components.parent</artifactId>
<version>2.14.1-SNAPSHOT</version>
<version>2.15.1-SNAPSHOT</version>
<relativePath>parent/pom.xml</relativePath>
</parent>

<artifactId>core.wcm.components.reactor</artifactId>
<packaging>pom</packaging>
<version>2.14.1-SNAPSHOT</version>
<version>2.15.1-SNAPSHOT</version>

<name>Adobe Experience Manager Core WCM Components Reactor</name>

Expand Down
4 changes: 2 additions & 2 deletions testing/it/e2e/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
<parent>
<groupId>com.adobe.cq</groupId>
<artifactId>core.wcm.components.parent</artifactId>
<version>2.14.1-SNAPSHOT</version>
<version>2.15.1-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>

<groupId>com.adobe.cq</groupId>
<artifactId>core.wcm.components.it.e2e</artifactId>
<version>2.14.1-SNAPSHOT</version>
<version>2.15.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Core Components End-to-End Tests</name>

Expand Down
4 changes: 2 additions & 2 deletions testing/it/http/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.adobe.cq</groupId>
<artifactId>core.wcm.components.parent</artifactId>
<version>2.14.1-SNAPSHOT</version>
<version>2.15.1-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>

Expand All @@ -33,7 +33,7 @@
<!-- ====================================================================== -->
<groupId>com.adobe.cq</groupId>
<artifactId>core.wcm.components.it.http</artifactId>
<version>2.14.1-SNAPSHOT</version>
<version>2.15.1-SNAPSHOT</version>
<name>Core Components HTTP Integration Tests</name>

<build>
Expand Down
2 changes: 1 addition & 1 deletion testing/it/ui-js/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "com.adobe.cq.core.wcm.components.it.ui-js",
"version": "2.14.1-SNAPSHOT",
"version": "2.15.1-SNAPSHOT",
"description": "Adobe Experience Manager Core WCM Components UI End-to-End Tests",
"license": "Apache-2.0",
"private": false,
Expand Down
4 changes: 2 additions & 2 deletions testing/it/ui-js/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.adobe.cq</groupId>
<artifactId>core.wcm.components.parent</artifactId>
<version>2.14.1-SNAPSHOT</version>
<version>2.15.1-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>

Expand All @@ -34,7 +34,7 @@
<artifactId>core.wcm.components.it.ui-js</artifactId>
<packaging>content-package</packaging>
<name>Adobe Experience Manager Core WCM Components JS Tests</name>
<version>2.14.1-SNAPSHOT</version>
<version>2.15.1-SNAPSHOT</version>

<!-- ====================================================================== -->
<!-- P R O P E R T I E S -->
Expand Down
4 changes: 2 additions & 2 deletions testing/junit/core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
<parent>
<groupId>com.adobe.cq</groupId>
<artifactId>core.wcm.components.parent</artifactId>
<version>2.14.1-SNAPSHOT</version>
<version>2.15.1-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>

<artifactId>core.wcm.components.junit.core</artifactId>
<version>2.14.1-SNAPSHOT</version>
<version>2.15.1-SNAPSHOT</version>
<name>Adobe Experience Manager Core WCM Components JUnit Testing</name>

<description>Useful tools for testing HTL-based AEM components</description>
Expand Down

0 comments on commit 786d85d

Please sign in to comment.