From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Thu, 12 Oct 2017 11:50:27 +0000 (+0300)
Subject: Merge "possibleVariable from resource into SCL"
X-Git-Tag: v1.31.0~125
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=b28a94bc9d4bc8265370edfe567e58a5af806da2;hp=b13a67c7a632d471687003cdcc8ff6c570e3fd0d

Merge "possibleVariable from resource into SCL"
---

diff --git a/features/pom.xml b/features/pom.xml
index da300eedb..9ccec7a55 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -83,20 +83,6 @@
             </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>
     
diff --git a/releng/org.simantics.tycho.configuration/pom.xml b/releng/org.simantics.tycho.configuration/pom.xml
index 53fe3b985..91de53571 100644
--- a/releng/org.simantics.tycho.configuration/pom.xml
+++ b/releng/org.simantics.tycho.configuration/pom.xml
@@ -58,6 +58,7 @@
 				<artifactId>target-platform-configuration</artifactId>
 				<version>${tycho.version}</version>
 				<configuration>
+					<includePackedArtifacts>true</includePackedArtifacts>
 					<target>
 						<artifact>
 							<groupId>org.simantics</groupId>
@@ -94,6 +95,36 @@
 				<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>