Skip to content

Commit 641869a

Browse files
kyrillzotkinkyrillzotkin
committed
Trying to fix the build
Signed-off-by: Kyrill Zotkin <143617+kyrillzotkin@users.noreply.github.com>
1 parent 222a2cb commit 641869a

File tree

33 files changed

+318
-660
lines changed

33 files changed

+318
-660
lines changed

‎.classpath‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,26 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" output="target/classes"
4-
path="src/main/java">
3+
<classpathentry kind="src" output="target/classes" path="src/main/java">
54
<attributes>
6-
<attribute name="optional" value="true" />
7-
<attribute name="maven.pomderived" value="true" />
5+
<attribute name="optional" value="true"/>
6+
<attribute name="maven.pomderived" value="true"/>
87
</attributes>
98
</classpathentry>
10-
<classpathentry kind="src" output="target/test-classes"
11-
path="src/test/java">
9+
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
1210
<attributes>
13-
<attribute name="optional" value="true" />
14-
<attribute name="maven.pomderived" value="true" />
11+
<attribute name="optional" value="true"/>
12+
<attribute name="maven.pomderived" value="true"/>
1513
</attributes>
1614
</classpathentry>
17-
<classpathentry kind="con"
18-
path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
15+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
1916
<attributes>
20-
<attribute name="maven.pomderived" value="true" />
17+
<attribute name="maven.pomderived" value="true"/>
2118
</attributes>
2219
</classpathentry>
23-
<classpathentry kind="con"
24-
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
20+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
2521
<attributes>
26-
<attribute name="module" value="true" />
22+
<attribute name="module" value="true"/>
2723
</attributes>
2824
</classpathentry>
29-
<classpathentry kind="output" path="target/classes" />
25+
<classpathentry kind="output" path="target/classes"/>
3026
</classpath>

‎.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
99
org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
1010
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
1111
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
12-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
13-
org.eclipse.jdt.core.compiler.compliance=11
12+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
13+
org.eclipse.jdt.core.compiler.compliance=17
1414
org.eclipse.jdt.core.compiler.problem.APILeak=warning
1515
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
1616
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -107,4 +107,4 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
107107
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
108108
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
109109
org.eclipse.jdt.core.compiler.release=enabled
110-
org.eclipse.jdt.core.compiler.source=11
110+
org.eclipse.jdt.core.compiler.source=17

‎bundles/org.enterprisedomain.classmaker.cdo.ui/target/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: ClassMaker CDO UI Support
44
Bundle-SymbolicName: org.enterprisedomain.classmaker.cdo.ui
5-
Bundle-Version: 0.8.46.202111140725
5+
Bundle-Version: 0.8.46.202207050943
66
Bundle-Vendor: Kyrill Zotkin
77
Require-Bundle: org.enterprisedomain.classmaker.cdo;bundle-version="0.0.
88
1",org.eclipse.emf.cdo.ui.shared;bundle-version="4.5.0",org.eclipse.emf

