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 2020/02/11 10:10:14 UTC
[sling-org-apache-sling-security] branch master updated (3c602bb ->
ccd7497)
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-security.git.
from 3c602bb SLING-8838 - Add HEAD support to ContentDispositionFilter
new d38dd20 SLING-9062 - security: upgrade to parent pom 35
new ccd7497 SLING-9062 - security: upgrade to parent pom 35
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 | 2 ++
pom.xml | 34 ++++++++++------------------------
2 files changed, 12 insertions(+), 24 deletions(-)
create mode 100644 bnd.bnd
[sling-org-apache-sling-security] 02/02: SLING-9062 - security:
upgrade to parent pom 35
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-security.git
commit ccd7497cfcc55f6970977ccef4988f4627f7d1fa
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Feb 11 11:09:55 2020 +0100
SLING-9062 - security: upgrade to parent pom 35
Add missing bnd.bnd file
---
bnd.bnd | 2 ++
1 file changed, 2 insertions(+)
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..7fa8807
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,2 @@
+Require-Capability: osgi.implementation;filter:="(&(osgi.implementation=osgi.http)(version>=1.0)(!(version<=2.0)))"
+
[sling-org-apache-sling-security] 01/02: SLING-9062 - security:
upgrade to parent pom 35
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-security.git
commit d38dd2035fc977c1983ab3770bde536527e3f85f
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Feb 11 11:06:45 2020 +0100
SLING-9062 - security: upgrade to parent pom 35
---
pom.xml | 34 ++++++++++------------------------
1 file changed, 10 insertions(+), 24 deletions(-)
diff --git a/pom.xml b/pom.xml
index c4eca30..257c94d 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.security</artifactId>
<version>1.1.17-SNAPSHOT</version>
- <packaging>bundle</packaging>
<name>Apache Sling Security</name>
<description>
@@ -43,29 +42,16 @@
<tag>HEAD</tag>
</scm>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.sling</groupId>
- <artifactId>maven-sling-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Require-Capability>
- osgi.implementation;filter:="(&(osgi.implementation=osgi.http)(version>=1.0)(!(version>=2.0)))"
- </Require-Capability>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<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>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>