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/05/12 14:18:42 UTC

[sling-samples] branch master updated (4a9382d -> b58f1a0)

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-samples.git.


    from 4a9382d  Feature Model Example
     new 11f7713  update Scripting Thymeleaf to latest snapshot
     new b58f1a0  SLING-7353 Update to Sling Parent 33

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:
 fling/pom.xml | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
olli@apache.org.

[sling-samples] 02/02: SLING-7353 Update to Sling Parent 33

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-samples.git

commit b58f1a00083edd0ff759327428fae80c0fdf212c
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat May 12 16:18:32 2018 +0200

    SLING-7353 Update to Sling Parent 33
---
 fling/pom.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/fling/pom.xml b/fling/pom.xml
index 04f69d1..0d0ec76 100644
--- a/fling/pom.xml
+++ b/fling/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.sling</groupId>
     <artifactId>sling</artifactId>
-    <version>30</version>
+    <version>33</version>
     <relativePath/>
   </parent>
 
@@ -63,13 +63,11 @@
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.service.component.annotations</artifactId>
-      <version>1.3.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.service.metatype.annotations</artifactId>
-      <version>1.3.0</version>
       <scope>provided</scope>
     </dependency>
     <!-- Apache Commons -->
@@ -176,8 +174,6 @@
             <Sling-Model-Packages>
               org.apache.sling.samples.fling.page
             </Sling-Model-Packages>
-            <_dsannotations>*</_dsannotations>
-            <_metatypeannotations>*</_metatypeannotations>
             <_removeheaders>
               Embed-Dependency,
               Private-Package,

-- 
To stop receiving notification emails like this one, please contact
olli@apache.org.

[sling-samples] 01/02: update Scripting Thymeleaf to latest snapshot

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-samples.git

commit 11f77131125bcb32314e361c6e15e33c80d17f4c
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat May 12 16:13:46 2018 +0200

    update Scripting Thymeleaf to latest snapshot
---
 fling/pom.xml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/fling/pom.xml b/fling/pom.xml
index 1da412a..04f69d1 100644
--- a/fling/pom.xml
+++ b/fling/pom.xml
@@ -113,7 +113,7 @@
     <dependency>
       <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.scripting.thymeleaf</artifactId>
-      <version>1.1.0</version>
+      <version>2.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -129,13 +129,6 @@
       <version>2.12.2</version>
       <scope>provided</scope>
     </dependency>
-    <!-- Thymeleaf -->
-    <dependency>
-      <groupId>org.thymeleaf</groupId>
-      <artifactId>thymeleaf</artifactId>
-      <version>3.0.3.RELEASE</version>
-      <scope>provided</scope>
-    </dependency>
     <!-- SubEtha SMTP -->
     <dependency>
       <groupId>org.subethamail</groupId>

-- 
To stop receiving notification emails like this one, please contact
olli@apache.org.