Skip to content

Commit

Permalink
Merge pull request #65 from merkle-open/6.5/develop
Browse files Browse the repository at this point in the history
6.5/develop
  • Loading branch information
MichaelHeil authored May 31, 2024
2 parents 601b668 + da8d884 commit 1e8e4d0
Show file tree
Hide file tree
Showing 16 changed files with 6 additions and 9 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Touch UI which lets you create a generic multifield in a dialog.
|------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| CI master | [![release and deploy](https://github.com/merkle-open/aem-generic-multifield/actions/workflows/release-and-deploy-release.yml/badge.svg?branch=6.5%2Fmaster)](https://github.com/merkle-open/aem-generic-multifield/actions/workflows/release-and-deploy-release.yml) |
| CI develop | [![deploy snapshot](https://github.com/merkle-open/aem-generic-multifield/actions/workflows/deploy-snapshot.yml/badge.svg?branch=6.5%2Fdevelop)](https://github.com/merkle-open/aem-generic-multifield/actions/workflows/deploy-snapshot.yml) |
| Dependency | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.namics.oss.aem/genericmultifield/badge.svg?version=3.2.0)](https://search.maven.org/artifact/com.namics.oss.aem/genericmultifield/3.2.0/bundle) |
| Dependency | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.namics.oss.aem/genericmultifield/badge.svg?version=3.2.1)](https://search.maven.org/artifact/com.namics.oss.aem/genericmultifield/3.2.1/bundle) |

<!-- TOC -->
* [Generic Multifield for AEM 6.5](#generic-multifield-for-aem-65)
Expand All @@ -34,7 +34,7 @@ Touch UI which lets you create a generic multifield in a dialog.
<dependency>
<groupId>com.namics.oss.aem</groupId>
<artifactId>genericmultifield</artifactId>
<version>3.2.0</version>
<version>3.2.1</version>
</dependency>
```

Expand Down Expand Up @@ -77,7 +77,7 @@ Example usage of the Generic Multifield in your component `_cq_dialog.xml` defin
name="./title"/>
<genericmultifield
jcr:primaryType="nt:unstructured"
sling:resourceType="merkle/genericmultifield"
sling:resourceType="namics/genericmultifield"
itemDialog="/your/project/path/component/item-dialog.xml"
fieldLabel="Generic Multifield"
fieldDescription="A list of generic multfield items"
Expand Down
9 changes: 3 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<groupId>com.namics.oss.aem</groupId>
<artifactId>genericmultifield</artifactId>
<packaging>bundle</packaging>
<version>3.2.0</version>
<version>3.2.1-SNAPSHOT</version>
<name>Generic Multi-field for AEM 6.5</name>
<description>com.namics.oss.aem - Generic Multi-field for AEM 6.5</description>
<url>https://github.com/merkle-open/aem-generic-multifield</url>
Expand Down Expand Up @@ -37,9 +37,6 @@

<maven.build.timestamp.format>yyyy-MM-dd-z-HH-mm-ss</maven.build.timestamp.format>
<git.build.time>${maven.build.timestamp}</git.build.time>
<git.branch>unknown</git.branch>
<git.commit.id>unknown</git.commit.id>
<git.commit.time>unknown</git.commit.time>
<java.version>11</java.version>
<encoding>UTF-8</encoding>
<project.build.sourceEncoding>${encoding}</project.build.sourceEncoding>
Expand All @@ -64,8 +61,8 @@
<dependencies>
<dependency>
<groupId>com.adobe.aem</groupId>
<artifactId>aem-sdk-api</artifactId>
<version>2023.12.14697.20231215T125030Z-231200</version>
<artifactId>uber-jar</artifactId>
<version>6.5.18</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down

0 comments on commit 1e8e4d0

Please sign in to comment.