‎bundles/org.enterprisedomain.classmaker.cdo.ui/target/p2artifacts.xml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<?artifactRepository version='1.1.0'?>
33
<artifacts size='2'>
4-
<artifact classifier='osgi.bundle' id='org.enterprisedomain.classmaker.cdo.ui' version='0.8.46.202111140725'>
5-
<properties size='5'>
6-
<property name='artifact.size' value='1982'/>
7-
<property name='download.size' value='1982'/>
4+
<artifact classifier='osgi.bundle' id='org.enterprisedomain.classmaker.cdo.ui' version='0.8.46.202207050943'>
5+
<properties size='6'>
6+
<property name='artifact.size' value='6310'/>
7+
<property name='download.size' value='6310'/>
88
<property name='maven-groupId' value='org.enterprisedomain'/>
99
<property name='maven-artifactId' value='org.enterprisedomain.classmaker.cdo.ui'/>
1010
<property name='maven-version' value='0.8.46-SNAPSHOT'/>
11+
<property name='maven-type' value='eclipse-plugin'/>
1112
</properties>
1213
</artifact>
13-
<artifact classifier='osgi.bundle' id='org.enterprisedomain.classmaker.cdo.ui.source' version='0.8.46.202111140725'>
14-
<properties size='6'>
15-
<property name='artifact.size' value='938'/>
16-
<property name='download.size' value='938'/>
14+
<artifact classifier='osgi.bundle' id='org.enterprisedomain.classmaker.cdo.ui.source' version='0.8.46.202207050943'>
15+
<properties size='7'>
16+
<property name='artifact.size' value='942'/>
17+
<property name='download.size' value='942'/>
1718
<property name='maven-groupId' value='org.enterprisedomain'/>
1819
<property name='maven-artifactId' value='org.enterprisedomain.classmaker.cdo.ui'/>
1920
<property name='maven-version' value='0.8.46-SNAPSHOT'/>
2021
<property name='maven-classifier' value='sources'/>
22+
<property name='maven-type' value='java-source'/>
2123
</properties>
2224
</artifact>
2325
</artifacts>

