464535 : extract incubator site in incubation profile

Change-Id: I2b162536ce3ae34e3511e0535007b164f39bca96
Signed-off-by: Fred Bricon <fbricon@gmail.com>

10 files changed, 160 insertions, 17 deletions

diff --git a/org.eclipse.m2e.importer.feature/feature.properties b/org.eclipse.m2e.importer.feature/feature.properties
index 1e849f46..982b9b75 100644
--- a/org.eclipse.m2e.importer.feature/feature.properties
+++ b/org.eclipse.m2e.importer.feature/feature.properties
@@ -4,7 +4,7 @@
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
-# 
+#
 # Contributors:
 #     Mickael Istria (Red Hat Inc.)
 ###############################################################################
@@ -24,11 +24,11 @@ providerName=Eclipse.org - m2e
 #updateSiteName=The Eclipse Project Updates
 
 # "description" property - description of the feature
-description=This adds to the Smart Inport framework support for Maven projects with m2e.
+description=This adds to the Smart Import framework support for Maven projects with m2e.
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2015 Red Hat Inc. and others.\n\
+Copyright (c) 2015-2016 Red Hat Inc. and others.\n\
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
diff --git a/org.eclipse.m2e.importer.feature/feature.xml b/org.eclipse.m2e.importer.feature/feature.xml
index 33fdf800..51256512 100644
--- a/org.eclipse.m2e.importer.feature/feature.xml
+++ b/org.eclipse.m2e.importer.feature/feature.xml
@@ -18,7 +18,11 @@
    <license url="%licenseURL">
       %license
    </license>
-   
+
+   <requires>
+      <import feature="org.eclipse.m2e.feature" />
+   </requires>
+
    <plugin
          id="org.eclipse.m2e.importer"
          download-size="0"
diff --git a/org.eclipse.m2e.importer/META-INF/MANIFEST.MF b/org.eclipse.m2e.importer/META-INF/MANIFEST.MF
index 6f58749d..34c691c8 100644
--- a/org.eclipse.m2e.importer/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.importer/META-INF/MANIFEST.MF
@@ -13,6 +13,6 @@ Require-Bundle: org.eclipse.e4.ui.importer,
  org.eclipse.m2e.core;bundle-version="1.6.0",
  org.eclipse.m2e.core.ui;bundle-version="1.6.0",
  org.slf4j.api;bundle-version="1.6.2"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.m2e.importer.internal.Activator
diff --git a/org.eclipse.m2e.incubation.site/category.xml b/org.eclipse.m2e.incubation.site/category.xml
new file mode 100644
index 00000000..5aca8141
--- /dev/null
+++ b/org.eclipse.m2e.incubation.site/category.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <description url="http://m2eclipse.sonatype.org/site">
+      Maven Integration for Eclipse
+   </description>
+   <feature id="org.eclipse.m2e.importer.feature" version="0.0.0">
+      <category name="m2e.incubation"/>
+   </feature>
+   <category-def name="m2e.incubation" label="Maven Integration for Eclipse - Incubating features"/>
+</site>
diff --git a/org.eclipse.m2e.incubation.site/org.eclipse.m2e.incubation.site.product b/org.eclipse.m2e.incubation.site/org.eclipse.m2e.incubation.site.product
new file mode 100644
index 00000000..0f0f7a04
--- /dev/null
+++ b/org.eclipse.m2e.incubation.site/org.eclipse.m2e.incubation.site.product
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product uid="org.eclipse.m2e.incubation.site" version="1.7.0.qualifier" useFeatures="true" includeLaunchers="false">
+
+   <features>
+      <feature id="org.eclipse.m2e.importer.feature" />
+   </features>
+
+</product>
diff --git a/org.eclipse.m2e.incubation.site/pom.xml b/org.eclipse.m2e.incubation.site/pom.xml
new file mode 100644
index 00000000..6201da0c
--- /dev/null
+++ b/org.eclipse.m2e.incubation.site/pom.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2008 Sonatype, Inc.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/legal/epl-v10.html
+-->
+<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/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.eclipse.m2e</groupId>
+    <artifactId>m2e-core</artifactId>
+    <version>1.7.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>org.eclipse.m2e.incubation.site</artifactId>
+  <packaging>eclipse-repository</packaging>
+
+  <name>Maven Integration for Eclipse Incubation Update Site</name>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <version>${tycho-version}</version>
+        <configuration>
+          <includePackedArtifacts>true</includePackedArtifacts>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>publish-site</id>
+
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.sonatype.plugins</groupId>
+            <artifactId>maven-upload-plugin</artifactId>
+            <version>0.0.1</version>
+            <executions>
+              <execution>
+                <id>publish-site</id>
+                <phase>install</phase>
+                <goals>
+                  <goal>upload-file</goal>
+                </goals>
+                <configuration>
+                  <file>${project.build.directory}/${project.artifactId}-${project.version}.zip</file>
+                  <serverId>${m2e.site-serverSettingsId}</serverId>
+                  <repositoryUrl>${m2e.site-compressed}</repositoryUrl>
+                  <repositoryPath>m2e/${unqualifiedVersion}/N/${unqualifiedVersion}.${buildQualifier}</repositoryPath>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>publish-site-latest</id>
+
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.sonatype.plugins</groupId>
+            <artifactId>maven-upload-plugin</artifactId>
+            <version>0.0.1</version>
+            <executions>
+              <execution>
+                <id>publish-site-latest</id>
+                <phase>install</phase>
+                <goals>
+                  <goal>upload-file</goal>
+                </goals>
+                <configuration>
+                  <file>${project.build.directory}/${project.artifactId}-${project.version}.zip</file>
+                  <serverId>${m2e.site-serverSettingsId}</serverId>
+                  <repositoryUrl>${m2e.site-compressed}</repositoryUrl>
+                  <repositoryPath>m2e/${unqualifiedVersion}/N/LATEST</repositoryPath>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>
diff --git a/org.eclipse.m2e.incubation.site/src/main/assembly/assembly.xml b/org.eclipse.m2e.incubation.site/src/main/assembly/assembly.xml
new file mode 100644
index 00000000..8c7848d4
--- /dev/null
+++ b/org.eclipse.m2e.incubation.site/src/main/assembly/assembly.xml
@@ -0,0 +1,15 @@
+<assembly>
+  <id>site</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>${project.build.directory}/site</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+  </fileSets>
+
+</assembly>
+
diff --git a/org.eclipse.m2e.site/category.xml b/org.eclipse.m2e.site/category.xml
index de60c1e3..c0342bff 100644
--- a/org.eclipse.m2e.site/category.xml
+++ b/org.eclipse.m2e.site/category.xml
@@ -9,9 +9,5 @@
    <feature url="features/org.eclipse.m2e.logback.feature_0.0.0.jar" id="org.eclipse.m2e.logback.feature" version="0.0.0">
       <category name="m2e"/>
    </feature>
