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 2021/12/15 11:24:35 UTC

[jackrabbit-filevault] 01/01: JCRVLT-576 make vault-validation runnable in OSGi container

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

kwin pushed a commit to branch feature/JCRVLT-576
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git

commit d0b0ea5e717aa87ccad1bed27adea1a1c3fc0323
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Wed Dec 15 12:24:16 2021 +0100

    JCRVLT-576 make vault-validation runnable in OSGi container
    
    include all non-exported classes/packages from Vault Core
    embed jcr2spi
---
 vault-validation/bnd.bnd           | 21 +++++++++++++++++++++
 vault-validation/min-target.bndrun | 15 +++++++++++++++
 vault-validation/pom.xml           |  4 ++++
 3 files changed, 40 insertions(+)

diff --git a/vault-validation/bnd.bnd b/vault-validation/bnd.bnd
new file mode 100644
index 0000000..4719dbc
--- /dev/null
+++ b/vault-validation/bnd.bnd
@@ -0,0 +1,21 @@
+#  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.
+
+# include complete packages (all transitive dependencies lead to Import-Package instructions)
+-conditionalpackage: org.apache.jackrabbit.jcr2spi.*,org.apache.jackrabbit.vault.fs.spi.impl.jcr20
+
+# only include individual classes from other impl packages
+-includeresource: @org.apache.jackrabbit.vault-*.jar!/org/apache/jackrabbit/vault/packaging/impl/(DefaultPackageProperties|PackagePropertiesImpl).*,\
+@org.apache.jackrabbit.vault-*.jar!/org/apache/jackrabbit/vault/fs/impl/io/XmlAnalyzer.*
\ No newline at end of file
diff --git a/vault-validation/min-target.bndrun b/vault-validation/min-target.bndrun
new file mode 100644
index 0000000..5359b89
--- /dev/null
+++ b/vault-validation/min-target.bndrun
@@ -0,0 +1,15 @@
+#  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.
+-include ../target-osgi-environment/min-target.bndrun
\ No newline at end of file
diff --git a/vault-validation/pom.xml b/vault-validation/pom.xml
index 8315f28..218f634 100644
--- a/vault-validation/pom.xml
+++ b/vault-validation/pom.xml
@@ -89,6 +89,10 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-resolver-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>