sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From romb...@apache.org
Subject [sling-ide-tooling] 04/05: SLING-5648 - Make Non-Eclipse Module regular Maven Packages
Date Thu, 05 Apr 2018 18:00:50 GMT
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 f7f20d07a0ce2b56e48f3db48995ef62d2b39802
Author: Robert Munteanu <rombert@apache.org>
AuthorDate: Thu Apr 5 19:43:18 2018 +0300

    SLING-5648 - Make Non-Eclipse Module regular Maven Packages
    
    Ensure that pure bnd modules are resolved as OSGi bundles in the Eclipse
    workspace by copying the MANIFEST.MF file to the project root, where
    PDE expects it.
---
 shared/modules/.gitignore            |  1 +
 shared/modules/api/pom.xml           | 10 ++---
 shared/modules/impl-resource/pom.xml |  9 ++---
 shared/modules/impl-vlt/pom.xml      |  9 ++---
 shared/modules/parent/pom.xml        | 76 ++++++++++++++++++++++++++++++++++++
 shared/modules/pom.xml               |  1 +
 shared/modules/vlt-wrapper/pom.xml   |  9 ++---
 7 files changed, 95 insertions(+), 20 deletions(-)

diff --git a/shared/modules/.gitignore b/shared/modules/.gitignore
new file mode 100644
index 0000000..6cb2adc
--- /dev/null
+++ b/shared/modules/.gitignore
@@ -0,0 +1 @@
+MANIFEST.MF
diff --git a/shared/modules/api/pom.xml b/shared/modules/api/pom.xml
index 2f6a2c1..9a5fba9 100644
--- a/shared/modules/api/pom.xml
+++ b/shared/modules/api/pom.xml
@@ -15,14 +15,14 @@
     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>
+        <groupId>org.apache.sling.ide</groupId>
+        <artifactId>sling-ide-shared-parent</artifactId>
+        <version>1.2.3-SNAPSHOT</version>
+        <relativePath>../parent/</relativePath>
     </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>
 
     <scm>
         <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-ide-tooling.git</connection>
diff --git a/shared/modules/impl-resource/pom.xml b/shared/modules/impl-resource/pom.xml
index 29aeccf..4bdae32 100644
--- a/shared/modules/impl-resource/pom.xml
+++ b/shared/modules/impl-resource/pom.xml
@@ -15,14 +15,13 @@
     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>
+        <groupId>org.apache.sling.ide</groupId>
+        <artifactId>sling-ide-shared-parent</artifactId>
+        <version>1.2.3-SNAPSHOT</version>
+        <relativePath>../parent/</relativePath>
     </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>
 
     <scm>
diff --git a/shared/modules/impl-vlt/pom.xml b/shared/modules/impl-vlt/pom.xml
index 19e9fb0..19af497 100644
--- a/shared/modules/impl-vlt/pom.xml
+++ b/shared/modules/impl-vlt/pom.xml
@@ -15,14 +15,13 @@
     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>
+        <groupId>org.apache.sling.ide</groupId>
+        <artifactId>sling-ide-shared-parent</artifactId>
+        <version>1.2.3-SNAPSHOT</version>
+        <relativePath>../parent/</relativePath>
     </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>
 
     <scm>
diff --git a/shared/modules/parent/pom.xml b/shared/modules/parent/pom.xml
new file mode 100644
index 0000000..b5f8dea
--- /dev/null
+++ b/shared/modules/parent/pom.xml
@@ -0,0 +1,76 @@
+<?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 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>33</version>
+        <relativePath />
+    </parent>
+
+    <groupId>org.apache.sling.ide</groupId>
+    <artifactId>sling-ide-shared-parent</artifactId>
+    <packaging>pom</packaging>
+    <version>1.2.3-SNAPSHOT</version>
+
+    <name>Apache Sling IDE - Shared Modules Parent</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>
+
+    <profiles>
+        <profile>
+            <id>m2e</id>
+            <!-- This profile is only activated when building in Eclipse 
+                with m2e -->
+            <activation>
+                <property>
+                    <name>m2e.version</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-resources-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>copy-manifest-for-pde</id>
+                                <phase>process-classes</phase>
+                                <goals>
+                                    <goal>copy-resources</goal>
+                                </goals>
+                                <configuration>
+                                    <outputDirectory>META-INF</outputDirectory>
+                                    <resources>
+                                        <resource>
+                                            <directory>${project.build.outputDirectory}/META-INF</directory>
+                                            <includes>
+                                                <include>MANIFEST.MF</include>
+                                            </includes>
+                                        </resource>
+                                    </resources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
diff --git a/shared/modules/pom.xml b/shared/modules/pom.xml
index 11a3734..5121b6b 100644
--- a/shared/modules/pom.xml
+++ b/shared/modules/pom.xml
@@ -33,6 +33,7 @@
     </scm>
 
     <modules>
+        <module>parent</module>
         <module>api</module>
         <module>impl-resource</module>
         <module>impl-vlt</module>
diff --git a/shared/modules/vlt-wrapper/pom.xml b/shared/modules/vlt-wrapper/pom.xml
index 2c6d95a..a180d92 100644
--- a/shared/modules/vlt-wrapper/pom.xml
+++ b/shared/modules/vlt-wrapper/pom.xml
@@ -15,14 +15,13 @@
     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>
+        <groupId>org.apache.sling.ide</groupId>
+        <artifactId>sling-ide-shared-parent</artifactId>
+        <version>1.2.3-SNAPSHOT</version>
+        <relativePath>../parent/</relativePath>
     </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>
 
     <scm>

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

Mime
View raw message