Merge "possibleVariable from resource into SCL"
authorTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Thu, 12 Oct 2017 11:50:27 +0000 (14:50 +0300)
committerGerrit Code Review <gerrit2@www.simantics.org>
Thu, 12 Oct 2017 11:50:27 +0000 (14:50 +0300)
features/pom.xml
releng/org.simantics.tycho.configuration/pom.xml

index da300eedb44d5ada2a705dd4f5404ee074c3fc95..9ccec7a55498f471e948b29514760cdf8ed12810 100644 (file)
             </execution>
           </executions>
         </plugin>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>tycho-p2-plugin</artifactId>
-          <version>${tycho.version}</version>
-          <executions>
-            <execution>
-              <id>attach-p2-metadata</id>
-              <phase>package</phase>
-              <goals>
-                <goal>p2-metadata</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
       </plugins>
     </build>
     
index 53fe3b985c231fb995de78a5bd6d211037b38158..91de535718b4af971fa1494ac00ab5aee290b570 100644 (file)
@@ -58,6 +58,7 @@
                                <artifactId>target-platform-configuration</artifactId>
                                <version>${tycho.version}</version>
                                <configuration>
+                                       <includePackedArtifacts>true</includePackedArtifacts>
                                        <target>
                                                <artifact>
                                                        <groupId>org.simantics</groupId>
                                <artifactId>tycho-source-feature-plugin</artifactId>
                                <version>${tycho.extras.version}</version>
                        </plugin>
+                       <plugin>
+                               <groupId>org.eclipse.tycho.extras</groupId>
+                               <artifactId>tycho-pack200b-plugin</artifactId>
+                               <version>${tycho.extras.version}</version>
+                               <executions>
+                                       <execution>
+                                               <id>pack200-pack</id>
+                                               <goals>
+                                                       <goal>pack</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.eclipse.tycho</groupId>
+                               <artifactId>tycho-p2-plugin</artifactId>
+                               <version>${tycho.version}</version>
+                               <executions>
+                                       <execution>
+                                               <id>attach-p2-metadata</id>
+                                               <phase>package</phase>
+                                               <goals>
+                                                       <goal>p2-metadata</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                               <configuration>
+                                       <defaultP2Metadata>false</defaultP2Metadata>
+                               </configuration>
+                       </plugin>
                </plugins>
        </build>
 </project>