Skip to content

Commit

Permalink
Migrate to 2024-12 and tycho 4.0.10
Browse files Browse the repository at this point in the history
  • Loading branch information
opcoach committed Dec 27, 2024
1 parent 1ee7b83 commit 7ef7be0
Show file tree
Hide file tree
Showing 22 changed files with 167 additions and 38 deletions.
9 changes: 9 additions & 0 deletions .project
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,14 @@
<arguments>1.0-name-matches-false-false-build</arguments>
</matcher>
</filter>
<filter>
<id>1722586997184</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
17 changes: 17 additions & 0 deletions build/com.opcoach.genmodeladdon.feature/.project
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,25 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
<filteredResources>
<filter>
<id>1722586997183</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
17 changes: 17 additions & 0 deletions build/com.opcoach.genmodeladdon.repository/.project
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,25 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.UpdateSiteNature</nature>
</natures>
<filteredResources>
<filter>
<id>1722586997185</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
11 changes: 11 additions & 0 deletions build/com.opcoach.genmodeladdon.tp/.project
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,15 @@
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
</natures>
<filteredResources>
<filter>
<id>1722586997187</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="GMA SimRel0324" sequenceNumber="1710846668">
<target name="GMA SimRel01224" sequenceNumber="1735291302">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.xtext.sdk.feature.group" version="2.34.0.v20240227-0940"/>
<unit id="org.eclipse.xtend.sdk.feature.group" version="2.34.0.v20240227-0940"/>
<unit id="org.eclipse.xtext.xbase.feature.group" version="2.34.0.v20240227-0940"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.34.0/"/>
<unit id="org.eclipse.xtext.sdk.feature.group" version="2.37.0.v20241119-0857"/>
<unit id="org.eclipse.xtend.sdk.feature.group" version="2.37.0.v20241119-0857"/>
<unit id="org.eclipse.xtext.xbase.feature.group" version="2.37.0.v20241119-0857"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.37.0/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.rcp.feature.group" version="4.31.0.v20240229-0520"/>
<unit id="org.eclipse.ant.core" version="3.7.300.v20231214-1526"/>
<unit id="org.eclipse.rcp.feature.group" version="4.34.0.v20241120-1800"/>
<unit id="org.eclipse.ant.core" version="3.7.500.v20241028-1712"/>
<unit id="org.apache.commons.io" version="2.8.0.v20210415-0900"/>
<unit id="org.eclipse.pde.feature.group" version="3.15.300.v20240229-0520"/>
<unit id="org.eclipse.emf.ant" version="2.12.0.v20230211-1150"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="2.37.0.v20240203-1010"/>
<unit id="org.eclipse.emf.codegen.ecore.feature.group" version="2.37.0.v20240203-1010"/>
<unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.17.0.v20240224-1400"/>
<unit id="org.eclipse.emf.importer.ecore" version="2.11.0.v20230211-1150"/>
<unit id="org.eclipse.emf.importer" version="2.13.0.v20230211-1150"/>
<unit id="org.eclipse.ant.launching" version="1.4.300.v20240110-1213"/>
<unit id="org.eclipse.core.runtime" version="3.31.0.v20240215-1631"/>
<unit id="org.junit" version="4.13.2.v20230809-1000"/>
<unit id="org.eclipse.jdt.junit.runtime" version="3.7.400.v20231214-1952"/>
<unit id="org.eclipse.sdk.feature.group" version="4.31.0.v20240229-1022"/>
<unit id="com.google.guava" version="33.0.0.jre"/>
<unit id="org.eclipse.pde.feature.group" version="3.16.100.v20241120-1800"/>
<unit id="org.eclipse.emf.ant" version="2.13.0.v20240604-0832"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="2.40.0.v20241018-1213"/>
<unit id="org.eclipse.emf.codegen.ecore.feature.group" version="2.40.0.v20240911-1442"/>
<unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.20.0.v20241116-0534"/>
<unit id="org.eclipse.emf.importer.ecore" version="2.12.0.v20240604-0832"/>
<unit id="org.eclipse.emf.importer" version="2.14.0.v20240604-0832"/>
<unit id="org.eclipse.ant.launching" version="1.4.600.v20241028-1712"/>
<unit id="org.eclipse.core.runtime" version="3.32.0.v20241003-0436"/>
<unit id="org.junit" version="4.13.2.v20240929-1000"/>
<unit id="org.eclipse.jdt.junit.runtime" version="3.7.500.v20240702-1918"/>
<unit id="org.eclipse.sdk.feature.group" version="4.34.0.v20241120-1800"/>
<unit id="com.google.guava" version="33.3.1.jre"/>
<unit id="jakarta.annotation-api" version="2.1.1"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
<unit id="org.apache.commons.commons-io" version="2.15.1"/>
<repository location="https://download.eclipse.org/releases/2024-03"/>
<unit id="org.apache.log4j" version="1.2.25"/>
<unit id="org.apache.commons.commons-io" version="2.17.0"/>
<repository location="https://download.eclipse.org/releases/2024-12"/>
</location>
</locations>
</target>
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
target "GMA SimRel0324"
target "GMA SimRel01224"

