From b4be963d311f5d7f23ce2e7e9c38b076298fc8c2 Mon Sep 17 00:00:00 2001 From: Niklas Rentz Date: Thu, 18 Apr 2024 14:22:15 +0200 Subject: [PATCH] updated to Eclipse 2023-12, KLighD 3.0.1, and related. Enforce Java 17. Fixed some generic warnings. Deactivated tests in Maven build. --- .../org.eclipse.core.resources.prefs | 0 .../org.eclipse.core.resources.prefs | 0 .../category.xml | 12 +-- .../de.cau.cs.kieler.spviz.repository/pom.xml | 1 - ....cau.cs.kieler.spviz.targetplatform.target | 27 ++--- .../pom.xml | 1 - build/pom.xml | 79 ++++++++++++++- .../org.eclipse.core.resources.prefs | 2 + .../de.cau.cs.kieler.spviz.feature/pom.xml | 2 - .../org.eclipse.core.resources.prefs | 2 + .../feature.xml | 99 +++++++++---------- .../de.cau.cs.kieler.spviz.ui.feature/pom.xml | 2 - .../.classpath | 3 +- .../.settings/org.eclipse.jdt.core.prefs | 11 ++- .../META-INF/MANIFEST.MF | 2 +- .../build.properties | 1 + .../de.cau.cs.kieler.spviz.spviz.ide/pom.xml | 2 - .../.classpath | 3 +- .../.settings/org.eclipse.jdt.core.prefs | 11 ++- .../META-INF/MANIFEST.MF | 6 +- .../pom.xml | 7 -- .../.classpath | 26 ----- .../.project | 34 ------- .../.settings/org.eclipse.jdt.core.prefs | 8 -- .../META-INF/MANIFEST.MF | 18 ---- .../build.properties | 6 -- .../pom.xml | 38 ------- .../ui/tests/SPVizUiInjectorProvider.java | 32 ------ .../.classpath | 3 +- .../.settings/org.eclipse.jdt.core.prefs | 11 ++- .../META-INF/MANIFEST.MF | 2 +- .../plugin.xml | 1 - .../de.cau.cs.kieler.spviz.spviz.ui/pom.xml | 2 - .../de.cau.cs.kieler.spviz.spviz/.classpath | 7 +- .../.settings/org.eclipse.jdt.core.prefs | 8 +- .../META-INF/MANIFEST.MF | 2 +- .../build.properties | 1 + plugins/de.cau.cs.kieler.spviz.spviz/pom.xml | 2 - .../generator/GenerateLanguageServer.xtend | 2 +- .../spviz/generator/GenerateMavenBuild.xtend | 35 +++---- .../spviz/generator/GenerateSyntheses.xtend | 2 +- .../spviz/generator/SPVizGenerator.xtend | 12 --- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 11 ++- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 2 - .../.classpath | 3 +- .../.settings/org.eclipse.jdt.core.prefs | 11 ++- .../META-INF/MANIFEST.MF | 4 +- .../pom.xml | 2 - .../.classpath | 26 ----- .../.project | 34 ------- .../.settings/org.eclipse.jdt.core.prefs | 8 -- .../META-INF/MANIFEST.MF | 18 ---- .../build.properties | 6 -- .../pom.xml | 38 ------- .../tests/SPVizModelUiInjectorProvider.java | 32 ------ .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 11 ++- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 2 - .../.classpath | 3 +- .../.settings/org.eclipse.jdt.core.prefs | 11 ++- .../META-INF/MANIFEST.MF | 2 +- .../de.cau.cs.kieler.spviz.spvizmodel/pom.xml | 2 - .../spvizmodel/generator/FileGenerator.xtend | 2 +- .../generator/GenerateGeneratorScaffold.xtend | 4 +- .../generator/GenerateModelMavenBuild.xtend | 92 +++++++++++++---- .../generator/JavaMavenProjectGenerator.xtend | 6 +- .../generator/JavaProjectGenerator.xtend | 2 +- 70 files changed, 313 insertions(+), 552 deletions(-) rename {plugins/de.cau.cs.kieler.spviz.spviz.ui.tests/.settings => .settings}/org.eclipse.core.resources.prefs (100%) rename {plugins/de.cau.cs.kieler.spviz.spvizmodel.ui.tests => build}/.settings/org.eclipse.core.resources.prefs (100%) create mode 100644 features/de.cau.cs.kieler.spviz.feature/.settings/org.eclipse.core.resources.prefs create mode 100644 features/de.cau.cs.kieler.spviz.ui.feature/.settings/org.eclipse.core.resources.prefs delete mode 100644 plugins/de.cau.cs.kieler.spviz.spviz.ui.tests/.classpath delete mode 100644 plugins/de.cau.cs.kieler.spviz.spviz.ui.tests/.project delete mode 100644 plugins/de.cau.cs.kieler.spviz.spviz.ui.tests/.settings/org.eclipse.jdt.core.prefs delete mode 100644 plugins/de.cau.cs.kieler.spviz.spviz.ui.tests/META-INF/MANIFEST.MF delete mode 100644 plugins/de.cau.cs.kieler.spviz.spviz.ui.tests/build.properties delete mode 100644 plugins/de.cau.cs.kieler.spviz.spviz.ui.tests/pom.xml delete mode 100644 plugins/de.cau.cs.kieler.spviz.spviz.ui.tests/src-gen/de/cau/cs/kieler/spviz/spviz/ui/tests/SPVizUiInjectorProvider.java delete mode 100644 plugins/de.cau.cs.kieler.spviz.spvizmodel.ui.tests/.classpath delete mode 100644 plugins/de.cau.cs.kieler.spviz.spvizmodel.ui.tests/.project delete mode 100644 plugins/de.cau.cs.kieler.spviz.spvizmodel.ui.tests/.settings/org.eclipse.jdt.core.prefs delete mode 100644 plugins/de.cau.cs.kieler.spviz.spvizmodel.ui.tests/META-INF/MANIFEST.MF delete mode 100644 plugins/de.cau.cs.kieler.spviz.spvizmodel.ui.tests/build.properties delete mode 100644 plugins/de.cau.cs.kieler.spviz.spvizmodel.ui.tests/pom.xml delete mode 100644 plugins/de.cau.cs.kieler.spviz.spvizmodel.ui.tests/src-gen/de/cau/cs/kieler/spviz/spvizmodel/ui/tests/SPVizModelUiInjectorProvider.java diff --git a/plugins/de.cau.cs.kieler.spviz.spviz.ui.tests/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from plugins/de.cau.cs.kieler.spviz.spviz.ui.tests/.settings/org.eclipse.core.resources.prefs rename to .settings/org.eclipse.core.resources.prefs diff --git a/plugins/de.cau.cs.kieler.spviz.spvizmodel.ui.tests/.settings/org.eclipse.core.resources.prefs b/build/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from plugins/de.cau.cs.kieler.spviz.spvizmodel.ui.tests/.settings/org.eclipse.core.resources.prefs rename to build/.settings/org.eclipse.core.resources.prefs diff --git a/build/de.cau.cs.kieler.spviz.repository/category.xml b/build/de.cau.cs.kieler.spviz.repository/category.xml index 5e54588..2f4d87c 100644 --- a/build/de.cau.cs.kieler.spviz.repository/category.xml +++ b/build/de.cau.cs.kieler.spviz.repository/category.xml @@ -20,12 +20,8 @@ - - - - - - - - + + + + diff --git a/build/de.cau.cs.kieler.spviz.repository/pom.xml b/build/de.cau.cs.kieler.spviz.repository/pom.xml index ebc966f..631505a 100644 --- a/build/de.cau.cs.kieler.spviz.repository/pom.xml +++ b/build/de.cau.cs.kieler.spviz.repository/pom.xml @@ -3,7 +3,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - 0.2.1-SNAPSHOT de.cau.cs.kieler.spviz.repository eclipse-repository Kieler Software Project Visualization Repository diff --git a/build/de.cau.cs.kieler.spviz.targetplatform/de.cau.cs.kieler.spviz.targetplatform.target b/build/de.cau.cs.kieler.spviz.targetplatform/de.cau.cs.kieler.spviz.targetplatform.target index 4fccc55..ab2bcc2 100644 --- a/build/de.cau.cs.kieler.spviz.targetplatform/de.cau.cs.kieler.spviz.targetplatform.target +++ b/build/de.cau.cs.kieler.spviz.targetplatform/de.cau.cs.kieler.spviz.targetplatform.target @@ -10,41 +10,26 @@ - - - - - + + - - - - - + + - + - - - - - - - - - - + \ No newline at end of file diff --git a/build/de.cau.cs.kieler.spviz.targetplatform/pom.xml b/build/de.cau.cs.kieler.spviz.targetplatform/pom.xml index 8220748..497880c 100644 --- a/build/de.cau.cs.kieler.spviz.targetplatform/pom.xml +++ b/build/de.cau.cs.kieler.spviz.targetplatform/pom.xml @@ -3,7 +3,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - 0.2.1-SNAPSHOT de.cau.cs.kieler.spviz.targetplatform eclipse-target-definition Software Project Visualization Target Platform diff --git a/build/pom.xml b/build/pom.xml index 04e3768..55fb76a 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -11,8 +11,8 @@ 2.7.3 - 2.27.0 - 11 + 2.33.0 + 17  (Sources) @@ -41,9 +41,9 @@ ../plugins/de.cau.cs.kieler.spviz.spvizmodel.ui ../features/de.cau.cs.kieler.spviz.feature ../features/de.cau.cs.kieler.spviz.ui.feature - ../plugins/de.cau.cs.kieler.spviz.spviz.tests + - ../plugins/de.cau.cs.kieler.spviz.spvizmodel.tests + de.cau.cs.kieler.spviz.repository @@ -170,6 +170,77 @@ + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.eclipse.tycho + tycho-compiler-plugin + ${tycho-version} + + compile + testCompile + validate-classpath + + + + + + + + + org.eclipse.tycho + tycho-packaging-plugin + ${tycho-version} + + build-qualifier + build-qualifier-aggregator + validate-id + validate-version + + + + + + + + + org.apache.maven.plugins + maven-clean-plugin + [3.0.0,) + + clean + + + + + + + + + org.eclipse.tycho + target-platform-configuration + [2.7.3,) + + target-platform + + + + + + + + + + + diff --git a/features/de.cau.cs.kieler.spviz.feature/.settings/org.eclipse.core.resources.prefs b/features/de.cau.cs.kieler.spviz.feature/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/features/de.cau.cs.kieler.spviz.feature/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/features/de.cau.cs.kieler.spviz.feature/pom.xml b/features/de.cau.cs.kieler.spviz.feature/pom.xml index 1b3fcc8..44f33ef 100644 --- a/features/de.cau.cs.kieler.spviz.feature/pom.xml +++ b/features/de.cau.cs.kieler.spviz.feature/pom.xml @@ -9,8 +9,6 @@ ../../build/pom.xml - de.cau.cs.kieler.spviz de.cau.cs.kieler.spviz.feature - 0.2.1-SNAPSHOT eclipse-feature diff --git a/features/de.cau.cs.kieler.spviz.ui.feature/.settings/org.eclipse.core.resources.prefs b/features/de.cau.cs.kieler.spviz.ui.feature/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/features/de.cau.cs.kieler.spviz.ui.feature/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/features/de.cau.cs.kieler.spviz.ui.feature/feature.xml b/features/de.cau.cs.kieler.spviz.ui.feature/feature.xml index 9dd593a..2d23d76 100644 --- a/features/de.cau.cs.kieler.spviz.ui.feature/feature.xml +++ b/features/de.cau.cs.kieler.spviz.ui.feature/feature.xml @@ -18,12 +18,12 @@ of Computer Science, Kiel University Eclipse Public License - v 2.0 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE - PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION - OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION + OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. 1. DEFINITIONS -"Contribution" means: +"Contribution" means: a) in the case of the initial Contributor, the initial content Distributed under this Agreement, and @@ -33,29 +33,29 @@ of Computer Science, Kiel University ii) additions to the Program; where such changes and/or additions to the Program originate from and are Distributed by that particular Contributor. A Contribution - "originates" from a Contributor if it was added to the Program by - such Contributor itself or anyone acting on such Contributor's behalf. + "originates" from a Contributor if it was added to the Program by + such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include changes or additions to the Program that are not Modified Works. -"Contributor" means any person or entity that Distributes the Program. +"Contributor" means any person or entity that Distributes the Program. -"Licensed Patents" mean patent claims licensable by a Contributor which +"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program. -"Program" means the Contributions Distributed in accordance with this +"Program" means the Contributions Distributed in accordance with this Agreement. -"Recipient" means anyone who receives the Program under this Agreement +"Recipient" means anyone who receives the Program under this Agreement or any Secondary License (as applicable), including Contributors. -"Derivative Works" shall mean any work, whether in Source Code or other +"Derivative Works" shall mean any work, whether in Source Code or other form, that is based on (or derived from) the Program and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. -"Modified Works" shall mean any work in Source Code or other form that +"Modified Works" shall mean any work in Source Code or other form that results from an addition to, deletion from, or modification of the contents of the Program, including, for purposes of clarity any new file in Source Code form that contains any contents of the Program. Modified @@ -64,14 +64,14 @@ interfaces, types, classes, structures, or files of the Program solely in each case in order to link to, bind by name, or subclass the Program or Modified Works thereof. -"Distribute" means the acts of a) distributing or b) making available +"Distribute" means the acts of a) distributing or b) making available in any manner that enables the transfer of a copy. -"Source Code" means the form of a Program preferred for making +"Source Code" means the form of a Program preferred for making modifications, including but not limited to software source code, documentation source, and configuration files. -"Secondary License" means either the GNU General Public License, +"Secondary License" means either the GNU General Public License, Version 2.0, or any later versions of that license, including any exceptions or additional permissions as identified by the initial Contributor. @@ -107,7 +107,7 @@ Contributor. assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to Distribute the - Program, it is Recipient's responsibility to acquire that license + Program, it is Recipient's responsibility to acquire that license before distributing the Program. d) Each Contributor represents that to its knowledge it has @@ -116,7 +116,7 @@ Contributor. e) Notwithstanding the terms of any Secondary License, no Contributor makes additional grants to any Recipient (other than - those set forth in this Agreement) as a result of such Recipient's + those set forth in this Agreement) as a result of such Recipient's receipt of the Program under the terms of a Secondary License (if permitted under the terms of Section 3). @@ -143,7 +143,7 @@ Contributor. liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; - iii) does not attempt to limit or alter the recipients' rights + iii) does not attempt to limit or alter the recipients' rights in the Source Code under section 3.2; and iv) requires any subsequent distribution of the Program by any @@ -164,7 +164,7 @@ Contributor. 3.3 Contributors may not remove or alter any copyright, patent, trademark, attribution notices, disclaimers of warranty, or limitations -of liability ("notices") contained within the Program from any copy of +of liability ("notices") contained within the Program from any copy of the Program which they Distribute, provided that Contributors may add their own appropriate notices. @@ -177,9 +177,9 @@ the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor -("Commercial Contributor") hereby agrees to defend and indemnify every -other Contributor ("Indemnified Contributor") against any losses, -damages and costs (collectively "Losses") arising from claims, lawsuits +("Commercial Contributor") hereby agrees to defend and indemnify every +other Contributor ("Indemnified Contributor") against any losses, +damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program @@ -196,7 +196,7 @@ For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance -claims and warranties are such Commercial Contributor's responsibility +claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to @@ -206,7 +206,7 @@ those damages. 5. NO WARRANTY EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT -PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS" +PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR @@ -240,17 +240,17 @@ minimum extent necessary to make such provision valid and enforceable. If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software -or hardware) infringes such Recipient's patent(s), then such Recipient's +or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed. -All Recipient's rights under this Agreement shall terminate if it +All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of -time after becoming aware of such noncompliance. If all Recipient's +time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. -However, Recipient's obligations under this Agreement and any licenses +However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive. Everyone is permitted to copy and distribute copies of this Agreement, @@ -278,10 +278,10 @@ No third-party beneficiary rights are created under this Agreement. Exhibit A - Form of Secondary Licenses Notice -"This Source Code may also be made available under the following +"This Source Code may also be made available under the following Secondary Licenses when the conditions for such availability set forth in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), -version(s), and exceptions or additional permissions here}." +version(s), and exceptions or additional permissions here}." Simply including a copy of this Agreement, including this Exhibit A is not sufficient to license the Source Code under Secondary Licenses. @@ -295,43 +295,36 @@ version(s), and exceptions or additional permissions here}." - + - + - + - + - + - - - - - + + + + + - - - - - - + + + + + + version="0.0.0"/> + version="0.0.0"/> diff --git a/features/de.cau.cs.kieler.spviz.ui.feature/pom.xml b/features/de.cau.cs.kieler.spviz.ui.feature/pom.xml index 803d892..1bb93cf 100644 --- a/features/de.cau.cs.kieler.spviz.ui.feature/pom.xml +++ b/features/de.cau.cs.kieler.spviz.ui.feature/pom.xml @@ -9,8 +9,6 @@ ../../build/pom.xml - de.cau.cs.kieler.spviz de.cau.cs.kieler.spviz.ui.feature - 0.2.1-SNAPSHOT eclipse-feature diff --git a/plugins/de.cau.cs.kieler.spviz.spviz.ide/.classpath b/plugins/de.cau.cs.kieler.spviz.spviz.ide/.classpath index a96bb15..f5ec80f 100644 --- a/plugins/de.cau.cs.kieler.spviz.spviz.ide/.classpath +++ b/plugins/de.cau.cs.kieler.spviz.spviz.ide/.classpath @@ -1,10 +1,9 @@ - - + diff --git a/plugins/de.cau.cs.kieler.spviz.spviz.ide/.settings/org.eclipse.jdt.core.prefs b/plugins/de.cau.cs.kieler.spviz.spviz.ide/.settings/org.eclipse.jdt.core.prefs index 7adc0fb..9478cb1 100644 --- a/plugins/de.cau.cs.kieler.spviz.spviz.ide/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/de.cau.cs.kieler.spviz.spviz.ide/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,15 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/plugins/de.cau.cs.kieler.spviz.spviz.ide/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.spviz.spviz.ide/META-INF/MANIFEST.MF index 5a4c60f..95ae45a 100644 --- a/plugins/de.cau.cs.kieler.spviz.spviz.ide/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.spviz.spviz.ide/META-INF/MANIFEST.MF @@ -11,6 +11,6 @@ Require-Bundle: de.cau.cs.kieler.spviz.spviz, org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.ide, org.eclipse.xtext.xbase.ide -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: de.cau.cs.kieler.spviz.spviz.ide.contentassist.antlr.internal, de.cau.cs.kieler.spviz.spviz.ide.contentassist.antlr diff --git a/plugins/de.cau.cs.kieler.spviz.spviz.ide/build.properties b/plugins/de.cau.cs.kieler.spviz.spviz.ide/build.properties index 5c6bbf9..60b8138 100644 --- a/plugins/de.cau.cs.kieler.spviz.spviz.ide/build.properties +++ b/plugins/de.cau.cs.kieler.spviz.spviz.ide/build.properties @@ -4,3 +4,4 @@ source.. = src/,\ bin.includes = .,\ META-INF/ bin.excludes = **/*.xtend +jre.compilation.profile = JavaSE-17 diff --git a/plugins/de.cau.cs.kieler.spviz.spviz.ide/pom.xml b/plugins/de.cau.cs.kieler.spviz.spviz.ide/pom.xml index 634b69f..cc2013b 100644 --- a/plugins/de.cau.cs.kieler.spviz.spviz.ide/pom.xml +++ b/plugins/de.cau.cs.kieler.spviz.spviz.ide/pom.xml @@ -9,9 +9,7 @@ ../../build/pom.xml - de.cau.cs.kieler.spviz de.cau.cs.kieler.spviz.spviz.ide - 0.2.1-SNAPSHOT eclipse-plugin diff --git a/plugins/de.cau.cs.kieler.spviz.spviz.tests/.classpath b/plugins/de.cau.cs.kieler.spviz.spviz.tests/.classpath index 777657a..80569a8 100644 --- a/plugins/de.cau.cs.kieler.spviz.spviz.tests/.classpath +++ b/plugins/de.cau.cs.kieler.spviz.spviz.tests/.classpath @@ -1,5 +1,4 @@ - @@ -22,6 +21,6 @@ - + diff --git a/plugins/de.cau.cs.kieler.spviz.spviz.tests/.settings/org.eclipse.jdt.core.prefs b/plugins/de.cau.cs.kieler.spviz.spviz.tests/.settings/org.eclipse.jdt.core.prefs index 7adc0fb..9478cb1 100644 --- a/plugins/de.cau.cs.kieler.spviz.spviz.tests/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/de.cau.cs.kieler.spviz.spviz.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,15 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/plugins/de.cau.cs.kieler.spviz.spviz.tests/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.spviz.spviz.tests/META-INF/MANIFEST.MF index a8b72f8..90d388a 100644 --- a/plugins/de.cau.cs.kieler.spviz.spviz.tests/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.spviz.spviz.tests/META-INF/MANIFEST.MF @@ -8,9 +8,9 @@ Bundle-SymbolicName: de.cau.cs.kieler.spviz.spviz.tests; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: de.cau.cs.kieler.spviz.spviz, de.cau.cs.kieler.spviz.spvizmodel, - org.junit.jupiter.api;bundle-version="[5.0.0,6.0.0)", org.eclipse.xtext.testing, org.eclipse.xtext.xbase.testing, - org.eclipse.xtext.xbase.lib;bundle-version="2.14.0" -Bundle-RequiredExecutionEnvironment: JavaSE-11 + org.eclipse.xtext.xbase.lib;bundle-version="2.14.0", + junit-jupiter-api +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: de.cau.cs.kieler.spviz.spviz.tests;x-internal=true diff --git a/plugins/de.cau.cs.kieler.spviz.spviz.tests/pom.xml b/plugins/de.cau.cs.kieler.spviz.spviz.tests/pom.xml index 26c43ea..97cc33c 100644 --- a/plugins/de.cau.cs.kieler.spviz.spviz.tests/pom.xml +++ b/plugins/de.cau.cs.kieler.spviz.spviz.tests/pom.xml @@ -9,9 +9,7 @@ ../../build/pom.xml - de.cau.cs.kieler.spviz de.cau.cs.kieler.spviz.spviz.tests - 0.2.1-SNAPSHOT eclipse-test-plugin @@ -27,11 +25,6 @@ org.eclipse.tycho tycho-surefire-plugin ${tycho-version} - - - de.cau.cs.kieler.klighd.test.SizeEstimationTestWithFailings - - diff --git a/plugins/de.cau.cs.kieler.spviz.spviz.ui.tests/.classpath b/plugins/de.cau.cs.kieler.spviz.spviz.ui.tests/.classpath deleted file mode 100644 index 116a47a..0000000 --- a/plugins/de.cau.cs.kieler.spviz.spviz.ui.tests/.classpath +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/de.cau.cs.kieler.spviz.spviz.ui.tests/.project b/plugins/de.cau.cs.kieler.spviz.spviz.ui.tests/.project deleted file mode 100644 index cc2e0d0..0000000 --- a/plugins/de.cau.cs.kieler.spviz.spviz.ui.tests/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - de.cau.cs.kieler.spviz.spviz.ui.tests - - - - - - org.eclipse.xtext.ui.shared.xtextBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.xtext.ui.shared.xtextNature - org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature - - diff --git a/plugins/de.cau.cs.kieler.spviz.spviz.ui.tests/.settings/org.eclipse.jdt.core.prefs b/plugins/de.cau.cs.kieler.spviz.spviz.ui.tests/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 9f6ece8..0000000 --- a/plugins/de.cau.cs.kieler.spviz.spviz.ui.tests/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/plugins/de.cau.cs.kieler.spviz.spviz.ui.tests/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.spviz.spviz.ui.tests/META-INF/MANIFEST.MF deleted file mode 100644 index 4c4a71d..0000000 --- a/plugins/de.cau.cs.kieler.spviz.spviz.ui.tests/META-INF/MANIFEST.MF +++ /dev/null @@ -1,18 +0,0 @@ -Manifest-Version: 1.0 -Automatic-Module-Name: de.cau.cs.kieler.spviz.spviz.ui.tests -Bundle-ManifestVersion: 2 -Bundle-Name: de.cau.cs.kieler.spviz.spviz.ui.tests -Bundle-Vendor: Kiel University -Bundle-Version: 0.1.0.qualifier -Bundle-SymbolicName: de.cau.cs.kieler.spviz.spviz.ui.tests; singleton:=true -Bundle-ActivationPolicy: lazy -Require-Bundle: de.cau.cs.kieler.spviz.spviz.ui, - org.junit.jupiter.api;bundle-version="[5.0.0,6.0.0)", - org.eclipse.core.runtime, - org.eclipse.ui.workbench;resolution:=optional, - org.eclipse.xtext.testing, - org.eclipse.xtext.ui.testing, - org.eclipse.xtext.xbase.junit, - org.eclipse.xtext.xbase.testing -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: de.cau.cs.kieler.spviz.spviz.ui.tests;x-internal=true diff --git a/plugins/de.cau.cs.kieler.spviz.spviz.ui.tests/build.properties b/plugins/de.cau.cs.kieler.spviz.spviz.ui.tests/build.properties deleted file mode 100644 index 5c6bbf9..0000000 --- a/plugins/de.cau.cs.kieler.spviz.spviz.ui.tests/build.properties +++ /dev/null @@ -1,6 +0,0 @@ -source.. = src/,\ - src-gen/,\ - xtend-gen/ -bin.includes = .,\ - META-INF/ -bin.excludes = **/*.xtend diff --git a/plugins/de.cau.cs.kieler.spviz.spviz.ui.tests/pom.xml b/plugins/de.cau.cs.kieler.spviz.spviz.ui.tests/pom.xml deleted file mode 100644 index f1384bb..0000000 --- a/plugins/de.cau.cs.kieler.spviz.spviz.ui.tests/pom.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - 4.0.0 - - de.cau.cs.kieler.spviz - parent - 0.1.0-SNAPSHOT - ../../build/pom.xml - - - de.cau.cs.kieler.spviz - de.cau.cs.kieler.spviz.spviz.ui.tests - 0.1.0-SNAPSHOT - eclipse-test-plugin - - - src - - - - org.eclipse.xtend - xtend-maven-plugin - - - - org.eclipse.tycho - tycho-surefire-plugin - ${tycho-version} - - - de.cau.cs.kieler.klighd.test.SizeEstimationTestWithFailings - - - - - - diff --git a/plugins/de.cau.cs.kieler.spviz.spviz.ui.tests/src-gen/de/cau/cs/kieler/spviz/spviz/ui/tests/SPVizUiInjectorProvider.java b/plugins/de.cau.cs.kieler.spviz.spviz.ui.tests/src-gen/de/cau/cs/kieler/spviz/spviz/ui/tests/SPVizUiInjectorProvider.java deleted file mode 100644 index fd82b8f..0000000 --- a/plugins/de.cau.cs.kieler.spviz.spviz.ui.tests/src-gen/de/cau/cs/kieler/spviz/spviz/ui/tests/SPVizUiInjectorProvider.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient - * - * http://rtsys.informatik.uni-kiel.de/kieler - * - * Copyright 2023 by - * + Kiel University - * + Department of Computer Science - * + Real-Time and Embedded Systems Group - * - * Generated by Xtext 2.27.0 - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License 2.0 which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * SPDX-License-Identifier: EPL-2.0 - */ -package de.cau.cs.kieler.spviz.spviz.ui.tests; - -import com.google.inject.Injector; -import de.cau.cs.kieler.spviz.spviz.ui.internal.SpvizActivator; -import org.eclipse.xtext.testing.IInjectorProvider; - -public class SPVizUiInjectorProvider implements IInjectorProvider { - - @Override - public Injector getInjector() { - return SpvizActivator.getInstance().getInjector("de.cau.cs.kieler.spviz.spviz.SPViz"); - } - -} diff --git a/plugins/de.cau.cs.kieler.spviz.spviz.ui/.classpath b/plugins/de.cau.cs.kieler.spviz.spviz.ui/.classpath index 942a373..b8f18c2 100644 --- a/plugins/de.cau.cs.kieler.spviz.spviz.ui/.classpath +++ b/plugins/de.cau.cs.kieler.spviz.spviz.ui/.classpath @@ -1,10 +1,9 @@ - - + diff --git a/plugins/de.cau.cs.kieler.spviz.spviz.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/de.cau.cs.kieler.spviz.spviz.ui/.settings/org.eclipse.jdt.core.prefs index 7adc0fb..9478cb1 100644 --- a/plugins/de.cau.cs.kieler.spviz.spviz.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/de.cau.cs.kieler.spviz.spviz.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,15 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/plugins/de.cau.cs.kieler.spviz.spviz.ui/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.spviz.spviz.ui/META-INF/MANIFEST.MF index 8b8b0d4..0bc92f7 100644 --- a/plugins/de.cau.cs.kieler.spviz.spviz.ui/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.spviz.spviz.ui/META-INF/MANIFEST.MF @@ -21,7 +21,7 @@ Require-Bundle: de.cau.cs.kieler.spviz.spviz, org.eclipse.xtext.ui.codetemplates.ui, org.eclipse.xtext.xbase.lib;bundle-version="2.14.0" Import-Package: org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: de.cau.cs.kieler.spviz.spviz.ui.quickfix, de.cau.cs.kieler.spviz.spviz.ui.internal, de.cau.cs.kieler.spviz.spviz.ui.contentassist diff --git a/plugins/de.cau.cs.kieler.spviz.spviz.ui/plugin.xml b/plugins/de.cau.cs.kieler.spviz.spviz.ui/plugin.xml index 89d759a..f954d01 100644 --- a/plugins/de.cau.cs.kieler.spviz.spviz.ui/plugin.xml +++ b/plugins/de.cau.cs.kieler.spviz.spviz.ui/plugin.xml @@ -1,5 +1,4 @@ - ../../build/pom.xml - de.cau.cs.kieler.spviz de.cau.cs.kieler.spviz.spviz.ui - 0.2.1-SNAPSHOT eclipse-plugin diff --git a/plugins/de.cau.cs.kieler.spviz.spviz/.classpath b/plugins/de.cau.cs.kieler.spviz.spviz/.classpath index 156a317..b30ae3a 100644 --- a/plugins/de.cau.cs.kieler.spviz.spviz/.classpath +++ b/plugins/de.cau.cs.kieler.spviz.spviz/.classpath @@ -1,14 +1,9 @@ - - - - - - + diff --git a/plugins/de.cau.cs.kieler.spviz.spviz/.settings/org.eclipse.jdt.core.prefs b/plugins/de.cau.cs.kieler.spviz.spviz/.settings/org.eclipse.jdt.core.prefs index cd8d089..9478cb1 100644 --- a/plugins/de.cau.cs.kieler.spviz.spviz/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/de.cau.cs.kieler.spviz.spviz/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -11,5 +11,5 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=17 diff --git a/plugins/de.cau.cs.kieler.spviz.spviz/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.spviz.spviz/META-INF/MANIFEST.MF index 154168e..4cbbfab 100644 --- a/plugins/de.cau.cs.kieler.spviz.spviz/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.spviz.spviz/META-INF/MANIFEST.MF @@ -18,7 +18,7 @@ Require-Bundle: de.cau.cs.kieler.spviz.spvizmodel, org.eclipse.xtext.xbase, org.eclipse.xtext.xbase.lib;bundle-version="2.14.0", org.eclipse.xtend.lib;bundle-version="2.14.0" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: de.cau.cs.kieler.spviz.spviz.services, de.cau.cs.kieler.spviz.spviz.parser.antlr, de.cau.cs.kieler.spviz.spviz.scoping, diff --git a/plugins/de.cau.cs.kieler.spviz.spviz/build.properties b/plugins/de.cau.cs.kieler.spviz.spviz/build.properties index a257c1f..1e6f6b8 100644 --- a/plugins/de.cau.cs.kieler.spviz.spviz/build.properties +++ b/plugins/de.cau.cs.kieler.spviz.spviz/build.properties @@ -24,3 +24,4 @@ additional.bundles = org.eclipse.xtext.xbase,\ org.apache.commons.logging,\ org.apache.log4j,\ com.ibm.icu +jre.compilation.profile = JavaSE-17 diff --git a/plugins/de.cau.cs.kieler.spviz.spviz/pom.xml b/plugins/de.cau.cs.kieler.spviz.spviz/pom.xml index 2af1df7..bb08ed3 100644 --- a/plugins/de.cau.cs.kieler.spviz.spviz/pom.xml +++ b/plugins/de.cau.cs.kieler.spviz.spviz/pom.xml @@ -9,9 +9,7 @@ ../../build/pom.xml - de.cau.cs.kieler.spviz de.cau.cs.kieler.spviz.spviz - 0.2.1-SNAPSHOT eclipse-plugin diff --git a/plugins/de.cau.cs.kieler.spviz.spviz/src/de/cau/cs/kieler/spviz/spviz/generator/GenerateLanguageServer.xtend b/plugins/de.cau.cs.kieler.spviz.spviz/src/de/cau/cs/kieler/spviz/spviz/generator/GenerateLanguageServer.xtend index 45dd516..9dc8871 100644 --- a/plugins/de.cau.cs.kieler.spviz.spviz/src/de/cau/cs/kieler/spviz/spviz/generator/GenerateLanguageServer.xtend +++ b/plugins/de.cau.cs.kieler.spviz.spviz/src/de/cau/cs/kieler/spviz/spviz/generator/GenerateLanguageServer.xtend @@ -211,7 +211,7 @@ class GenerateLanguageServer { - + diff --git a/plugins/de.cau.cs.kieler.spviz.spviz/src/de/cau/cs/kieler/spviz/spviz/generator/GenerateMavenBuild.xtend b/plugins/de.cau.cs.kieler.spviz.spviz/src/de/cau/cs/kieler/spviz/spviz/generator/GenerateMavenBuild.xtend index ea716fd..ce591ec 100644 --- a/plugins/de.cau.cs.kieler.spviz.spviz/src/de/cau/cs/kieler/spviz/spviz/generator/GenerateMavenBuild.xtend +++ b/plugins/de.cau.cs.kieler.spviz.spviz/src/de/cau/cs/kieler/spviz/spviz/generator/GenerateMavenBuild.xtend @@ -181,9 +181,7 @@ class GenerateMavenBuild { ../«vizArtifactIdPrefix».build/pom.xml - «vizArtifactIdPrefix» «vizArtifactIdPrefix».«bundleSuffix» - «version»-SNAPSHOT eclipse-plugin @@ -215,24 +213,24 @@ class GenerateMavenBuild { - + - + - + - + - + - - - - - - + + + + + + ../pom.xml - «artifactIdPrefix» «artifactIdPrefix».feature - «version»-SNAPSHOT eclipse-feature @@ -316,11 +312,10 @@ class GenerateMavenBuild { - - - - - + + + + diff --git a/plugins/de.cau.cs.kieler.spviz.spviz/src/de/cau/cs/kieler/spviz/spviz/generator/GenerateSyntheses.xtend b/plugins/de.cau.cs.kieler.spviz.spviz/src/de/cau/cs/kieler/spviz/spviz/generator/GenerateSyntheses.xtend index 9430d4e..54a96a2 100644 --- a/plugins/de.cau.cs.kieler.spviz.spviz/src/de/cau/cs/kieler/spviz/spviz/generator/GenerateSyntheses.xtend +++ b/plugins/de.cau.cs.kieler.spviz.spviz/src/de/cau/cs/kieler/spviz/spviz/generator/GenerateSyntheses.xtend @@ -1420,7 +1420,7 @@ class GenerateSyntheses { def static void configureOverviewLayout(KNode node) { node => [ setLayoutOption(CoreOptions::ALGORITHM, "org.eclipse.elk.layered") - setLayoutOption(LayeredOptions.CONSIDER_MODEL_ORDER_COMPONENTS, ComponentOrderingStrategy.FORCE_MODEL_ORDER) + setLayoutOption(LayeredOptions.CONSIDER_MODEL_ORDER_COMPONENTS, ComponentOrderingStrategy.GROUP_MODEL_ORDER) setLayoutOption(CoreOptions::DIRECTION, Direction.RIGHT) setLayoutOption(CoreOptions::EDGE_ROUTING, EdgeRouting.POLYLINE) setLayoutOption(CoreOptions::PORT_CONSTRAINTS, PortConstraints::FIXED_SIDE) diff --git a/plugins/de.cau.cs.kieler.spviz.spviz/src/de/cau/cs/kieler/spviz/spviz/generator/SPVizGenerator.xtend b/plugins/de.cau.cs.kieler.spviz.spviz/src/de/cau/cs/kieler/spviz/spviz/generator/SPVizGenerator.xtend index 60ec39b..36f8756 100644 --- a/plugins/de.cau.cs.kieler.spviz.spviz/src/de/cau/cs/kieler/spviz/spviz/generator/SPVizGenerator.xtend +++ b/plugins/de.cau.cs.kieler.spviz.spviz/src/de/cau/cs/kieler/spviz/spviz/generator/SPVizGenerator.xtend @@ -198,17 +198,6 @@ class SPVizGenerator extends AbstractGenerator { - - de.cau.cs.kieler.klighd - de.cau.cs.kieler.klighd.incremental - ${klighd-version} - - - org.eclipse.platform - org.eclipse.swt - - - de.cau.cs.kieler.klighd de.cau.cs.kieler.klighd.lsp @@ -260,7 +249,6 @@ class SPVizGenerator extends AbstractGenerator { new Dependency("de.cau.cs.kieler.klighd", "de.cau.cs.kieler.kgraph.text.ide", "${klighd-version}"), new Dependency("de.cau.cs.kieler.klighd", "de.cau.cs.kieler.klighd", "${klighd-version}"), new Dependency("de.cau.cs.kieler.klighd", "de.cau.cs.kieler.klighd.ide", "${klighd-version}"), - new Dependency("de.cau.cs.kieler.klighd", "de.cau.cs.kieler.klighd.incremental", "${klighd-version}"), new Dependency("de.cau.cs.kieler.klighd", "de.cau.cs.kieler.klighd.krendering.extensions", "${klighd-version}"), new Dependency("de.cau.cs.kieler.klighd", "de.cau.cs.kieler.klighd.lsp", "${klighd-version}"), new Dependency("de.cau.cs.kieler.klighd", "de.cau.cs.kieler.klighd.standalone", "${klighd-version}"), diff --git a/plugins/de.cau.cs.kieler.spviz.spvizmodel.ide/.classpath b/plugins/de.cau.cs.kieler.spviz.spvizmodel.ide/.classpath index 102c497..f5ec80f 100644 --- a/plugins/de.cau.cs.kieler.spviz.spvizmodel.ide/.classpath +++ b/plugins/de.cau.cs.kieler.spviz.spvizmodel.ide/.classpath @@ -4,6 +4,6 @@ - + diff --git a/plugins/de.cau.cs.kieler.spviz.spvizmodel.ide/.settings/org.eclipse.jdt.core.prefs b/plugins/de.cau.cs.kieler.spviz.spvizmodel.ide/.settings/org.eclipse.jdt.core.prefs index 7adc0fb..9478cb1 100644 --- a/plugins/de.cau.cs.kieler.spviz.spvizmodel.ide/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/de.cau.cs.kieler.spviz.spvizmodel.ide/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,15 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/plugins/de.cau.cs.kieler.spviz.spvizmodel.ide/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.spviz.spvizmodel.ide/META-INF/MANIFEST.MF index 62cbfa3..b5ab6d3 100644 --- a/plugins/de.cau.cs.kieler.spviz.spvizmodel.ide/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.spviz.spvizmodel.ide/META-INF/MANIFEST.MF @@ -10,6 +10,6 @@ Require-Bundle: de.cau.cs.kieler.spviz.spvizmodel, org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.ide, org.eclipse.xtext.xbase.ide -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: de.cau.cs.kieler.spviz.spvizmodel.ide.contentassist.antlr.internal, de.cau.cs.kieler.spviz.spvizmodel.ide.contentassist.antlr diff --git a/plugins/de.cau.cs.kieler.spviz.spvizmodel.ide/pom.xml b/plugins/de.cau.cs.kieler.spviz.spvizmodel.ide/pom.xml index 1cf6ad2..f2666a7 100644 --- a/plugins/de.cau.cs.kieler.spviz.spvizmodel.ide/pom.xml +++ b/plugins/de.cau.cs.kieler.spviz.spvizmodel.ide/pom.xml @@ -9,9 +9,7 @@ ../../build/pom.xml - de.cau.cs.kieler.spviz de.cau.cs.kieler.spviz.spvizmodel.ide - 0.2.1-SNAPSHOT eclipse-plugin diff --git a/plugins/de.cau.cs.kieler.spviz.spvizmodel.tests/.classpath b/plugins/de.cau.cs.kieler.spviz.spvizmodel.tests/.classpath index 777657a..80569a8 100644 --- a/plugins/de.cau.cs.kieler.spviz.spvizmodel.tests/.classpath +++ b/plugins/de.cau.cs.kieler.spviz.spvizmodel.tests/.classpath @@ -1,5 +1,4 @@ - @@ -22,6 +21,6 @@ - + diff --git a/plugins/de.cau.cs.kieler.spviz.spvizmodel.tests/.settings/org.eclipse.jdt.core.prefs b/plugins/de.cau.cs.kieler.spviz.spvizmodel.tests/.settings/org.eclipse.jdt.core.prefs index 7adc0fb..9478cb1 100644 --- a/plugins/de.cau.cs.kieler.spviz.spvizmodel.tests/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/de.cau.cs.kieler.spviz.spvizmodel.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,15 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/plugins/de.cau.cs.kieler.spviz.spvizmodel.tests/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.spviz.spvizmodel.tests/META-INF/MANIFEST.MF index f714c4c..9661cec 100644 --- a/plugins/de.cau.cs.kieler.spviz.spvizmodel.tests/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.spviz.spvizmodel.tests/META-INF/MANIFEST.MF @@ -10,6 +10,6 @@ Require-Bundle: de.cau.cs.kieler.spviz.spvizmodel, org.eclipse.xtext.testing, org.eclipse.xtext.xbase.lib;bundle-version="2.14.0", org.eclipse.xtext.xbase.testing, - org.junit.jupiter.api;bundle-version="[5.0.0,6.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 + junit-jupiter-api +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: de.cau.cs.kieler.spviz.spvizmodel.tests;x-internal=true diff --git a/plugins/de.cau.cs.kieler.spviz.spvizmodel.tests/pom.xml b/plugins/de.cau.cs.kieler.spviz.spvizmodel.tests/pom.xml index 4a94465..20476ea 100644 --- a/plugins/de.cau.cs.kieler.spviz.spvizmodel.tests/pom.xml +++ b/plugins/de.cau.cs.kieler.spviz.spvizmodel.tests/pom.xml @@ -9,9 +9,7 @@ ../../build/pom.xml - de.cau.cs.kieler.spviz de.cau.cs.kieler.spviz.spvizmodel.tests - 0.2.1-SNAPSHOT eclipse-test-plugin diff --git a/plugins/de.cau.cs.kieler.spviz.spvizmodel.ui.tests/.classpath b/plugins/de.cau.cs.kieler.spviz.spvizmodel.ui.tests/.classpath deleted file mode 100644 index 116a47a..0000000 --- a/plugins/de.cau.cs.kieler.spviz.spvizmodel.ui.tests/.classpath +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/de.cau.cs.kieler.spviz.spvizmodel.ui.tests/.project b/plugins/de.cau.cs.kieler.spviz.spvizmodel.ui.tests/.project deleted file mode 100644 index a16f444..0000000 --- a/plugins/de.cau.cs.kieler.spviz.spvizmodel.ui.tests/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - de.cau.cs.kieler.spviz.spvizmodel.ui.tests - - - - - - org.eclipse.xtext.ui.shared.xtextBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.xtext.ui.shared.xtextNature - org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature - - diff --git a/plugins/de.cau.cs.kieler.spviz.spvizmodel.ui.tests/.settings/org.eclipse.jdt.core.prefs b/plugins/de.cau.cs.kieler.spviz.spvizmodel.ui.tests/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 9f6ece8..0000000 --- a/plugins/de.cau.cs.kieler.spviz.spvizmodel.ui.tests/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/plugins/de.cau.cs.kieler.spviz.spvizmodel.ui.tests/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.spviz.spvizmodel.ui.tests/META-INF/MANIFEST.MF deleted file mode 100644 index 4e7b8a0..0000000 --- a/plugins/de.cau.cs.kieler.spviz.spvizmodel.ui.tests/META-INF/MANIFEST.MF +++ /dev/null @@ -1,18 +0,0 @@ -Manifest-Version: 1.0 -Automatic-Module-Name: de.cau.cs.kieler.spviz.spvizmodel.ui.tests -Bundle-ManifestVersion: 2 -Bundle-Name: de.cau.cs.kieler.spviz.spvizmodel.ui.tests -Bundle-Vendor: Kiel University -Bundle-Version: 0.1.0.qualifier -Bundle-SymbolicName: de.cau.cs.kieler.spviz.spvizmodel.ui.tests; singleton:=true -Bundle-ActivationPolicy: lazy -Require-Bundle: de.cau.cs.kieler.spviz.spvizmodel.ui, - org.eclipse.core.runtime, - org.eclipse.ui.workbench;resolution:=optional, - org.eclipse.xtext.testing, - org.eclipse.xtext.ui.testing, - org.eclipse.xtext.xbase.junit, - org.eclipse.xtext.xbase.testing, - org.junit.jupiter.api;bundle-version="[5.0.0,6.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: de.cau.cs.kieler.spviz.spvizmodel.ui.tests;x-internal=true diff --git a/plugins/de.cau.cs.kieler.spviz.spvizmodel.ui.tests/build.properties b/plugins/de.cau.cs.kieler.spviz.spvizmodel.ui.tests/build.properties deleted file mode 100644 index 5c6bbf9..0000000 --- a/plugins/de.cau.cs.kieler.spviz.spvizmodel.ui.tests/build.properties +++ /dev/null @@ -1,6 +0,0 @@ -source.. = src/,\ - src-gen/,\ - xtend-gen/ -bin.includes = .,\ - META-INF/ -bin.excludes = **/*.xtend diff --git a/plugins/de.cau.cs.kieler.spviz.spvizmodel.ui.tests/pom.xml b/plugins/de.cau.cs.kieler.spviz.spvizmodel.ui.tests/pom.xml deleted file mode 100644 index cd80539..0000000 --- a/plugins/de.cau.cs.kieler.spviz.spvizmodel.ui.tests/pom.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - 4.0.0 - - de.cau.cs.kieler.spviz - parent - 0.1.0-SNAPSHOT - ../../build/pom.xml - - - de.cau.cs.kieler.spviz - de.cau.cs.kieler.spviz.spvizmodel.ui.tests - 0.1.0-SNAPSHOT - eclipse-test-plugin - - - src - - - - org.eclipse.xtend - xtend-maven-plugin - - - - org.eclipse.tycho - tycho-surefire-plugin - ${tycho-version} - - - de.cau.cs.kieler.klighd.test.SizeEstimationTestWithFailings - - - - - - diff --git a/plugins/de.cau.cs.kieler.spviz.spvizmodel.ui.tests/src-gen/de/cau/cs/kieler/spviz/spvizmodel/ui/tests/SPVizModelUiInjectorProvider.java b/plugins/de.cau.cs.kieler.spviz.spvizmodel.ui.tests/src-gen/de/cau/cs/kieler/spviz/spvizmodel/ui/tests/SPVizModelUiInjectorProvider.java deleted file mode 100644 index 7ab881c..0000000 --- a/plugins/de.cau.cs.kieler.spviz.spvizmodel.ui.tests/src-gen/de/cau/cs/kieler/spviz/spvizmodel/ui/tests/SPVizModelUiInjectorProvider.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient - * - * http://rtsys.informatik.uni-kiel.de/kieler - * - * Copyright 2021 by - * + Kiel University - * + Department of Computer Science - * + Real-Time and Embedded Systems Group - * - * Generated by Xtext 2.25.0 - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License 2.0 which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * SPDX-License-Identifier: EPL-2.0 - */ -package de.cau.cs.kieler.spviz.spvizmodel.ui.tests; - -import com.google.inject.Injector; -import de.cau.cs.kieler.spviz.spvizmodel.ui.internal.SpvizmodelActivator; -import org.eclipse.xtext.testing.IInjectorProvider; - -public class SPVizModelUiInjectorProvider implements IInjectorProvider { - - @Override - public Injector getInjector() { - return SpvizmodelActivator.getInstance().getInjector("de.cau.cs.kieler.spviz.spvizmodel.SPVizModel"); - } - -} diff --git a/plugins/de.cau.cs.kieler.spviz.spvizmodel.ui/.classpath b/plugins/de.cau.cs.kieler.spviz.spvizmodel.ui/.classpath index 102c497..f5ec80f 100644 --- a/plugins/de.cau.cs.kieler.spviz.spvizmodel.ui/.classpath +++ b/plugins/de.cau.cs.kieler.spviz.spvizmodel.ui/.classpath @@ -4,6 +4,6 @@ - + diff --git a/plugins/de.cau.cs.kieler.spviz.spvizmodel.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/de.cau.cs.kieler.spviz.spvizmodel.ui/.settings/org.eclipse.jdt.core.prefs index 7adc0fb..9478cb1 100644 --- a/plugins/de.cau.cs.kieler.spviz.spvizmodel.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/de.cau.cs.kieler.spviz.spvizmodel.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,15 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/plugins/de.cau.cs.kieler.spviz.spvizmodel.ui/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.spviz.spvizmodel.ui/META-INF/MANIFEST.MF index 58048f0..7a4c099 100644 --- a/plugins/de.cau.cs.kieler.spviz.spvizmodel.ui/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.spviz.spvizmodel.ui/META-INF/MANIFEST.MF @@ -19,7 +19,7 @@ Require-Bundle: de.cau.cs.kieler.spviz.spvizmodel, org.eclipse.xtext.xbase.lib;bundle-version="2.14.0", org.eclipse.xtend.lib;bundle-version="2.14.0";resolution:=optional Import-Package: org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: de.cau.cs.kieler.spviz.spvizmodel.ui.internal, de.cau.cs.kieler.spviz.spvizmodel.ui.contentassist, de.cau.cs.kieler.spviz.spvizmodel.ui.quickfix diff --git a/plugins/de.cau.cs.kieler.spviz.spvizmodel.ui/pom.xml b/plugins/de.cau.cs.kieler.spviz.spvizmodel.ui/pom.xml index 03ed157..09126a1 100644 --- a/plugins/de.cau.cs.kieler.spviz.spvizmodel.ui/pom.xml +++ b/plugins/de.cau.cs.kieler.spviz.spvizmodel.ui/pom.xml @@ -9,9 +9,7 @@ ../../build/pom.xml - de.cau.cs.kieler.spviz de.cau.cs.kieler.spviz.spvizmodel.ui - 0.2.1-SNAPSHOT eclipse-plugin diff --git a/plugins/de.cau.cs.kieler.spviz.spvizmodel/.classpath b/plugins/de.cau.cs.kieler.spviz.spvizmodel/.classpath index a96bb15..f5ec80f 100644 --- a/plugins/de.cau.cs.kieler.spviz.spvizmodel/.classpath +++ b/plugins/de.cau.cs.kieler.spviz.spvizmodel/.classpath @@ -1,10 +1,9 @@ - - + diff --git a/plugins/de.cau.cs.kieler.spviz.spvizmodel/.settings/org.eclipse.jdt.core.prefs b/plugins/de.cau.cs.kieler.spviz.spvizmodel/.settings/org.eclipse.jdt.core.prefs index 7adc0fb..9478cb1 100644 --- a/plugins/de.cau.cs.kieler.spviz.spvizmodel/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/de.cau.cs.kieler.spviz.spvizmodel/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,15 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/plugins/de.cau.cs.kieler.spviz.spvizmodel/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.spviz.spvizmodel/META-INF/MANIFEST.MF index 62401ca..c532f88 100644 --- a/plugins/de.cau.cs.kieler.spviz.spvizmodel/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.spviz.spvizmodel/META-INF/MANIFEST.MF @@ -21,7 +21,7 @@ Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.xbase, org.eclipse.xtext.xbase.lib;bundle-version="2.14.0", org.eclipse.xtend.lib;bundle-version="2.14.0" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: de.cau.cs.kieler.spviz.spvizmodel, de.cau.cs.kieler.spviz.spvizmodel.generator, de.cau.cs.kieler.spviz.spvizmodel.generator.maven, diff --git a/plugins/de.cau.cs.kieler.spviz.spvizmodel/pom.xml b/plugins/de.cau.cs.kieler.spviz.spvizmodel/pom.xml index edbe25f..0143cd4 100644 --- a/plugins/de.cau.cs.kieler.spviz.spvizmodel/pom.xml +++ b/plugins/de.cau.cs.kieler.spviz.spvizmodel/pom.xml @@ -9,9 +9,7 @@ ../../build/pom.xml - de.cau.cs.kieler.spviz de.cau.cs.kieler.spviz.spvizmodel - 0.2.1-SNAPSHOT eclipse-plugin diff --git a/plugins/de.cau.cs.kieler.spviz.spvizmodel/src/de/cau/cs/kieler/spviz/spvizmodel/generator/FileGenerator.xtend b/plugins/de.cau.cs.kieler.spviz.spvizmodel/src/de/cau/cs/kieler/spviz/spvizmodel/generator/FileGenerator.xtend index 84b32df..a0ea0a9 100644 --- a/plugins/de.cau.cs.kieler.spviz.spvizmodel/src/de/cau/cs/kieler/spviz/spvizmodel/generator/FileGenerator.xtend +++ b/plugins/de.cau.cs.kieler.spviz.spvizmodel/src/de/cau/cs/kieler/spviz/spvizmodel/generator/FileGenerator.xtend @@ -184,7 +184,7 @@ class FileGenerator { Bundle-Name: «identifier» Bundle-SymbolicName: «CodeGenUtil.validPluginID(identifier)»; singleton:=true Bundle-Version: 0.1.0.qualifier - Bundle-RequiredExecutionEnvironment: JavaSE-11 + Bundle-RequiredExecutionEnvironment: JavaSE-17 «FOR exportedPackage : exportedPackages BEFORE "Export-Package:" SEPARATOR ','» «" " + exportedPackage» «ENDFOR» diff --git a/plugins/de.cau.cs.kieler.spviz.spvizmodel/src/de/cau/cs/kieler/spviz/spvizmodel/generator/GenerateGeneratorScaffold.xtend b/plugins/de.cau.cs.kieler.spviz.spvizmodel/src/de/cau/cs/kieler/spviz/spvizmodel/generator/GenerateGeneratorScaffold.xtend index 7afab2e..850cd1b 100644 --- a/plugins/de.cau.cs.kieler.spviz.spvizmodel/src/de/cau/cs/kieler/spviz/spvizmodel/generator/GenerateGeneratorScaffold.xtend +++ b/plugins/de.cau.cs.kieler.spviz.spvizmodel/src/de/cau/cs/kieler/spviz/spvizmodel/generator/GenerateGeneratorScaffold.xtend @@ -422,8 +422,8 @@ class GenerateGeneratorScaffold { def static requiredBundles(SPVizModel model) { return #[ - new Dependency("info.picocli", "picocli" , "4.6.3"), - new Dependency("org.eclipse.emf", "org.eclipse.emf.ecore.xmi", "2.16.0"), + new Dependency("info.picocli", "picocli" , "4.7.5"), + new Dependency("org.eclipse.emf", "org.eclipse.emf.ecore.xmi", "2.36.0"), new Dependency(model.package, model.package + ".model", "0.1.0-SNAPSHOT") ] } diff --git a/plugins/de.cau.cs.kieler.spviz.spvizmodel/src/de/cau/cs/kieler/spviz/spvizmodel/generator/GenerateModelMavenBuild.xtend b/plugins/de.cau.cs.kieler.spviz.spvizmodel/src/de/cau/cs/kieler/spviz/spvizmodel/generator/GenerateModelMavenBuild.xtend index 1f7d4d6..d47b0ba 100644 --- a/plugins/de.cau.cs.kieler.spviz.spvizmodel/src/de/cau/cs/kieler/spviz/spvizmodel/generator/GenerateModelMavenBuild.xtend +++ b/plugins/de.cau.cs.kieler.spviz.spvizmodel/src/de/cau/cs/kieler/spviz/spvizmodel/generator/GenerateModelMavenBuild.xtend @@ -114,18 +114,18 @@ class GenerateModelMavenBuild { - 11 - 11 - 11 + 17 + 17 + 17 + 0.9.1 + 2.10.1 + 7.0.0 + 3.0.1.v20240410 + 0.22.0 2.7.3 - 2.28.0 - 0.8.1 - 2.9.0 - 5.1.0 - 2.3.0.v20230606 - 0.15.0 - 2.28.0 + 2.33.0 + 2.33.0  (Sources) UTF-8 @@ -272,7 +272,8 @@ class GenerateModelMavenBuild { - + org.eclipse.m2e lifecycle-mapping @@ -299,6 +300,63 @@ class GenerateModelMavenBuild { + + + org.eclipse.tycho + tycho-compiler-plugin + ${tycho-version} + + compile + testCompile + validate-classpath + + + + + + + + + org.eclipse.tycho + tycho-packaging-plugin + ${tycho-version} + + build-qualifier + build-qualifier-aggregator + validate-id + validate-version + + + + + + + + + org.apache.maven.plugins + maven-clean-plugin + [3.0.0,) + + clean + + + + + + + + + org.eclipse.tycho + target-platform-configuration + [2.7.3,) + + target-platform + + + + + + @@ -332,29 +390,25 @@ class GenerateModelMavenBuild { - + ««« ««« ««« ««« - - - - - + - + - + diff --git a/plugins/de.cau.cs.kieler.spviz.spvizmodel/src/de/cau/cs/kieler/spviz/spvizmodel/generator/JavaMavenProjectGenerator.xtend b/plugins/de.cau.cs.kieler.spviz.spvizmodel/src/de/cau/cs/kieler/spviz/spvizmodel/generator/JavaMavenProjectGenerator.xtend index 7d8db35..431a3d3 100644 --- a/plugins/de.cau.cs.kieler.spviz.spvizmodel/src/de/cau/cs/kieler/spviz/spvizmodel/generator/JavaMavenProjectGenerator.xtend +++ b/plugins/de.cau.cs.kieler.spviz.spvizmodel/src/de/cau/cs/kieler/spviz/spvizmodel/generator/JavaMavenProjectGenerator.xtend @@ -186,7 +186,7 @@ class JavaMavenProjectGenerator { // Configure classpath val entries = newArrayList - entries.add(JavaCore.newContainerEntry(new Path("org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"))); + entries.add(JavaCore.newContainerEntry(new Path("org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"))); entries.add(JavaCore.newContainerEntry(new Path("org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"))) // The source folders @@ -255,8 +255,8 @@ class JavaMavenProjectGenerator { maven-compiler-plugin 3.10.0 - 11 - 11 + 17 + 17 «IF xtendSources» diff --git a/plugins/de.cau.cs.kieler.spviz.spvizmodel/src/de/cau/cs/kieler/spviz/spvizmodel/generator/JavaProjectGenerator.xtend b/plugins/de.cau.cs.kieler.spviz.spvizmodel/src/de/cau/cs/kieler/spviz/spvizmodel/generator/JavaProjectGenerator.xtend index a228d1c..a4b0766 100644 --- a/plugins/de.cau.cs.kieler.spviz.spvizmodel/src/de/cau/cs/kieler/spviz/spvizmodel/generator/JavaProjectGenerator.xtend +++ b/plugins/de.cau.cs.kieler.spviz.spvizmodel/src/de/cau/cs/kieler/spviz/spvizmodel/generator/JavaProjectGenerator.xtend @@ -149,7 +149,7 @@ class JavaProjectGenerator { // Configure classpath val entries = newArrayList entries.add(JavaCore.newContainerEntry(new Path("org.eclipse.xtend.XTEND_CONTAINER"))) - entries.add(JavaCore.newContainerEntry(new Path("org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"))); + entries.add(JavaCore.newContainerEntry(new Path("org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"))); entries.add(JavaCore.newContainerEntry(new Path("org.eclipse.pde.core.requiredPlugins"))) // The source and xtend-gen folders