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 2021/09/24 15:30:15 UTC

svn commit: r50067 - /release/sling/

Author: rombert
Date: Fri Sep 24 15:30:14 2021
New Revision: 50067

Log:
sling-bundle-parent 46

Added:
    release/sling/sling-bundle-parent-46-source-release.zip   (with props)
    release/sling/sling-bundle-parent-46-source-release.zip.asc   (with props)
    release/sling/sling-bundle-parent-46-source-release.zip.md5
    release/sling/sling-bundle-parent-46-source-release.zip.sha1
    release/sling/sling-bundle-parent-46-source-release.zip.sha512
    release/sling/sling-bundle-parent-46-source-release.zip.sha512.md5
    release/sling/sling-bundle-parent-46-source-release.zip.sha512.sha1
    release/sling/sling-bundle-parent-46.pom
    release/sling/sling-bundle-parent-46.pom.asc   (with props)
    release/sling/sling-bundle-parent-46.pom.md5
    release/sling/sling-bundle-parent-46.pom.sha1
Removed:
    release/sling/sling-bundle-parent-45-source-release.zip
    release/sling/sling-bundle-parent-45-source-release.zip.asc
    release/sling/sling-bundle-parent-45-source-release.zip.md5
    release/sling/sling-bundle-parent-45-source-release.zip.sha1
    release/sling/sling-bundle-parent-45-source-release.zip.sha512
    release/sling/sling-bundle-parent-45-source-release.zip.sha512.md5
    release/sling/sling-bundle-parent-45-source-release.zip.sha512.sha1
    release/sling/sling-bundle-parent-45.pom
    release/sling/sling-bundle-parent-45.pom.asc
    release/sling/sling-bundle-parent-45.pom.md5
    release/sling/sling-bundle-parent-45.pom.sha1

Added: release/sling/sling-bundle-parent-46-source-release.zip
==============================================================================
Binary file - no diff available.

Propchange: release/sling/sling-bundle-parent-46-source-release.zip
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: release/sling/sling-bundle-parent-46-source-release.zip.asc
==============================================================================
Binary file - no diff available.

Propchange: release/sling/sling-bundle-parent-46-source-release.zip.asc
------------------------------------------------------------------------------
    svn:mime-type = application/pgp-signature

Added: release/sling/sling-bundle-parent-46-source-release.zip.md5
==============================================================================
--- release/sling/sling-bundle-parent-46-source-release.zip.md5 (added)
+++ release/sling/sling-bundle-parent-46-source-release.zip.md5 Fri Sep 24 15:30:14 2021
@@ -0,0 +1 @@
+9f78a649eabe2b302d2cdadf01ca8a32
\ No newline at end of file

Added: release/sling/sling-bundle-parent-46-source-release.zip.sha1
==============================================================================
--- release/sling/sling-bundle-parent-46-source-release.zip.sha1 (added)
+++ release/sling/sling-bundle-parent-46-source-release.zip.sha1 Fri Sep 24 15:30:14 2021
@@ -0,0 +1 @@
+e6bfbea0558533898cb51ab7447b2fe1172f8829
\ No newline at end of file

Added: release/sling/sling-bundle-parent-46-source-release.zip.sha512
==============================================================================
--- release/sling/sling-bundle-parent-46-source-release.zip.sha512 (added)
+++ release/sling/sling-bundle-parent-46-source-release.zip.sha512 Fri Sep 24 15:30:14 2021
@@ -0,0 +1 @@
+917baf01ab4c809ac34547c4ebaf43bf2e3515a5528f72eff95d5846af619f4397b05434b24470ff970cf311d72a1794d34c4fb1f1a533ac3154fd8997e66262
\ No newline at end of file

Added: release/sling/sling-bundle-parent-46-source-release.zip.sha512.md5
==============================================================================
--- release/sling/sling-bundle-parent-46-source-release.zip.sha512.md5 (added)
+++ release/sling/sling-bundle-parent-46-source-release.zip.sha512.md5 Fri Sep 24 15:30:14 2021
@@ -0,0 +1 @@
+2443ad866128192705cc55d8bc3c4e63
\ No newline at end of file

Added: release/sling/sling-bundle-parent-46-source-release.zip.sha512.sha1
==============================================================================
--- release/sling/sling-bundle-parent-46-source-release.zip.sha512.sha1 (added)
+++ release/sling/sling-bundle-parent-46-source-release.zip.sha512.sha1 Fri Sep 24 15:30:14 2021
@@ -0,0 +1 @@
+86ef6cb7813ad73bfe6514852e0df1ff2fee299d
\ No newline at end of file