with source requirements


location "https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.34.0/" {
location "https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.37.0/" {
org.eclipse.xtext.sdk.feature.group
org.eclipse.xtend.sdk.feature.group
org.eclipse.xtext.xbase.feature.group
}


location "https://download.eclipse.org/releases/2024-03" {
location "https://download.eclipse.org/releases/2024-12" {

org.eclipse.rcp.feature.group
org.eclipse.ant.core
Expand Down
2 changes: 1 addition & 1 deletion build/com.opcoach.genmodeladdon.tp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@

<artifactId>com.opcoach.genmodeladdon.tp</artifactId>
<packaging>eclipse-target-definition</packaging>
<version>4.31.0</version>
<version>4.34.0</version>

</project>
17 changes: 17 additions & 0 deletions com.opcoach.genmodeladdon.core.test/.project
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,26 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
<filteredResources>
<filter>
<id>1722586997181</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
17 changes: 17 additions & 0 deletions com.opcoach.genmodeladdon.core/.project
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,27 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
</natures>
<filteredResources>
<filter>
<id>1722586997180</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
eclipse.preferences.version=1
encoding//src/com/opcoach/genmodeladdon/core=ISO-8859-1
encoding//src/com/opcoach/genmodeladdon/core/GenerateAntFileForCodeGeneration.xtend=ISO-8859-1
encoding/<project>=UTF-8
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
1 change: 0 additions & 1 deletion com.opcoach.genmodeladdon.sample/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src-gen/"/>
<classpathentry kind="output" path="bin"/>
</classpath>
17 changes: 17 additions & 0 deletions com.opcoach.genmodeladdon.sample/.project
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,27 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.sirius.nature.modelingproject</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
</natures>
<filteredResources>
<filter>
<id>1722586997186</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
1 change: 0 additions & 1 deletion com.opcoach.genmodeladdon.sample/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@ bin.includes = .,\
plugin.properties,\
sampleProject.zip
jars.compile.order = .
source.. = src-gen/
output.. = bin/
17 changes: 17 additions & 0 deletions com.opcoach.genmodeladdon.ui/.project
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,26 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
<filteredResources>
<filter>
<id>1722586997188</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<packaging>pom</packaging>

<properties>
<tycho-version>4.0.6</tycho-version>
<tycho-version>4.0.10</tycho-version>
</properties>


Expand Down Expand Up @@ -39,7 +39,7 @@
<artifact>
<groupId>com.opcoach.genmodeladdon</groupId>
<artifactId>com.opcoach.genmodeladdon.tp</artifactId>
<version>4.31.0</version>
<version>4.34.0</version>
</artifact>
</target>
<environments>
Expand Down

0 comments on commit 7ef7be0

Please sign in to comment.