Several changes

Signed-off-by: Kyrill Zotkin <[email protected]>
enterpriseDomain · Oct 2, 2024 · 25c70be · 25c70be
1 parent d2b65ca
commit 25c70be
Show file tree

Hide file tree

Showing 144 changed files with 4,036 additions and 11,118 deletions.
diff --git a/.classpath b/.classpath
@@ -17,7 +17,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -20,15 +20,15 @@ jobs:
       with:
         maven-version: 3.9.0
     - uses: actions/checkout@v3
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
-        java-version: '17'
+        java-version: '21'
     - name: Copy toolchain      
       run: |
        mkdir -p ~/.m2/
-       echo "<toolchains xmlns=\"http://maven.apache.org/TOOLCHAINS/1.1.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://maven.apache.org/TOOLCHAINS/1.1.0 http://maven.apache.org/xsd/toolchains-1.1.0.xsd\"><toolchain><type>jdk</type><provides><id>JavaSE-17</id><version>17</version><vendor>eclipse</vendor></provides><configuration><jdkHome>/$JAVA_HOME</jdkHome></configuration></toolchain></toolchains>" > ~/.m2/toolchains.xml
+       echo "<toolchains xmlns=\"http://maven.apache.org/TOOLCHAINS/1.1.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://maven.apache.org/TOOLCHAINS/1.1.0 http://maven.apache.org/xsd/toolchains-1.1.0.xsd\"><toolchain><type>jdk</type><provides><id>JavaSE-21</id><version>21</version><vendor>eclipse</vendor></provides><configuration><jdkHome>/$JAVA_HOME</jdkHome></configuration></toolchain></toolchains>" > ~/.m2/toolchains.xml
     - name: Build with Maven      
       run:
        mvn -B clean package --file pom.xml

diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extensions>
 	<extension>
-		<groupId>org.eclipse.tycho.extras</groupId>
-		<artifactId>tycho-pomless</artifactId>
-		<version>0.25.0</version>
+		<groupId>org.eclipse.tycho</groupId>
+		<artifactId>tycho-build</artifactId>
+		<version>4.0.8</version>
 	</extension>
 </extensions>
diff --git a/bundles/org.enterprisedomain.classmaker.cdo.ui/.classpath b/bundles/org.enterprisedomain.classmaker.cdo.ui/.classpath
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins" />
+	<classpathentry kind="src" path="src" />
+	<classpathentry kind="con"
+		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21" />
+	<classpathentry kind="output" path="bin" />
 </classpath>
diff --git a/bundles/org.enterprisedomain.classmaker.cdo.ui/META-INF/MANIFEST.MF b/bundles/org.enterprisedomain.classmaker.cdo.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ClassMaker CDO UI Support
 Bundle-SymbolicName: org.enterprisedomain.classmaker.cdo.ui;singleton:=true
-Bundle-Version: 0.8.55.qualifier
+Bundle-Version: 0.8.55
 Bundle-Vendor: Kyrill Zotkin
 Require-Bundle: org.enterprisedomain.classmaker.cdo;bundle-version="0.0.1",
  org.eclipse.emf.cdo.ui.shared;bundle-version="[4.5.0,5.0.0)",
@@ -11,4 +11,4 @@ Require-Bundle: org.enterprisedomain.classmaker.cdo;bundle-version="0.0.1",
  org.eclipse.net4j.tcp;bundle-version="[4.2.1,5.0.0)",
  org.eclipse.equinox.concurrent;bundle-version="1.2.0"
 Automatic-Module-Name: org.enterprisedomain.classmaker.cdo.ui
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
diff --git a/bundles/org.enterprisedomain.classmaker.cdo.ui/plugin.xml b/bundles/org.enterprisedomain.classmaker.cdo.ui/plugin.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <plugin>
-   <extension
-         point="org.eclipse.emf.cdo.ui.editorOpeners">
-      <editorOpener
-            class="org.enterprisedomain.classmaker.cdo.ui.CDOEditorOpener"
-            icon="platform:/plugin/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_editor.gif"
-            id="org.enterprisedomain.classmaker.cdo.ui.editorOpener"
-            name="CDO Editor"
-            priority="700"
-            regex="cdo.*">
-      </editorOpener>
-   </extension>
+	<extension
+		point="org.eclipse.emf.cdo.ui.editorOpeners">
+		<editorOpener
+			class="org.enterprisedomain.classmaker.cdo.ui.CDOEditorOpener"
+			icon="platform:/plugin/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_editor.gif"
+			id="org.enterprisedomain.classmaker.cdo.ui.editorOpener"
+			name="CDO Editor"
+			priority="700"
+			regex="cdo.*">
+		</editorOpener>
+	</extension>
 
 </plugin>
diff --git a/bundles/org.enterprisedomain.classmaker.cdo.ui/pom.xml b/bundles/org.enterprisedomain.classmaker.cdo.ui/pom.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.enterprisedomain</groupId>
 		<artifactId>org.enterprisedomain.root</artifactId>
