update to build with the current version of gemoc commons

diverse-project · Oct 11, 2023 · 151b13e · 151b13e
1 parent e2ec3b8
commit 151b13e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/k3.eclipse/fr.inria.diverse.k3.eclipse.root/promotion_build.sh b/k3.eclipse/fr.inria.diverse.k3.eclipse.root/promotion_build.sh
@@ -9,7 +9,7 @@ fi
 set -x
 
 WORKSPACE=$(pwd)
-UPDATESITE_REPOSITORY="${WORKSPACE}/k3.eclipse/fr.inria.diverse.k3.p2updatesite/target/site"
+UPDATESITE_REPOSITORY="${WORKSPACE}/k3.eclipse/fr.inria.diverse.k3.p2updatesite/target/repository"
 DEPLOY_SERVER="kermeta.org"
 DEPLOY_USER="web-kermeta"
 DEPLOY_PATH="/home/web/apache/sites/kermeta.org/htdocs/k3"

diff --git a/k3.eclipse/fr.inria.diverse.k3.eclipse.root/promotion_build.xml b/k3.eclipse/fr.inria.diverse.k3.eclipse.root/promotion_build.xml
@@ -14,7 +14,7 @@
 	<property environment="env"/>
 
 	<property name="env.WORKSPACE" location="."/>
-	<property name="updatesite.repository" location="${env.WORKSPACE}/k3.eclipse/fr.inria.diverse.k3.p2updatesite/target/site"/>
+	<property name="updatesite.repository" location="${env.WORKSPACE}/k3.eclipse/fr.inria.diverse.k3.p2updatesite/target/repository"/>
 	<property name="deploy.server" value="kermeta.org"/>
 	<property name="deploy.user" value="web-kermeta"/>
 	<property name="deploy.path" value="/home/web/apache/sites/kermeta.org/htdocs/k3"/>

diff --git a/...fr.inria.diverse.k3.p2updatesite/site.xml → ...nria.diverse.k3.p2updatesite/category.xml b/...fr.inria.diverse.k3.p2updatesite/site.xml → ...nria.diverse.k3.p2updatesite/category.xml
@@ -6,7 +6,7 @@
    <feature url="features/fr.inria.diverse.k3.runtime.feature_4.2.0.qualifier.jar" id="fr.inria.diverse.k3.runtime.feature" version="4.2.0.qualifier">
       <category name="k3"/>
    </feature>
-   <feature url="features/org.eclipse.gemoc.commons.feature_3.6.0.qualifier.jar" id="org.eclipse.gemoc.commons.feature" version="3.6.0.qualifier">
+   <feature url="features/org.eclipse.gemoc.commons.feature_3.6.1.qualifier.jar" id="org.eclipse.gemoc.commons.feature" version="3.6.1.qualifier">
       <category name="dependencies"/>
    </feature>
    <category-def name="k3" label="Kermeta3"/>

diff --git a/k3.eclipse/fr.inria.diverse.k3.p2updatesite/pom.xml b/k3.eclipse/fr.inria.diverse.k3.p2updatesite/pom.xml
@@ -28,4 +28,15 @@
 		<!-- deployment this module -->
 		<maven.deploy.skip>false</maven.deploy.skip>
 	</properties>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-repository-plugin</artifactId>
+				<version>${tycho.version}</version>
+				<configuration>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>