[sling-org-apache-sling-app-cms] 02/02: SLING-11080 - Updating to use Java 11 as the base version, building with 11/17 and updating to the latest parent

[dk...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git

commit 27ef20b062cf4c1703ffb274d715737dc38d90e3
Author: Dan Klco <kl...@adobe.com>
AuthorDate: Thu Jan 20 22:15:57 2022 -0500

    SLING-11080 - Updating to use Java 11 as the base version, building with 11/17 and updating to the latest parent
---
 .sling-module.json | 5 +++++
 pom.xml            | 7 ++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.sling-module.json b/.sling-module.json
new file mode 100644
index 0000000..2026d55
--- /dev/null
+++ b/.sling-module.json
@@ -0,0 +1,5 @@
+{
+    "jenkins": {
+        "jdks": [11,17]
+    }
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 983b820..13ec543 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.apache.sling</groupId>
     <artifactId>sling-bundle-parent</artifactId>
-    <version>43</version>
+    <version>46</version>
   </parent>
   <artifactId>org.apache.sling.cms</artifactId>
   <name>Apache Sling - CMS</name>
@@ -25,8 +25,9 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <sling.cms.java.version>11</sling.cms.java.version>
-    <maven.compiler.source>1.${sling.cms.java.version}</maven.compiler.source>
+    <maven.compiler.source>${sling.cms.java.version}</maven.compiler.source>
     <maven.compiler.target>${maven.compiler.source}</maven.compiler.target>
+    <project.build.outputTimestamp>10</project.build.outputTimestamp>
     <!-- Common Versions -->
     <cms-version>${project.parent.version}</cms-version>
     <asm-version>9.2</asm-version>
@@ -428,7 +429,7 @@
           <configuration>
             <signature>
               <groupId>org.codehaus.mojo.signature</groupId>
-              <artifactId>java1${sling.cms.java.version}</artifactId>
+              <artifactId>java${sling.cms.java.version}</artifactId>
               <version>1.0</version>
             </signature>
           </configuration>