Skip to content

Commit b685345

Browse files
kyrillzotkinkyrillzotkin
authored
Merge branch 'master' into develop
2 parents 47106a0 + 0bdd39c commit b685345

File tree

9 files changed

+102
-40
lines changed

9 files changed

+102
-40
lines changed

‎.github/FUNDING.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ open_collective: # Replace with a single Open Collective username
66
ko_fi: # Replace with a single Ko-fi username
77
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
88
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
9-
custom: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=5U2B8G9H72CQG&lc=RU&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted
9+
custom: [ "https://liberapay.com/kirill/donate", "https://money.yandex.ru/to/4100115600714785" ]

‎.github/workflows/delete_old_versions.yml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# This is a basic workflow to help you get started with Actions
2+
3+
name: Delete Old Versions
4+
5+
# Controls when the action will run.
6+
on:
7+
# Allows you to run this workflow manually from the Actions tab
8+
workflow_dispatch:
9+
10+
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
11+
jobs:
12+
# This workflow contains a single job called "build"
13+
build:
14+
# The type of runner that the job will run on
15+
runs-on: ubuntu-latest
16+
17+
# Steps represent a sequence of tasks that will be executed as part of the job
18+
steps:
19+
- name: Delete Package Versions
20+
uses: actions/delete-package-versions@v1.0.3
21+
with:
22+
package-name: 'org.enterprisedomain.org.enterprisedomain.*'
23+
token: ${{ secrets.DEL }}
24+
num-old-versions-to-delete: 1

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ClassMaker ![Java CI & CD with Maven](https://github.com/enterpriseDomain/ClassMaker/workflows/Java%20CI%20&%20CD%20with%20Maven/badge.svg) [![Code Triagers Badge](https://www.codetriage.com/kyrillzotkin/classmaker/badges/users.svg)](https://www.codetriage.com/kyrillzotkin/classmaker)
1+
ClassMaker ![Java CI & CD with Maven](https://github.com/enterpriseDomain/ClassMaker/workflows/Java%20CI%20&%20CD%20with%20Maven/badge.svg) [![Codeship Status for enterpriseDomain/ClassMaker](https://app.codeship.com/projects/f2b3a5b0-a311-0138-75aa-424b3afc3481/status?branch=master)](https://app.codeship.com/projects/402166) [![Code Triagers Badge](https://www.codetriage.com/kyrillzotkin/classmaker/badges/users.svg)](https://www.codetriage.com/kyrillzotkin/classmaker)
22
===========
33

44
ClassMaker is an Eclipse plug-in that allows to create classes programmatically, providing them to client bundle.
@@ -28,7 +28,7 @@ Here is how you can use it:
2828
ClassMakerService classMaker = (ClassMakerService) bundleContext
2929
.getService(serviceReference);
3030

31-
// Produce result by combining them
31+
// Produce the result by combining them
3232
EPackage jPackage = (EPackage) classMaker.make(ePackage, progressMonitor);
3333

3434
...

‎bundles/org.enterprisedomain.classmaker/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)";visibil
3434
org.eclipse.equinox.launcher;bundle-version="[1.3.200,2.0.0)",
3535
org.eclipse.pde.api.tools;bundle-version="[1.1.1,2.0.0)",
3636
org.eclipse.jdt.launching;bundle-version="[3.8.100,4.0.0)",
37-
org.eclipse.jgit;bundle-version="[5.0.1,6.0.0)";visibility:=reexport,
37+
org.eclipse.jgit;bundle-version="6.0.0";visibility:=reexport,
3838
org.eclipse.equinox.concurrent;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
3939
org.eclipse.equinox.p2.core;bundle-version="[2.4.100,3.0.0)",
4040
org.eclipse.equinox.p2.repository;bundle-version="[2.3.200,3.0.0)",

‎features/org.enterprisedomain.classmaker.ecp.feature/feature.xml‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -108,23 +108,27 @@ limitations under the License.
108108

109109
<requires>
110110
<import plugin="org.eclipse.core.runtime"/>
111-
<import plugin="org.eclipse.emf.ecp.view.model" version="1.24.0" match="greaterOrEqual"/>
111+
<import plugin="org.eclipse.emf.ecore" version="2.12.0" match="compatible"/>
112+
<import plugin="org.eclipse.emf.ecp.core" version="1.25.0" match="greaterOrEqual"/>
113+
<import plugin="org.eclipse.emf.ecp.view.model" version="1.25.0" match="greaterOrEqual"/>
112114
<import plugin="org.eclipse.emf.edit.ui" version="2.14.0" match="compatible"/>
113115
<import plugin="org.eclipse.jface" version="3.11.0" match="greaterOrEqual"/>
116+
<import plugin="org.eclipse.core.expressions" version="3.6.600" match="compatible"/>
114117
<import plugin="org.eclipse.ui" version="3.109.100" match="compatible"/>
118+
<import plugin="org.eclipse.emf.ecp.core" version="1.26.0" match="compatible"/>
115119
<import plugin="org.enterprisedomain.classmaker" version="0.8.0" match="equivalent"/>
116120
<import plugin="org.enterprisedomain.classmaker.edit" version="0.8.0" match="greaterOrEqual"/>
117-
<import plugin="org.enterprisedomain.ecp" version="0.8.0" match="greaterOrEqual"/>
121+
<import plugin="org.enterprisedomain.ecp" version="0.8.0" match="equivalent"/>
118122
<import plugin="org.eclipse.core.runtime" version="3.15.200" match="greaterOrEqual"/>
119-
<import plugin="org.eclipse.emf.ecp.ui" version="1.24.0" match="greaterOrEqual"/>
120123
<import plugin="org.eclipse.swt" version="3.110.0" match="greaterOrEqual"/>
121124
<import plugin="org.enterprisedomain.classmaker.edit" version="0.8.46" match="greaterOrEqual"/>
122125
<import plugin="org.eclipse.emf.common.ui"/>
123126
<import plugin="org.eclipse.ui.navigator" version="3.7.0" match="compatible"/>
124-
<import plugin="org.eclipse.emf.ecp.common.ui" version="1.24.0" match="greaterOrEqual"/>
125-
<import plugin="org.eclipse.emf.ecp.ui.e3" version="1.24.0" match="greaterOrEqual"/>
127+
<import plugin="org.eclipse.emf.ecp.common.ui" version="1.26.0" match="compatible"/>
128+
<import plugin="org.eclipse.emf.ecp.ui.e3" version="1.26.0" match="compatible"/>
129+
<import plugin="org.eclipse.ui.workbench"/>
130+
<import plugin="org.eclipse.emf.ecp.ui" version="1.26.0" match="compatible"/>
126131
<import plugin="org.eclipse.core.runtime" version="3.12.0" match="compatible"/>
127-
<import plugin="org.eclipse.emf.ecore" version="2.12.0" match="compatible"/>
128132
<import plugin="org.eclipse.emf.ecore.xmi" version="2.12.0" match="compatible"/>
129133
<import plugin="org.eclipse.emf.codegen.ecore" version="2.12.0" match="compatible"/>
130134
<import plugin="org.eclipse.osgi" version="3.11.1" match="compatible"/>
@@ -133,14 +137,13 @@ limitations under the License.
133137
<import plugin="org.eclipse.e4.core.di" version="1.6.1" match="compatible"/>
134138
<import plugin="org.eclipse.core.resources" version="3.11.0" match="compatible"/>
135139
<import plugin="org.eclipse.pde.core" version="3.11.0" match="compatible"/>
136-
<import plugin="org.apache.ant" version="1.9.6" match="compatible"/>
140+
<import plugin="org.apache.ant" version="1.10.9" match="compatible"/>
137141
<import plugin="org.eclipse.jdt.core" version="3.12.1" match="compatible"/>
138142
<import plugin="org.eclipse.pde.launching" version="3.6.400" match="compatible"/>
139143
<import plugin="org.eclipse.equinox.launcher" version="1.3.200" match="compatible"/>
140144
<import plugin="org.eclipse.pde.api.tools" version="1.1.1" match="compatible"/>
141145
<import plugin="org.eclipse.jdt.launching" version="3.8.100" match="compatible"/>
142-
<import plugin="org.eclipse.jgit" version="5.0.1" match="compatible"/>
143-
<import plugin="org.eclipse.jgit.pgm" version="5.5.1" match="compatible"/>
146+
<import plugin="org.eclipse.jgit" version="6.0.0" match="greaterOrEqual"/>
144147
<import plugin="org.eclipse.equinox.concurrent" version="1.1.0" match="compatible"/>
145148
<import plugin="org.eclipse.equinox.p2.core" version="2.4.100" match="compatible"/>
146149
<import plugin="org.eclipse.equinox.p2.repository" version="2.3.200" match="compatible"/>
@@ -164,13 +167,16 @@ limitations under the License.
164167
<import plugin="org.eclipse.swt" version="3.110.0" match="compatible"/>
165168
<import plugin="org.eclipse.jface" version="3.13.1" match="compatible"/>
166169
<import plugin="org.eclipse.core.jobs" version="3.9.1" match="compatible"/>
167-
<import plugin="javax.annotation" version="1.2.0" match="greaterOrEqual"/>
170+
<import plugin="javax.annotation" version="1.3.5" match="compatible"/>
168171
<import plugin="org.eclipse.pde.ds.core" version="1.1.500" match="greaterOrEqual"/>
169172
<import plugin="org.eclipse.pde.ds.lib" version="1.1.300" match="greaterOrEqual"/>
170-
<import plugin="org.eclipse.emf.edit" version="2.15.0" match="greaterOrEqual"/>
173+
<import plugin="org.eclipse.emf.edit" version="2.16.0" match="greaterOrEqual"/>
171174
<import plugin="org.eclipse.emf.edit.ui" version="2.16.0" match="greaterOrEqual"/>
175+
<import plugin="org.apache.felix.gogo.command" version="1.1.2" match="greaterOrEqual"/>
176+
<import plugin="org.apache.felix.gogo.runtime" version="1.1.4" match="greaterOrEqual"/>
177+
<import plugin="org.apache.felix.gogo.shell" version="1.1.4" match="greaterOrEqual"/>
172178
<import feature="org.eclipse.emf.ecp.feature" version="1.8.0.20160216-1319" match="greaterOrEqual"/>
173-
<import plugin="org.eclipse.emf.ecp.core" version="1.24.0" match="greaterOrEqual"/>
179+
<import plugin="org.eclipse.emf.query" version="1.7.0" match="greaterOrEqual"/>
174180
</requires>
175181

176182
<plugin

‎features/org.enterprisedomain.classmaker.feature/feature.xml‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ limitations under the License.
9999
search-location="both"/>
100100

101101
<requires>
102-
<import plugin="org.eclipse.core.runtime" version="3.12.0" match="compatible"/>
102+
<import plugin="org.eclipse.core.runtime" version="3.12.0" match="compatible"/>
103103
<import plugin="org.eclipse.emf.ecore" version="2.12.0" match="compatible"/>
104104
<import plugin="org.eclipse.emf.ecore.xmi" version="2.12.0" match="compatible"/>
105105
<import plugin="org.eclipse.emf.codegen.ecore" version="2.12.0" match="compatible"/>
@@ -109,13 +109,13 @@ limitations under the License.
109109
<import plugin="org.eclipse.e4.core.di" version="1.6.1" match="compatible"/>
110110
<import plugin="org.eclipse.core.resources" version="3.11.0" match="compatible"/>
111111
<import plugin="org.eclipse.pde.core" version="3.11.0" match="compatible"/>
112+
<import plugin="org.apache.ant" version="1.10.9" match="compatible"/>
112113
<import plugin="org.eclipse.jdt.core" version="3.12.1" match="compatible"/>
113114
<import plugin="org.eclipse.pde.launching" version="3.6.400" match="compatible"/>
114115
<import plugin="org.eclipse.equinox.launcher" version="1.3.200" match="compatible"/>
115116
<import plugin="org.eclipse.pde.api.tools" version="1.1.1" match="compatible"/>
116117
<import plugin="org.eclipse.jdt.launching" version="3.8.100" match="compatible"/>
117-
<import plugin="org.eclipse.jgit" version="5.0.1" match="compatible"/>
118-
<import plugin="org.eclipse.jgit.pgm" version="5.5.1" match="compatible"/>
118+
<import plugin="org.eclipse.jgit" version="6.0.0" match="greaterOrEqual"/>
119119
<import plugin="org.eclipse.equinox.concurrent" version="1.1.0" match="compatible"/>
120120
<import plugin="org.eclipse.equinox.p2.core" version="2.4.100" match="compatible"/>
121121
<import plugin="org.eclipse.equinox.p2.repository" version="2.3.200" match="compatible"/>
@@ -139,17 +139,16 @@ limitations under the License.
139139
<import plugin="org.eclipse.swt" version="3.110.0" match="compatible"/>
140140
<import plugin="org.eclipse.jface" version="3.13.1" match="compatible"/>
141141
<import plugin="org.eclipse.core.jobs" version="3.9.1" match="compatible"/>
142+
<import plugin="javax.annotation" version="1.3.5" match="compatible"/>
142143
<import plugin="org.eclipse.pde.ds.core" version="1.1.500" match="greaterOrEqual"/>
143144
<import plugin="org.eclipse.pde.ds.lib" version="1.1.300" match="greaterOrEqual"/>
144-
<import plugin="org.eclipse.emf.edit" version="2.15.0" match="greaterOrEqual"/>
145+
<import plugin="org.eclipse.emf.edit" version="2.16.0" match="greaterOrEqual"/>
145146
<import plugin="org.eclipse.emf.edit.ui" version="2.16.0" match="greaterOrEqual"/>
147+
<import plugin="org.apache.felix.gogo.command" version="1.1.2" match="greaterOrEqual"/>
148+
<import plugin="org.apache.felix.gogo.runtime" version="1.1.4" match="greaterOrEqual"/>
149+
<import plugin="org.apache.felix.gogo.shell" version="1.1.4" match="greaterOrEqual"/>
146150
<import feature="org.eclipse.e4.rcp" version="1.6.3.v20180214-0345" match="greaterOrEqual"/>
147-
<import plugin="org.apache.ant" version="1.10.9" match="compatible"/>
148-
<import plugin="javax.annotation" version="1.3.5" match="compatible"/>
149-
<import plugin="org.eclipse.osgi" version="3.16.200" match="compatible"/>
150-
<import plugin="org.enterprisedomain.classmaker" version="0.8.46" match="greaterOrEqual"/>
151-
<import plugin="org.eclipse.emf.cdo" version="4.13.0" match="greaterOrEqual"/>
152-
<import plugin="org.eclipse.emf.cdo.edit" version="4.5.4" match="greaterOrEqual"/>
151+
<import plugin="org.eclipse.emf.query" version="1.7.0" match="greaterOrEqual"/>
153152
</requires>
154153

155154
<plugin

‎releng/org.enterprisedomain.target/latest.tpd‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
target "org.enterprisedomain.target.latest" with allEnvironments configurePhase
22

33
location updates "http://download.eclipse.org/eclipse/updates/latest/" {
4-
org.eclipse.e4.rcp.feature.group
5-
org.eclipse.rcp.configuration.feature.group
4+
org.eclipse.e4.rcp.feature.group [4.23.0,5.0.0)
5+
org.eclipse.rcp.configuration.feature.group [1.1.1500,1.2.0)
66
org.eclipse.rcp.source.feature.group
77
org.eclipse.e4.rcp.source.feature.group
88
org.eclipse.equinox.sdk.feature.group
@@ -13,8 +13,8 @@ location updates "http://download.eclipse.org/eclipse/updates/latest/" {
1313
}
1414

1515
location simrel_latest "https://download.eclipse.org/releases/latest/" {
16-
org.eclipse.jdt.feature.group
17-
org.eclipse.emf.sdk.feature.group [2.27.0,2.28.0)
16+
org.eclipse.jdt.feature.group [3.18.1000,3.19.0)
17+
org.eclipse.emf.sdk.feature.group [2.29.0,3.0.0)
1818
org.eclipse.gef.sdk.feature.group
1919
org.eclipse.graphiti.feature.feature.group
2020
org.eclipse.graphiti.export.feature.feature.group
@@ -37,11 +37,11 @@ location simrel_latest "https://download.eclipse.org/releases/latest/" {
3737
org.eclipse.emf.ecp.emfforms.sdk.feature.feature.group [1.26.1,1.27.0)
3838
org.eclipse.ecf.core.ssl.feature.feature.group
3939
org.eclipse.ecf.filetransfer.ssl.feature.feature.group
40-
org.eclipse.ecf.filetransfer.httpclient45.feature.feature.group
40+
org.eclipse.ecf.filetransfer.httpclient5.feature.feature.group
4141
}
4242

4343
location "http://download.eclipse.org/egit/updates/" {
44-
org.eclipse.jgit.feature.group [5.13.0,5.14.0)
44+
org.eclipse.jgit.feature.group [6.0.0,7.0.0)
4545
}
4646

4747
location "http://download.eclipse.org/sirius/updates/releases/6.5.1/2020-09/" {
@@ -53,4 +53,4 @@ location "http://download.eclipse.org/sirius/updates/releases/6.5.1/2020-09/" {
5353
org.eclipse.sirius.diagram.ui
5454
org.eclipse.sirius.runtime.feature.group
5555
org.eclipse.sirius.properties.feature.feature.group
56-
}
56+
}

‎releng/org.enterprisedomain.target/org.enterprisedomain.target.target‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -184,12 +184,7 @@
184184
<unit id="org.apache.poi.ooxml" version="4.1.1.v20200820-1148"/>
185185
<unit id="org.apache.poi.ooxml.source" version="4.1.1.v20200820-1148"/>
186186
<unit id="org.apache.poi.ooxml.schemas" version="4.1.1.v20200922-2105"/>
187-
<unit id="org.apache.xmlbeans" version="3.1.0.v20200922-1359"/>
188-
<unit id="org.apache.xmlbeans.source" version="3.1.0.v20200922-1359"/>
189-
<unit id="org.apache.commons.collections4" version="4.4.0.v20200420-1700"/>
190-
<unit id="org.apache.commons.collections4.source" version="4.4.0.v20200420-1700"/>
191-
<unit id="org.apache.commons.math3" version="3.6.1.v20200817-1830"/>
192-
<unit id="org.apache.commons.math3.source" version="3.6.1.v20200817-1830"/>
187+
<unit id="org.apache.poi.ooxml.schemas.source" version="3.9.0.v201405241750"/>
193188
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository/"/>
194189
</location>
195190
<location includeMode="slicer" includeAllPlatforms="true" includeSource="false" includeConfigurePhase="true" type="InstallableUnit">

‎releng/org.enterprisedomain.workbench.product/workbench.product‎

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,10 +306,48 @@
306306
<feature id="org.eclipse.ecf.filetransfer.feature"/>
307307
<feature id="org.eclipse.ecf.core.ssl.feature"/>
308308
<feature id="org.eclipse.ecf.filetransfer.ssl.feature"/>
309-
<feature id="org.eclipse.ecf.filetransfer.httpclient45.feature"/>
310309
<feature id="org.enterprisedomain.classmaker.ecp.feature"/>
311310
<feature id="org.eclipse.equinox.p2.extras.feature" installMode="root"/>
312311
<feature id="org.eclipse.rcp" installMode="root"/>
312+
<feature id="org.eclipse.emf.sdk" installMode="root"/>
313+
<feature id="org.eclipse.emf.mapping.ecore" installMode="root"/>
314+
<feature id="org.eclipse.emf.databinding.edit.source" installMode="root"/>
315+
<feature id="org.eclipse.emf.codegen.ui.source" installMode="root"/>
316+
<feature id="org.eclipse.emf.databinding.source" installMode="root"/>
317+
<feature id="org.eclipse.emf.codegen" installMode="root"/>
318+
<feature id="org.eclipse.emf" installMode="root"/>
319+
<feature id="org.eclipse.emf.mapping.ecore.editor.source" installMode="root"/>
320+
<feature id="org.eclipse.emf.edit" installMode="root"/>
321+
<feature id="org.eclipse.emf.codegen.ui" installMode="root"/>
322+
<feature id="org.eclipse.emf.ecore.editor.source" installMode="root"/>
323+
<feature id="org.eclipse.emf.databinding.edit" installMode="root"/>
324+
<feature id="org.eclipse.emf.common.source" installMode="root"/>
325+
<feature id="org.eclipse.emf.edit.source" installMode="root"/>
326+
<feature id="org.eclipse.emf.codegen.ecore" installMode="root"/>
327+
<feature id="org.eclipse.emf.converter" installMode="root"/>
328+
<feature id="org.eclipse.emf.mapping.ecore.source" installMode="root"/>
329+
<feature id="org.eclipse.emf.edit.ui" installMode="root"/>
330+
<feature id="org.eclipse.emf.codegen.source" installMode="root"/>
331+
<feature id="org.eclipse.emf.mapping.source" installMode="root"/>
332+
<feature id="org.eclipse.emf.codegen.ecore.ui.source" installMode="root"/>
333+
<feature id="org.eclipse.emf.doc" installMode="root"/>
334+
<feature id="org.eclipse.emf.ecore.source" installMode="root"/>
335+
<feature id="org.eclipse.emf.edit.ui.source" installMode="root"/>
336+
<feature id="org.eclipse.emf.common.ui" installMode="root"/>
337+
<feature id="org.eclipse.emf.converter.source" installMode="root"/>
338+
<feature id="org.eclipse.emf.mapping.ui" installMode="root"/>
339+
<feature id="org.eclipse.emf.codegen.ecore.source" installMode="root"/>
340+
<feature id="org.eclipse.emf.mapping" installMode="root"/>
341+
<feature id="org.eclipse.emf.mapping.ui.source" installMode="root"/>
342+
<feature id="org.eclipse.emf.ecore.edit.source" installMode="root"/>
343+
<feature id="org.eclipse.emf.codegen.ecore.ui" installMode="root"/>
344+
<feature id="org.eclipse.emf.ecore.editor" installMode="root"/>
345+
<feature id="org.eclipse.emf.source" installMode="root"/>
346+
<feature id="org.eclipse.emf.mapping.ecore.editor" installMode="root"/>
347+
<feature id="org.eclipse.emf.databinding" installMode="root"/>
348+
<feature id="org.eclipse.emf.ecore.edit" installMode="root"/>
349+
<feature id="org.eclipse.emf.common.ui.source" installMode="root"/>
350+
<feature id="org.eclipse.ecf.filetransfer.httpclient5.feature" installMode="root"/>
313351
</features>
314352

315353
<configurations>

0 commit comments

Comments
 (0)