You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2022/10/22 11:59:56 UTC
[sling-org-apache-sling-scripting-freemarker] branch master updated (c88e4ee -> 2444680)
This is an automated email from the ASF dual-hosted git repository.
olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-freemarker.git
from c88e4ee disable dependabot
new 245ec6f SLING-11646 Update to Sling Bundle Parent 49
new 2444680 build with Java 8, 11 and 17
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.sling-module.json | 9 +++++++++
pom.xml | 24 ++++--------------------
2 files changed, 13 insertions(+), 20 deletions(-)
create mode 100644 .sling-module.json
[sling-org-apache-sling-scripting-freemarker] 01/02: SLING-11646 Update to Sling Bundle Parent 49
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-freemarker.git
commit 245ec6fc7cd681b64a12c18a82500ce2c64d0ba9
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Oct 22 13:58:05 2022 +0200
SLING-11646 Update to Sling Bundle Parent 49
---
pom.xml | 24 ++++--------------------
1 file changed, 4 insertions(+), 20 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3801a10..9a649e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-bundle-parent</artifactId>
- <version>43</version>
+ <version>49</version>
<relativePath />
</parent>
@@ -35,10 +35,10 @@
<description>Support for FreeMarker scripting</description>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<sling.java.version>8</sling.java.version>
- <org.ops4j.pax.exam.version>4.13.4</org.ops4j.pax.exam.version>
+ <javadoc.excludePackageNames />
+ <project.build.outputTimestamp>1970-01-01T00:00:00Z</project.build.outputTimestamp>
+ <org.ops4j.pax.exam.version>4.13.3</org.ops4j.pax.exam.version>
</properties>
<scm>
@@ -75,21 +75,6 @@
</plugins>
</build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <!-- No javadocs -->
- <excludePackageNames>
- org.apache.sling.scripting.freemarker
- </excludePackageNames>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
<dependencies>
<!-- javax -->
<dependency>
@@ -121,7 +106,6 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.http</artifactId>
- <version>1.2.1</version>
<scope>test</scope>
</dependency>
<dependency>
[sling-org-apache-sling-scripting-freemarker] 02/02: build with Java 8, 11 and 17
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-freemarker.git
commit 24446804e8f06e74236c6877b6736fdcd3dd3e67
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Oct 22 13:59:08 2022 +0200
build with Java 8, 11 and 17
---
.sling-module.json | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/.sling-module.json b/.sling-module.json
new file mode 100644
index 0000000..c4627e9
--- /dev/null
+++ b/.sling-module.json
@@ -0,0 +1,9 @@
+{
+ "jenkins": {
+ "jdks": [
+ 17,
+ 11,
+ 8
+ ]
+ }
+}