Merge 4041686 into d6c2059

LorenzoBettini · Jun 17, 2021 · 557cc36 · 557cc36
2 parents d6c2059 + 4041686
commit 557cc36
Show file tree

Hide file tree

Showing 4 changed files with 233 additions and 6 deletions.
diff --git a/jbase.example.client.maven/pom.xml b/jbase.example.client.maven/pom.xml
@@ -8,7 +8,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <xtext-version>2.25.0</xtext-version>
+    <xtext-version>2.26.0-SNAPSHOT</xtext-version>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
@@ -166,4 +166,117 @@
       </plugins>
     </pluginManagement>
   </build>
+
+  <repositories>
+    <repository>
+      <id>xtext-lib-repository</id>
+      <name>xtext-lib-repository</name>
+      <url>https://ci.eclipse.org/xtext/job/xtext-lib/job/cd_guice501/lastSuccessfulBuild/artifact/build/maven-repository/</url>
+    </repository>
+    <repository>
+      <id>xtext-core-repository</id>
+      <name>xtext-core-repository</name>
+      <url>https://ci.eclipse.org/xtext/job/xtext-core/job/cd_guice501/lastSuccessfulBuild/artifact/build/maven-repository/</url>
+    </repository>
+    <repository>
+      <id>xtext-extras-repository</id>
+      <name>xtext-extras-repository</name>
+      <url>https://ci.eclipse.org/xtext/job/xtext-extras/job/cd_guice501/lastSuccessfulBuild/artifact/build/maven-repository/</url>
+    </repository>
+    <repository>
+      <id>xtext-maven-repository</id>
+      <name>xtext-maven-repository</name>
+      <url>https://ci.eclipse.org/xtext/job/xtext-maven/job/cd_guice501/lastSuccessfulBuild/artifact/build/maven-repository/</url>
+    </repository>
+    <repository>
+      <id>xtext-xtend-repository</id>
+      <name>xtext-xtend-repository</name>
+      <url>https://ci.eclipse.org/xtext/job/xtext-xtend/job/cd_guice501/lastSuccessfulBuild/artifact/build/maven-repository/</url>
+    </repository>
+    <repository>
+      <id>xtext-web-repository</id>
+      <name>xtext-web-repository</name>
+      <url>https://ci.eclipse.org/xtext/job/xtext-web/job/cd_guice501/lastSuccessfulBuild/artifact/build/maven-repository/</url>
+    </repository>
+    <repository>
+      <id>xtext-mwe-repository</id>
+      <name>xtext-mwe-repository</name>
+      <url>https://ci.eclipse.org/mwe/job/mwe2/job/cd_mweGuice5Experimentb/lastSuccessfulBuild/artifact/git-repo/my-local-snapshots-dir/</url>
+    </repository>
+  </repositories>
+  <pluginRepositories>
+    <pluginRepository>
+      <id>xtext-lib-plugin-repository</id>
+      <name>xtext-lib-plugin-repository</name>
+      <url>https://ci.eclipse.org/xtext/job/xtext-lib/job/cd_guice501/lastSuccessfulBuild/artifact/build/maven-repository/</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+    <pluginRepository>
+      <id>xtext-core-plugin-repository</id>
+      <name>xtext-core-plugin-repository</name>
+      <url>https://ci.eclipse.org/xtext/job/xtext-core/job/cd_guice501/lastSuccessfulBuild/artifact/build/maven-repository/</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+    <pluginRepository>
+      <id>xtext-extras-plugin-repository</id>
+      <name>xtext-extras-plugin-repository</name>
+      <url>https://ci.eclipse.org/xtext/job/xtext-extras/job/cd_guice501/lastSuccessfulBuild/artifact/build/maven-repository/</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+    <pluginRepository>
+      <name>xtext-maven-plugin-repository</name>
+      <id>xtext-maven-plugin-repository</id>
+      <url>https://ci.eclipse.org/xtext/job/xtext-maven/job/cd_guice501/lastSuccessfulBuild/artifact/build/maven-repository/</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+    <pluginRepository>
+      <name>xtext-xtend-plugin-repository</name>
+      <id>xtext-xtend-plugin-repository</id>
+      <url>https://ci.eclipse.org/xtext/job/xtext-xtend/job/cd_guice501/lastSuccessfulBuild/artifact/build/maven-repository/</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+    <pluginRepository>
+      <id>xtext-web-plugin-repository</id>
+      <name>xtext-web-plugin-repository</name>
+      <url>https://ci.eclipse.org/xtext/job/xtext-web/job/cd_guice501/lastSuccessfulBuild/artifact/build/maven-repository/</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+    <pluginRepository>
+      <id>xtext-mwe-plugin-repository</id>
+      <name>xtext-mwe-plugin-repository</name>
+      <url>https://ci.eclipse.org/mwe/job/mwe2/job/cd_mweGuice5Experimentb/lastSuccessfulBuild/artifact/git-repo/my-local-snapshots-dir/</url>
+      <releases><enabled>false</enabled></releases>
+      <snapshots><enabled>true</enabled></snapshots>
+    </pluginRepository>
+  </pluginRepositories>
 </project>
