Skip to content

Commit

Permalink
feat: #81 Start including the latest kotling in the pom.xml or kgstat…
Browse files Browse the repository at this point in the history 
…sSrv.
  • Loading branch information
@dmitry-weirdo
dmitry-weirdo committed Nov 21, 2024
1 parent bc94cc4 commit fb8395b
Show file tree
Hide file tree
Showing 2 changed files with 117 additions and 3 deletions.
99 changes: 98 additions & 1 deletion kgstatsSrv/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,74 @@
</configuration>
</plugin>

<!-- MapStruct and Lombok configuration -->
<!-- see https://kotlinlang.org/docs/maven.html#compile-kotlin-and-java-sources -->
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<version>${kotlin.version}</version>
<extensions>true</extensions> <!-- You can set this option
to automatically take information about lifecycles -->
<executions>
<execution>
<id>compile</id>
<goals>
<goal>compile</goal> <!-- You can skip the <goals> element
if you enable extensions for the plugin -->
</goals>
<configuration>
<sourceDirs>
<sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
<sourceDir>${project.basedir}/src/main/java</sourceDir>
</sourceDirs>
</configuration>
</execution>
<execution>
<id>test-compile</id>
<goals>
<goal>test-compile</goal> <!-- You can skip the <goals> element
if you enable extensions for the plugin -->
</goals>
<configuration>
<sourceDirs>
<sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
<sourceDir>${project.basedir}/src/test/java</sourceDir>
</sourceDirs>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<executions>
<!-- Replacing default-compile as it is treated specially by Maven -->
<execution>
<id>default-compile</id>
<phase>none</phase>
</execution>
<!-- Replacing default-testCompile as it is treated specially by Maven -->
<execution>
<id>default-testCompile</id>
<phase>none</phase>
</execution>
<execution>
<id>java-compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>java-test-compile</id>
<phase>test-compile</phase>
<goals>
<goal>testCompile</goal>
</goals>
</execution>
</executions>

<!-- MapStruct and Lombok configuration -->
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
Expand All @@ -178,7 +241,41 @@
</path>
</annotationProcessorPaths>
</configuration>

</plugin>

<!-- MapStruct and Lombok configuration -->
<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
<annotationProcessorPaths>
<path>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
<version>${org.mapstruct.version}</version>
</path>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</path>
&lt;!&ndash; This is needed when using Lombok 1.8.16 and above &ndash;&gt;
&lt;!&ndash; see https://mapstruct.org/faq/#can-i-use-mapstruct-together-with-project-lombok &ndash;&gt;
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok-mapstruct-binding</artifactId>
<version>${lombok-mapstruct-binding.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
-->

<!-- see https://github.com/OpenAPITools/openapi-generator/tree/master/modules/openapi-generator-maven-plugin -->
<plugin>
Expand Down
21 changes: 19 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

<properties>
<java.version>17</java.version>
<kotlin.version>2.0.21</kotlin.version>
<org.mapstruct.version>1.4.1.Final</org.mapstruct.version>
<lombok.version>1.18.34</lombok.version>
<lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version>
Expand All @@ -41,7 +42,7 @@
<maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
<maven-source-plugin.version>2.2.1</maven-source-plugin.version>
<maven-war-plugin.version>3.4.0</maven-war-plugin.version>
<maven-javadoc-plugin.version>2.9.1</maven-javadoc-plugin.version>
<maven-javadoc-plugin.version>3.11.1</maven-javadoc-plugin.version>
<maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
<openapi-generator-maven-plugin.version>5.0.0</openapi-generator-maven-plugin.version>
<build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>
Expand Down Expand Up @@ -158,9 +159,25 @@
</build>

<!-- see https://stackoverflow.com/a/37280943/8534088-->
<!-- dependencies will be ALWAYS inherited by all child modules -->
<!-- dependencies will ALWAYS be inherited by all child modules -->

<dependencies>

<!-- Kotlin dependency -->
<!-- see https://kotlinlang.org/docs/maven.html#dependencies -->
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>${kotlin.version}</version>
</dependency>

<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-reflect</artifactId>
<version>${kotlin.version}</version>
</dependency>


<!-- Use log4j2 instead of slf4j -->
<!-- see https://stackoverflow.com/a/41500347/8534088 -->
<dependency>
Expand Down

0 comments on commit fb8395b

Please sign in to comment.