Merge pull request #51 from Microservice-API-Patterns/maintenance/xtextupdate2024

Maintenance/xtextupdate2024

Author: socadk

README.md

@@ -1,4 +1,4 @@
-#Tue Feb 01 15:17:48 CET 2022
+#Tue Sep 03 12:32:38 CEST 2024
 artifact.repository.factory.order=artifacts.xml.xz,artifacts.xml,\!
-version=1
 metadata.repository.factory.order=content.xml.xz,content.xml,\!
+version=1

changelog.md

@@ -1,106 +1,88 @@
 buildscript {
-        repositories {
-                mavenCentral()
-                jcenter()
-        }
-        dependencies {
-                classpath 'org.xtext:xtext-gradle-plugin:2.0.8'
-        }
+	repositories {
+		mavenCentral()
+		maven {
+			url "https://plugins.gradle.org/m2/"
+		}
+	}
+	dependencies {
+		classpath 'org.xtext:xtext-gradle-plugin:4.0.0'
+	}
 }
 
+
+
 def pomXml = new XmlSlurper().parse('pom.xml')
 
 subprojects {
-        ext.xtextVersion = '2.21.0'
-        repositories {
-                jcenter()
-        }
-
-        apply plugin: 'java'
-        apply plugin: 'maven-publish'
-        apply plugin: 'org.xtext.xtend'
-        apply from: "${rootDir}/gradle/maven-deployment.gradle"
-        apply plugin: 'eclipse'
-        apply plugin: 'jacoco'
-        apply plugin: 'signing'
-
-        group = 'io.mdsl'
-        version = pomXml.version
-
-        sourceCompatibility = '1.8'
-        targetCompatibility = '1.8'
-
-        configurations.all {
-                exclude group: 'asm'
-        }
-	
-	/*
+		ext.xtextVersion = '2.35.0'
+
+		apply plugin: 'java-library'
+		apply plugin: 'maven-publish'
+		apply plugin: 'org.xtext.xtend'
+		apply plugin: 'eclipse'
+		apply plugin: 'jacoco'
+		apply plugin: 'signing'
+
+		dependencies {
+			implementation platform("org.eclipse.xtext:xtext-dev-bom:${xtextVersion}")
+		}
+
+		group = 'io.mdsl'
+		version = pomXml.version
+
+		java {
+			sourceCompatibility = JavaVersion.VERSION_17
+			targetCompatibility = JavaVersion.VERSION_17
+		}
+
+		configurations.all {
+				exclude group: 'asm'
+		}
+
+		repositories {
+			mavenCentral()
+			maven {
+				url "https://plugins.gradle.org/m2/"
+			}
+		}
+
 	// causes my local build to fail:
 	signing {
-    		sign configurations.archives
+			sign configurations.archives
 	}
-	*/
 
-	uploadArchives {
+	publishing {
 		repositories {
-			mavenDeployer {
-				beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-
-      				repository(url: "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/") {	
-      				// needed, from https://github.com/NeuronRobotics/nrjavaserial/issues/123
-					authentication(userName: hasProperty('ossrhUsername')?ossrhUsername:'', password: hasProperty('ossrhPassword')?ossrhPassword:'')
+			maven {
+				def releasesRepoUrl = uri("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/")
+				def snapshotsRepoUrl = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
+				url = "${project.version}".endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
+				credentials {
+					username = project.findProperty('ossrhTokenUsername') ?: ""
+					password = project.findProperty('ossrhTokenPassword') ?: ""
 				}
-
-				snapshotRepository(url: "https://s01.oss.sonatype.org/content/repositories/snapshots/") {
-					// needed, from https://github.com/NeuronRobotics/nrjavaserial/issues/123
-					authentication(userName: hasProperty('ossrhUsername')?ossrhUsername:'', password: hasProperty('ossrhPassword')?ossrhPassword:'')
-				}
-
-
-                                pom.project {
-                                        name 'io.mdsl:io.mdsl.parent'
-                                        description 'A domain-specific language to specify (micro-)service contracts, data representations and endpoints.'
-                                        url 'https://microservice-api-patterns.github.io/MDSL-Specification/'
-
-                                        scm {
-                                                connection 'scm:git:https://github.com/Microservice-API-Patterns/MDSL-Specification.git'
-                                                developerConnection 'scm:git:ssh://github.com:Microservice-API-Patterns/MDSL-Specification.git'
-                                                url 'https://github.com/Microservice-API-Patterns/MDSL-Specification/tree/master'
-                                        }
-
-                                        licenses {
-                                                license {
-                                                        name 'The Apache License, Version 2.0'
-                                                        url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                                                }
-                                        }
-
-                                        developers {
-                                                developer {
-                                                        name 'socadk'
-                                                        email '[email protected]'
-                                                }
-                                        }
-                                }
 			}
 		}
 	}
+
+
 // workaround for XText+Gradle build problems: https://github.com/eclipse/xtext/issues/1976#issuecomment-862141814
-    configurations.all {
-	    resolutionStrategy {
-	        eachDependency { DependencyResolveDetails details ->
-	            if (details.requested.group == 'org.eclipse.platform' && details.requested.name == 'org.eclipse.core.runtime') {
-	                details.useVersion "3.19.0"
-	            }
-	            if (details.requested.group == 'org.eclipse.platform' && details.requested.name == 'org.eclipse.equinox.common') {
-	                details.useVersion("3.13.0")
-	            }
-	        }
-	    }
+	configurations.all {
+		resolutionStrategy {
+			eachDependency { DependencyResolveDetails details ->
+				if (details.requested.group == 'org.eclipse.platform' && details.requested.name == 'org.eclipse.core.runtime') {
+					details.useVersion "3.19.0"
+				}
+				if (details.requested.group == 'org.eclipse.platform' && details.requested.name == 'org.eclipse.equinox.common') {
+					details.useVersion("3.13.0")
+				}
+			}
+		}
 	}
 }
 
 
 configure(subprojects.findAll {it.name != 'mdsl-cli'}) {
-        apply from: "${rootDir}/gradle/source-layout.gradle"
+		apply from: "${rootDir}/gradle/source-layout.gradle"
 }

docs/index.md

@@ -5,17 +5,17 @@ if (name.endsWith("-tests")) {
 			resources.srcDirs = []
 		}
 		test {
-			java.srcDirs = ['src', 'src-gen']
+			java.srcDirs = ['src', 'src-gen', 'xtend-gen']
 			resources.srcDirs = ['src', 'src-gen']
-			xtendOutputDir = 'xtend-gen'
+			xtend.outputDir = 'xtend-gen'
 		}
 	}
 } else {
 	sourceSets {
 		main {
-			java.srcDirs = ['src', 'src-gen']
+			java.srcDirs = ['src', 'src-gen', 'xtend-gen']
 			resources.srcDirs = ['src', 'src-gen']
-			xtendOutputDir = 'xtend-gen'
+			xtend.outputDir = 'xtend-gen'
 		}
 		test {
 			java.srcDirs = []

docs/updates/README.md

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists