Merge pull request #802 from navikt/bump-32

bump to 3.2, add parameters option to compiler
navikt · Nov 29, 2023 · 4e3c487 · 4e3c487
2 parents 907d595 + 9b7d08c
commit 4e3c487
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 21 deletions.
diff --git a/pom.xml b/pom.xml
@@ -53,7 +53,7 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <java.version>17</java.version>
-        <spring-boot.version>3.1.6</spring-boot.version>
+        <spring-boot.version>3.2.0</spring-boot.version>
         <oauth2-oidc-sdk.version>11.7</oauth2-oidc-sdk.version>
         <validation-api.version>2.0.1.Final</validation-api.version>
         <rest-assured.version>5.3.2</rest-assured.version>
@@ -453,4 +453,4 @@
             <artifactId>nimbus-jose-jwt</artifactId>
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/token-client-core/pom.xml b/token-client-core/pom.xml
@@ -43,6 +43,15 @@
     </dependencies>
     <build>
         <plugins>
+            <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <configuration>
+                        <compilerArgs>
+                            <arg>-parameters</arg>
+                        </compilerArgs>
+                    </configuration>
+                </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>

diff --git a/token-client-spring/pom.xml b/token-client-spring/pom.xml
@@ -99,6 +99,9 @@
             <plugin>
                 <groupId>org.jetbrains.kotlin</groupId>
                 <artifactId>kotlin-maven-plugin</artifactId>
+                <configuration>
+                  <javaParameters>true</javaParameters>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

diff --git a/token-validation-spring-test/pom.xml b/token-validation-spring-test/pom.xml
@@ -43,28 +43,14 @@
     </dependencies>
     <build>
         <plugins>
- <plugin>
+           <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <parameters>true</parameters>
+                    <compilerArgs>
+                        <arg>-parameters</arg>
+                    </compilerArgs>
                 </configuration>
-                <executions>
-                    <execution>
-                        <id>compile</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>testCompile</id>
-                        <phase>test-compile</phase>
-                        <goals>
-                            <goal>testCompile</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -89,4 +75,4 @@
             </build>
         </profile>
     </profiles>
-</project>
+</project>