Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version lifting of Eclipse, Java and Tycho #74

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+136,457 −134,316
Open

Version lifting of Eclipse, Java and Tycho #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e2eefd
Upgrade plugins and other components to Eclipse 2023-06 and Java to V…
mmitas777 Sep 8, 2023
e1b9437
Upgrade plugins and other components to Eclipse 2023-06 and Java 17: …
mmitas777 Nov 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
40 changes: 40 additions & 0 deletions code generators/de.fhdo.lemma.ddd/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
23 changes: 23 additions & 0 deletions code generators/de.fhdo.lemma.ddd/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>de.fhdo.lemma.ddd</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
3 changes: 3 additions & 0 deletions code generators/de.fhdo.lemma.ddd/.settings/org.eclipse.core.resources.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding/<project>=UTF-8
8 changes: 8 additions & 0 deletions code generators/de.fhdo.lemma.ddd/.settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=17
10 changes: 5 additions & 5 deletions code generators/de.fhdo.lemma.ddd/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>11</java.version>
<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<versions.maven.plugin.version>2.8.1</versions.maven.plugin.version>
<java.version>17</java.version>
<maven.compiler.plugin.version>3.11.0</maven.compiler.plugin.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<versions.maven.plugin.version>2.16.0</versions.maven.plugin.version>
</properties>

<build>
Expand Down
6 changes: 3 additions & 3 deletions code generators/de.fhdo.lemma.model_processing.code_generation.ddd/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
kotlin("jvm") version "1.3.72"
maven
`maven-publish`
}

group = "de.fhdo.lemma.model_processing.code_generation.ddd"
Expand All @@ -14,7 +14,7 @@ repositories {

buildscript {
extra.set("javaBaseGeneratorVersion", version)
extra.set("javaParserVersion", "3.24.2")
extra.set("javaParserVersion", "3.25.5")
extra.set("koinVersion", "2.0.1")
extra.set("lemmaEclipsePluginsVersion", version)
extra.set("modelProcessingVersion", version)
Expand Down Expand Up @@ -42,7 +42,7 @@ dependencies {
}

tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = "11"
kotlinOptions.jvmTarget = "17"
// Java Base Generator uses @JvmDefault annotation
kotlinOptions.freeCompilerArgs = listOf("-Xjvm-default=compatibility")
}
1 change: 0 additions & 1 deletion code generators/de.fhdo.lemma.model_processing.code_generation.ddd/deploy.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
base
maven
`maven-publish`
}

Expand Down
2 changes: 1 addition & 1 deletion ....fhdo.lemma.model_processing.code_generation.ddd/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 2 additions & 0 deletions ...model_processing.code_generation.deployment_base/.settings/org.eclipse.jdt.apt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
org.eclipse.jdt.apt.aptEnabled=false
2 changes: 1 addition & 1 deletion ...nerators/de.fhdo.lemma.model_processing.code_generation.deployment_base/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM maven:3.6.3-openjdk-11-slim
FROM maven:3.9.4-eclipse-temurin-17
ARG LEMMA_VERSION

COPY \
Expand Down
12 changes: 6 additions & 6 deletions code generators/de.fhdo.lemma.model_processing.code_generation.deployment_base/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>11</java.version>
<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
<xtend.version>2.25.0</xtend.version>
<java.version>17</java.version>
<maven.compiler.plugin.version>3.11.0</maven.compiler.plugin.version>
<xtend.version>2.32.0</xtend.version>
<snakeyaml.version>1.21</snakeyaml.version>
<maven-assembly.version>3.3.0</maven-assembly.version>
<jackson.dataformat.version>2.12.3</jackson.dataformat.version>
<groovy.version>3.0.3</groovy.version>
<maven-assembly.version>3.6.0</maven-assembly.version>
<jackson.dataformat.version>2.15.2</jackson.dataformat.version>
<groovy.version>3.0.19</groovy.version>
<kotlin.version>1.3.72</kotlin.version>
</properties>

Expand Down
20 changes: 10 additions & 10 deletions code generators/de.fhdo.lemma.model_processing.code_generation.java_base/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
kotlin("jvm") version "1.3.72"
maven
`maven-publish`
}

group = "de.fhdo.lemma.model_processing.code_generation.java_base"
Expand All @@ -13,18 +13,18 @@ repositories {
}