-   <feature id="org.eclipse.m2e.importer.feature" version="0.0.0">
-      <category name="m2e.incubation"/>
-   </feature>
    <category-def name="m2e" label="Maven Integration for Eclipse"/>
-   <category-def name="m2e.incubation" label="Maven Integration for Eclipse - Incubating features"/>
 </site>
diff --git a/org.eclipse.m2e.site/org.eclipse.m2e.site.product b/org.eclipse.m2e.site/org.eclipse.m2e.site.product
index 95ad54f4..fe247a2b 100644
--- a/org.eclipse.m2e.site/org.eclipse.m2e.site.product
+++ b/org.eclipse.m2e.site/org.eclipse.m2e.site.product
@@ -7,7 +7,6 @@
       <feature id="org.eclipse.m2e.feature" />
       <feature id="org.eclipse.m2e.sdk.feature" />
       <feature id="org.eclipse.m2e.logback.feature" />
-      <feature id="org.eclipse.m2e.importer.feature" />
    </features>
 
 </product>
diff --git a/pom.xml b/pom.xml
index d9c4ad93..e45dfb51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,11 +72,6 @@
       <layout>p2</layout>
       <url>http://download.eclipse.org/cbi/updates/license</url>
     </repository>
-    <repository>
-      <id>e4.ui-incubator</id>
-      <layout>p2</layout>
-      <url>http://download.eclipse.org/e4/snapshots/org.eclipse.e4.ui</url>
-    </repository>
   </repositories>
 
   <pluginRepositories>
@@ -110,7 +105,6 @@
     <module>org.eclipse.m2e.scm</module>
     <module>org.eclipse.m2e.profiles.core</module>
     <module>org.eclipse.m2e.profiles.ui</module>
-    <module>org.eclipse.m2e.importer</module>
 
     <!-- common test helpers -->
     <module>org.eclipse.m2e.tests.common</module>
@@ -121,7 +115,6 @@
 
     <!-- features -->
     <module>org.eclipse.m2e.feature</module>
-    <module>org.eclipse.m2e.importer.feature</module>
     <module>org.eclipse.m2e.sdk.feature</module>
     <module>org.eclipse.m2e.logback.feature</module>
 
@@ -322,6 +315,27 @@
         <module>m2e-maven-runtime</module>
       </modules>
     </profile>
+    <profile>
+      <id>incubation</id>
+      <activation>
+        <property>
+          <name>incubation</name>
+          <value>true</value>
+        </property>
+      </activation>
+      <modules>
+        <module>org.eclipse.m2e.importer</module>
+        <module>org.eclipse.m2e.importer.feature</module>
+        <module>org.eclipse.m2e.incubation.site</module>
+      </modules>
+      <repositories>
+        <repository>
+          <id>e4.ui-incubator</id>
+          <layout>p2</layout>
+          <url>http://download.eclipse.org/e4/snapshots/org.eclipse.e4.ui</url>
+        </repository>
+      </repositories>
+    </profile>
   </profiles>
 
   <developers>