You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2022/01/12 13:41:04 UTC

[sling-org-apache-sling-security] branch master updated: Update to parent 46

This is an automated email from the ASF dual-hosted git repository.

cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-security.git


The following commit(s) were added to refs/heads/master by this push:
     new 070642f  Update to parent 46
070642f is described below

commit 070642f6e4b55d5f4552982bee215df8ddbdd9bb
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Jan 12 14:40:58 2022 +0100

    Update to parent 46
---
 bnd.bnd | 1 +
 pom.xml | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/bnd.bnd b/bnd.bnd
index 5b280f4..ceccf40 100644
--- a/bnd.bnd
+++ b/bnd.bnd
@@ -1,2 +1,3 @@
+-noimportjava: true
 Require-Capability: osgi.implementation;filter:="(&(osgi.implementation=osgi.http)(version>=1.0)(!(version>=2.0)))"
 
diff --git a/pom.xml b/pom.xml
index 17fcb31..e295206 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling-bundle-parent</artifactId>
-        <version>35</version>
+        <version>46</version>
         <relativePath />
     </parent>
 
@@ -35,6 +35,10 @@
         The Apache Sling Security module.
     </description>
 
+    <properties>
+        <project.build.outputTimestamp>1</project.build.outputTimestamp>
+    </properties>
+
     <scm>
         <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-security.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-security.git</developerConnection>
@@ -93,6 +97,7 @@
         <dependency>
             <groupId>org.jmock</groupId>
             <artifactId>jmock-junit4</artifactId>
+            <version>2.12.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>