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

svn commit: r1877679 - in /jackrabbit/commons/filevault/trunk: parent/ vault-core/ vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ vault-rcp/ vault-sync/ vault-validation/

Author: kwin
Date: Wed May 13 06:56:07 2020
New Revision: 1877679

URL: http://svn.apache.org/viewvc?rev=1877679&view=rev
Log:
Merge branch 'feature/JCRVLT-429-bnd-maven-plugin' into trunk

Added:
    jackrabbit/commons/filevault/trunk/vault-core/bnd.bnd
    jackrabbit/commons/filevault/trunk/vault-rcp/bnd.bnd
Modified:
    jackrabbit/commons/filevault/trunk/parent/pom.xml
    jackrabbit/commons/filevault/trunk/vault-core/.ratignore
    jackrabbit/commons/filevault/trunk/vault-core/pom.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/DumpCoverageTests.java
    jackrabbit/commons/filevault/trunk/vault-rcp/pom.xml
    jackrabbit/commons/filevault/trunk/vault-sync/pom.xml
    jackrabbit/commons/filevault/trunk/vault-validation/pom.xml

Modified: jackrabbit/commons/filevault/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/parent/pom.xml?rev=1877679&r1=1877678&r2=1877679&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/parent/pom.xml (original)
+++ jackrabbit/commons/filevault/trunk/parent/pom.xml Wed May 13 06:56:07 2020
@@ -17,17 +17,17 @@
 <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>
     <!-- ====================================================================== -->
-    <!-- P A R E N T P R O J E C T D E S C R I P T I O N -->
+    <!-- P A R E N T  P R O J E C T  D E S C R I P T I O N -->
     <!-- ====================================================================== -->
     <parent>
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
-        <version>21</version>
+        <version>23</version>
         <relativePath />
     </parent>
 
     <!-- ====================================================================== -->
-    <!-- P R O J E C T D E S C R I P T I O N -->
+    <!-- P R O J E C T  D E S C R I P T I O N -->
     <!-- ====================================================================== -->
     <groupId>org.apache.jackrabbit.vault</groupId>
     <artifactId>parent</artifactId>
@@ -54,10 +54,11 @@ Apache Jackrabbit FileVault is a project
         <test.vm.options>-Doak=$test.oak}</test.vm.options>
         <argLine>${test.vm.options}</argLine>
         <java.target.version>1.8</java.target.version>
+        <bnd.version>5.0.1</bnd.version>
     </properties>
 
     <!-- ====================================================================== -->
-    <!-- S C M D E F I N I T I O N -->
+    <!-- S C M  D E F I N I T I O N -->
     <!-- ====================================================================== -->
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk/parent</connection>
@@ -96,49 +97,13 @@ Apache Jackrabbit FileVault is a project
     </ciManagement>
 
     <!-- ====================================================================== -->
-    <!-- B U I L D D E F I N I T I O N -->
+    <!-- B U I L D  D E F I N I T I O N -->
     <!-- ====================================================================== -->
     <build>
-        <plugins>
-            <!-- compiler stuff -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <configuration>
-                    <source>${java.target.version}</source>
-                    <target>${java.target.version}</target>
-                    <debug>true</debug>
-                    <showDeprecation>false</showDeprecation>
-                    <showWarnings>true</showWarnings>
-                    <optimize>false</optimize>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.0.0-M2</version>
-                <executions>
-                    <execution>
-                        <id>enforce-java</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireJavaVersion>
-                                    <version>${java.target.version}</version>
-                                </requireJavaVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
         <pluginManagement>
             <plugins>
                 <!-- ====================================================================== -->
-                <!-- S L I N G P L U G I N -->
+                <!-- S L I N G  P L U G I N -->
                 <!-- ====================================================================== -->
                 <plugin>
                     <groupId>org.apache.sling</groupId>
@@ -146,66 +111,58 @@ Apache Jackrabbit FileVault is a project
                     <version>2.4.2</version>
                     <configuration>
                         <slingUrl>http://localhost:4502</slingUrl>