buildscript {
extra.set("classgraphVersion", "4.8.35")
extra.set("commonsVersion", "3.5")
extra.set("groovyVersion", "3.0.3")
extra.set("jansiVersion", "1.17.1")
extra.set("javaParserVersion", "3.24.2")
extra.set("classgraphVersion", "4.8.162")
extra.set("commonsVersion", "3.13.0")
extra.set("groovyVersion", "3.0.19")
extra.set("jansiVersion", "2.4.0")
extra.set("javaParserVersion", "3.25.5")
extra.set("koinVersion", "2.0.1")
extra.set("lemmaEclipsePluginsVersion", version)
extra.set("log4jVersion", "2.16.0")
extra.set("log4jVersion", "2.20.0")
extra.set("loggingVersion", "1.7.9")
extra.set("lsp4jVersion", "0.10.0")
extra.set("lsp4jVersion", "0.21.1")
extra.set("modelProcessingVersion", version)
extra.set("picocliVersion", "3.9.3")
extra.set("picocliVersion", "4.7.5")
extra.set("xmlBuilderVersion", "1.7.2")
}

Expand Down Expand Up @@ -81,7 +81,7 @@ dependencies {
}

tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = "11"
kotlinOptions.jvmTarget = "17"
// Support @JvmDefault annotation
kotlinOptions.freeCompilerArgs = listOf("-Xjvm-default=compatibility")
}
Expand Down
1 change: 0 additions & 1 deletion code generators/de.fhdo.lemma.model_processing.code_generation.java_base/deploy.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
base
maven
`maven-publish`
}

Expand Down
2 changes: 1 addition & 1 deletion code generators/de.fhdo.lemma.model_processing.code_generation.java_base/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM maven:3.6.3-openjdk-11-slim
FROM maven:3.9.4-eclipse-temurin-17
ARG LEMMA_VERSION

COPY \
Expand Down
2 changes: 1 addition & 1 deletion ...lemma.model_processing.code_generation.java_base/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 2 additions & 0 deletions ...o.lemma.model_processing.code_generation.mariadb/.settings/org.eclipse.jdt.apt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
org.eclipse.jdt.apt.aptEnabled=false
2 changes: 1 addition & 1 deletion code generators/de.fhdo.lemma.model_processing.code_generation.mariadb/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM maven:3.6.3-openjdk-11-slim
FROM maven:3.9.4-eclipse-temurin-17
ARG LEMMA_VERSION

COPY \
Expand Down
8 changes: 4 additions & 4 deletions code generators/de.fhdo.lemma.model_processing.code_generation.mariadb/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>11</java.version>
<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
<xtend.version>2.25.0</xtend.version>
<java.version>17</java.version>
<maven.compiler.plugin.version>3.11.0</maven.compiler.plugin.version>
<xtend.version>2.32.0</xtend.version>
<snakeyaml.version>1.21</snakeyaml.version>
<maven-assembly.version>3.3.0</maven-assembly.version>
<maven-assembly.version>3.6.0</maven-assembly.version>
</properties>

<dependencies>
Expand Down
2 changes: 2 additions & 0 deletions ...o.lemma.model_processing.code_generation.mongodb/.settings/org.eclipse.jdt.apt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
org.eclipse.jdt.apt.aptEnabled=false
2 changes: 1 addition & 1 deletion code generators/de.fhdo.lemma.model_processing.code_generation.mongodb/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM maven:3.6.3-openjdk-11-slim
FROM maven:3.9.4-eclipse-temurin-17
ARG LEMMA_VERSION

COPY \
Expand Down
8 changes: 4 additions & 4 deletions code generators/de.fhdo.lemma.model_processing.code_generation.mongodb/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<java.version>11</java.version>
<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
<xtend.version>2.25.0</xtend.version>
<java.version>17</java.version>
<maven.compiler.plugin.version>3.11.0</maven.compiler.plugin.version>
<xtend.version>2.32.0</xtend.version>
<snakeyaml.version>1.21</snakeyaml.version>
<maven-assembly.version>3.3.0</maven-assembly.version>
<maven-assembly.version>3.6.0</maven-assembly.version>
</properties>

<dependencies>
Expand Down
14 changes: 7 additions & 7 deletions ...nerators/de.fhdo.lemma.model_processing.code_generation.springcloud.cqrs/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
kotlin("jvm") version "1.3.72"
maven
`maven-publish`
}

