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 2018/04/05 11:03:47 UTC
[sling-ide-tooling] 01/14: SLING-5648 - Make Non-Eclipse Module
regular Maven Packages
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch feature/intellij
in repository https://gitbox.apache.org/repos/asf/sling-ide-tooling.git
commit 0740871bc4deeb5b68ba47bcd0e8a52dec8bc283
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Apr 3 17:23:23 2018 +0300
SLING-5648 - Make Non-Eclipse Module regular Maven Packages
Move the vlt-wrapper module to shared/modules.
---
eclipse/pom.xml | 1 -
eclipse/vlt-wrapper/META-INF/LICENSE | 202 ----------------------
eclipse/vlt-wrapper/META-INF/MANIFEST.MF | 60 -------
eclipse/vlt-wrapper/META-INF/NOTICE | 11 --
eclipse/vlt-wrapper/build.properties | 18 --
eclipse/vlt-wrapper/lib/.gitignore | 1 -
eclipse/vlt-wrapper/pom.xml | 178 -------------------
{eclipse => shared/modules}/vlt-wrapper/README.md | 0
shared/modules/vlt-wrapper/bnd.bnd | 37 ++++
shared/modules/vlt-wrapper/pom.xml | 132 ++++++++++++++
shared/p2/pom.xml | 5 +
shared/p2/shared-feature/feature.xml | 17 +-
shared/p2/shared-feature/pom.xml | 5 +
13 files changed, 180 insertions(+), 487 deletions(-)
diff --git a/eclipse/pom.xml b/eclipse/pom.xml
index e11145b..4e65fb5 100644
--- a/eclipse/pom.xml
+++ b/eclipse/pom.xml
@@ -41,7 +41,6 @@
<module>artifacts</module>
<module>impl-resource</module>
<module>impl-resource-test</module>
- <module>vlt-wrapper</module>
<module>impl-vlt</module>
<module>impl-vlt-test</module>
<module>eclipse-core</module>
diff --git a/eclipse/vlt-wrapper/META-INF/LICENSE b/eclipse/vlt-wrapper/META-INF/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/eclipse/vlt-wrapper/META-INF/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
diff --git a/eclipse/vlt-wrapper/META-INF/MANIFEST.MF b/eclipse/vlt-wrapper/META-INF/MANIFEST.MF
deleted file mode 100644
index 8f8c1d5..0000000
--- a/eclipse/vlt-wrapper/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,60 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.apache.sling.ide.vlt-wrapper
-Bundle-Version: 1.2.3.qualifier
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Bundle-ClassPath: .,
- lib/org.apache.jackrabbit.vault-3.1.44.jar,
- lib/vault-davex-3.1.44.jar,
- lib/jcr-2.0.jar,
- lib/guava-15.0.jar,
- lib/jackrabbit-api-2.16.1.jar,
- lib/jackrabbit-spi2dav-2.16.1.jar,
- lib/jackrabbit-spi-2.16.1.jar,
- lib/jackrabbit-jcr-client-2.16.1.jar,
- lib/jackrabbit-jcr2spi-2.16.1.jar,
- lib/jackrabbit-jcr-commons-2.16.1.jar,
- lib/jackrabbit-spi-commons-2.16.1.jar,
- lib/jackrabbit-webdav-2.16.1.jar,
- lib/httpmime-4.5.3.jar,
- lib/httpclient-4.5.3.jar,
- lib/httpcore-4.4.6.jar
-Export-Package: javax.jcr,
- javax.jcr.nodetype,
- org.apache.jackrabbit.api,
- org.apache.jackrabbit.spi.commons.conversion,
- org.apache.jackrabbit.spi.commons.namespace,
- org.apache.jackrabbit.util,
- org.apache.jackrabbit.vault.davex,
- org.apache.jackrabbit.vault.fs,
- org.apache.jackrabbit.vault.fs.api,
- org.apache.jackrabbit.vault.fs.config,
- org.apache.jackrabbit.vault.fs.filter,
- org.apache.jackrabbit.vault.fs.impl,
- org.apache.jackrabbit.vault.fs.impl.aggregator,
- org.apache.jackrabbit.vault.fs.impl.io,
- org.apache.jackrabbit.vault.fs.impl.io.legacycnd,
- org.apache.jackrabbit.vault.fs.io,
- org.apache.jackrabbit.vault.fs.spi,
- org.apache.jackrabbit.vault.fs.spi.impl.jcr20,
- org.apache.jackrabbit.vault.packaging,
- org.apache.jackrabbit.vault.packaging.impl,
- org.apache.jackrabbit.vault.util,
- org.apache.jackrabbit.vault.util.xml.serialize,
- org.apache.jackrabbit.vault.util.xml.xerces.dom,
- org.apache.jackrabbit.vault.util.xml.xerces.util,
- org.apache.jackrabbit.vault.util.xml.xerces.xni,
- org.apache.jackrabbit.vault.util.xml.xerces.xni.parser
-Require-Bundle: org.eclipse.core.runtime
-Import-Package: org.apache.commons.collections,
- org.apache.commons.collections.map,
- org.apache.commons.collections.list,
- org.apache.commons.collections.iterators,
- org.apache.commons.logging,
- org.apache.commons.codec,
- org.apache.commons.codec.binary,
- org.apache.commons.io,
- org.apache.commons.io.output,
- org.osgi.framework,
- org.slf4j
diff --git a/eclipse/vlt-wrapper/META-INF/NOTICE b/eclipse/vlt-wrapper/META-INF/NOTICE
deleted file mode 100644
index 45dda0c..0000000
--- a/eclipse/vlt-wrapper/META-INF/NOTICE
+++ /dev/null
@@ -1,11 +0,0 @@
-
-Sling IDE Tools: FileVault wrapper
-Copyright 2007-2014 The Apache Software Foundation
-
-Apache Sling is based on source code originally developed
-by Day Software (http://www.day.com/).
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-
diff --git a/eclipse/vlt-wrapper/build.properties b/eclipse/vlt-wrapper/build.properties
deleted file mode 100644
index d3b5912..0000000
--- a/eclipse/vlt-wrapper/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- lib/org.apache.jackrabbit.vault-3.1.44.jar,\
- lib/vault-davex-3.1.44.jar,\
- lib/jcr-2.0.jar,\
- lib/guava-15.0.jar,\
- lib/jackrabbit-api-2.16.1.jar,\
- lib/jackrabbit-spi2dav-2.16.1.jar,\
- lib/jackrabbit-spi-2.16.1.jar,\
- lib/jackrabbit-jcr-client-2.16.1.jar,\
- lib/jackrabbit-jcr2spi-2.16.1.jar,\
- lib/jackrabbit-jcr-commons-2.16.1.jar,\
- lib/jackrabbit-spi-commons-2.16.1.jar,\
- lib/jackrabbit-webdav-2.16.1.jar,\
- lib/httpmime-4.5.3.jar,\
- lib/httpclient-4.5.3.jar,\
- lib/httpcore-4.4.6.jar
diff --git a/eclipse/vlt-wrapper/lib/.gitignore b/eclipse/vlt-wrapper/lib/.gitignore
deleted file mode 100644
index f23b948..0000000
--- a/eclipse/vlt-wrapper/lib/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.jar
\ No newline at end of file
diff --git a/eclipse/vlt-wrapper/pom.xml b/eclipse/vlt-wrapper/pom.xml
deleted file mode 100644
index 1dd9674..0000000
--- a/eclipse/vlt-wrapper/pom.xml
+++ /dev/null
@@ -1,178 +0,0 @@
-<?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 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.sling.ide</groupId>
- <artifactId>sling-ide-tooling</artifactId>
- <version>1.2.3-SNAPSHOT</version>
- </parent>
- <artifactId>org.apache.sling.ide.vlt-wrapper</artifactId>
- <packaging>eclipse-plugin</packaging>
- <name>Apache Sling IDE Tools FileVault wrapper</name>
-
- <scm>
- <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-ide-tooling.git</connection>
- <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-ide-tooling.git</developerConnection>
- <url>https://gitbox.apache.org/repos/asf?p=sling-ide-tooling.git</url>
- </scm>
- <build>
- <!-- ensure that extra files are picked up by the maven-source-plugin -->
- <resources>
- <resource>
- <directory>.</directory>
- <includes>
- <include>build.properties</include>
- <include>META-INF/*</include>
- </includes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>lib</directory>
- <includes>
- <include>**/*.jar</include>
- </includes>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <configuration>
- <artifactItems>
- <!-- START JCR dependencies -->
- <artifactItem>
- <groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
- <version>2.0</version>
- </artifactItem>
- <!-- END JCR dependencies -->
-
- <!-- START Apache Jackrabbit dependencies -->
- <artifactItem>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-api</artifactId>
- <version>${jackrabbit.version}</version>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-webdav</artifactId>
- <version>${jackrabbit.version}</version>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-spi-commons</artifactId>
- <version>${jackrabbit.version}</version>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-jcr-commons</artifactId>
- <version>${jackrabbit.version}</version>
- </artifactItem>
- <!-- transitive dependency of jackrabbit-jcr-commons -->
- <artifactItem>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>15.0</version>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-jcr2spi</artifactId>
- <version>${jackrabbit.version}</version>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-jcr-client</artifactId>
- <version>${jackrabbit.version}</version>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-spi</artifactId>
- <version>${jackrabbit.version}</version>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-spi2dav</artifactId>
- <version>${jackrabbit.version}</version>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpmime</artifactId>
- <version>4.5.3</version>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.5.3</version>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>4.4.6</version>
- </artifactItem>
- <!-- END Apache Jackrabbit dependencies -->
-
- <!-- START Apache Jackrabbit FileVault dependencies -->
- <artifactItem>
- <groupId>org.apache.jackrabbit.vault</groupId>
- <artifactId>vault-davex</artifactId>
- <version>${vault.version}</version>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.jackrabbit.vault</groupId>
- <artifactId>org.apache.jackrabbit.vault</artifactId>
- <version>${vault.version}</version>
- </artifactItem>
- <!-- END Apache Jackrabbit FileVault dependencies -->
-
- </artifactItems>
- <outputDirectory>lib</outputDirectory>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>copy</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <properties>
- <!-- must match the version being referenced in the pom.xml of filevault -->
- <jackrabbit.version>2.16.1</jackrabbit.version>
- <vault.version>3.1.44</vault.version>
- </properties>
-</project>
diff --git a/eclipse/vlt-wrapper/README.md b/shared/modules/vlt-wrapper/README.md
similarity index 100%
rename from eclipse/vlt-wrapper/README.md
rename to shared/modules/vlt-wrapper/README.md
diff --git a/shared/modules/vlt-wrapper/bnd.bnd b/shared/modules/vlt-wrapper/bnd.bnd
new file mode 100644
index 0000000..378e706
--- /dev/null
+++ b/shared/modules/vlt-wrapper/bnd.bnd
@@ -0,0 +1,37 @@
+-exportcontents: javax.jcr,\
+ javax.jcr.nodetype,\
+ org.apache.jackrabbit.api,\
+ org.apache.jackrabbit.api.management, \
+ org.apache.jackrabbit.api.security.authorization, \
+ org.apache.jackrabbit.api.security.principal, \
+ org.apache.jackrabbit.api.security.user, \
+ org.apache.jackrabbit.spi,\
+ org.apache.jackrabbit.spi.commons.conversion,\
+ org.apache.jackrabbit.spi.commons.namespace,\
+ org.apache.jackrabbit.util,\
+ org.apache.jackrabbit.vault.davex,\
+ org.apache.jackrabbit.vault.fs,\
+ org.apache.jackrabbit.vault.fs.api,\
+ org.apache.jackrabbit.vault.fs.config,\
+ org.apache.jackrabbit.vault.fs.filter,\
+ org.apache.jackrabbit.vault.fs.impl,\
+ org.apache.jackrabbit.vault.fs.impl.aggregator,\
+ org.apache.jackrabbit.vault.fs.impl.io,\
+ org.apache.jackrabbit.vault.fs.impl.io.legacycnd,\
+ org.apache.jackrabbit.vault.fs.io,\
+ org.apache.jackrabbit.vault.fs.spi,\
+ org.apache.jackrabbit.vault.fs.spi.impl.jcr20,\
+ org.apache.jackrabbit.vault.packaging,\
+ org.apache.jackrabbit.vault.packaging.impl,\
+ org.apache.jackrabbit.vault.util,\
+ org.apache.jackrabbit.vault.util.xml.serialize,\
+ org.apache.jackrabbit.vault.util.xml.xerces.dom,\
+ org.apache.jackrabbit.vault.util.xml.xerces.util,\
+ org.apache.jackrabbit.vault.util.xml.xerces.xni,\
+ org.apache.jackrabbit.vault.util.xml.xerces.xni.parser
+
+-includeresource: guava-*.jar;lib:=true,\
+ jackrabbit-*.jar;lib:=true, \
+ vault-*;lib:=true, \
+ http*.jar;lib:=true
+
diff --git a/shared/modules/vlt-wrapper/pom.xml b/shared/modules/vlt-wrapper/pom.xml
new file mode 100644
index 0000000..dd0c636
--- /dev/null
+++ b/shared/modules/vlt-wrapper/pom.xml
@@ -0,0 +1,132 @@
+<?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
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>sling</artifactId>
+ <version>33</version>
+ </parent>
+
+ <artifactId>org.apache.sling.ide.vlt-wrapper</artifactId>
+ <version>1.2.3-SNAPSHOT</version>
+ <name>Apache Sling IDE Tools FileVault wrapper</name>
+
+ <scm>
+ <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-ide-tooling.git</connection>
+ <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-ide-tooling.git</developerConnection>
+ <url>https://gitbox.apache.org/repos/asf?p=sling-ide-tooling.git</url>
+ </scm>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <!-- START JCR dependencies -->
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ </dependency>
+ <!-- END JCR dependencies -->
+
+ <!-- START Apache Jackrabbit dependencies -->
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-api</artifactId>
+ <version>${jackrabbit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-webdav</artifactId>
+ <version>${jackrabbit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-spi-commons</artifactId>
+ <version>${jackrabbit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-commons</artifactId>
+ <version>${jackrabbit.version}</version>
+ </dependency>
+ <!-- transitive dependency of jackrabbit-jcr-commons -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>15.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr2spi</artifactId>
+ <version>${jackrabbit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-client</artifactId>
+ <version>${jackrabbit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-spi</artifactId>
+ <version>${jackrabbit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-spi2dav</artifactId>
+ <version>${jackrabbit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ <version>4.5.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.5.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>4.4.6</version>
+ </dependency>
+ <!-- END Apache Jackrabbit dependencies -->
+
+ <!-- START Apache Jackrabbit FileVault dependencies -->
+ <dependency>
+ <groupId>org.apache.jackrabbit.vault</groupId>
+ <artifactId>vault-davex</artifactId>
+ <version>${vault.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit.vault</groupId>
+ <artifactId>org.apache.jackrabbit.vault</artifactId>
+ <version>${vault.version}</version>
+ </dependency>
+ </dependencies>
+
+ <properties>
+ <!-- must match the version being referenced in the pom.xml of filevault -->
+ <jackrabbit.version>2.16.1</jackrabbit.version>
+ <vault.version>3.1.44</vault.version>
+ </properties>
+</project>
diff --git a/shared/p2/pom.xml b/shared/p2/pom.xml
index edda3a4..c9902c7 100644
--- a/shared/p2/pom.xml
+++ b/shared/p2/pom.xml
@@ -43,6 +43,11 @@
<layout>p2</layout>
<url>http://download.eclipse.org/releases/luna</url>
</repository>
+ <repository>
+ <id>orbit</id>
+ <layout>p2</layout>
+ <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/</url>
+ </repository>
</repositories>
<build>
diff --git a/shared/p2/shared-feature/feature.xml b/shared/p2/shared-feature/feature.xml
index 65c0500..0533ba2 100644
--- a/shared/p2/shared-feature/feature.xml
+++ b/shared/p2/shared-feature/feature.xml
@@ -233,25 +233,10 @@
unpack="false"/>
<plugin
- id="org.apache.commons.io"
+ id="org.apache.sling.ide.vlt-wrapper"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
-
- <plugin
- id="org.apache.commons.httpclient"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="com.google.gson"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
</feature>
diff --git a/shared/p2/shared-feature/pom.xml b/shared/p2/shared-feature/pom.xml
index 18f93ee..d41000f 100644
--- a/shared/p2/shared-feature/pom.xml
+++ b/shared/p2/shared-feature/pom.xml
@@ -20,6 +20,11 @@
<artifactId>org.apache.sling.ide.api</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.ide.vlt-wrapper</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
</project>
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.