You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ra...@apache.org on 2019/12/17 13:27:51 UTC
[sling-org-apache-sling-scripting-jsp] branch master updated:
SLING-8928 - Upgrade to parent pom 35
This is an automated email from the ASF dual-hosted git repository.
radu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-jsp.git
The following commit(s) were added to refs/heads/master by this push:
new 018f2b4 SLING-8928 - Upgrade to parent pom 35
018f2b4 is described below
commit 018f2b46d8cfd9b9543bb5909e1615a19554dfaa
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Tue Dec 17 14:27:32 2019 +0100
SLING-8928 - Upgrade to parent pom 35
---
bnd.bnd | 3 ++
pom.xml | 55 +++++++++-------------
.../sling/scripting/jsp/util/package-info.java | 27 +++++++++++
3 files changed, 52 insertions(+), 33 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..7e39640
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,3 @@
+ScriptEngine-Name:${project.name}
+ScriptEngine-Version:${project.version}
+-conditionalpackage: org.apache.el.*
diff --git a/pom.xml b/pom.xml
index e599eb7..a571b90 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,14 +22,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>30</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>35</version>
<relativePath />
</parent>
<artifactId>org.apache.sling.scripting.jsp</artifactId>
<version>2.4.1-SNAPSHOT</version>
- <packaging>bundle</packaging>
<name>Apache Sling Scripting JSP</name>
<description>Support for JSP scripting</description>
@@ -44,31 +43,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>
- org.apache.sling.scripting.jsp.util;version=2.0.8
- </Export-Package>
- <Private-Package>
- org.apache.sling.scripting.jsp.*,
- org.apache.juli.logging
- </Private-Package>
-
- <ScriptEngine-Name>${project.name}</ScriptEngine-Name>
- <ScriptEngine-Version>${project.version}</ScriptEngine-Version>
-
- <Embed-Dependency>
- jasper-el,
- org.apache.sling.commons.osgi;inline="org/apache/sling/commons/osgi/PropertiesUtil.*"
- </Embed-Dependency>
- <Embed-StripGroup>true</Embed-StripGroup>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
@@ -83,6 +57,26 @@
<dependencies>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.versioning</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.metatype.annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.bundle</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
@@ -105,11 +99,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
<version>2.11.0</version>
diff --git a/src/main/java/org/apache/sling/scripting/jsp/util/package-info.java b/src/main/java/org/apache/sling/scripting/jsp/util/package-info.java
new file mode 100644
index 0000000..cb3df98
--- /dev/null
+++ b/src/main/java/org/apache/sling/scripting/jsp/util/package-info.java
@@ -0,0 +1,27 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+@Version("2.0.8")
+package org.apache.sling.scripting.jsp.util;
+
+import org.osgi.annotation.versioning.Version;
+
+
+
+
+