Add SDK to update site

Signed-off-by: Fred Bricon <fbricon@gmail.com>
jbosstools · Sep 19, 2012 · 1945390 · 1945390
1 parent a981bd7
commit 1945390
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 37 deletions.
diff --git a/org.jboss.tools.maven.apt.feature/pom.xml b/org.jboss.tools.maven.apt.feature/pom.xml
@@ -19,4 +19,37 @@
   <packaging>eclipse-feature</packaging>
 
   <name>Maven Integration for Eclipse JDT APT :: Feature</name>
-</project>
+
+  <build>
+  <plugins>
+        <plugin>
+                <groupId>org.eclipse.tycho.extras</groupId>
+                <artifactId>tycho-source-feature-plugin</artifactId>
+                <version>${tycho-extras-version}</version>
+                <executions>
+                        <execution>
+                                <id>source-feature</id>
+                                <phase>package</phase>
+                                <goals>
+                                        <goal>source-feature</goal>
+                                </goals>
+                        </execution>
+                </executions>
+            </plugin>
+        <plugin>
+                <groupId>org.eclipse.tycho</groupId>
+                <artifactId>tycho-p2-plugin</artifactId>
+                <version>${tycho-version}</version>
+                <executions>
+                        <execution>
+                                <id>attached-p2-metadata</id>
+                                <phase>package</phase>
+                                <goals>
+                                        <goal>p2-metadata</goal>
+                                </goals>
+                        </execution>
+                </executions>
+        </plugin>
+    </plugins>
+  </build>
+  </project>
diff --git a/org.jboss.tools.maven.apt.feature/sourceTemplateFeature/.gitkeep b/org.jboss.tools.maven.apt.feature/sourceTemplateFeature/.gitkeep
diff --git a/org.jboss.tools.maven.apt.site/site.xml → org.jboss.tools.maven.apt.site/category.xml b/org.jboss.tools.maven.apt.site/site.xml → org.jboss.tools.maven.apt.site/category.xml
@@ -8,4 +8,8 @@
       <category name="m2e-apt"/>
    </feature>
    <category-def name="m2e-apt" label="Maven Integration for JDT APT"/>
+   <feature url="features/org.jboss.tools.maven.apt.feature.source_0.0.0.qualifier.jar" id="org.jboss.tools.maven.apt.feature.source" version="0.0.0">
+      <category name="m2e-apt-sdk"/>
+   </feature>
+   <category-def name="m2e-apt-sdk" label="Maven Integration for JDT APT (SDK)"/>
 </site>
diff --git a/org.jboss.tools.maven.apt.site/pom.xml b/org.jboss.tools.maven.apt.site/pom.xml
@@ -16,40 +16,9 @@
   </parent>
 
   <artifactId>org.jboss.tools.maven.apt.site</artifactId>
-  <packaging>eclipse-update-site</packaging>
+  <packaging>eclipse-repository</packaging>
 
   <name>Maven Integration for Eclipse JDT APT :: Site</name>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-packaging-plugin</artifactId>
-        <version>${tycho-version}</version>
-        <configuration>
-          <metadataRepositoryName>Maven Integration for Eclipse JDT APT</metadataRepositoryName>
-          <artifactRepositoryName>Maven Integration for Eclipse JDT APT</artifactRepositoryName>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/assembly.xml</descriptor>
-          </descriptors>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-assembly</id> 
-            <phase>package</phase> 
-            <goals>
-              <goal>single</goal> 
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
 </project>
 
diff --git a/pom.xml b/pom.xml
@@ -30,8 +30,9 @@
   <inceptionYear>2011</inceptionYear>
   <properties>
     <tycho-version>0.15.0</tycho-version>
+    <tycho-extras-version>${tycho-version}</tycho-extras-version>
     <tycho.test.jvmArgs>-Xmx800m -XX:MaxPermSize=256m</tycho.test.jvmArgs>
-    <m2e-core-version>1.1.0</m2e-core-version>
+    <m2e-core-version>1.2.0</m2e-core-version>
     <site-compressed>http://repository.sonatype.org/service/local/repositories/forge-sites/content-compressed/</site-compressed>
   </properties>
 
@@ -50,15 +51,15 @@
     </repository>
 
     <repository>
-      <id>helios</id>
+      <id>juno</id>
       <layout>p2</layout>
-      <url>http://download.eclipse.org/releases/indigo</url>
+      <url>http://download.eclipse.org/releases/juno</url>
     </repository>
 
     <repository>
       <id>m2e</id>
       <layout>p2</layout>
-      <url>https://repository.sonatype.org/content/repositories/forge-sites/m2e/${m2e-core-version}/N/LATEST/</url>
+      <url>http://download.eclipse.org/technology/m2e/releases/</url>
     </repository>
   </repositories>
 
@@ -80,6 +81,21 @@
           <ignoreTychoRepositories>true</ignoreTychoRepositories>
         </configuration>
       </plugin>
+
+        <plugin>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>tycho-source-plugin</artifactId>
+            <version>${tycho-version}</version>
+            <executions>
+                    <execution>
+                            <id>plugin-source</id>
+                            <goals>
+                                    <goal>plugin-source</goal>
+                            </goals>
+                    </execution>
+            </executions>
+        </plugin>
+
     </plugins>
 
     <pluginManagement>