-                        <slingUrlSuffix>/libs/system/install</slingUrlSuffix>
-                        <usePut>true</usePut>
+                        <slingUrlSuffix>/system/console</slingUrlSuffix>
+                        <deploymentMethod>WebConsole</deploymentMethod>
                     </configuration>
                 </plugin>
-                <!-- ====================================================================== -->
-                <!-- B U N D L E P L U G I N -->
-                <!-- ====================================================================== -->
                 <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-bundle-plugin</artifactId>
-                    <version>4.2.1</version>
-                    <inherited>true</inherited>
-                    <configuration>
-                        <outputDirectory>${basedir}/target/classes</outputDirectory>
-                        <obrRepository>NONE</obrRepository>
-                        <instructions>
-                            <Bundle-Category>jackrabbit</Bundle-Category>
-                            <Bundle-DocURL>http://jackrabbit.apache.org/filevault/</Bundle-DocURL>
-                            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
-                            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                            <_provider-policy>[$(version;===;$(@)),$(version;=+;$(@)))</_provider-policy>
-                            <_consumer-policy>[$(version;===;$(@)),$(version;+;$(@)))</_consumer-policy>
-                            <_removeheaders>
-                                ReleaseRepository-Id,
-                                ReleaseRepository-Name,
-                                ReleaseRepository-URL,
-                                SnapshotRepository-Id,
-                                SnapshotRepository-Name,
-                                SnapshotRepository-URL,
-                                Include-Resource,
-                                Private-Package
-                            </_removeheaders>
-                        </instructions>
-                        <exportScr>true</exportScr>
-                    </configuration>
+                    <groupId>biz.aQute.bnd</groupId>
+                    <artifactId>bnd-maven-plugin</artifactId>
+                    <version>${bnd.version}</version>
                     <executions>
                         <execution>
-                            <id>baseline</id>
+                            <id>generate-osgi-metadata</id>
                             <goals>
-                                <goal>baseline</goal>
+                                <goal>bnd-process</goal>
                             </goals>
                             <configuration>
-                                <failOnError>true</failOnError>
+                                <bnd><![CDATA[
+# we cannot let bnd-maven-plugin generate it automatically, as Maven applies some inheritance logic
+Bundle-DocURL: https://jackrabbit.apache.org/filevault/
+Bundle-Category: jackrabbit
+# https://github.com/bndtools/bnd/tree/master/maven/bnd-maven-plugin#reproducible-builds
+-noextraheaders: true
+-snapshot: SNAPSHOT
+# export all versioned packages except for conditional ones (https://github.com/bndtools/bnd/issues/3721#issuecomment-579026778)
+-exportcontents: ${removeall;${packages;VERSIONED};${packages;CONDITIONAL}}
+                                ]]></bnd>
                             </configuration>
                         </execution>
-                        <!-- Configure extra execution of 'manifest' in process-classes phase to make sure SCR metadata is generated before
-                            unit test runs -->
+                    </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>scr-metadata</id>
+                            <id>baseline</id>
                             <goals>
-                                <goal>manifest</goal>
+                                <goal>baseline</goal>
                             </goals>
-                            <configuration>
-                                <supportIncrementalBuild>true</supportIncrementalBuild>
-                            </configuration>
                         </execution>
                     </executions>
                 </plugin>
                 <!-- ====================================================================== -->
-                <!-- S U R E F I R E P L U G I N -->
+                <!-- S U R E F I R E  P L U G I N -->
                 <!-- ====================================================================== -->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -222,7 +179,7 @@ Apache Jackrabbit FileVault is a project
                     </configuration>
                 </plugin>
                 <!-- ====================================================================== -->
-                <!-- R E L E A S E P L U G I N -->
+                <!-- R E L E A S E  P L U G I N -->
                 <!-- ====================================================================== -->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -235,19 +192,19 @@ Apache Jackrabbit FileVault is a project
                         <dependency>
                             <groupId>org.apache.maven.release</groupId>
                             <artifactId>maven-release-oddeven-policy</artifactId>
-                            <version>2.5.3</version>
+                            <version>3.0.0-M1</version>
                         </dependency>
                     </dependencies>
                 </plugin>
                 <!-- ====================================================================== -->