‎bundles/org.enterprisedomain.classmaker.cdo.ui/target/p2content.xml‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<units size='2'>
3-
<unit id='org.enterprisedomain.classmaker.cdo.ui' version='0.8.46.202111140725' singleton='false' generation='2'>
4-
<update id='org.enterprisedomain.classmaker.cdo.ui' range='[0.0.0,0.8.46.202111140725)' severity='0'/>
5-
<properties size='5'>
3+
<unit id='org.enterprisedomain.classmaker.cdo.ui' version='0.8.46.202207050943' singleton='false' generation='2'>
4+
<update id='org.enterprisedomain.classmaker.cdo.ui' range='[0.0.0,0.8.46.202207050943)' severity='0'/>
5+
<properties size='6'>
66
<property name='org.eclipse.equinox.p2.name' value='ClassMaker CDO UI Support'/>
77
<property name='org.eclipse.equinox.p2.provider' value='Kyrill Zotkin'/>
88
<property name='maven-groupId' value='org.enterprisedomain'/>
99
<property name='maven-artifactId' value='org.enterprisedomain.classmaker.cdo.ui'/>
1010
<property name='maven-version' value='0.8.46-SNAPSHOT'/>
11+
<property name='maven-type' value='eclipse-plugin'/>
1112
</properties>
1213
<provides size='4'>
13-
<provided namespace='org.eclipse.equinox.p2.iu' name='org.enterprisedomain.classmaker.cdo.ui' version='0.8.46.202111140725'/>
14-
<provided namespace='osgi.bundle' name='org.enterprisedomain.classmaker.cdo.ui' version='0.8.46.202111140725'/>
15-
<provided namespace='osgi.identity' name='org.enterprisedomain.classmaker.cdo.ui' version='0.8.46.202111140725'>
14+
<provided namespace='org.eclipse.equinox.p2.iu' name='org.enterprisedomain.classmaker.cdo.ui' version='0.8.46.202207050943'/>
15+
<provided namespace='osgi.bundle' name='org.enterprisedomain.classmaker.cdo.ui' version='0.8.46.202207050943'/>
16+
<provided namespace='osgi.identity' name='org.enterprisedomain.classmaker.cdo.ui' version='0.8.46.202207050943'>
1617
<properties size='1'>
1718
<property name='type' value='osgi.bundle'/>
1819
</properties>
@@ -36,20 +37,20 @@
3637
</requiredProperties>
3738
</requires>
3839
<artifacts size='1'>
39-
<artifact classifier='osgi.bundle' id='org.enterprisedomain.classmaker.cdo.ui' version='0.8.46.202111140725'/>
40+
<artifact classifier='osgi.bundle' id='org.enterprisedomain.classmaker.cdo.ui' version='0.8.46.202207050943'/>
4041
</artifacts>
4142
<touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
4243
<touchpointData size='1'>
4344
<instructions size='1'>
4445
<instruction key='manifest'>
45-
Bundle-SymbolicName: org.enterprisedomain.classmaker.cdo.ui&#xA;Bundle-Version: 0.8.46.202111140725&#xA;
46+
Bundle-SymbolicName: org.enterprisedomain.classmaker.cdo.ui&#xA;Bundle-Version: 0.8.46.202207050943&#xA;
4647
</instruction>
4748
</instructions>
4849
</touchpointData>
4950
</unit>
50-
<unit id='org.enterprisedomain.classmaker.cdo.ui.source' version='0.8.46.202111140725' singleton='false'>
51-
<update id='org.enterprisedomain.classmaker.cdo.ui.source' range='[0.0.0,0.8.46.202111140725)' severity='0'/>
52-
<properties size='9'>
51+
<unit id='org.enterprisedomain.classmaker.cdo.ui.source' version='0.8.46.202207050943' singleton='false'>
52+
<update id='org.enterprisedomain.classmaker.cdo.ui.source' range='[0.0.0,0.8.46.202207050943)' severity='0'/>
53+
<properties size='10'>
5354
<property name='df_LT.bundleVendor' value='Kyrill Zotkin'/>
5455
<property name='df_LT.bundleName' value='ClassMaker CDO UI Support Source'/>
5556
<property name='org.eclipse.equinox.p2.name' value='%bundleName'/>
@@ -59,11 +60,12 @@
5960
<property name='maven-artifactId' value='org.enterprisedomain.classmaker.cdo.ui'/>
6061
<property name='maven-version' value='0.8.46-SNAPSHOT'/>
6162
<property name='maven-classifier' value='sources'/>
63+
<property name='maven-type' value='java-source'/>
6264
</properties>
6365
<provides size='5'>
64-
<provided namespace='org.eclipse.equinox.p2.iu' name='org.enterprisedomain.classmaker.cdo.ui.source' version='0.8.46.202111140725'/>
65-
<provided namespace='osgi.bundle' name='org.enterprisedomain.classmaker.cdo.ui.source' version='0.8.46.202111140725'/>
66-
<provided namespace='osgi.identity' name='org.enterprisedomain.classmaker.cdo.ui.source' version='0.8.46.202111140725'>
66+
<provided namespace='org.eclipse.equinox.p2.iu' name='org.enterprisedomain.classmaker.cdo.ui.source' version='0.8.46.202207050943'/>
67+
<provided namespace='osgi.bundle' name='org.enterprisedomain.classmaker.cdo.ui.source' version='0.8.46.202207050943'/>
68+
<provided namespace='osgi.identity' name='org.enterprisedomain.classmaker.cdo.ui.source' version='0.8.46.202207050943'>
6769
<properties size='1'>
6870
<property name='type' value='osgi.bundle'/>
6971
</properties>
@@ -72,13 +74,13 @@
7274
<provided namespace='org.eclipse.equinox.p2.localization' name='df_LT' version='1.0.0'/>
7375
</provides>
7476
<artifacts size='1'>
75-
<artifact classifier='osgi.bundle' id='org.enterprisedomain.classmaker.cdo.ui.source' version='0.8.46.202111140725'/>
77+
<artifact classifier='osgi.bundle' id='org.enterprisedomain.classmaker.cdo.ui.source' version='0.8.46.202207050943'/>
7678
</artifacts>
7779
<touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
7880
<touchpointData size='1'>
7981
<instructions size='1'>
8082
<instruction key='manifest'>
81-
Bundle-SymbolicName: org.enterprisedomain.classmaker.cdo.ui.source&#xA;Bundle-Version: 0.8.46.202111140725&#xA;
83+
Bundle-SymbolicName: org.enterprisedomain.classmaker.cdo.ui.source&#xA;Bundle-Version: 0.8.46.202207050943&#xA;
8284
</instruction>
8385
</instructions>
8486
</touchpointData>