group = "de.fhdo.lemma.model_processing.code_generation.springcloud.cqrs"
Expand All @@ -11,17 +11,17 @@ repositories {
}

buildscript {
extra.set("groovyVersion", "3.0.3")
extra.set("jansiVersion", "1.17.1")
extra.set("groovyVersion", "3.0.19")
extra.set("jansiVersion", "2.4.0")
extra.set("javaBaseGeneratorVersion", version)
extra.set("javaParserVersion", "3.24.2")
extra.set("javaParserVersion", "3.25.5")
extra.set("coroutinesVersion", "1.1.1")
extra.set("lemmaEclipsePluginsVersion", version)
extra.set("log4jVersion", "2.16.0")
extra.set("log4jVersion", "2.20.0")
extra.set("loggingVersion", "1.7.9")
extra.set("lsp4jVersion", "0.10.0")
extra.set("lsp4jVersion", "0.21.1")
extra.set("modelProcessingVersion", version)
extra.set("picocliVersion", "3.9.3")
extra.set("picocliVersion", "4.7.5")
}

dependencies {
Expand Down
1 change: 0 additions & 1 deletion ...erators/de.fhdo.lemma.model_processing.code_generation.springcloud.cqrs/deploy.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
base
maven
`maven-publish`
}

Expand Down
2 changes: 1 addition & 1 deletion ...erators/de.fhdo.lemma.model_processing.code_generation.springcloud.cqrs/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM maven:3.6.3-openjdk-11-slim
FROM maven:3.9.4-eclipse-temurin-17
ARG LEMMA_VERSION

COPY \
Expand Down
2 changes: 1 addition & 1 deletion ...odel_processing.code_generation.springcloud.cqrs/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
18 changes: 9 additions & 9 deletions ...de.fhdo.lemma.model_processing.code_generation.springcloud.domain_events/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
kotlin("jvm") version "1.3.72"
maven
`maven-publish`
}

group = "de.fhdo.lemma.model_processing.code_generation.springcloud.domain_events"
Expand All @@ -12,16 +12,16 @@ repositories {

buildscript {
extra.set("coroutinesVersion", "1.1.1")
extra.set("groovyVersion", "3.0.3")
extra.set("jansiVersion", "1.17.1")
extra.set("groovyVersion", "3.0.19")
extra.set("jansiVersion", "2.4.0")
extra.set("javaBaseGeneratorVersion", version)
extra.set("javaParserVersion", "3.24.2")
extra.set("javaParserVersion", "3.25.5")
extra.set("lemmaEclipsePluginsVersion", version)
extra.set("log4jVersion", "2.16.0")
extra.set("log4jVersion", "2.20.0")
extra.set("loggingVersion", "1.7.9")
extra.set("lsp4jVersion", "0.10.0")
extra.set("lsp4jVersion", "0.21.1")
extra.set("modelProcessingVersion", version)
extra.set("picocliVersion", "3.9.3")
extra.set("picocliVersion", "4.7.5")
}

dependencies {
Expand Down Expand Up @@ -82,12 +82,12 @@ dependencies {

tasks {
compileKotlin {
kotlinOptions.jvmTarget = "11"
kotlinOptions.jvmTarget = "17"
// Java Base Generator uses @JvmDefault annotation
kotlinOptions.freeCompilerArgs = listOf("-Xjvm-default=compatibility")
}
compileTestKotlin {
kotlinOptions.jvmTarget = "11"
kotlinOptions.jvmTarget = "17"
// Java Base Generator uses @JvmDefault annotation
kotlinOptions.freeCompilerArgs = listOf("-Xjvm-default=compatibility")
}
Expand Down
1 change: 0 additions & 1 deletion ...e.fhdo.lemma.model_processing.code_generation.springcloud.domain_events/deploy.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
base
maven
`maven-publish`
}

Expand Down
2 changes: 1 addition & 1 deletion ...e.fhdo.lemma.model_processing.code_generation.springcloud.domain_events/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM maven:3.6.3-openjdk-11-slim
FROM maven:3.9.4-eclipse-temurin-17
ARG LEMMA_VERSION

COPY \
Expand Down
2 changes: 1 addition & 1 deletion ...essing.code_generation.springcloud.domain_events/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading