Skip to content

Commit

Permalink
Merge pull request #449 from xtext/cd-orbit-202412
Browse files Browse the repository at this point in the history 
orbit 2024-12 and regen sample projects
  • Loading branch information
@cdietrich
cdietrich authored Sep 17, 2024
2 parents b7e1f94 + df352a1 commit 1e13a90
Show file tree
Hide file tree
Showing 23 changed files with 17 additions and 515 deletions.
2 changes: 1 addition & 1 deletion domainmodel/2.37.0/org.eclipse.xtext.example.domainmodel.releng/tp/domainmodel.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
Just mention the p2 repo so that additional requirements with ranges specified in
features and bundles are taken from Orbit (e.g., objectweb.asm)
-->
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-12"/>
</location>
</locations>
</target>
1 change: 1 addition & 0 deletions greetings-maven/2.37.0-J11/org.xtext.example.mydsl.ide/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<version>3.3.0</version>
<executions>
<execution>
<?m2e ignore?>
<id>add-source</id>
<phase>initialize</phase>
<goals>
Expand Down
33 changes: 0 additions & 33 deletions greetings-maven/2.37.0-J11/org.xtext.example.mydsl.parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,39 +75,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.codehaus.mojo
</groupId>
<artifactId>
build-helper-maven-plugin
</artifactId>
<versionRange>
[1.9.1,)
</versionRange>
<goals>
<goal>add-resource</goal>
<goal>add-source</goal>
<goal>add-test-resource</goal>
<goal>add-test-source</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
Expand Down
36 changes: 2 additions & 34 deletions greetings-maven/2.37.0-J11/org.xtext.example.mydsl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<version>3.0.0</version>
<executions>
<execution>
<?m2e ignore?>
<id>mwe2Launcher</id>
<phase>generate-sources</phase>
<goals>
Expand Down Expand Up @@ -77,6 +78,7 @@
<version>3.3.0</version>
<executions>
<execution>
<?m2e ignore?>
<id>add-source</id>
<phase>initialize</phase>
<goals>
Expand Down Expand Up @@ -141,40 +143,6 @@
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.codehaus.mojo
</groupId>
<artifactId>
exec-maven-plugin
</artifactId>
<versionRange>
[1.2.1,)
</versionRange>
<goals>
<goal>java</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>

<dependencies>
Expand Down
1 change: 1 addition & 0 deletions greetings-maven/2.37.0-J21/org.xtext.example.mydsl.ide/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<version>3.3.0</version>
<executions>
<execution>
<?m2e ignore?>
<id>add-source</id>
<phase>initialize</phase>
<goals>
Expand Down
33 changes: 0 additions & 33 deletions greetings-maven/2.37.0-J21/org.xtext.example.mydsl.parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,39 +75,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.codehaus.mojo
</groupId>
<artifactId>
build-helper-maven-plugin
</artifactId>
<versionRange>
[1.9.1,)
</versionRange>
<goals>
<goal>add-resource</goal>
<goal>add-source</goal>
<goal>add-test-resource</goal>
<goal>add-test-source</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
Expand Down
36 changes: 2 additions & 34 deletions greetings-maven/2.37.0-J21/org.xtext.example.mydsl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<version>3.0.0</version>
<executions>
<execution>
<?m2e ignore?>
<id>mwe2Launcher</id>
<phase>generate-sources</phase>
<goals>
Expand Down Expand Up @@ -77,6 +78,7 @@
<version>3.3.0</version>
<executions>
<execution>
<?m2e ignore?>
<id>add-source</id>
<phase>initialize</phase>
<goals>
Expand Down Expand Up @@ -141,40 +143,6 @@
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.codehaus.mojo
</groupId>
<artifactId>
exec-maven-plugin
</artifactId>
<versionRange>
[1.2.1,)
</versionRange>
<goals>
<goal>java</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>

<dependencies>
Expand Down
1 change: 1 addition & 0 deletions greetings-maven/2.37.0/org.xtext.example.mydsl.ide/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<version>3.3.0</version>
<executions>
<execution>
<?m2e ignore?>
<id>add-source</id>
<phase>initialize</phase>
<goals>
Expand Down
33 changes: 0 additions & 33 deletions greetings-maven/2.37.0/org.xtext.example.mydsl.parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,39 +75,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.codehaus.mojo
</groupId>
<artifactId>
build-helper-maven-plugin
</artifactId>
<versionRange>
[1.9.1,)
</versionRange>
<goals>
<goal>add-resource</goal>
<goal>add-source</goal>
<goal>add-test-resource</goal>
<goal>add-test-source</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
Expand Down
36 changes: 2 additions & 34 deletions greetings-maven/2.37.0/org.xtext.example.mydsl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<version>3.0.0</version>
<executions>
<execution>
<?m2e ignore?>
<id>mwe2Launcher</id>
<phase>generate-sources</phase>
<goals>
Expand Down Expand Up @@ -77,6 +78,7 @@
<version>3.3.0</version>
<executions>
<execution>
<?m2e ignore?>
<id>add-source</id>
<phase>initialize</phase>
<goals>
Expand Down Expand Up @@ -141,40 +143,6 @@
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.codehaus.mojo
</groupId>
<artifactId>
exec-maven-plugin
</artifactId>
<versionRange>
[1.2.1,)
</versionRange>
<goals>
<goal>java</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>

<dependencies>
Expand Down
33 changes: 0 additions & 33 deletions greetings-tycho/2.37.0-J11/org.xtext.example.mydsl.parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,39 +167,6 @@
</filesets>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.codehaus.mojo
</groupId>
<artifactId>
build-helper-maven-plugin
</artifactId>
<versionRange>
[1.9.1,)
</versionRange>
<goals>
<goal>add-resource</goal>
<goal>add-source</goal>
<goal>add-test-resource</goal>
<goal>add-test-source</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
<plugin>
<!--
Can be removed after first generator execution
Expand Down
Loading

0 comments on commit 1e13a90

Please sign in to comment.