‎bundles/org.enterprisedomain.classmaker.cdo/.classpath‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
4+
<attributes>
5+
<attribute name="module" value="true"/>
6+
</attributes>
7+
</classpathentry>
48
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
59
<classpathentry kind="src" path="src"/>
610
<classpathentry kind="output" path="bin"/>

‎bundles/org.enterprisedomain.classmaker.cdo/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
eclipse.preferences.version=1
2-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
3-
org.eclipse.jdt.core.compiler.compliance=11
2+
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
4+
org.eclipse.jdt.core.compiler.compliance=17
45
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
56
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
67
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
78
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
89
org.eclipse.jdt.core.compiler.release=enabled
9-
org.eclipse.jdt.core.compiler.source=11
10+
org.eclipse.jdt.core.compiler.source=17

‎bundles/org.enterprisedomain.classmaker.cdo/target/MANIFEST.MF‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: ClassMaker CDO Support
44
Bundle-SymbolicName: org.enterprisedomain.classmaker.cdo;singleton:=true
5-
Bundle-Version: 0.8.46.202111140725
5+
Bundle-Version: 0.8.46.202207050943
66
Bundle-Vendor: Kyrill Zotkin
77
Automatic-Module-Name: org.enterprisedomain.classmaker.cdo
88
Bundle-RequiredExecutionEnvironment: JavaSE-11
99
Bundle-Activator: org.enterprisedomain.classmaker.cdo.Activator
1010
Require-Bundle: org.eclipse.osgi;bundle-version="[3.16.200,4.0.0)",org.e
1111
nterprisedomain.classmaker;bundle-version="0.8.46",org.eclipse.emf.cdo;
12-
bundle-version="4.13.0";visibility:=reexport,org.eclipse.emf.cdo.edit;b
13-
undle-version="4.5.4"
12+
bundle-version="4.15.0";visibility:=reexport,org.eclipse.emf.cdo.edit;b
13+
undle-version="4.5.6";visibility:=reexport
14+
Export-Package: org.enterprisedomain.classmaker.cdo
1415

‎bundles/org.enterprisedomain.classmaker.cdo/target/p2artifacts.xml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<?artifactRepository version='1.1.0'?>
33
<artifacts size='2'>
4-
<artifact classifier='osgi.bundle' id='org.enterprisedomain.classmaker.cdo' version='0.8.46.202111140725'>
5-
<properties size='5'>
6-
<property name='artifact.size' value='5285'/>
7-
<property name='download.size' value='5285'/>
4+
<artifact classifier='osgi.bundle' id='org.enterprisedomain.classmaker.cdo' version='0.8.46.202207050943'>
5+
<properties size='6'>
6+
<property name='artifact.size' value='8830'/>
7+
<property name='download.size' value='8830'/>
88
<property name='maven-groupId' value='org.enterprisedomain'/>
99
<property name='maven-artifactId' value='org.enterprisedomain.classmaker.cdo'/>
1010
<property name='maven-version' value='0.8.46-SNAPSHOT'/>
11+
<property name='maven-type' value='eclipse-plugin'/>
1112
</properties>
1213
</artifact>
13-
<artifact classifier='osgi.bundle' id='org.enterprisedomain.classmaker.cdo.source' version='0.8.46.202111140725'>
14-
<properties size='6'>
15-
<property name='artifact.size' value='3255'/>
16-
<property name='download.size' value='3255'/>
14+
<artifact classifier='osgi.bundle' id='org.enterprisedomain.classmaker.cdo.source' version='0.8.46.202207050943'>
15+
<properties size='7'>
16+
<property name='artifact.size' value='3258'/>
17+
<property name='download.size' value='3258'/>
1718
<property name='maven-groupId' value='org.enterprisedomain'/>
1819
<property name='maven-artifactId' value='org.enterprisedomain.classmaker.cdo'/>
1920
<property name='maven-version' value='0.8.46-SNAPSHOT'/>
2021
<property name='maven-classifier' value='sources'/>
22+
<property name='maven-type' value='java-source'/>
2123
</properties>
2224
</artifact>
2325
</artifacts>

0 commit comments

Comments
 (0)