-                <!-- R A T P L U G I N -->
+                <!-- R A T  P L U G I N -->
                 <!-- ====================================================================== -->
                 <plugin>
                     <groupId>org.apache.rat</groupId>
                     <artifactId>apache-rat-plugin</artifactId>
-                    <version>0.13</version>
                     <configuration>
                         <excludes>
+                            <excludes>.ratignore</excludes>
                             <exclude>release.properties</exclude>
                             <exclude>.git/**</exclude>
                             <exclude>.idea/**</exclude>
@@ -257,11 +214,10 @@ Apache Jackrabbit FileVault is a project
                             <exclude>.mvn/**</exclude>
                             <exclude>.no-defender.sh</exclude>
                         </excludes>
-                        <consoleOutput>true</consoleOutput>
                     </configuration>
                 </plugin>
                 <!-- ====================================================================== -->
-                <!-- S I T E P L U G I N -->
+                <!-- S I T E  P L U G I N -->
                 <!-- ====================================================================== -->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -296,6 +252,46 @@ Apache Jackrabbit FileVault is a project
                 </plugin>
             </plugins>
         </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.rat</groupId>
+                <artifactId>apache-rat-plugin</artifactId>
+            </plugin>
+            <!-- compiler stuff -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>${java.target.version}</source>
+                    <target>${java.target.version}</target>
+                    <debug>true</debug>
+                    <showDeprecation>false</showDeprecation>
+                    <showWarnings>true</showWarnings>
+                    <optimize>false</optimize>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.0.0-M2</version>
+                <executions>
+                    <execution>
+                        <id>enforce-java</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireJavaVersion>
+                                    <version>${java.target.version}</version>
+                                </requireJavaVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+        
     </build>
 
     <!-- ====================================================================== -->
@@ -313,7 +309,7 @@ Apache Jackrabbit FileVault is a project
     </reporting>
 
     <!-- ====================================================================== -->
-    <!-- D E P E N D E N C Y M A N A G E M E N T -->
+    <!-- D E P E N D E N C Y  M A N A G E M E N T -->
     <!-- ====================================================================== -->
     <dependencyManagement>
         <dependencies>
@@ -408,11 +404,42 @@ Apache Jackrabbit FileVault is a project
 
             <!-- other -->
 
+            <!-- OSGi -->
+            <!-- OSGi framework 1.8, Core R6 (https://osgi.org/javadoc/r6/core/org/osgi/framework/package-summary.html) -->
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.framework</artifactId>
+                <version>1.8.0</version>
+                <scope>provided</scope>
+            </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.3.1, Compendium R6 (https://osgi.org/javadoc/r6/cmpn/org/osgi/service/event/package-summary.html) -->
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.service.event</artifactId>
+                <version>1.3.1</version>
+                <scope>provided</scope>
+            </dependency>
+
             <!-- OSGi Annotations: @Version -->
             <dependency>
                 <groupId>org.osgi</groupId>
-                <artifactId>osgi.annotation</artifactId>
-                <version>6.0.1</version>
+                <artifactId>org.osgi.annotation.versioning</artifactId>
+                <version>1.1.0</version>
                 <scope>provided</scope>
             </dependency>
             <!-- Declarative Service Annotations -->
@@ -480,7 +507,7 @@ Apache Jackrabbit FileVault is a project
     <profiles>
         <profile>
             <!-- ====================================================================== -->
-            <!-- R A T P L U G I N -->
+            <!-- R A T  P L U G I N -->
             <!-- ====================================================================== -->
             <id>rat-check</id>
             <activation>
@@ -497,6 +524,9 @@ Apache Jackrabbit FileVault is a project
                                 <goals>
                                     <goal>check</goal>
                                 </goals>
+                                <configuration>
+                                    <consoleOutput>true</consoleOutput>
+                                </configuration>
                             </execution>
                         </executions>
                     </plugin>

Modified: jackrabbit/commons/filevault/trunk/vault-core/.ratignore
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/.ratignore?rev=1877679&r1=1877678&r2=1877679&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/.ratignore (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/.ratignore Wed May 13 06:56:07 2020
@@ -1,4 +1,3 @@
-.ratignore
 src/test/resources/org/apache/jackrabbit/vault/packaging/impl/exploded-package-folder1/marker
 src/test/resources/org/apache/jackrabbit/vault/fs/filter/workspacefilters/complex-expected.xml
 src/test/resources/org/apache/jackrabbit/vault/fs/io/DocViewFormat/formatted.xml
\ No newline at end of file

Added: jackrabbit/commons/filevault/trunk/vault-core/bnd.bnd
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/bnd.bnd?rev=1877679&view=auto
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/bnd.bnd (added)
+++ jackrabbit/commons/filevault/trunk/vault-core/bnd.bnd Wed May 13 06:56:07 2020
@@ -0,0 +1,32 @@
+#  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.
+
+Import-Package: org.apache.jackrabbit.*;version=!,\
+                            org.apache.sling.jcr.api;resolution:=optional,\
+                            javax.jcr,\
+                            javax.jcr.lock,\
+                            javax.jcr.nodetype,\
+                            javax.jcr.observation,\
+                            javax.jcr.query,\
+                            javax.jcr.query.qom,\
+                            javax.jcr.retention,\
+                            javax.jcr.security,\
+                            javax.jcr.util,\
+                            javax.jcr.version,\
+                            *
+DynamicImport-Package: *
+-includeresource: @txw2-[0-9.]*.jar!/com/sun/xml/txw2/output/(IndentingXMLStreamWriter|DelegatingXMLStreamWriter).*,\
+                  @woodstox-core-[0-9.]*.jar,\
+                  @stax2-api-[0-9.]*.jar
\ No newline at end of file

Modified: jackrabbit/commons/filevault/trunk/vault-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/pom.xml?rev=1877679&r1=1877678&r2=1877679&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/pom.xml (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/pom.xml Wed May 13 06:56:07 2020
@@ -31,12 +31,9 @@
     <!-- ====================================================================== -->
     <artifactId>org.apache.jackrabbit.vault</artifactId>
     <version>3.4.5-SNAPSHOT</version>
-    <packaging>bundle</packaging>
 
     <name>Apache Jackrabbit FileVault Core Bundle</name>
-    <description>
-        Builds an OSGi bundle for the file vault parts
-    </description>
+    <description>The core classes of Apache Jackrabbit FileVault</description>
 
     <!-- ====================================================================== -->
     <!-- S C M  D E F I N I T I O N                                             -->
@@ -53,72 +50,33 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.sling</groupId>
-                <artifactId>sling-maven-plugin</artifactId>
-                <configuration>
-                    <slingUrlSuffix>/libs/system/install/</slingUrlSuffix>
-                </configuration>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-maven-plugin</artifactId>
             </plugin>
             <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-baseline-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
-                    <instructions>
-                        <Bundle-Build>${buildNumber}</Bundle-Build>
-                        <!-- remove the unused dependencies of shaded com.ctc.wstx.shaded.msv_core.driver.textui.Driver in Woodstox Core (JCRVLT-414) -->
-                        <Import-Package>
-                            org.apache.jackrabbit.*;version=!,
-                            org.apache.sling.jcr.api;resolution:=optional,
-                            javax.jcr,
-                            javax.jcr.lock,
-                            javax.jcr.nodetype,
-                            javax.jcr.observation,
-                            javax.jcr.query,
-                            javax.jcr.query.qom,
-                            javax.jcr.retention,
-                            javax.jcr.security,
-                            javax.jcr.util,
-                            javax.jcr.version,
-                            *
-                        </Import-Package>
-                        <!-- to load hook classes through this bundle's classloader -->
-                        <DynamicImport-Package>*</DynamicImport-Package>
-                        <Embed-Dependency>woodstox-core,stax2-api</Embed-Dependency>
-                        <Embed-Transitive>true</Embed-Transitive>
-                        <Include-Resource>
-                            @txw2-[0-9.]*.jar!/com/sun/xml/txw2/output/(IndentingXMLStreamWriter|DelegatingXMLStreamWriter).*
-                        </Include-Resource>
-                    </instructions>
+                    <archive>
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                    </archive>
                 </configuration>
             </plugin>
             <plugin>
+                <groupId>org.apache.sling</groupId>
+                <artifactId>sling-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
                     <excludePackageNames>org.apache.jackrabbit.vault.util.xml.*</excludePackageNames>
                 </configuration>
             </plugin>
-            <!-- ====================================================================== -->
-            <!-- R A T   P L U G I N                                                    -->
-            <!-- ====================================================================== -->
-            <plugin>
-                <groupId>org.apache.rat</groupId>
-                <artifactId>apache-rat-plugin</artifactId>
-                <version>0.12</version>
-                <executions>
-                    <execution>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                        <configuration>
-                            <basedir>${project.basedir}</basedir>
-                            <excludesFile>${project.basedir}/.ratignore</excludesFile>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 
@@ -157,11 +115,10 @@
         
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <version>4.3.0</version>
+            <artifactId>org.osgi.framework</artifactId>
             <scope>provided</scope>
         </dependency>
-    
+
         <!-- StaX implementation for indentation -->
         <dependency>
             <groupId>org.glassfish.jaxb</groupId>
@@ -201,7 +158,7 @@
         <!-- OSGi Annotations: @Version -->
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>osgi.annotation</artifactId>
+            <artifactId>org.osgi.annotation.versioning</artifactId>
         </dependency>
         <!-- Declarative Service Annotations -->
         <dependency>

Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/DumpCoverageTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/DumpCoverageTests.java?rev=1877679&r1=1877678&r2=1877679&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/DumpCoverageTests.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/DumpCoverageTests.java Wed May 13 06:56:07 2020
@@ -17,6 +17,8 @@
 
 package org.apache.jackrabbit.vault.packaging.integration;
 
+import static org.junit.Assert.assertEquals;
+
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collections;
@@ -36,7 +38,6 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static junit.framework.Assert.assertEquals;
 
 /**
  * {@code ImportTests}...

Added: jackrabbit/commons/filevault/trunk/vault-rcp/bnd.bnd
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-rcp/bnd.bnd?rev=1877679&view=auto
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-rcp/bnd.bnd (added)
+++ jackrabbit/commons/filevault/trunk/vault-rcp/bnd.bnd Wed May 13 06:56:07 2020
@@ -0,0 +1,18 @@
+#  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.
+-includeresource: @vault-davex-[0-9.]*(-SNAPSHOT).jar,\
+                  @jackrabbit-spi2dav-[0-9.]*.jar,\
+                  @jackrabbit-jcr-client-[0-9.]*.jar,\
+                  @jackrabbit-jcr2spi-[0-9.]*.jar
\ No newline at end of file

Modified: jackrabbit/commons/filevault/trunk/vault-rcp/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-rcp/pom.xml?rev=1877679&r1=1877678&r2=1877679&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-rcp/pom.xml (original)
+++ jackrabbit/commons/filevault/trunk/vault-rcp/pom.xml Wed May 13 06:56:07 2020
@@ -30,8 +30,6 @@
     <!-- P R O J E C T  D E S C R I P T I O N                                   -->
     <!-- ====================================================================== -->
     <artifactId>org.apache.jackrabbit.vault.rcp</artifactId>
-    <version>3.4.5-SNAPSHOT</version>
-    <packaging>bundle</packaging>
 
     <name>Apache Jackrabbit FileVault RCP Server Bundle</name>
     <description>
@@ -60,20 +58,16 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
+                    <groupId>biz.aQute.bnd</groupId>
+                    <artifactId>bnd-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
-                    <instructions>
-                        <Bundle-Build>${buildNumber}</Bundle-Build>
-                        <Bundle-Category>jcr,granite</Bundle-Category>
-                        <Embed-Dependency>
-                            vault-davex,
-                            jackrabbit-spi2dav,
-                            jackrabbit-jcr-client,
-                            jackrabbit-jcr2spi
-                        </Embed-Dependency>
-                    </instructions>
+                    <archive>
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                    </archive>
                 </configuration>
             </plugin>
             <!-- exclude test resources from rat-check -->
@@ -154,7 +148,7 @@
         <!-- OSGi Annotations: @Version -->
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>osgi.annotation</artifactId>
+            <artifactId>org.osgi.annotation.versioning</artifactId>
         </dependency>
         <!-- Declarative Service Annotations -->
         <dependency>
@@ -170,8 +164,7 @@
         <dependency>
             <groupId>org.apache.jackrabbit.vault</groupId>
             <artifactId>vault-davex</artifactId>
-            <version>3.4.5-SNAPSHOT</version>
-            <scope>compile</scope>
+            <version>${project.version}</version>
         </dependency>
 
     </dependencies>

Modified: jackrabbit/commons/filevault/trunk/vault-sync/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-sync/pom.xml?rev=1877679&r1=1877678&r2=1877679&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-sync/pom.xml (original)
+++ jackrabbit/commons/filevault/trunk/vault-sync/pom.xml Wed May 13 06:56:07 2020
@@ -52,9 +52,22 @@
             <plugin>
                 <groupId>org.apache.sling</groupId>
                 <artifactId>sling-maven-plugin</artifactId>
+            </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>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
-                    <slingUrlSuffix>/libs/crx/vault/install/</slingUrlSuffix>
-                    <slingUrl>http://localhost:4502/crx/repository/crx.default</slingUrl>
+                    <archive>
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                    </archive>
                 </configuration>
             </plugin>
             <plugin>
@@ -118,7 +131,7 @@
         <!-- OSGi Annotations: @Version -->
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>osgi.annotation</artifactId>
+            <artifactId>org.osgi.annotation.versioning</artifactId>
         </dependency>
         <!-- Declarative Service Annotations -->
         <dependency>

Modified: jackrabbit/commons/filevault/trunk/vault-validation/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/pom.xml?rev=1877679&r1=1877678&r2=1877679&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/pom.xml (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/pom.xml Wed May 13 06:56:07 2020
@@ -17,7 +17,7 @@
 <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>
     <!-- ====================================================================== -->
-    <!-- P A R E N T P R O J E C T D E S C R I P T I O N -->
+    <!-- P A R E N T  P R O J E C T  D E S C R I P T I O N -->
     <!-- ====================================================================== -->
     <parent>
         <groupId>org.apache.jackrabbit.vault</groupId>
@@ -27,16 +27,15 @@
     </parent>
 
     <!-- ====================================================================== -->
-    <!-- P R O J E C T D E S C R I P T I O N -->
+    <!-- P R O J E C T  D E S C R I P T I O N -->
     <!-- ====================================================================== -->
     <artifactId>vault-validation</artifactId>
-    <packaging>bundle</packaging>
 
     <name>Apache Jackrabbit FileVault Validation</name>
     <description>Provides a validation framework with SPI and API for performing validations on FileVault packages</description>
 
     <!-- ====================================================================== -->
-    <!-- S C M D E F I N I T I O N -->
+    <!-- S C M  D E F I N I T I O N -->
     <!-- ====================================================================== -->
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk/vault-validation</connection>
@@ -47,7 +46,7 @@
     <build>
         <plugins>
             <!-- ====================================================================== -->
-            <!-- R A T   P L U G I N                                                    -->
+            <!-- R A T  P L U G I N                                                    -->
             <!-- ====================================================================== -->
             <plugin>
                 <groupId>org.apache.rat</groupId>
@@ -66,19 +65,21 @@
                 </executions>
             </plugin>
             <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-bundle-plugin</artifactId>
-                    <extensions>true</extensions>
-                    <configuration>
-                        <instructions>
-                            <Include-Resource>{maven-resources},META-INF/services=target/classes/META-INF/services</Include-Resource>
-                        </instructions>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <id>baseline</id>
-                        </execution>
-                    </executions>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-baseline-maven-plugin</artifactId>
+            </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>
     </build>
@@ -90,7 +91,7 @@
         <dependency>
             <groupId>org.apache.jackrabbit.vault</groupId>
             <artifactId>org.apache.jackrabbit.vault</artifactId>
-            <version>3.4.5-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
@@ -125,7 +126,7 @@
 
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>osgi.annotation</artifactId>
+            <artifactId>org.osgi.annotation.versioning</artifactId>
             <scope>provided</scope>
         </dependency>