Skip to content

Commit cef2954

Browse files
opcoachopcoach
committed
Update release 4.26 with xtend generation
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
1 parent 12c34ea commit cef2954

16 files changed

Lines changed: 54 additions & 60 deletions

File tree

‎build/com.opcoach.genmodeladdon.feature/feature.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<feature
33
id="com.opcoach.genmodeladdon.feature"
44
label="EMF genModelAddon (override generated code)"
5-
version="2.5.0.qualifier"
5+
version="2.6.0.qualifier"
66
provider-name="OPCOACH">
77

88
<description url="http://www.example.com/description">

‎build/com.opcoach.genmodeladdon.feature/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.opcoach.genmodeladdon</groupId>
99
<artifactId>com.opcoach.genmodeladdon.parent</artifactId>
10-
<version>2.5.0-SNAPSHOT</version>
10+
<version>2.6.0-SNAPSHOT</version>
1111
<relativePath>../../pom.xml</relativePath>
1212
</parent>
1313

‎build/com.opcoach.genmodeladdon.repository/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.opcoach.genmodeladdon</groupId>
99
<artifactId>com.opcoach.genmodeladdon.parent</artifactId>
10-
<version>2.5.0-SNAPSHOT</version>
10+
<version>2.6.0-SNAPSHOT</version>
1111
<relativePath>../../pom.xml</relativePath>
1212
</parent>
1313

‎build/com.opcoach.genmodeladdon.tp/com.opcoach.genmodeladdon.tp.target‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,33 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde?>
33
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
4-
<target name="GMA SimRel0922" sequenceNumber="1663843751">
4+
<target name="GMA SimRel1222" sequenceNumber="1671644835">
55
<locations>
66
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
7-
<unit id="org.eclipse.xtext.sdk.feature.group" version="2.28.0.v20220829-0555"/>
8-
<unit id="org.eclipse.xtend.sdk.feature.group" version="2.28.0.v20220829-0555"/>
9-
<unit id="org.eclipse.xtext.xbase.feature.group" version="2.28.0.v20220829-0555"/>
10-
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.28.0/"/>
7+
<unit id="org.eclipse.xtext.sdk.feature.group" version="2.29.0.v20221121-1054"/>
8+
<unit id="org.eclipse.xtend.sdk.feature.group" version="2.29.0.v20221121-1054"/>
9+
<unit id="org.eclipse.xtext.xbase.feature.group" version="2.29.0.v20221121-1054"/>
10+
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.29.0/"/>
1111
</location>
1212
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
13-
<unit id="org.eclipse.rcp.feature.group" version="4.25.0.v20220831-1800"/>
13+
<unit id="org.eclipse.rcp.feature.group" version="4.26.0.v20221123-2302"/>
1414
<unit id="org.eclipse.ant.core" version="3.6.500.v20220718-1722"/>
1515
<unit id="org.apache.commons.io" version="2.8.0.v20210415-0900"/>
16-
<unit id="org.eclipse.pde.feature.group" version="3.14.1300.v20220831-1800"/>
16+
<unit id="org.eclipse.pde.feature.group" version="3.14.1400.v20221123-1800"/>
1717
<unit id="org.eclipse.emf.ant" version="2.11.0.v20200324-0723"/>
18-
<unit id="org.eclipse.emf.sdk.feature.group" version="2.31.0.v20220817-1401"/>
19-
<unit id="org.eclipse.emf.codegen.ecore.feature.group" version="2.31.0.v20220730-0849"/>
20-
<unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.13.0.v20220519-1115"/>
18+
<unit id="org.eclipse.emf.sdk.feature.group" version="2.32.0.v20221121-1400"/>
19+
<unit id="org.eclipse.emf.codegen.ecore.feature.group" version="2.32.0.v20221121-1400"/>
20+
<unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.14.0.v20221117-1134"/>
2121
<unit id="org.eclipse.emf.importer.ecore" version="2.10.0.v20200324-0723"/>
2222
<unit id="org.eclipse.emf.importer" version="2.12.0.v20190321-1539"/>
2323
<unit id="org.eclipse.ant.launching" version="1.3.400.v20220718-1722"/>
24-
<unit id="org.eclipse.core.runtime" version="3.26.0.v20220813-0916"/>
24+
<unit id="org.eclipse.core.runtime" version="3.26.100.v20221021-0005"/>
2525
<unit id="org.junit" version="4.13.2.v20211018-1956"/>
2626
<unit id="org.eclipse.jdt.junit.runtime" version="3.7.0.v20220609-1843"/>
27-
<unit id="org.eclipse.sdk.feature.group" version="4.25.0.v20220831-1800"/>
27+
<unit id="org.eclipse.sdk.feature.group" version="4.26.0.v20221123-2302"/>
2828
<unit id="com.google.guava" version="31.1.0.jre"/>
29-
<repository location="https://download.eclipse.org/releases/2022-09"/>
30-
</location>
31-
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
32-
<unit id="javax.annotation" version="1.3.5.v20200909-1856"/>
33-
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository"/>
29+
<unit id="javax.annotation" version="1.3.5.v20221112-0806"/>
30+
<repository location="https://download.eclipse.org/releases/2022-12"/>
3431
</location>
3532
</locations>
3633
</target>

