You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2020/05/31 17:13:00 UTC

[sling-org-apache-sling-starter] branch feature/generate-index created (now 22c49a9)

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

kwin pushed a change to branch feature/generate-index
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git.


      at 22c49a9  SLING-9491 generate bnd OSGi index

This branch includes the following new commits:

     new 22c49a9  SLING-9491 generate bnd OSGi index

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-starter] 01/01: SLING-9491 generate bnd OSGi index

Posted by kw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

kwin pushed a commit to branch feature/generate-index
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git

commit 22c49a980be7468871bb10ef057b6388164d9190
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Sun May 31 19:12:43 2020 +0200

    SLING-9491 generate bnd OSGi index
---
 pom.xml | 111 +++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 61 insertions(+), 50 deletions(-)

diff --git a/pom.xml b/pom.xml
index 79c026a..e197d9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-    <!--
-        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">
+<!--
+    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>35</version>
-        <relativePath />
+        <version>39</version>
+        <relativePath/>
     </parent>
 
     <artifactId>org.apache.sling.starter</artifactId>
@@ -33,8 +34,8 @@
         <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-starter.git</url>
-      <tag>HEAD</tag>
-  </scm>
+        <tag>HEAD</tag>
+    </scm>
 
     <properties>
         <sling.java.version>8</sling.java.version>
@@ -42,18 +43,29 @@
     </properties>
 
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.sling</groupId>
+                    <artifactId>slingstart-maven-plugin</artifactId>
+                    <version>1.9.12</version>
+                </plugin>
+                
+                <plugin>
+                    <!-- Extend RAT configuration from parent pom -->
+                    <groupId>org.apache.rat</groupId>
+                    <artifactId>apache-rat-plugin</artifactId>
+                    <configuration>
+                        <excludes combine.children="append">
+                            <!-- Exclude sling instance -->
+                            <exclude>sling/**</exclude>
+                        </excludes>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
         <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>ianal-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>verify-legal-files</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
+
             <plugin>
                 <artifactId>maven-clean-plugin</artifactId>
                 <configuration>
@@ -74,13 +86,13 @@
                 <extensions>true</extensions>
                 <executions>
                     <execution>
-                         <id>start-container</id>
+                        <id>start-container</id>
                         <goals>
                             <goal>start</goal>
                             <goal>stop</goal>
                         </goals>
                     </execution>
-                </executions>                
+                </executions>
                 <configuration>
                     <createWebapp>true</createWebapp>
                     <servers>
@@ -88,10 +100,26 @@
                             <port>${http.port}</port>
                             <controlPort>${sling.control.port}</controlPort>
                         </server>
-                    </servers>                    
+                    </servers>
                 </configuration>
             </plugin>
-
+            <!-- generate bnd OSGi index (https://github.com/bndtools/bnd/tree/master/maven/bnd-indexer-maven-plugin) -->
+            <plugin>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-indexer-maven-plugin</artifactId>
+                <version>5.0.1</version>
+                <executions>
+                    <execution>
+                        <id>index</id>
+                        <goals>
+                            <goal>index</goal>
+                        </goals>
+                        <configuration>
+                            <scopes>provided</scopes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
@@ -129,27 +157,10 @@
                         <IT.expected.bundles.count>${IT.expected.bundles.count}</IT.expected.bundles.count>
                     </systemPropertyVariables>
                 </configuration>
-            </plugin>            
+            </plugin>
         </plugins>
-
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <!-- Extend RAT configuration from parent pom -->
-                    <groupId>org.apache.rat</groupId>
-                    <artifactId>apache-rat-plugin</artifactId>
-                    <configuration>
-                        <excludes combine.children="append">
-                            <!-- Exclude sling instance -->
-                            <exclude>sling/**</exclude>
-                        </excludes>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-
     </build>
-    
+
     <dependencies>
         <dependency>
             <groupId>junit</groupId>