changing version management

adding filter for version in l18n

CityDoctorParent/CityDoctorCheckResult/build.gradle

-/*
- * This file was generated by the Gradle 'init' task.
- */
-
 plugins {
     id 'citydoctor-multi-module'
 }
 
 dependencies {
-    api 'jakarta.xml.bind:jakarta.xml.bind-api:2.3.3'
-    runtimeOnly 'com.sun.xml.bind:jaxb-impl:2.3.3'
-    testImplementation 'junit:junit:4.13.2'
+    api(libs.jakarta.xml.bind.api)
+    runtimeOnly(libs.jaxb.impl)
+    testImplementation(libs.junit)
 }
 
 description = 'CityDoctorCheckResult'

CityDoctorParent/CityDoctorEdge/build.gradle

@@ -7,10 +7,10 @@ plugins {
 }
 
 dependencies {
-    api 'org.apache.logging.log4j:log4j-api:2.18.0'
+    api(libs.log4j.api)
     api project(':CityDoctorModel')
-    testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.apache.logging.log4j:log4j-core:2.18.0'
+    testImplementation(libs.junit)
+    testImplementation(libs.log4j.core)
 }
 
 test {

CityDoctorParent/CityDoctorModel/build.gradle

-/*
- * This file was generated by the Gradle 'init' task.
- */
-
 plugins {
     id 'citydoctor-multi-module'
+    id "com.gorylenko.gradle-git-properties" version "2.4.1"
 }
 
 dependencies {
-    api 'org.citygml4j:citygml4j-core:3.0.0-rc.4'
-    api 'org.citygml4j:citygml4j-xml:3.0.0-rc.4'
-    api 'de.hft.stuttgart:citygml4j-quality-ade:3.2.0'
-    api 'gov.nist.math:jama:1.0.3'
-    api 'org.jogamp.gluegen:gluegen-rt-main:2.3.2'
-    api 'org.jogamp.jogl:jogl-all-main:2.3.2'
-    api 'org.apache.logging.log4j:log4j-api:2.18.0'
-    api 'org.yaml:snakeyaml:1.30'
-    api 'org.locationtech.proj4j:proj4j:1.1.5'
-    testImplementation 'org.apache.logging.log4j:log4j-core:2.18.0'
+    api(libs.citygml4j.core)
+    api(libs.citygml4j.xml)
+    api(libs.citygml4j.quality.ade)
+    api(libs.jama)
+    api(libs.gluegen.rt.main)
+    api(libs.jogl.all.main)
+    api(libs.log4j.api)
+    api(libs.snakeyaml)
+    api(libs.proj4j)
+    testImplementation(libs.log4j.core)
+}
+
+gitProperties {
+    extProperty = 'gitProps' // git properties will be put in a map at project.ext.gitProps
+}
+generateGitProperties.outputs.upToDateWhen { false } // make sure the generateGitProperties task always executes (even when git.properties is not changed)
+
+
+import org.apache.tools.ant.filters.*
+
+processResources {
+	dependsOn 'generateGitProperties'
+	//versionString = "${-> project.ext.gitProps['git.commit.id.abbrev']}"
+	filesMatching('CityDoctorLocalization.properties') {
+		filter(ReplaceTokens, tokens: [gitVersion:  project.ext.gitProps['git.commit.id.abbrev'], cdVersion: version])                               
+	}
+	outputs.upToDateWhen {
+	   false
+	}
 }
 
 description = 'CityDoctorModel'

CityDoctorParent/CityDoctorModel/src/main/resources/CityDoctorLocalization.properties

-CityDoctorValidation.Version=${versionString}
+CityDoctorValidation.Version=@cdVersion@-@gitVersion@
 DistanceError.distanceFromPlane=distance from plane
 AboutDialog.developedBy=Developed by
 AboutDialog.contact=Contact

CityDoctorParent/CityDoctorValidation/build.gradle

@@ -143,18 +143,17 @@ dependencies {
     implementation project(':CityDoctorModel')
     implementation project(':CityDoctorEdge')
     implementation project(':CityDoctorCheckResult')
-    implementation('net.sf.saxon:Saxon-HE:11.3') {
+    implementation(libs.saxon.he) {
        		exclude group: 'xml-apis', module: 'xml-apis'
   	}
-    implementation('org.apache.xmlgraphics:fop:2.7') {
+    implementation(libs.fop) {
        		exclude group: 'xml-apis', module: 'xml-apis'
   	}
-    implementation 'org.jdom:jdom2:2.0.6.1'
-    implementation "org.apache.logging.log4j:log4j-api:2.18.0"
-    implementation 'org.apache.logging.log4j:log4j-core:2.18.0'
-    implementation 'org.locationtech.jts:jts-core:1.19.0'
-    implementation 'de.hft.stuttgart:citygml4j-quality-ade:3.2.0'
-    testImplementation 'junit:junit:4.13.2'
+    implementation(libs.jdom2)
+    implementation(libs.log4j.api)
+    implementation(libs.log4j.core)
+    implementation(libs.jts.core)
+    implementation(libs.citygml4j.quality.ade)
     
 }
 

CityDoctorParent/buildSrc/src/main/groovy/citydoctor-multi-module.gradle

-/*
- * This file was generated by the Gradle 'init' task.
- */
-
 plugins {
     id 'java-library'
+    id 'maven-publish'
 }
 
 repositories {
+	mavenLocal()
 	mavenCentral()
     flatDir {
         dirs rootProject.files('non-maven-libs')
     }
 }
 
+publishing {
+    publications {
+        maven(MavenPublication) {
+            from components.java
+        }
+    }
+}
+
 test {
     useJUnitPlatform()
 }

CityDoctorParent/settings.gradle

-/*
- * This file was generated by the Gradle 'init' task.
- */
-
 rootProject.name = 'CityDoctorParent'
 include(':CityDoctorModel')
 include(':CityDoctorValidation')
 include(':CityDoctorCheckResult')
 include(':CityDoctorEdge')
 
-ext.libraries = [
-	log4j_api: "org.apache.logging.log4j:log4j-api:2.18.0"
-
-]
+dependencyResolutionManagement {
+	versionCatalogs {
+		libs {
+		    library('citygml4j-core', 'org.citygml4j:citygml4j-core:3.0.0-rc.4')
+		    library('citygml4j-xml', 'org.citygml4j:citygml4j-xml:3.0.0-rc.4')
+		    library('citygml4j-quality-ade', 'de.hft.stuttgart:citygml4j-quality-ade:3.2.0')
+		    library('jama', 'gov.nist.math:jama:1.0.3')
+		    library('gluegen-rt-main', 'org.jogamp.gluegen:gluegen-rt-main:2.3.2')
+		    library('jogl-all-main', 'org.jogamp.jogl:jogl-all-main:2.3.2')
+		    library('log4j-api', 'org.apache.logging.log4j:log4j-api:2.18.0')
+		    library('log4j-core', 'org.apache.logging.log4j:log4j-core:2.18.0')
+		    library('snakeyaml', 'org.yaml:snakeyaml:1.30')
+		    library('proj4j', 'org.locationtech.proj4j:proj4j:1.1.5')
+		    library('saxon-he', 'net.sf.saxon:Saxon-HE:11.3')
+		    library('fop', 'org.apache.xmlgraphics:fop:2.7')
+		    library('jdom2', 'org.jdom:jdom2:2.0.6.1')
+		    library('jts-core', 'org.locationtech.jts:jts-core:1.19.0')
+		    library('junit', 'junit:junit:4.13.2')
+		    library('jaxb-impl', 'com.sun.xml.bind:jaxb-impl:2.3.3')
+		    library('jakarta.xml.bind-api', 'jakarta.xml.bind:jakarta.xml.bind-api:2.3.3')
+		    library('log4j-slf4j18-impl', 'org.apache.logging.log4j:log4j-slf4j18-impl:2.17.2')	    
+		}
+	}
+}