diff --git a/jbase.parent/pom.xml b/jbase.parent/pom.xml
@@ -57,7 +57,9 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <os-jvm-flags />
     <memoryArgs>-Xms256M -Xmx1024M -XX:+HeapDumpOnOutOfMemoryError</memoryArgs>
+    <xtextVersion>2.26.0-SNAPSHOT</xtextVersion>
     <xtext-version>${xtextVersion}</xtext-version>
+    <mwe2Version>2.12.2-SNAPSHOT</mwe2Version>
 
     <!-- For tests for Java 9 and above -->
     <moduleProperties></moduleProperties>
@@ -404,4 +406,117 @@
     </repository>
   </distributionManagement>
 
+  <repositories>
+    <repository>
+      <id>xtext-lib-repository</id>
+      <name>xtext-lib-repository</name>
+      <url>https://ci.eclipse.org/xtext/job/xtext-lib/job/cd_guice501/lastSuccessfulBuild/artifact/build/maven-repository/</url>
+    </repository>
+    <repository>
+      <id>xtext-core-repository</id>
+      <name>xtext-core-repository</name>
+      <url>https://ci.eclipse.org/xtext/job/xtext-core/job/cd_guice501/lastSuccessfulBuild/artifact/build/maven-repository/</url>
+    </repository>
+    <repository>
+      <id>xtext-extras-repository</id>
+      <name>xtext-extras-repository</name>
+      <url>https://ci.eclipse.org/xtext/job/xtext-extras/job/cd_guice501/lastSuccessfulBuild/artifact/build/maven-repository/</url>
+    </repository>
+    <repository>
+      <id>xtext-maven-repository</id>
+      <name>xtext-maven-repository</name>
+      <url>https://ci.eclipse.org/xtext/job/xtext-maven/job/cd_guice501/lastSuccessfulBuild/artifact/build/maven-repository/</url>
+    </repository>
+    <repository>
+      <id>xtext-xtend-repository</id>
+      <name>xtext-xtend-repository</name>
+      <url>https://ci.eclipse.org/xtext/job/xtext-xtend/job/cd_guice501/lastSuccessfulBuild/artifact/build/maven-repository/</url>
+    </repository>
+    <repository>
+      <id>xtext-web-repository</id>
+      <name>xtext-web-repository</name>
+      <url>https://ci.eclipse.org/xtext/job/xtext-web/job/cd_guice501/lastSuccessfulBuild/artifact/build/maven-repository/</url>
+    </repository>
+    <repository>
+      <id>xtext-mwe-repository</id>
+      <name>xtext-mwe-repository</name>
+      <url>https://ci.eclipse.org/mwe/job/mwe2/job/cd_mweGuice5Experimentb/lastSuccessfulBuild/artifact/git-repo/my-local-snapshots-dir/</url>
+    </repository>
+  </repositories>
+  <pluginRepositories>
+    <pluginRepository>
+      <id>xtext-lib-plugin-repository</id>
+      <name>xtext-lib-plugin-repository</name>
+      <url>https://ci.eclipse.org/xtext/job/xtext-lib/job/cd_guice501/lastSuccessfulBuild/artifact/build/maven-repository/</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+    <pluginRepository>
+      <id>xtext-core-plugin-repository</id>
+      <name>xtext-core-plugin-repository</name>
+      <url>https://ci.eclipse.org/xtext/job/xtext-core/job/cd_guice501/lastSuccessfulBuild/artifact/build/maven-repository/</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+    <pluginRepository>
+      <id>xtext-extras-plugin-repository</id>
+      <name>xtext-extras-plugin-repository</name>
+      <url>https://ci.eclipse.org/xtext/job/xtext-extras/job/cd_guice501/lastSuccessfulBuild/artifact/build/maven-repository/</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+    <pluginRepository>
+      <name>xtext-maven-plugin-repository</name>
+      <id>xtext-maven-plugin-repository</id>
+      <url>https://ci.eclipse.org/xtext/job/xtext-maven/job/cd_guice501/lastSuccessfulBuild/artifact/build/maven-repository/</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+    <pluginRepository>
+      <name>xtext-xtend-plugin-repository</name>
+      <id>xtext-xtend-plugin-repository</id>
+      <url>https://ci.eclipse.org/xtext/job/xtext-xtend/job/cd_guice501/lastSuccessfulBuild/artifact/build/maven-repository/</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+    <pluginRepository>
+      <id>xtext-web-plugin-repository</id>
+      <name>xtext-web-plugin-repository</name>
+      <url>https://ci.eclipse.org/xtext/job/xtext-web/job/cd_guice501/lastSuccessfulBuild/artifact/build/maven-repository/</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+    <pluginRepository>
+      <id>xtext-mwe-plugin-repository</id>
+      <name>xtext-mwe-plugin-repository</name>
+      <url>https://ci.eclipse.org/mwe/job/mwe2/job/cd_mweGuice5Experimentb/lastSuccessfulBuild/artifact/git-repo/my-local-snapshots-dir/</url>
+      <releases><enabled>false</enabled></releases>
+      <snapshots><enabled>true</enabled></snapshots>
+    </pluginRepository>
+  </pluginRepositories>
+
 </project>
