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 2018/09/07 17:02:09 UTC
[sling-org-apache-sling-scripting-freemarker] branch master updated
(77549f9 -> 551b18c)
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 77549f9 SLING-7749 Stabilize integration tests by waiting for SlingScriptAdapterFactory
new cc6d78d SLING-7892 Update to Sling Parent 34
new 551b18c SLING-7893 Update Pax Exam to 4.12.0
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:
bnd.bnd | 10 ----------
pom.xml | 4 ++--
2 files changed, 2 insertions(+), 12 deletions(-)
[sling-org-apache-sling-scripting-freemarker] 01/02: SLING-7892
Update to Sling Parent 34
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 cc6d78dc39508399dc380289626e9ce5c05ad8a5
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Sep 7 18:51:13 2018 +0200
SLING-7892 Update to Sling Parent 34
---
bnd.bnd | 10 ----------
pom.xml | 2 +-
2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
index 669351e..5ad716a 100644
--- a/bnd.bnd
+++ b/bnd.bnd
@@ -1,13 +1,3 @@
-Bundle-Category: sling
-
-Bundle-Description: ${project.description}
-
-Bundle-DocURL: https://sling.apache.org
-
-Bundle-License: Apache License, Version 2.0
-
-Bundle-Vendor: The Apache Software Foundation
-
ScriptEngine-Name: ${project.name}
ScriptEngine-Version: ${project.version}
diff --git a/pom.xml b/pom.xml
index 35a78d7..4cb144d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>33</version>
+ <version>34</version>
<relativePath/>
</parent>
[sling-org-apache-sling-scripting-freemarker] 02/02: SLING-7893
Update Pax Exam to 4.12.0
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 551b18c808a6eb81c182c2e9817193c02599a47a
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Sep 7 18:53:38 2018 +0200
SLING-7893 Update Pax Exam to 4.12.0
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 4cb144d..14c00ed 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.11.0</org.ops4j.pax.exam.version>
+ <org.ops4j.pax.exam.version>4.12.0</org.ops4j.pax.exam.version>
</properties>
<scm>