You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by tm...@apache.org on 2022/04/28 07:51:05 UTC
[sling-org-apache-sling-distribution-sample] branch SLING-11255 created (now 3e2e8a5)
This is an automated email from the ASF dual-hosted git repository.
tmaret pushed a change to branch SLING-11255
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-sample.git
at 3e2e8a5 SLING-11255 - Update to sling-bundle-parent version 47
This branch includes the following new commits:
new 3e2e8a5 SLING-11255 - Update to sling-bundle-parent version 47
The 1 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.
[sling-org-apache-sling-distribution-sample] 01/01: SLING-11255 - Update to sling-bundle-parent version 47
Posted by tm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tmaret pushed a commit to branch SLING-11255
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-sample.git
commit 3e2e8a5f85dfc41f5073b7a5547613553d19e37b
Author: tmaret <tm...@adobe.com>
AuthorDate: Thu Apr 28 09:50:47 2022 +0200
SLING-11255 - Update to sling-bundle-parent version 47
---
bnd.bnd | 6 ++++
pom.xml | 41 ++++++++++------------
.../org/apache/sling/distribution/test/Init.java | 6 ++--
.../sling/distribution/test/package-info.java | 22 ++++++++++++
4 files changed, 49 insertions(+), 26 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..e865e29
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,6 @@
+Bundle-Category: sling
+Bundle-Description: ${project.description}
+Bundle-License: Apache License, Version 2.0
+Sling-Initial-Content: SLING-CONTENT/libs/sling/distribution;path:=/libs/sling/distribution;overwrite:=true,\
+ SLING-CONTENT/var/sling/distribution;path:=/var/sling/distribution;overwrite:=true,\
+ SLING-CONTENT/etc/distribution;path:=/etc/distribution;overwrite:=true
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 67620d9..849a3ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,8 +24,8 @@
<!-- ======================================================================= -->
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>26</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>47</version>
<relativePath />
</parent>
@@ -34,13 +34,16 @@
<!-- ======================================================================= -->
<artifactId>org.apache.sling.distribution.sample</artifactId>
<version>0.1.7-SNAPSHOT</version>
- <packaging>bundle</packaging>
<name>Apache Sling Distribution Sample</name>
<description>
The Apache Sling Distribution sample bundle provides a set of sample configurations and custom component implementations.
</description>
+ <properties>
+ <project.build.outputTimestamp>2022-04-28T00:00:00Z</project.build.outputTimestamp>
+ </properties>
+
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-sample.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-sample.git</developerConnection>
@@ -53,27 +56,12 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
</plugin>
<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>
- <Bundle-SymbolicName>org.apache.sling.distribution.sample</Bundle-SymbolicName>
- <Sling-Initial-Content>
- SLING-CONTENT/libs/sling/distribution;path:=/libs/sling/distribution;overwrite:=true,
- SLING-CONTENT/var/sling/distribution;path:=/var/sling/distribution;overwrite:=true,
- SLING-CONTENT/etc/distribution;path:=/etc/distribution;overwrite:=true
- </Sling-Initial-Content>
- </instructions>
- </configuration>
+ <artifactId>sling-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -86,16 +74,23 @@
<!-- D E P E N D E N C I E S -->
<!-- ======================================================================= -->
<dependencies>
+ <!-- OSGi -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>org.osgi.annotation.versioning</artifactId>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
diff --git a/src/main/java/org/apache/sling/distribution/test/Init.java b/src/main/java/org/apache/sling/distribution/test/Init.java
index e81a894..4e33974 100644
--- a/src/main/java/org/apache/sling/distribution/test/Init.java
+++ b/src/main/java/org/apache/sling/distribution/test/Init.java
@@ -20,9 +20,9 @@
package org.apache.sling.distribution.test;
-import org.apache.felix.scr.annotations.Activate;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Reference;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
import org.apache.jackrabbit.api.JackrabbitSession;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.User;
diff --git a/src/main/java/org/apache/sling/distribution/test/package-info.java b/src/main/java/org/apache/sling/distribution/test/package-info.java
new file mode 100644
index 0000000..989986b
--- /dev/null
+++ b/src/main/java/org/apache/sling/distribution/test/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * 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.
+ */
+
+@org.osgi.annotation.versioning.Version("0.1.7")
+package org.apache.sling.distribution.test;
+