You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/10/18 23:26:24 UTC
[sling-org-apache-sling-scripting-groovy] branch master created
(now 08173ae)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-groovy.git.
at 08173ae SLING-7167 Adjust READMEs
This branch includes the following new commits:
new 09325fc SLING-3888 - Move groovy extension bundle to contrib/scripting
new 68f210b [maven-release-plugin] prepare release org.apache.sling.scripting.groovy-1.0.0
new 834d2c3 SLING-3888 - Move groovy extension bundle to contrib/scripting
new 2850e27 groovy: version back to 1.0.0-SNAPSHOT
new 535e4df [maven-release-plugin] prepare release org.apache.sling.scripting.groovy-1.0.0
new 15d3439 [maven-release-plugin] prepare for next development iteration
new 2e67bec Update to Sling Parent POM 22 with baselining enabled
new d68b8f4 SLING-4698 - Set parent.relativePath to empty for all modules
new 695b6ac Update to latest Groovy
new 26aa6b1 add README
new a4386d1 Update contrib modules to Parent 23
new 2d9b660 set parent version to 24 and add empty relativePath where missing
new 831fd37 Update the contrib reactor to parent 25
new 553161e SLING-5377 Update Groovy to 2.4.5
new 10e5ba5 style/cleanup
new 76fe791 SLING-5377 Update Groovy to 2.4.5
new bbeaf65 SLING-5378 Use version of Groovy in GSPScriptEngineFactory for language version
new a348762 Switch to parent pom 26
new 5518de3 [maven-release-plugin] prepare release org.apache.sling.scripting.groovy-1.0.2
new bc0b14c [maven-release-plugin] prepare for next development iteration
new 0ea1d20 SLING-5556 Update Groovy to 2.4.6
new 53ccb21 SLING-5786 Update Groovy to 2.4.7
new f7a15b0 SLING-6626 Update Groovy to 2.4.9
new db26cd8 SLING-6642 Add extensions and names to GSPScriptEngineFactory's component properties
new 22184cc SLING-6656 Wrong language name in GSPScriptEngineFactory
new 08173ae SLING-7167 Adjust READMEs
The 26 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.
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].
[sling-org-apache-sling-scripting-groovy] 12/26: set parent version
to 24 and add empty relativePath where missing
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-groovy.git
commit 2d9b660aee388a834751ade8874500b2874581d6
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Jul 7 07:36:29 2015 +0000
set parent version to 24 and add empty relativePath where missing
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1689588 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 394c348..bf9e0bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>sling</artifactId>
<groupId>org.apache.sling</groupId>
- <version>23</version>
+ <version>24</version>
<relativePath/>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-groovy] 23/26: SLING-6626 Update
Groovy to 2.4.9
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-groovy.git
commit f7a15b0b139df7817b1ad15d37f77a9153c78053
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Mar 9 12:16:05 2017 +0000
SLING-6626 Update Groovy to 2.4.9
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1786151 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 138e0b2..63c464a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
<description>Support for scripting with Groovy</description>
<properties>
- <groovy.version>2.4.7</groovy.version>
+ <groovy.version>2.4.9</groovy.version>
</properties>
<scm>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-groovy] 16/26: SLING-5377 Update
Groovy to 2.4.5
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-groovy.git
commit 76fe7910b32126100584235cd354e4fbaa6d2798
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Dec 15 23:39:20 2015 +0000
SLING-5377 Update Groovy to 2.4.5
* remove optional groovy-xml
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1720275 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 6 ------
1 file changed, 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 97c62d9..a7eadd0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,12 +78,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-xml</artifactId>
- <version>${groovy.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
<scope>provided</scope>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-groovy] 10/26: add README
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-groovy.git
commit 26aa6b1abcec19c5cf9b3046529ca0a60a8e5397
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Fri May 22 15:56:08 2015 +0000
add README
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1681157 13f79535-47bb-0310-9956-ffa450edef68
---
README.md | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..f0b2410
--- /dev/null
+++ b/README.md
@@ -0,0 +1,5 @@
+Groovy scripting engine for Apache Sling
+----------------------------------------
+
+This bundle provides just the Sling bridging code, it requires the groovy-all bundle
+to be installed separately.
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-groovy] 15/26: style/cleanup
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-groovy.git
commit 10e5ba5e4e4d0ddbdf7570d097fb9e8ab00fcf81
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Dec 15 13:07:20 2015 +0000
style/cleanup
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1720151 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 145 +++++++++++++++++++++++++++++-----------------------------------
1 file changed, 66 insertions(+), 79 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4d0b791..97c62d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,67 +1,64 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>sling</artifactId>
- <groupId>org.apache.sling</groupId>
- <version>25</version>
- <relativePath/>
- </parent>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>sling</artifactId>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.scripting.groovy</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- <packaging>bundle</packaging>
+ <version>26-SNAPSHOT</version>
+ <relativePath/>
+ </parent>
+
+ <artifactId>org.apache.sling.scripting.groovy</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <packaging>bundle</packaging>
- <name>Apache Sling Scripting Groovy Support</name>
- <description>
- Support for scripting with Groovy
- </description>
+ <name>Apache Sling Scripting Groovy Support</name>
+ <description>Support for scripting with Groovy</description>
<properties>
<groovy.version>2.4.5</groovy.version>
</properties>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/groovy</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/groovy</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/groovy</url>
- </scm>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/groovy</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/groovy</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/groovy</url>
+ </scm>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </build>
- <dependencies>
+ <dependencies>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
@@ -86,33 +83,23 @@
<version>${groovy.version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.scripting.api</artifactId>
- <version>2.0.2-incubator</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.classloader</artifactId>
- <version>1.0.0</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.scripting.api</artifactId>
+ <version>2.1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.classloader</artifactId>
+ <version>1.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
</project>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-groovy] 03/26: SLING-3888 - Move
groovy extension bundle to contrib/scripting
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-groovy.git
commit 834d2c30e2295d2260a84e6ad1dcd955ee097be5
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Sep 2 17:30:29 2014 +0000
SLING-3888 - Move groovy extension bundle to contrib/scripting
Fix scm tags
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1622071 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8d757e9..a462c4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,9 +38,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.groovy-1.0.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.groovy-1.0.0</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.groovy-1.0.0</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/groovy</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/groovy</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/groovy</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-groovy] 11/26: Update contrib
modules to Parent 23
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-groovy.git
commit a4386d18dcfab21d4ff4a610f577c563184dd765
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu Jun 25 13:10:59 2015 +0000
Update contrib modules to Parent 23
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1687503 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 01e8232..394c348 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>sling</artifactId>
<groupId>org.apache.sling</groupId>
- <version>22</version>
+ <version>23</version>
<relativePath/>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-groovy] 18/26: Switch to parent
pom 26
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-groovy.git
commit a348762f43951f6f8a107e33cb8307bddaf2f16a
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sun Jan 3 14:07:46 2016 +0000
Switch to parent pom 26
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1722720 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index a7eadd0..6f1c09c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>sling</artifactId>
<groupId>org.apache.sling</groupId>
- <version>26-SNAPSHOT</version>
+ <version>26</version>
<relativePath/>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-groovy] 19/26:
[maven-release-plugin] prepare release
org.apache.sling.scripting.groovy-1.0.2
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-groovy.git
commit 5518de3d6a2c0a098aff7ff261270fd43e591e3a
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Jan 9 13:33:07 2016 +0000
[maven-release-plugin] prepare release org.apache.sling.scripting.groovy-1.0.2
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1723852 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6f1c09c..304ffdc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,11 +24,11 @@
<artifactId>sling</artifactId>
<groupId>org.apache.sling</groupId>
<version>26</version>
- <relativePath/>
+ <relativePath />
</parent>
<artifactId>org.apache.sling.scripting.groovy</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2</version>
<packaging>bundle</packaging>
<name>Apache Sling Scripting Groovy Support</name>
@@ -39,9 +39,9 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/groovy</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/groovy</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/groovy</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.groovy-1.0.2</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.groovy-1.0.2</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.groovy-1.0.2</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-groovy] 13/26: Update the contrib
reactor to parent 25
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-groovy.git
commit 831fd37cec3cf6d723b378f2061f240584fbbd54
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Oct 5 10:04:15 2015 +0000
Update the contrib reactor to parent 25
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1706781 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index bf9e0bc..e707693 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>sling</artifactId>
<groupId>org.apache.sling</groupId>
- <version>24</version>
+ <version>25</version>
<relativePath/>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-groovy] 09/26: Update to latest
Groovy
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-groovy.git
commit 695b6ac5d9d08ef40fdfbb4c59ef7882c691c6d7
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Wed May 13 10:56:31 2015 +0000
Update to latest Groovy
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1679176 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 31b47e4..01e8232 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
- <version>1.8.0</version>
+ <version>2.4.3</version>
<scope>provided</scope>
</dependency>
<dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-groovy] 22/26: SLING-5786 Update
Groovy to 2.4.7
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-groovy.git
commit 53ccb21a970f94e3f420b51963a7d84ea73445d4
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Jun 14 13:56:40 2016 +0000
SLING-5786 Update Groovy to 2.4.7
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1748415 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 839f0a5..138e0b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
<description>Support for scripting with Groovy</description>
<properties>
- <groovy.version>2.4.6</groovy.version>
+ <groovy.version>2.4.7</groovy.version>
</properties>
<scm>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-groovy] 20/26:
[maven-release-plugin] prepare for next development iteration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-groovy.git
commit bc0b14c4272c5369d4fdf55ead4b11bcea82b74b
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Jan 9 13:33:23 2016 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1723855 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 304ffdc..714e66e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>org.apache.sling.scripting.groovy</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Scripting Groovy Support</name>
@@ -39,9 +39,9 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.groovy-1.0.2</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.groovy-1.0.2</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.groovy-1.0.2</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/groovy</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/groovy</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/groovy</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-groovy] 21/26: SLING-5556 Update
Groovy to 2.4.6
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-groovy.git
commit 0ea1d2023899c4841429c6c156ddbc25f4171bf0
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Feb 24 10:06:22 2016 +0000
SLING-5556 Update Groovy to 2.4.6
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1732053 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 714e66e..839f0a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
<description>Support for scripting with Groovy</description>
<properties>
- <groovy.version>2.4.5</groovy.version>
+ <groovy.version>2.4.6</groovy.version>
</properties>
<scm>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-groovy] 01/26: SLING-3888 - Move
groovy extension bundle to contrib/scripting
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-groovy.git
commit 09325fcd7a82730a57b4c62fe8a29d1157977cdf
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Sep 2 14:18:42 2014 +0000
SLING-3888 - Move groovy extension bundle to contrib/scripting
Relocate the groovy extension bundle under contrib/scripting and also move it to the contrib reactor from the main reactor.
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1622011 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 96 ++++++++++++++++++++++
.../JsonBuilderBindingsValuesProvider.java | 46 +++++++++++
.../groovy/scripting/internal/GSPScriptEngine.java | 69 ++++++++++++++++
.../scripting/internal/GSPScriptEngineFactory.java | 68 +++++++++++++++
4 files changed, 279 insertions(+)
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..7cfa2a5
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>sling</artifactId>
+ <groupId>org.apache.sling</groupId>
+ <version>20</version>
+ <relativePath>../../../parent/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.scripting.groovy</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+
+ <name>Apache Sling Scripting Groovy Support</name>
+ <description>
+ Support for scripting with Groovy
+ </description>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/groovy</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/groovy</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/groovy</url>
+ </scm>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>1.8.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.scripting.api</artifactId>
+ <version>2.0.2-incubator</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.classloader</artifactId>
+ <version>1.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/src/main/java/org/apache/sling/scripting/groovy/json/internal/JsonBuilderBindingsValuesProvider.java b/src/main/java/org/apache/sling/scripting/groovy/json/internal/JsonBuilderBindingsValuesProvider.java
new file mode 100644
index 0000000..520f9ca
--- /dev/null
+++ b/src/main/java/org/apache/sling/scripting/groovy/json/internal/JsonBuilderBindingsValuesProvider.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.sling.scripting.groovy.json.internal;
+
+import groovy.json.JsonBuilder;
+
+import java.util.HashMap;
+
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Properties;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Service;
+
+/**
+ * BindingsValuesProvider which binds an instance of JsonBuilder.
+ */
+@SuppressWarnings("serial")
+@Component(immediate=true, metatype=false)
+@Service
+@Properties({
+ @Property(name="service.description", value="JSONGroovyBuilder BindingsValuesProvider"),
+ @Property(name="service.vendor", value="The Apache Software Foundation"),
+ @Property(name="javax.script.name", value="groovy")
+})
+public class JsonBuilderBindingsValuesProvider extends HashMap<String, Object> {
+
+ public JsonBuilderBindingsValuesProvider() {
+ super();
+ put("jsonBuilder", new JsonBuilder());
+ }
+
+}
diff --git a/src/main/java/org/apache/sling/scripting/groovy/scripting/internal/GSPScriptEngine.java b/src/main/java/org/apache/sling/scripting/groovy/scripting/internal/GSPScriptEngine.java
new file mode 100644
index 0000000..f2fca41
--- /dev/null
+++ b/src/main/java/org/apache/sling/scripting/groovy/scripting/internal/GSPScriptEngine.java
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.sling.scripting.groovy.scripting.internal;
+
+import groovy.lang.Writable;
+import groovy.text.GStringTemplateEngine;
+import groovy.text.Template;
+import groovy.text.TemplateEngine;
+
+import java.io.IOException;
+import java.io.Reader;
+
+import javax.script.Bindings;
+import javax.script.ScriptContext;
+import javax.script.ScriptEngineFactory;
+import javax.script.ScriptException;
+
+import org.apache.sling.scripting.api.AbstractSlingScriptEngine;
+
+/**
+ * The actual GSP Script Engine, which simply wraps Groovy's
+ */
+public class GSPScriptEngine extends AbstractSlingScriptEngine {
+
+ private TemplateEngine templateEngine;
+
+ public GSPScriptEngine(ScriptEngineFactory scriptEngineFactory, ClassLoader classLoader) {
+ super(scriptEngineFactory);
+ this.templateEngine = new GStringTemplateEngine(classLoader);
+ }
+
+ public Object eval(Reader reader, ScriptContext ctx) throws ScriptException {
+ Template template = null;
+ try {
+ template = templateEngine.createTemplate(reader);
+ } catch (IOException e) {
+ throw new ScriptException("Unable to compile GSP script: " + e.getMessage());
+ } catch (ClassNotFoundException e) {
+ throw new ScriptException("Unable to compile GSP script: " + e.getMessage());
+ }
+
+ Bindings bindings = ctx.getBindings(ScriptContext.ENGINE_SCOPE);
+
+ Writable result = template.make(bindings);
+
+ try {
+ result.writeTo(ctx.getWriter());
+ } catch (IOException e) {
+ throw new ScriptException("Unable to write result of script execution: " + e.getMessage());
+ }
+
+ return null;
+ }
+
+}
diff --git a/src/main/java/org/apache/sling/scripting/groovy/scripting/internal/GSPScriptEngineFactory.java b/src/main/java/org/apache/sling/scripting/groovy/scripting/internal/GSPScriptEngineFactory.java
new file mode 100644
index 0000000..b00fb97
--- /dev/null
+++ b/src/main/java/org/apache/sling/scripting/groovy/scripting/internal/GSPScriptEngineFactory.java
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.sling.scripting.groovy.scripting.internal;
+
+import java.util.Collections;
+import java.util.List;
+
+import javax.script.ScriptEngine;
+
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Properties;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.Service;
+import org.apache.sling.commons.classloader.DynamicClassLoaderManager;
+import org.apache.sling.scripting.api.AbstractScriptEngineFactory;
+
+/**
+ * Script engine for Groovy Scripting Pages.
+ */
+@Component
+@Service
+@Properties({
+ @Property(name="service.vendor", value="The Apache Software Foundation"),
+ @Property(name="service.description", value="GSP Script Engine"),
+ @Property(name="compatible.javax.script.name", value="groovy")
+})
+public class GSPScriptEngineFactory extends AbstractScriptEngineFactory {
+
+ public GSPScriptEngineFactory() {
+ setNames("gsp", "GSP");
+ }
+
+ @Reference
+ private DynamicClassLoaderManager dynamicClassLoaderManager;
+
+ public String getLanguageName() {
+ return "Groovy Scripting Pages";
+ }
+
+ @Override
+ public List<String> getExtensions() {
+ return Collections.singletonList("gsp");
+ }
+
+ public String getLanguageVersion() {
+ return "1.0";
+ }
+
+ public ScriptEngine getScriptEngine() {
+ return new GSPScriptEngine(this, dynamicClassLoaderManager.getDynamicClassLoader());
+ }
+
+}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-groovy] 25/26: SLING-6656 Wrong
language name in GSPScriptEngineFactory
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-groovy.git
commit 22184ccd174f3099c53be5f2df26acee3e8c3dfb
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Mar 16 19:36:10 2017 +0000
SLING-6656 Wrong language name in GSPScriptEngineFactory
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1787233 13f79535-47bb-0310-9956-ffa450edef68
---
.../scripting/groovy/scripting/internal/GSPScriptEngineFactory.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/sling/scripting/groovy/scripting/internal/GSPScriptEngineFactory.java b/src/main/java/org/apache/sling/scripting/groovy/scripting/internal/GSPScriptEngineFactory.java
index 883473a..bdef117 100644
--- a/src/main/java/org/apache/sling/scripting/groovy/scripting/internal/GSPScriptEngineFactory.java
+++ b/src/main/java/org/apache/sling/scripting/groovy/scripting/internal/GSPScriptEngineFactory.java
@@ -31,7 +31,7 @@ import org.apache.sling.scripting.api.AbstractScriptEngineFactory;
import org.codehaus.groovy.util.ReleaseInfo;
/**
- * Script engine for Groovy Scripting Pages.
+ * Script engine for Groovy Server Pages.
*/
@Component
@Service
@@ -52,7 +52,7 @@ public class GSPScriptEngineFactory extends AbstractScriptEngineFactory {
private DynamicClassLoaderManager dynamicClassLoaderManager;
public String getLanguageName() {
- return "Groovy Scripting Pages";
+ return "Groovy Server Pages";
}
@Override
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-groovy] 06/26:
[maven-release-plugin] prepare for next development iteration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-groovy.git
commit 15d3439c92079c9d2d1b263200c0c39e3109016f
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Sep 2 17:31:36 2014 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1622075 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8d757e9..164e2c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.groovy</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Scripting Groovy Support</name>
@@ -38,9 +38,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.groovy-1.0.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.groovy-1.0.0</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.groovy-1.0.0</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/groovy</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/groovy</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/groovy</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-groovy] 07/26: Update to Sling
Parent POM 22 with baselining enabled
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-groovy.git
commit 2e67bec3acd9a6ad0a222171709ead1f26d6e80d
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Oct 1 06:52:29 2014 +0000
Update to Sling Parent POM 22 with baselining enabled
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1628620 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 164e2c3..28208b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>sling</artifactId>
<groupId>org.apache.sling</groupId>
- <version>20</version>
+ <version>22</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-groovy] 24/26: SLING-6642 Add
extensions and names to GSPScriptEngineFactory's component properties
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-groovy.git
commit db26cd8bbcbaf00b67955ef77454c92fae7eb26a
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Mar 15 08:28:08 2017 +0000
SLING-6642 Add extensions and names to GSPScriptEngineFactory's component properties
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1786995 13f79535-47bb-0310-9956-ffa450edef68
---
.../scripting/groovy/scripting/internal/GSPScriptEngineFactory.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/main/java/org/apache/sling/scripting/groovy/scripting/internal/GSPScriptEngineFactory.java b/src/main/java/org/apache/sling/scripting/groovy/scripting/internal/GSPScriptEngineFactory.java
index e4d112f..883473a 100644
--- a/src/main/java/org/apache/sling/scripting/groovy/scripting/internal/GSPScriptEngineFactory.java
+++ b/src/main/java/org/apache/sling/scripting/groovy/scripting/internal/GSPScriptEngineFactory.java
@@ -38,6 +38,8 @@ import org.codehaus.groovy.util.ReleaseInfo;
@Properties({
@Property(name="service.vendor", value="The Apache Software Foundation"),
@Property(name="service.description", value="GSP Script Engine"),
+ @Property(name="extensions", value = {"gsp"}),
+ @Property(name="names", value = {"gsp", "GSP"}),
@Property(name="compatible.javax.script.name", value="groovy")
})
public class GSPScriptEngineFactory extends AbstractScriptEngineFactory {
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-groovy] 26/26: SLING-7167 Adjust
READMEs
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-groovy.git
commit 08173ae2c4c4b5bfe34dab51fbcec38569686901
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Oct 3 10:06:59 2017 +0000
SLING-7167 Adjust READMEs
add uniform header linking to Sling project
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1810920 13f79535-47bb-0310-9956-ffa450edef68
---
README.md | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index f0b2410..1682688 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
-Groovy scripting engine for Apache Sling
-----------------------------------------
+# Apache Sling Scripting Groovy Support
+
+This module is part of the [Apache Sling](https://sling.apache.org) project.
This bundle provides just the Sling bridging code, it requires the groovy-all bundle
to be installed separately.
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-groovy] 08/26: SLING-4698 - Set
parent.relativePath to empty for all modules
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-groovy.git
commit d68b8f433c5e053b07cf0eaf5d960f3e21053d7a
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu May 7 10:14:40 2015 +0000
SLING-4698 - Set parent.relativePath to empty for all modules
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1678154 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 28208b2..31b47e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<artifactId>sling</artifactId>
<groupId>org.apache.sling</groupId>
<version>22</version>
- <relativePath>../../../parent/pom.xml</relativePath>
+ <relativePath/>
</parent>
<groupId>org.apache.sling</groupId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-groovy] 17/26: SLING-5378 Use
version of Groovy in GSPScriptEngineFactory for language version
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-groovy.git
commit bbeaf650197adf626eda1f3e2ef7f14d9a1219e5
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Dec 16 00:33:35 2015 +0000
SLING-5378 Use version of Groovy in GSPScriptEngineFactory for language version
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1720287 13f79535-47bb-0310-9956-ffa450edef68
---
.../scripting/groovy/scripting/internal/GSPScriptEngineFactory.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/scripting/groovy/scripting/internal/GSPScriptEngineFactory.java b/src/main/java/org/apache/sling/scripting/groovy/scripting/internal/GSPScriptEngineFactory.java
index b00fb97..e4d112f 100644
--- a/src/main/java/org/apache/sling/scripting/groovy/scripting/internal/GSPScriptEngineFactory.java
+++ b/src/main/java/org/apache/sling/scripting/groovy/scripting/internal/GSPScriptEngineFactory.java
@@ -28,6 +28,7 @@ import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
import org.apache.sling.commons.classloader.DynamicClassLoaderManager;
import org.apache.sling.scripting.api.AbstractScriptEngineFactory;
+import org.codehaus.groovy.util.ReleaseInfo;
/**
* Script engine for Groovy Scripting Pages.
@@ -58,7 +59,7 @@ public class GSPScriptEngineFactory extends AbstractScriptEngineFactory {
}
public String getLanguageVersion() {
- return "1.0";
+ return ReleaseInfo.getVersion();
}
public ScriptEngine getScriptEngine() {
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-groovy] 14/26: SLING-5377 Update
Groovy to 2.4.5
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-groovy.git
commit 553161ef58adc769681d347bdb9f32790e316fb5
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Dec 15 13:04:27 2015 +0000
SLING-5377 Update Groovy to 2.4.5
* add property groovy.version 2.4.5
* use groovy, groovy-json, groovy-templates and groovy-xml instead of groovy-all
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1720149 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 34 ++++++++++++++++++++++++++++------
1 file changed, 28 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index e707693..4d0b791 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,10 @@
Support for scripting with Groovy
</description>
+ <properties>
+ <groovy.version>2.4.5</groovy.version>
+ </properties>
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/groovy</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/groovy</developerConnection>
@@ -58,12 +62,30 @@
</build>
<dependencies>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <version>2.4.3</version>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ <version>${groovy.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-json</artifactId>
+ <version>${groovy.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-templates</artifactId>
+ <version>${groovy.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-xml</artifactId>
+ <version>${groovy.version}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-groovy] 04/26: groovy: version
back to 1.0.0-SNAPSHOT
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-groovy.git
commit 2850e270de400015106ba32957af7a6578bf35ba
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Sep 2 17:31:12 2014 +0000
groovy: version back to 1.0.0-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1622072 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index a462c4f..5480347 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.groovy</artifactId>
- <version>1.0.0</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Scripting Groovy Support</name>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-groovy] 02/26:
[maven-release-plugin] prepare release
org.apache.sling.scripting.groovy-1.0.0
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-groovy.git
commit 68f210baf9b6fa765fd8576909295e7255e7384e
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Sep 2 17:28:21 2014 +0000
[maven-release-plugin] prepare release org.apache.sling.scripting.groovy-1.0.0
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1622070 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7cfa2a5..8d757e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.groovy</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<packaging>bundle</packaging>
<name>Apache Sling Scripting Groovy Support</name>
@@ -38,9 +38,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/groovy</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/groovy</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/groovy</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.groovy-1.0.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.groovy-1.0.0</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.groovy-1.0.0</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-groovy] 05/26:
[maven-release-plugin] prepare release
org.apache.sling.scripting.groovy-1.0.0
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-groovy.git
commit 535e4dfb623a3b0daadd2969ac8d9e7929bc2884
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Sep 2 17:31:31 2014 +0000
[maven-release-plugin] prepare release org.apache.sling.scripting.groovy-1.0.0
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1622073 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5480347..8d757e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.groovy</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<packaging>bundle</packaging>
<name>Apache Sling Scripting Groovy Support</name>
@@ -38,9 +38,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/groovy</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/groovy</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/groovy</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.groovy-1.0.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.groovy-1.0.0</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.groovy-1.0.0</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.