Include source features in generated SDK P2 repository

The problem was that the generated org.simantics.sdk.source feature was
missing from org.simantics.sdk.repository/category.xml and thus the
build would not include any sources.

Also bumped used tycho version to 0.26.0 from 0.25.0.

refs #6621

Change-Id: I10e63a77b414f67bb32168d93d0c612ac1bc0b56

diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index 2d97f0e0d341141aca355b2c4e8ad7970b8ac31e..19c1651eabad3ae02a218ba625fd438af450d408 100644 (file)
--- a/.mvn/extensions.xml
+++ b/.mvn/extensions.xml
@@ -3,6 +3,6 @@
   <extension>\r
     <groupId>org.eclipse.tycho.extras</groupId>\r
     <artifactId>tycho-pomless</artifactId>\r
   <extension>\r
     <groupId>org.eclipse.tycho.extras</groupId>\r
     <artifactId>tycho-pomless</artifactId>\r

-    <version>0.25.0</version>\r
+    <version>0.26.0</version>\r

   </extension>\r
 </extensions> 
\ No newline at end of file
   </extension>\r
 </extensions> 
\ No newline at end of file

diff --git a/releng/org.simantics.sdk.repository/category.xml b/releng/org.simantics.sdk.repository/category.xml
index f97fc75744c111369b30c66e56b15480f8637a5c..64051231aecbc03bc2f790daa0ca9cd5b9d0f606 100644 (file)
--- a/releng/org.simantics.sdk.repository/category.xml
+++ b/releng/org.simantics.sdk.repository/category.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <site>\r
 <?xml version="1.0" encoding="UTF-8"?>\r
 <site>\r

-   <feature url="features/org.simantics.sdk_1.25.0.jar" id="org.simantics.sdk" version="1.25.0">\r
+   <feature id="org.simantics.sdk">\r
+      <category name="org.simantics.target"/>\r
+   </feature>\r
+   <feature id="org.simantics.sdk.source">\r

       <category name="org.simantics.target"/>\r
    </feature>\r
    <category-def name="org.simantics.target" label="Simantics Target">\r
       <category name="org.simantics.target"/>\r
    </feature>\r
    <category-def name="org.simantics.target" label="Simantics Target">\r

diff --git a/releng/org.simantics.tycho.configuration/pom.xml b/releng/org.simantics.tycho.configuration/pom.xml
index 5e874e6a639d8acaa64281b39c9c26addf727ecd..a6b0ce2fa0054057a7bf62e7445f89c6c2ffbb93 100644 (file)
--- a/releng/org.simantics.tycho.configuration/pom.xml
+++ b/releng/org.simantics.tycho.configuration/pom.xml
@@ -8,8 +8,8 @@
        <packaging>pom</packaging>\r
 \r
        <properties>\r
        <packaging>pom</packaging>\r
 \r
        <properties>\r

-               <tycho.version>0.25.0</tycho.version>\r
-               <tycho.extras.version>0.25.0</tycho.extras.version>\r
+               <tycho.version>0.26.0</tycho.version>\r
+               <tycho.extras.version>0.26.0</tycho.extras.version>\r

                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
                <mars-repo.url>http://download.eclipse.org/releases/mars</mars-repo.url>\r
        </properties>\r
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
                <mars-repo.url>http://download.eclipse.org/releases/mars</mars-repo.url>\r
        </properties>\r


@@ -32,6 +32,11 @@
                                <version>${tycho.version}</version>\r
                                <extensions>true</extensions>\r
                        </plugin>\r
                                <version>${tycho.version}</version>\r
                                <extensions>true</extensions>\r
                        </plugin>\r

+                       <plugin>\r
+                               <groupId>org.eclipse.tycho</groupId>\r
+                               <artifactId>tycho-versions-plugin</artifactId>\r
+                               <version>${tycho.version}</version>\r
+                       </plugin>\r

                        <plugin>\r
                                <groupId>org.eclipse.tycho</groupId>\r
                                <artifactId>tycho-packaging-plugin</artifactId>\r
                        <plugin>\r
                                <groupId>org.eclipse.tycho</groupId>\r
                                <artifactId>tycho-packaging-plugin</artifactId>\r


@@ -85,6 +90,11 @@
                                        </environments>\r
                                </configuration>\r
                        </plugin>\r
                                        </environments>\r
                                </configuration>\r
                        </plugin>\r

+                       <plugin>\r
+                               <groupId>org.eclipse.tycho.extras</groupId>\r
+                               <artifactId>tycho-source-feature-plugin</artifactId>\r
+                               <version>${tycho.extras.version}</version>\r
+                       </plugin>\r

                </plugins>\r
        </build>\r
 </project>\r
                </plugins>\r
        </build>\r
 </project>\r