-		<version>0.8.55-SNAPSHOT</version>
+		<version>0.8.55</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

diff --git a/bundles/org.enterprisedomain.classmaker.cdo.ui/target/MANIFEST.MF b/bundles/org.enterprisedomain.classmaker.cdo.ui/target/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: ClassMaker CDO UI Support
 Bundle-SymbolicName: org.enterprisedomain.classmaker.cdo.ui;singleton:=t
  rue
-Bundle-Version: 0.8.55.202402081017
+Bundle-Version: 0.8.55
 Bundle-Vendor: Kyrill Zotkin
 Require-Bundle: org.enterprisedomain.classmaker.cdo;bundle-version="0.0.
  1",org.eclipse.emf.cdo.ui.shared;bundle-version="[4.5.0,5.0.0)",org.ecl
@@ -12,5 +12,5 @@ Require-Bundle: org.enterprisedomain.classmaker.cdo;bundle-version="0.0.
  sion="[4.2.1,5.0.0)",org.eclipse.equinox.concurrent;bundle-version="1.2
  .0"
 Automatic-Module-Name: org.enterprisedomain.classmaker.cdo.ui
-Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=17))"
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=21))"
 
diff --git a/bundles/org.enterprisedomain.classmaker.cdo/.classpath b/bundles/org.enterprisedomain.classmaker.cdo/.classpath
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry kind="con"
+		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
-			<attribute name="module" value="true"/>
+			<attribute name="module" value="true" />
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins" />
+	<classpathentry kind="src" path="src" />
+	<classpathentry kind="output" path="bin" />
 </classpath>
diff --git a/bundles/org.enterprisedomain.classmaker.cdo/META-INF/MANIFEST.MF b/bundles/org.enterprisedomain.classmaker.cdo/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ClassMaker CDO Support
 Bundle-SymbolicName: org.enterprisedomain.classmaker.cdo;singleton:=true
-Bundle-Version: 0.8.55.qualifier
+Bundle-Version: 0.8.55
 Bundle-Vendor: Kyrill Zotkin
 Automatic-Module-Name: org.enterprisedomain.classmaker.cdo
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-Activator: org.enterprisedomain.classmaker.cdo.Activator
 Require-Bundle: org.eclipse.osgi;bundle-version="[3.18.200,4.0.0)",
  org.enterprisedomain.classmaker;bundle-version="0.8.55";visibility:=reexport,

diff --git a/bundles/org.enterprisedomain.classmaker.cdo/plugin.xml b/bundles/org.enterprisedomain.classmaker.cdo/plugin.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <plugin>
-   <extension
-         point="org.enterprisedomain.classmaker.customizers">
-      <customizer
-            class="org.enterprisedomain.classmaker.cdo.CreateCDOGeneratorCustomizer"
-            rank="4"
-            stage="org.enterprisedomain.classmaker.customization.stages.project.create.generator">
-      </customizer>
-   </extension>
+	<extension
+		point="org.enterprisedomain.classmaker.customizers">
+		<customizer
+			class="org.enterprisedomain.classmaker.cdo.CreateCDOGeneratorCustomizer"
+			rank="4"
+			stage="org.enterprisedomain.classmaker.customization.stages.project.create.generator">
+		</customizer>
+	</extension>
 
 </plugin>
diff --git a/bundles/org.enterprisedomain.classmaker.cdo/pom.xml b/bundles/org.enterprisedomain.classmaker.cdo/pom.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.enterprisedomain</groupId>
 		<artifactId>org.enterprisedomain.root</artifactId>
-		<version>0.8.55-SNAPSHOT</version>
+		<version>0.8.55</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

diff --git a/bundles/org.enterprisedomain.classmaker.cdo/target/MANIFEST.MF b/bundles/org.enterprisedomain.classmaker.cdo/target/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ClassMaker CDO Support
 Bundle-SymbolicName: org.enterprisedomain.classmaker.cdo;singleton:=true
-Bundle-Version: 0.8.55.202402081017
+Bundle-Version: 0.8.55
 Bundle-Vendor: Kyrill Zotkin
 Automatic-Module-Name: org.enterprisedomain.classmaker.cdo
 Bundle-Activator: org.enterprisedomain.classmaker.cdo.Activator
@@ -12,5 +12,5 @@ Require-Bundle: org.eclipse.osgi;bundle-version="[3.18.200,4.0.0)",org.e
  rt,org.eclipse.emf.cdo.edit;bundle-version="[4.5.6,5.0.0)";visibility:=
  reexport
 Export-Package: org.enterprisedomain.classmaker.cdo
-Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=17))"
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=21))"
 
diff --git a/...in.classmaker.edit/src/org/enterprisedomain/classmaker/provider/ClassMakerEditPlugin.java b/...in.classmaker.edit/src/org/enterprisedomain/classmaker/provider/ClassMakerEditPlugin.java