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:51 UTC

[sling-ide-tooling] 05/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 f7a4d476e4183d370d7656035df9837502d30976
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Apr 3 17:23:23 2018 +0300

    SLING-5648 - Make Non-Eclipse Module regular Maven Packages
    
    Improvements to shared/modules:
    
    - add bnd.bnd files to make sure the bnd profile is picked up
      and the correct MANIFEST.MF packed
    - add a reactor module
---
 shared/modules/api/bnd.bnd           |  1 +
 shared/modules/api/pom.xml           |  1 +
 shared/modules/impl-resource/bnd.bnd |  1 +
 shared/modules/impl-resource/pom.xml |  3 ++-
 shared/modules/impl-vlt/pom.xml      |  3 ++-
 shared/modules/pom.xml               | 41 ++++++++++++++++++++++++++++++++++++
 shared/modules/vlt-wrapper/bnd.bnd   |  1 +
 shared/modules/vlt-wrapper/pom.xml   |  1 +
 8 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/shared/modules/api/bnd.bnd b/shared/modules/api/bnd.bnd
new file mode 100644
index 0000000..dbeea24
--- /dev/null
+++ b/shared/modules/api/bnd.bnd
@@ -0,0 +1 @@
+-exportcontents: ${packages;VERSIONED}
diff --git a/shared/modules/api/pom.xml b/shared/modules/api/pom.xml
index ca1c466..2f6a2c1 100644
--- a/shared/modules/api/pom.xml
+++ b/shared/modules/api/pom.xml
@@ -19,6 +19,7 @@
         <artifactId>sling</artifactId>
         <version>33</version>
     </parent>
+    <groupId>org.apache.sling.ide</groupId>
     <artifactId>org.apache.sling.ide.api</artifactId>
     <name>Apache Sling IDE Tools API</name>
     <version>1.2.3-SNAPSHOT</version>
diff --git a/shared/modules/impl-resource/bnd.bnd b/shared/modules/impl-resource/bnd.bnd
new file mode 100644
index 0000000..dbeea24
--- /dev/null
+++ b/shared/modules/impl-resource/bnd.bnd
@@ -0,0 +1 @@
+-exportcontents: ${packages;VERSIONED}
diff --git a/shared/modules/impl-resource/pom.xml b/shared/modules/impl-resource/pom.xml
index f89329c..29aeccf 100644
--- a/shared/modules/impl-resource/pom.xml
+++ b/shared/modules/impl-resource/pom.xml
@@ -20,6 +20,7 @@
         <version>33</version>
     </parent>
 
+    <groupId>org.apache.sling.ide</groupId>
     <artifactId>org.apache.sling.ide.impl-resource</artifactId>
     <version>1.2.3-SNAPSHOT</version>
     <name>Apache Sling IDE Tools Resource-based Implementation</name>
@@ -41,7 +42,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.sling</groupId>
+            <groupId>org.apache.sling.ide</groupId>
             <artifactId>org.apache.sling.ide.api</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
diff --git a/shared/modules/impl-vlt/pom.xml b/shared/modules/impl-vlt/pom.xml
index 8333a97..19e9fb0 100644
--- a/shared/modules/impl-vlt/pom.xml
+++ b/shared/modules/impl-vlt/pom.xml
@@ -20,6 +20,7 @@
         <version>33</version>
     </parent>
 
+    <groupId>org.apache.sling.ide</groupId>
     <artifactId>org.apache.sling.ide.impl-vlt</artifactId>
     <version>1.2.3-SNAPSHOT</version>
     <name>Apache Sling IDE Tools FileVault implementation</name>
@@ -51,7 +52,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.sling</groupId>
+            <groupId>org.apache.sling.ide</groupId>
             <artifactId>org.apache.sling.ide.api</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
diff --git a/shared/modules/pom.xml b/shared/modules/pom.xml
new file mode 100644
index 0000000..11a3734
--- /dev/null
+++ b/shared/modules/pom.xml
@@ -0,0 +1,41 @@
+<?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</groupId>
+        <artifactId>apache</artifactId>
+        <version>14</version>
+    </parent>
+    <groupId>org.apache.sling.ide</groupId>
+    <artifactId>sling-ide-tooling-shared</artifactId>
+    <version>1.2.3-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>Apache Sling IDE Tools - Shared Modules</name>
+    <url>http://sling.apache.org</url>
+
+    <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>
+
+    <modules>
+        <module>api</module>
+        <module>impl-resource</module>
+        <module>impl-vlt</module>
+        <module>vlt-wrapper</module>
+    </modules>
+</project>
diff --git a/shared/modules/vlt-wrapper/bnd.bnd b/shared/modules/vlt-wrapper/bnd.bnd
index 378e706..679bf03 100644
--- a/shared/modules/vlt-wrapper/bnd.bnd
+++ b/shared/modules/vlt-wrapper/bnd.bnd
@@ -35,3 +35,4 @@
     vault-*;lib:=true, \
     http*.jar;lib:=true
 
+Import-Package: sun.misc;resolution:=optional, *
\ No newline at end of file
diff --git a/shared/modules/vlt-wrapper/pom.xml b/shared/modules/vlt-wrapper/pom.xml
index dd0c636..2c6d95a 100644
--- a/shared/modules/vlt-wrapper/pom.xml
+++ b/shared/modules/vlt-wrapper/pom.xml
@@ -20,6 +20,7 @@
         <version>33</version>
     </parent>
 
+    <groupId>org.apache.sling.ide</groupId>
     <artifactId>org.apache.sling.ide.vlt-wrapper</artifactId>
     <version>1.2.3-SNAPSHOT</version>
     <name>Apache Sling IDE Tools FileVault wrapper</name>

-- 
To stop receiving notification emails like this one, please contact
rombert@apache.org.