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 2019/12/09 12:48:15 UTC

[sling-org-apache-sling-scripting-el-api] branch master updated: SLING-8903 el-api - upgrade to parent pom 35

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-el-api.git


The following commit(s) were added to refs/heads/master by this push:
     new 3c42926  SLING-8903 el-api - upgrade to parent pom 35
3c42926 is described below

commit 3c42926bc5c3e2d831db8e3ac790bbbb1f3c2964
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Dec 9 13:39:46 2019 +0100

    SLING-8903 el-api - upgrade to parent pom 35
---
 bnd.bnd |  2 ++
 pom.xml | 29 ++---------------------------
 2 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..43605eb
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,2 @@
+Export-Package: javax.el;version=2.1
+
diff --git a/pom.xml b/pom.xml
index 683826d..e36f00e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,13 +23,12 @@
 
   <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.el-api</artifactId>
-  <packaging>bundle</packaging>
   <version>1.0.1-SNAPSHOT</version>
 
   <name>Apache Sling Wrapper Bundle for Apache Tomcat EL API</name>
@@ -41,30 +40,6 @@
     <url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-scripting-el-api.git</url>
   </scm>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Export-Package>
-              javax.el;version=2.1
-            </Export-Package>
-            <Embed-Dependency>*;scope=compile</Embed-Dependency>
-            <_removeheaders>
-              Embedded-Artifacts,
-              Embed-Dependency,
-              Private-Package,
-              Include-Resource
-            </_removeheaders>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.tomcat</groupId>