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 2014/06/30 15:43:57 UTC
svn commit: r1606737 - in /sling/trunk/tooling/ide: ./ api/ artifacts/
eclipse-core/ eclipse-m2e-test/ eclipse-m2e-ui/ eclipse-ui/ feature/
impl-resource/ impl-vlt/ m2e-feature/ p2update/ target-definition/
vlt-wrapper/
Author: rombert
Date: Mon Jun 30 13:43:56 2014
New Revision: 1606737
URL: http://svn.apache.org/r1606737
Log:
SLING-3685 - Document and further automate the IDE tooling release
process
Execute the maven-source-plugin during the 'sign' profile, and make sure
that the proper artifacts are included:
- include Eclipse plug-in specific artifacts in the output by making
them part of the Maven resources
- use the custom MANIFEST.MF whenever present
Modified:
sling/trunk/tooling/ide/api/pom.xml
sling/trunk/tooling/ide/artifacts/pom.xml
sling/trunk/tooling/ide/eclipse-core/pom.xml
sling/trunk/tooling/ide/eclipse-m2e-test/pom.xml
sling/trunk/tooling/ide/eclipse-m2e-ui/pom.xml
sling/trunk/tooling/ide/eclipse-ui/pom.xml
sling/trunk/tooling/ide/feature/pom.xml
sling/trunk/tooling/ide/impl-resource/pom.xml
sling/trunk/tooling/ide/impl-vlt/pom.xml
sling/trunk/tooling/ide/m2e-feature/pom.xml
sling/trunk/tooling/ide/p2update/pom.xml
sling/trunk/tooling/ide/pom.xml
sling/trunk/tooling/ide/target-definition/pom.xml
sling/trunk/tooling/ide/vlt-wrapper/pom.xml
Modified: sling/trunk/tooling/ide/api/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/api/pom.xml?rev=1606737&r1=1606736&r2=1606737&view=diff
==============================================================================
--- sling/trunk/tooling/ide/api/pom.xml (original)
+++ sling/trunk/tooling/ide/api/pom.xml Mon Jun 30 13:43:56 2014
@@ -32,4 +32,29 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/ide/api</developerConnection>
<url>http://svn.apache.org/viewvc/sling/trunk/tooling/ide/api</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>
+ <include>OSGI-INF/*</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: sling/trunk/tooling/ide/artifacts/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/artifacts/pom.xml?rev=1606737&r1=1606736&r2=1606737&view=diff
==============================================================================
--- sling/trunk/tooling/ide/artifacts/pom.xml (original)
+++ sling/trunk/tooling/ide/artifacts/pom.xml Mon Jun 30 13:43:56 2014
@@ -35,9 +35,29 @@
</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>
+ <include>OSGI-INF/*</include>
+ </includes>
+ </resource>
+ </resources>
<plugins>
<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>
<version>2.8</version>
<executions>
Modified: sling/trunk/tooling/ide/eclipse-core/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/pom.xml?rev=1606737&r1=1606736&r2=1606737&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-core/pom.xml (original)
+++ sling/trunk/tooling/ide/eclipse-core/pom.xml Mon Jun 30 13:43:56 2014
@@ -32,4 +32,30 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/ide/eclipse-core</developerConnection>
<url>http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core</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>.options</include>
+ <include>plugin.xml</include>
+ <include>META-INF/*</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: sling/trunk/tooling/ide/eclipse-m2e-test/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-m2e-test/pom.xml?rev=1606737&r1=1606736&r2=1606737&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-m2e-test/pom.xml (original)
+++ sling/trunk/tooling/ide/eclipse-m2e-test/pom.xml Mon Jun 30 13:43:56 2014
@@ -32,4 +32,28 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/ide/eclipse-m2e-test</developerConnection>
<url>http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-m2e-test</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>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: sling/trunk/tooling/ide/eclipse-m2e-ui/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-m2e-ui/pom.xml?rev=1606737&r1=1606736&r2=1606737&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-m2e-ui/pom.xml (original)
+++ sling/trunk/tooling/ide/eclipse-m2e-ui/pom.xml Mon Jun 30 13:43:56 2014
@@ -33,14 +33,30 @@
<url>http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-m2e-ui</url>
</scm>
-<build>
+ <build>
+ <!-- ensure that extra files are picked up by the maven-source-plugin -->
<resources>
- <resource>
- <directory>src/main/java</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
+ <resource>
+ <directory>.</directory>
+ <includes>
+ <include>build.properties</include>
+ <include>META-INF/*</include>
+ <include>.options</include>
+ <include>icons/*</include>
+ <include>lifecycle-mapping-metadata.xml</include>
+ </includes>
+ </resource>
</resources>
-</build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: sling/trunk/tooling/ide/eclipse-ui/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/pom.xml?rev=1606737&r1=1606736&r2=1606737&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/pom.xml (original)
+++ sling/trunk/tooling/ide/eclipse-ui/pom.xml Mon Jun 30 13:43:56 2014
@@ -33,19 +33,32 @@
<url>http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui</url>
</scm>
- <build>
+ <build>
+ <!-- ensure that extra files are picked up by the maven-source-plugin -->
<resources>
- <resource>
- <directory>src/main/java</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
+ <resource>
+ <directory>.</directory>
+ <includes>
+ <include>build.properties</include>
+ <include>META-INF/*</include>
+ <include>OSGI-INF/*</include>
+ <include>icons/*</include>
+ <include>.options</include>
+ </includes>
+ </resource>
</resources>
-
<plugins>
<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>
Modified: sling/trunk/tooling/ide/feature/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/feature/pom.xml?rev=1606737&r1=1606736&r2=1606737&view=diff
==============================================================================
--- sling/trunk/tooling/ide/feature/pom.xml (original)
+++ sling/trunk/tooling/ide/feature/pom.xml Mon Jun 30 13:43:56 2014
@@ -32,4 +32,18 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/ide/feature</developerConnection>
<url>http://svn.apache.org/viewvc/sling/trunk/tooling/ide/feature</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>
+ <include>feature.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
</project>
Modified: sling/trunk/tooling/ide/impl-resource/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-resource/pom.xml?rev=1606737&r1=1606736&r2=1606737&view=diff
==============================================================================
--- sling/trunk/tooling/ide/impl-resource/pom.xml (original)
+++ sling/trunk/tooling/ide/impl-resource/pom.xml Mon Jun 30 13:43:56 2014
@@ -32,4 +32,29 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/ide/impl-resource</developerConnection>
<url>http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-resource</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>
+ <include>OSGI-INF/*</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: sling/trunk/tooling/ide/impl-vlt/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-vlt/pom.xml?rev=1606737&r1=1606736&r2=1606737&view=diff
==============================================================================
--- sling/trunk/tooling/ide/impl-vlt/pom.xml (original)
+++ sling/trunk/tooling/ide/impl-vlt/pom.xml Mon Jun 30 13:43:56 2014
@@ -32,4 +32,30 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/ide/impl-vlt</developerConnection>
<url>http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-vlt</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>
+ <include>OSGI-INF/*</include>
+ <include>.options</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: sling/trunk/tooling/ide/m2e-feature/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/m2e-feature/pom.xml?rev=1606737&r1=1606736&r2=1606737&view=diff
==============================================================================
--- sling/trunk/tooling/ide/m2e-feature/pom.xml (original)
+++ sling/trunk/tooling/ide/m2e-feature/pom.xml Mon Jun 30 13:43:56 2014
@@ -32,4 +32,18 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/ide/m2e-feature</developerConnection>
<url>http://svn.apache.org/viewvc/sling/trunk/tooling/ide/m2e-feature</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>
+ <include>feature.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
</project>
Modified: sling/trunk/tooling/ide/p2update/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/p2update/pom.xml?rev=1606737&r1=1606736&r2=1606737&view=diff
==============================================================================
--- sling/trunk/tooling/ide/p2update/pom.xml (original)
+++ sling/trunk/tooling/ide/p2update/pom.xml Mon Jun 30 13:43:56 2014
@@ -34,6 +34,16 @@
</scm>
<build>
+ <!-- ensure that extra files are picked up by the maven-source-plugin -->
+ <resources>
+ <resource>
+ <directory>.</directory>
+ <includes>
+ <include>category.xml</include>
+ <include>siteTemplate/*</include>
+ </includes>
+ </resource>
+ </resources>
<plugins>
<plugin>
<groupId>org.jboss.tools.tycho-plugins</groupId>
Modified: sling/trunk/tooling/ide/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/pom.xml?rev=1606737&r1=1606736&r2=1606737&view=diff
==============================================================================
--- sling/trunk/tooling/ide/pom.xml (original)
+++ sling/trunk/tooling/ide/pom.xml Mon Jun 30 13:43:56 2014
@@ -231,6 +231,25 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
Modified: sling/trunk/tooling/ide/target-definition/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/target-definition/pom.xml?rev=1606737&r1=1606736&r2=1606737&view=diff
==============================================================================
--- sling/trunk/tooling/ide/target-definition/pom.xml (original)
+++ sling/trunk/tooling/ide/target-definition/pom.xml Mon Jun 30 13:43:56 2014
@@ -33,4 +33,16 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/ide/target-definition</developerConnection>
<url>http://svn.apache.org/viewvc/sling/trunk/tooling/ide/target-definition</url>
</scm>
+
+ <build>
+ <!-- ensure that extra files are picked up by the maven-source-plugin -->
+ <resources>
+ <resource>
+ <directory>.</directory>
+ <includes>
+ <include>*.target</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
</project>
Modified: sling/trunk/tooling/ide/vlt-wrapper/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/vlt-wrapper/pom.xml?rev=1606737&r1=1606736&r2=1606737&view=diff
==============================================================================
--- sling/trunk/tooling/ide/vlt-wrapper/pom.xml (original)
+++ sling/trunk/tooling/ide/vlt-wrapper/pom.xml Mon Jun 30 13:43:56 2014
@@ -32,9 +32,27 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/ide/vlt-wrapper</developerConnection>
<url>http://svn.apache.org/viewvc/sling/trunk/tooling/ide/vlt-wrapper</url>
</scm>
-
- <build>
- <plugins>
+ <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>
+ <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>