Merge remote-tracking branch 'origin/master' into pr/97

# Conflicts: # .gitignore # .trunk/trunk.yaml # build-logic/src/main/kotlin/djaxonomy.test-conventions.gradle.kts # docs/resources/integration.md # mkdocs.yml # subprojects/common/ddo-core/build.gradle.kts
truthencode · Sep 9, 2023 · 9dcf111 · 9dcf111
2 parents 9d78600 + 0a5fe39
commit 9dcf111
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,8 +13,6 @@ hs*.log
 
 docsold/
 
-subprojects/common/ddo-modeling/src/main/avro/io/truthencode/ddo/model/protocol/
-
 #Maven exclusions
 target/
 pom.xml.tag

diff --git a/pom.xml b/pom.xml
@@ -81,7 +81,7 @@
 		<!-- Scala -->
         <scala.base>2.12</scala.base>
         <scala.minor.version>2.13.6</scala.minor.version>
-        <scala.version>${scala.base}.${scala.minor.version}</scala.version>
+        <scala.version>2.13.12</scala.version>
         <scala.tools.version>${scala.base}</scala.tools.version>
         <scala.logging.version>3.9.4</scala.logging.version>
         <scala.binary.full.version>${scala.version}</scala.binary.full.version>
@@ -587,7 +587,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>3.0.0</version>
+                    <version>3.4.0</version>
                 </plugin>
                 <plugin>
                     <groupId>pl.project13.maven</groupId>