diff --git a/jbase.targetplatform/jbase.target.target b/jbase.targetplatform/jbase.target.target
@@ -19,12 +19,11 @@
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.emf.mwe2.runtime.sdk.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.12.1/"/>
+<repository location="https://ci.eclipse.org/mwe/job/mwe2/job/cd_mweGuice5Experimentb/lastSuccessfulBuild/artifact/git-repo/maven/org.eclipse.emf.mwe2.repository/target/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.xtext.redist.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0/"/>
+<repository location="https://ci.eclipse.org/xtext/job/xtext-umbrella/job/cd_guice501/lastSuccessfulBuild/artifact/build/p2-repository/"/>
 </location>
 </locations>
 </target>
diff --git a/jbase.ui.feature/feature.xml b/jbase.ui.feature/feature.xml
@@ -103,8 +103,8 @@ This Agreement is governed by the laws of the State of New York and the intellec
          version="0.0.0"/>
 
    <requires>
-      <import feature="org.eclipse.xtext.xbase" version="2.25.0" match="equivalent"/>
-      <import feature="org.eclipse.xtext.ui" version="2.25.0" match="equivalent"/>
+      <import feature="org.eclipse.xtext.xbase" version="2.26.0" match="equivalent"/>
+      <import feature="org.eclipse.xtext.ui" version="2.26.0" match="equivalent"/>
    </requires>
 
    <plugin