Added: release/sling/sling-bundle-parent-46.pom
==============================================================================
--- release/sling/sling-bundle-parent-46.pom (added)
+++ release/sling/sling-bundle-parent-46.pom Fri Sep 24 15:30:14 2021
@@ -0,0 +1,315 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.sling</groupId>
+        <artifactId>sling</artifactId>
+        <version>46</version>
+        <relativePath>../sling-parent</relativePath>
+    </parent>
+
+    <groupId>org.apache.sling</groupId>
+    <artifactId>sling-bundle-parent</artifactId>
+    <packaging>pom</packaging>
+
+    <name>Apache Sling (Bundle Parent)</name>
+    <description>The parent project for Apache Sling bundle modules</description>
+
+    <scm>
+        <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-parent.git</connection>
+        <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-parent.git</developerConnection>
+        <url>https://gitbox.apache.org/repos/asf?p=sling-parent.git</url>
+        <tag>sling-parent-reactor-46</tag>
+    </scm>
+
+    <properties>
+        <bnd.version>5.3.0</bnd.version>
+    </properties>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+
+                <plugin>
+                    <groupId>org.apache.sling</groupId>
+                    <artifactId>sling-maven-plugin</artifactId>
+                    <version>2.4.2</version>
+                </plugin>
+                <plugin>
+                    <groupId>biz.aQute.bnd</groupId>
+                    <artifactId>bnd-maven-plugin</artifactId>
+                    <version>${bnd.version}</version>
+                    <executions>
+                        <execution>
+                            <id>bnd-process</id>
+                            <goals>
+                                <goal>bnd-process</goal>
+                            </goals>
+                            <configuration>
+                                <bnd><![CDATA[
+# a lot of bundle header are generated from pom elements by default: https://github.com/bndtools/bnd/tree/master/maven/bnd-maven-plugin#default-bundle-headers
+Bundle-Category: sling
+
+# export all versioned packages except for conditional ones (https://github.com/bndtools/bnd/issues/3721#issuecomment-579026778)
+-exportcontents: ${removeall;${packages;VERSIONED};${packages;CONDITIONAL}}
+
+# see https://issues.apache.org/jira/browse/SLING-8980
+-snapshot: SNAPSHOT
+
+# reproducible builds (https://github.com/bndtools/bnd/issues/3521)
+-noextraheaders: true
+
+# we cannot let bnd-maven-plugin generate it automatically, as Maven applies some inheritance logic which is incorrect for Sling (https://issues.apache.org/jira/browse/SLING-8537)
+Bundle-DocURL: https://sling.apache.org
+
+# generate error (instead of warning) when exported package uses private (non-exported) reference
+-fixupmessages:"Export *,  has \\d+,  private references"; \
+    restrict:=warning; \
+    is:=error
+                                ]]></bnd>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>biz.aQute.bnd</groupId>
+                    <artifactId>bnd-baseline-maven-plugin</artifactId>
+                    <version>${bnd.version}</version>
+                    <configuration>
+                        <includeDistributionManagement>false</includeDistributionManagement>
+                        <fullReport>true</fullReport>
+                        <diffignores>
+                            <!-- ignore Bundle-Version header for baseline, i.e. no enforcement of specific bundle versions -->
+                            <diffignore>Bundle-Version</diffignore>
+                        </diffignores>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>bnd-baseline</id>
+                            <goals>
+                                <goal>baseline</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <configuration>
+                        <archive>
+                            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                        </archive>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>ban-plugins-and-dependencies</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <bannedPlugins>
+                                    <excludes>
+                                        <exclude>org.apache.felix:maven-scr-plugin</exclude>
+                                    </excludes>
+                                    <message>Felix SCR annotations and the maven-scr-plugin are no longer supported - please migrate to OSGi
+                                        annotations or stick with Sling Parent 29.</message>
+                                </bannedPlugins>
+                                <bannedDependencies>
+                                    <excludes>
+                                        <exclude>org.apache.felix:org.apache.felix.scr.annotations</exclude>
+                                    </excludes>
+                                    <message>Felix SCR annotations and the maven-scr-plugin are no longer supported - please migrate to OSGi
+                                        annotations or stick with Sling Parent 29.</message>
+                                </bannedDependencies>
+                                <bannedPlugins>
+                                    <excludes>
+                                        <exclude>org.apache.felix:maven-bundle-plugin</exclude>
+                                    </excludes>
+                                    <message>The maven-bundle-plugin is no longer supported - please migrate to bnd-maven-plugin or stick
+                                        with Sling Parent 34.</message>
+                                </bannedPlugins>
+                                <bannedPlugins>
+                                    <excludes>
+                                        <exclude>org.apache.sling:maven-sling-plugin</exclude>
+                                    </excludes>
+                                    <message>Please change all occurences of maven-sling-plugin to sling-maven-plugin (plugin was renamed).</message>
+                                </bannedPlugins>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-maven-plugin</artifactId>
+            </plugin>
+             <plugin>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-baseline-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+
+    </build>
+
+    <profiles>
+        <profile>
+            <!--
+                Use this profile to install the OSGi bundle
+                automatically, during development
+            -->
+            <id>autoInstallBundle</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.sling</groupId>
+                        <artifactId>sling-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>install-bundle</id>
+                                <goals>
+                                    <goal>install</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+    <dependencyManagement>
+
+        <!-- OSGi -->
+        <dependencies>
+            <!-- Aggregates (rather use individual artifacts referenced below) -->
+            <!-- Core R7 -->
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>osgi.core</artifactId>
+                <version>7.0.0</version>
+                <scope>provided</scope>
+            </dependency>
+            <!-- Compendium R6 -->
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>osgi.cmpn</artifactId>
+                <version>7.0.0</version>
+                <scope>provided</scope>
+            </dependency>
+            <!-- individual OSGi spec API artifacts (preferred) -->
+            <!-- Framework 1.9, Core R7 (https://docs.osgi.org/javadoc/osgi.core/7.0.0/org/osgi/framework/package-summary.html) -->
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.framework</artifactId>
+                <version>1.9.0</version>
+                <scope>provided</scope>
+            </dependency>
+            <!-- Tracker 1.5, Core R7 (https://docs.osgi.org/javadoc/osgi.core/7.0.0/org/osgi/util/tracker/package-summary.html) -->
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.util.tracker</artifactId>
+                <version>1.5.3</version>
+                <scope>provided</scope>
+            </dependency>
+            <!-- Data Transfer Object 1.1, Core R7 (https://docs.osgi.org/javadoc/osgi.core/7.0.0/org/osgi/dto/package-summary.html) -->
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.dto</artifactId>
+                <version>1.1.1</version>
+            </dependency>
+            <!-- URL Handlers 1.0, Core R7 (https://docs.osgi.org/javadoc/osgi.core/7.0.0/org/osgi/service/url/package-summary.html) -->
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.service.url</artifactId>
+                <version>1.0.0</version>
+            </dependency>
+            <!-- Configuration Admin 1.6, Compendium R7 (https://osgi.org/javadoc/osgi.cmpn/7.0.0/org/osgi/service/cm/package-frame.html) -->
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.service.cm</artifactId>
+                <version>1.6.0</version>
+                <scope>provided</scope>
+            </dependency>
+            <!-- Service Component 1.4, Compendium R7 (https://osgi.org/javadoc/osgi.cmpn/7.0.0/org/osgi/service/component/package-frame.html) -->
+            <!-- and component property types (https://osgi.org/javadoc/osgi.cmpn/7.0.0/org/osgi/service/component/propertytypes/package-frame.html) -->
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.service.component</artifactId>
+                <version>1.4.0</version>
+                <scope>provided</scope>
+            </dependency>
+            <!-- Event Admin 1.4, Compendium R7 (https://docs.osgi.org/javadoc/osgi.cmpn/7.0.0/org/osgi/service/event/package-summary.html) -->
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.service.event</artifactId>
+                <version>1.4.0</version>
+                <scope>provided</scope>
+            </dependency>
+            <!-- OSGi annotations (OSGi R7) -->
+            <!-- https://osgi.org/javadoc/osgi.annotation/7.0.0/org/osgi/annotation/versioning/package-frame.html -->
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.annotation.versioning</artifactId>
+                <version>1.1.1</version>
+                <scope>provided</scope>
+            </dependency>
+            <!-- https://osgi.org/javadoc/osgi.annotation/7.0.0/org/osgi/annotation/bundle/package-frame.html -->
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.annotation.bundle</artifactId>
+                <version>1.0.0</version>
+                <scope>provided</scope>
+            </dependency>
+            <!-- https://osgi.org/javadoc/osgi.cmpn/7.0.0/org/osgi/service/component/annotations/package-frame.html -->
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.service.component.annotations</artifactId>
+                <version>1.4.0</version>
+                <scope>provided</scope>
+            </dependency>
+            <!-- https://osgi.org/javadoc/osgi.cmpn/7.0.0/org/osgi/service/metatype/annotations/package-frame.html -->
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.service.metatype.annotations</artifactId>
+                <version>1.4.0</version>
+                <scope>provided</scope>
+            </dependency>
+            <!-- https://sling.apache.org/apidocs/sling11/org/apache/sling/servlets/annotations/package-summary.html -->
+            <dependency>
+                <groupId>org.apache.sling</groupId>
+                <artifactId>org.apache.sling.servlets.annotations</artifactId>
+                <version>1.2.4</version>
+                <scope>provided</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+</project>

Added: release/sling/sling-bundle-parent-46.pom.asc
==============================================================================
Binary file - no diff available.

Propchange: release/sling/sling-bundle-parent-46.pom.asc
------------------------------------------------------------------------------
    svn:mime-type = application/pgp-signature

Added: release/sling/sling-bundle-parent-46.pom.md5
==============================================================================
--- release/sling/sling-bundle-parent-46.pom.md5 (added)
+++ release/sling/sling-bundle-parent-46.pom.md5 Fri Sep 24 15:30:14 2021
@@ -0,0 +1 @@
+4cffd49e3e0b78ad5f1c663f12d4a1f6
\ No newline at end of file

Added: release/sling/sling-bundle-parent-46.pom.sha1
==============================================================================
--- release/sling/sling-bundle-parent-46.pom.sha1 (added)
+++ release/sling/sling-bundle-parent-46.pom.sha1 Fri Sep 24 15:30:14 2021
@@ -0,0 +1 @@
+354008fc57107fc50728d25553deac41d043000e
\ No newline at end of file