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 2020/10/03 10:22:06 UTC
[sling-org-apache-sling-scripting-freemarker] branch master updated
(b42f72e -> 919a46d)
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 b42f72e SLING-9789 Silence the incompatible improvements error (checkCurrentVersionNotRecycled)
new 3188ab7 style
new a5d141f SLING-9790 Update to Sling Bundle Parent 39
new 919a46d SLING-9791 Update Pax Exam to 4.13.4
The 3 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:
pom.xml | 6 +++---
.../apache/sling/scripting/freemarker/internal/AdaptToMethod.java | 2 +-
.../sling/scripting/freemarker/internal/IncludeDirective.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
[sling-org-apache-sling-scripting-freemarker] 02/03: SLING-9790
Update to Sling Bundle Parent 39
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 a5d141f8d575e7e749f6a0bc0cba65fc67169ae6
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Oct 3 12:18:37 2020 +0200
SLING-9790 Update to Sling Bundle Parent 39
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 921b7b1..677423d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-bundle-parent</artifactId>
- <version>38</version>
+ <version>39</version>
<relativePath />
</parent>
[sling-org-apache-sling-scripting-freemarker] 03/03: SLING-9791
Update Pax Exam to 4.13.4
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 919a46dca2bb347e74d1e2b770dd05c08cc05f1d
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Oct 3 12:21:49 2020 +0200
SLING-9791 Update Pax Exam to 4.13.4
Update Pax Exam to 4.13.4 and jsoup to 1.13.1
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 677423d..e668413 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
<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.3</org.ops4j.pax.exam.version>
+ <org.ops4j.pax.exam.version>4.13.4</org.ops4j.pax.exam.version>
</properties>
<scm>
@@ -254,7 +254,7 @@
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
- <version>1.11.3</version>
+ <version>1.13.1</version>
<scope>test</scope>
</dependency>
<!-- logging -->
[sling-org-apache-sling-scripting-freemarker] 01/03: style
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 3188ab78acdff4fbaea197d8e9b138f1d00cc502
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Oct 3 12:05:56 2020 +0200
style
---
.../org/apache/sling/scripting/freemarker/internal/AdaptToMethod.java | 2 +-
.../apache/sling/scripting/freemarker/internal/IncludeDirective.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/sling/scripting/freemarker/internal/AdaptToMethod.java b/src/main/java/org/apache/sling/scripting/freemarker/internal/AdaptToMethod.java
index b9c46cc..5c57307 100644
--- a/src/main/java/org/apache/sling/scripting/freemarker/internal/AdaptToMethod.java
+++ b/src/main/java/org/apache/sling/scripting/freemarker/internal/AdaptToMethod.java
@@ -44,7 +44,7 @@ public class AdaptToMethod implements TemplateMethodModelEx {
@Reference
private DynamicClassLoaderManager dynamicClassLoaderManager;
- public AdaptToMethod() {
+ public AdaptToMethod() { //
}
@Override
diff --git a/src/main/java/org/apache/sling/scripting/freemarker/internal/IncludeDirective.java b/src/main/java/org/apache/sling/scripting/freemarker/internal/IncludeDirective.java
index 94eda67..b9ae37b 100644
--- a/src/main/java/org/apache/sling/scripting/freemarker/internal/IncludeDirective.java
+++ b/src/main/java/org/apache/sling/scripting/freemarker/internal/IncludeDirective.java
@@ -64,7 +64,7 @@ public class IncludeDirective implements TemplateDirectiveModel {
private final Logger logger = LoggerFactory.getLogger(IncludeDirective.class);
- public IncludeDirective() {
+ public IncludeDirective() { //
}
@Override