‎build/com.opcoach.genmodeladdon.tp/com.opcoach.genmodeladdon.tp.tpd‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
target "GMA SimRel0922"
1+
target "GMA SimRel1222"
22

33
with source requirements
44

55

6-
location "https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.28.0/" {
6+
location "https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.29.0/" {
77
org.eclipse.xtext.sdk.feature.group
88
org.eclipse.xtend.sdk.feature.group
99
org.eclipse.xtext.xbase.feature.group
1010
}
1111

1212

13-
location "https://download.eclipse.org/releases/2022-09" {
13+
location "https://download.eclipse.org/releases/2022-12" {
1414

1515
org.eclipse.rcp.feature.group
1616
org.eclipse.ant.core
@@ -31,13 +31,10 @@ location "https://download.eclipse.org/releases/2022-09" {
3131
org.eclipse.sdk.feature.group
3232

3333
com.google.guava
34+
javax.annotation
3435

3536
}
3637

37-
// Add support for java 11 (removed javax.annotation)...
38-
location "https://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository" {
39-
javax.annotation
40-
}
4138

4239

4340

‎build/com.opcoach.genmodeladdon.tp/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<parent>
66
<groupId>com.opcoach.genmodeladdon</groupId>
77
<artifactId>com.opcoach.genmodeladdon.parent</artifactId>
8-
<version>2.5.0-SNAPSHOT</version>
8+
<version>2.6.0-SNAPSHOT</version>
99
<relativePath>../../pom.xml</relativePath>
1010
</parent>
1111

1212

1313
<artifactId>com.opcoach.genmodeladdon.tp</artifactId>
1414
<packaging>eclipse-target-definition</packaging>
15-
<version>4.25.0</version>
15+
<version>4.26.0</version>
1616

1717
</project>

‎com.opcoach.genmodeladdon.core.test/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: Test
44
Bundle-SymbolicName: com.opcoach.genmodeladdon.core.test;singleton:=true
5-
Bundle-Version: 2.5.0.qualifier
5+
Bundle-Version: 2.6.0.qualifier
66
Bundle-Vendor: OPCOACH
77
Fragment-Host: com.opcoach.genmodeladdon.core;bundle-version="1.6.4"
88
Bundle-RequiredExecutionEnvironment: JavaSE-11

‎com.opcoach.genmodeladdon.core.test/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.opcoach.genmodeladdon</groupId>
99
<artifactId>com.opcoach.genmodeladdon.parent</artifactId>
10-
<version>2.5.0-SNAPSHOT</version>
10+
<version>2.6.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>com.opcoach.genmodeladdon.core.test</artifactId>

‎com.opcoach.genmodeladdon.core.test/src/com/opcoach/genmodeladdon/core/test/TestClassNames.java‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -119,35 +119,35 @@ public void testGenerateFactoryInterfaceNameWithOtherPrefix() {
119119

120120
@Test
121121
public void testXtendClassNames() {
122-
assertFileExists("src/com//opcoach/xtend/project/impl/CompanyImpl.xtend");
123-
assertFileNotExists("src/com//opcoach/xtend/project/impl/CompanyImpl.java");
122+
assertFileExists("src/com/opcoach/xtend/project/impl/CompanyImpl.xtend");
123+
assertFileNotExists("src/com/opcoach/xtend/project/impl/CompanyImpl.java");
124124

125-
assertFileExists("src/com//opcoach/xtend/project/impl/FolderImpl.xtend");
126-
assertFileNotExists("src/com//opcoach/xtend/project/impl/FolderImpl.java");
125+
assertFileExists("src/com/opcoach/xtend/project/impl/FolderImpl.xtend");
126+
assertFileNotExists("src/com/opcoach/xtend/project/impl/FolderImpl.java");
127127

128-
assertFileExists("src/com//opcoach/xtend/project/impl/PersonImpl.xtend");
129-
assertFileNotExists("src/com//opcoach/xtend/project/impl/PersonImpl.java");
128+
assertFileExists("src/com/opcoach/xtend/project/impl/PersonImpl.xtend");
129+
assertFileNotExists("src/com/opcoach/xtend/project/impl/PersonImpl.java");
130130

131-
assertFileExists("src/com//opcoach/xtend/project/impl/ProjectFactoryImpl.java");
132-
assertFileNotExists("src/com//opcoach/xtend/project/impl/ProjectFactoryImpl.xtend");
131+
assertFileExists("src/com/opcoach/xtend/project/impl/ProjectFactoryImpl.java");
132+
assertFileNotExists("src/com/opcoach/xtend/project/impl/ProjectFactoryImpl.xtend");
133133

134-
assertFileExists("src/com//opcoach/xtend/project/impl/ProjectFolderImpl.xtend");
135-
assertFileNotExists("src/com//opcoach/xtend/project/impl/ProjectFolderImpl.java");
134+
assertFileExists("src/com/opcoach/xtend/project/impl/ProjectFolderImpl.xtend");
135+
assertFileNotExists("src/com/opcoach/xtend/project/impl/ProjectFolderImpl.java");
136136

137-
assertFileExists("src/com//opcoach/xtend/project/impl/ProjectImpl.xtend");
138-
assertFileNotExists("src/com//opcoach/xtend/project/impl/ProjectImpl.java");
137+
assertFileExists("src/com/opcoach/xtend/project/impl/ProjectImpl.xtend");
138+
assertFileNotExists("src/com/opcoach/xtend/project/impl/ProjectImpl.java");
139139

140-
assertFileExists("src/com//opcoach/xtend/project/impl/StoreImpl.xtend");
141-
assertFileNotExists("src/com//opcoach/xtend/project/impl/StoreImpl.java");
140+
assertFileExists("src/com/opcoach/xtend/project/impl/StoreImpl.xtend");
141+
assertFileNotExists("src/com/opcoach/xtend/project/impl/StoreImpl.java");
142142

143-
assertFileExists("src/com//opcoach/xtend/project/impl/TaskFolderImpl.xtend");
144-
assertFileNotExists("src/com//opcoach/xtend/project/impl/TaskFolderImpl.java");
143+
assertFileExists("src/com/opcoach/xtend/project/impl/TaskFolderImpl.xtend");
144+
assertFileNotExists("src/com/opcoach/xtend/project/impl/TaskFolderImpl.java");
145145

146-
assertFileExists("src/com//opcoach/xtend/project/impl/TaskImpl.xtend");
147-
assertFileNotExists("src/com//opcoach/xtend/project/impl/TaskImpl.java");
146+
assertFileExists("src/com/opcoach/xtend/project/impl/TaskImpl.xtend");
147+
assertFileNotExists("src/com/opcoach/xtend/project/impl/TaskImpl.java");
148148

149-
assertFileExists("src/com//opcoach/xtend/project/impl/TaskStoreImpl.xtend");
150-
assertFileNotExists("src/com//opcoach/xtend/project/impl/TaskStoreImpl.java");
149+
assertFileExists("src/com/opcoach/xtend/project/impl/TaskStoreImpl.xtend");
150+
assertFileNotExists("src/com/opcoach/xtend/project/impl/TaskStoreImpl.java");
151151
}
152152

153153
}

‎com.opcoach.genmodeladdon.core/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: Core
44
Bundle-SymbolicName: com.opcoach.genmodeladdon.core;singleton:=true
5-
Bundle-Version: 2.5.0.qualifier
5+
Bundle-Version: 2.6.0.qualifier
66
Bundle-Vendor: OPCOACH
77
Bundle-RequiredExecutionEnvironment: JavaSE-11
88
Require-Bundle: org.eclipse.emf.codegen.ecore;visibility:=reexport,

0 commit comments

Comments
 (0)