Skip to content

Commit 4e3c487

Browse files
authored
Merge pull request #802 from navikt/bump-32
bump to 3.2, add parameters option to compiler
2 parents 907d595 + 9b7d08c commit 4e3c487

File tree

4 files changed

+19
-21
lines changed

4 files changed

+19
-21
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<maven.compiler.source>17</maven.compiler.source>
5454
<maven.compiler.target>17</maven.compiler.target>
5555
<java.version>17</java.version>
56-
<spring-boot.version>3.1.6</spring-boot.version>
56+
<spring-boot.version>3.2.0</spring-boot.version>
5757
<oauth2-oidc-sdk.version>11.7</oauth2-oidc-sdk.version>
5858
<validation-api.version>2.0.1.Final</validation-api.version>
5959
<rest-assured.version>5.3.2</rest-assured.version>
@@ -453,4 +453,4 @@
453453
<artifactId>nimbus-jose-jwt</artifactId>
454454
</dependency>
455455
</dependencies>
456-
</project>
456+
</project>

token-client-core/pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,15 @@
4343
</dependencies>
4444
<build>
4545
<plugins>
46+
<plugin>
47+
<groupId>org.apache.maven.plugins</groupId>
48+
<artifactId>maven-compiler-plugin</artifactId>
49+
<configuration>
50+
<compilerArgs>
51+
<arg>-parameters</arg>
52+
</compilerArgs>
53+
</configuration>
54+
</plugin>
4655
<plugin>
4756
<groupId>org.apache.maven.plugins</groupId>
4857
<artifactId>maven-source-plugin</artifactId>

token-client-spring/pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,9 @@
9999
<plugin>
100100
<groupId>org.jetbrains.kotlin</groupId>
101101
<artifactId>kotlin-maven-plugin</artifactId>
102+
<configuration>
103+
<javaParameters>true</javaParameters>
104+
</configuration>
102105
</plugin>
103106
<plugin>
104107
<groupId>org.apache.maven.plugins</groupId>

token-validation-spring-test/pom.xml

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -43,28 +43,14 @@
4343
</dependencies>
4444
<build>
4545
<plugins>
46-
<plugin>
46+
<plugin>
4747
<groupId>org.apache.maven.plugins</groupId>
4848
<artifactId>maven-compiler-plugin</artifactId>
4949
<configuration>
50-
<parameters>true</parameters>
50+
<compilerArgs>
51+
<arg>-parameters</arg>
52+
</compilerArgs>
5153
</configuration>
52-
<executions>
53-
<execution>
54-
<id>compile</id>
55-
<phase>compile</phase>
56-
<goals>
57-
<goal>compile</goal>
58-
</goals>
59-
</execution>
60-
<execution>
61-
<id>testCompile</id>
62-
<phase>test-compile</phase>
63-
<goals>
64-
<goal>testCompile</goal>
65-
</goals>
66-
</execution>
67-
</executions>
6854
</plugin>
6955
<plugin>
7056
<groupId>org.apache.maven.plugins</groupId>
@@ -89,4 +75,4 @@
8975
</build>
9076
</profile>
9177
</profiles>
92-
</project>
78+
</project>

0 commit comments

Comments
 (0)