Merge pull request #805 from navikt/pomming

pom cleanup
navikt · Nov 30, 2023 · 6a88e56 · 6a88e56
2 parents 8d16f1b + 83ac9b6
commit 6a88e56
Show file tree

Hide file tree

Showing 12 changed files with 52 additions and 71 deletions.
diff --git a/pom.xml b/pom.xml
@@ -104,27 +104,21 @@
         </plugins>
         <pluginManagement>
             <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <configuration>
+                        <compilerArgs>
+                            <arg>-parameters</arg>
+                        </compilerArgs>
+                    </configuration>
+                </plugin>
                 <plugin>
                     <groupId>org.jetbrains.kotlin</groupId>
                     <artifactId>kotlin-maven-plugin</artifactId>
                     <version>${kotlin.version}</version>
-                    <executions>
-                        <execution>
-                            <id>compile</id>
-                            <phase>compile</phase>
-                            <goals>
-                                <goal>compile</goal>
-                            </goals>
-                        </execution>
-                        <execution>
-                            <id>test-compile</id>
-                            <phase>test-compile</phase>
-                            <goals>
-                                <goal>test-compile</goal>
-                            </goals>
-                        </execution>
-                    </executions>
                     <configuration>
+                            <javaParameters>true</javaParameters>
                             <args>
                                 <arg>-Xjsr305=strict</arg>
                             </args>
@@ -141,6 +135,7 @@
                             <version>${kotlin.version}</version>
                         </dependency>
                     </dependencies>
+                    <extensions>true</extensions>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>

diff --git a/token-client-core/pom.xml b/token-client-core/pom.xml
@@ -44,14 +44,9 @@
     <build>
         <plugins>
             <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <configuration>
-                        <compilerArgs>
-                            <arg>-parameters</arg>
-                        </compilerArgs>
-                    </configuration>
-                </plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>

diff --git a/...-client-kotlin-demo/src/test/kotlin/no/nav/security/token/support/ktor/ApplicationTest.kt b/...-client-kotlin-demo/src/test/kotlin/no/nav/security/token/support/ktor/ApplicationTest.kt
@@ -78,16 +78,16 @@ internal class ApplicationTest {
     ) {
         (environment.config as MapApplicationConfig).apply {
             val prefix = "no.nav.security.jwt"
-            put("${prefix}.issuers.size", "1")
-            put("${prefix}.issuers.0.issuer_name", issuerId)
-            put("${prefix}.issuers.0.discoveryurl", "${server.wellKnownUrl(issuerId)}")
-            put("${prefix}.issuers.0.accepted_audience", acceptedAudience)
-            put("${prefix}.client.registration.clients.size", "1")
-            put("${prefix}.client.registration.clients.0.client_name", "issuer1")
-            put("${prefix}.client.registration.clients.0.well_known_url", "${server.wellKnownUrl(issuerId)}")
-            put("${prefix}.client.registration.clients.0.authentication.client_id", "client1")
-            put("${prefix}.client.registration.clients.0.authentication.client_auth_method", "private_key_jwt")
-            put("${prefix}.client.registration.clients.0.authentication.client_jwk", jwk)
+            put("$prefix.issuers.size", "1")
+            put("$prefix.issuers.0.issuer_name", issuerId)
+            put("$prefix.issuers.0.discoveryurl", "${server.wellKnownUrl(issuerId)}")
+            put("$prefix.issuers.0.accepted_audience", acceptedAudience)
+            put("$prefix.client.registration.clients.size", "1")
+            put("$prefix.client.registration.clients.0.client_name", "issuer1")
+            put("$prefix.client.registration.clients.0.well_known_url", "${server.wellKnownUrl(issuerId)}")
+            put("$prefix.client.registration.clients.0.authentication.client_id", "client1")
+            put("$prefix.client.registration.clients.0.authentication.client_auth_method", "private_key_jwt")
+            put("$prefix.client.registration.clients.0.authentication.client_jwk", jwk)
         }
     }
 

diff --git a/...o/src/test/kotlin/no/nav/security/token/support/ktor/oauth/OAuth2ClientIntegrationTest.kt b/...o/src/test/kotlin/no/nav/security/token/support/ktor/oauth/OAuth2ClientIntegrationTest.kt
@@ -32,7 +32,7 @@ internal class OAuth2ClientIntegrationTest {
 
     // TODO: fix test on github actions
     @Test
-    @Disabled("fails on github actions, but runs fine in Idea and mvn locally, maybe something with clock/time")
+   @Disabled("fails on github actions, but runs fine in Idea and mvn locally, maybe something with clock/time")
     fun `token request should return cached response on second request with same request`() {
         withMockOAuth2Server {
             this.enqueueCallback(

diff --git a/token-client-spring/pom.xml b/token-client-spring/pom.xml
@@ -99,9 +99,6 @@
             <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-core/pom.xml b/token-validation-core/pom.xml
@@ -42,6 +42,10 @@
 				</environmentVariables>
 			</configuration>
 		</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>

diff --git a/token-validation-filter/pom.xml b/token-validation-filter/pom.xml
@@ -34,6 +34,10 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>

diff --git a/token-validation-jaxrs/pom.xml b/token-validation-jaxrs/pom.xml
@@ -68,6 +68,10 @@
     </dependencies>
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>

diff --git a/token-validation-ktor-demo/pom.xml b/token-validation-ktor-demo/pom.xml
@@ -79,7 +79,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
             </plugin>
-
             <plugin>
                 <groupId>org.jetbrains.kotlin</groupId>
                 <artifactId>kotlin-maven-plugin</artifactId>

diff --git a/token-validation-ktor-v2/pom.xml b/token-validation-ktor-v2/pom.xml
@@ -59,11 +59,15 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>com.github.tomakehurst</groupId>
+            <groupId>org.wiremock</groupId>
             <artifactId>wiremock</artifactId>
-            <version>2.27.2</version>
+            <version>3.3.1</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+        </dependency>
         <dependency>
             <!-- needed by Wiremock -->
             <groupId>commons-logging</groupId>
@@ -117,7 +121,6 @@
                     </execution>
                 </executions>
             </plugin>
-
         </plugins>
     </build>
     <profiles>

diff --git a/...demo/src/test/java/no/nav/security/token/support/demo/spring/rest/DemoControllerTest.java b/...demo/src/test/java/no/nav/security/token/support/demo/spring/rest/DemoControllerTest.java
@@ -11,6 +11,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.http.HttpStatus;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.web.servlet.setup.ConfigurableMockMvcBuilder;
@@ -21,9 +22,11 @@
 import java.util.Collections;
 import java.util.List;
 
+import static io.restassured.module.mockmvc.RestAssuredMockMvc.*;
 import static io.restassured.module.mockmvc.RestAssuredMockMvc.given;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.*;
 
-@SpringBootTest(classes = DemoApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@SpringBootTest(classes = DemoApplication.class, webEnvironment = RANDOM_PORT)
 @ActiveProfiles("test")
 @EnableMockOAuth2Server
 class DemoControllerTest {
@@ -35,15 +38,15 @@ class DemoControllerTest {
 
     @BeforeEach
     void initialiseRestAssuredMockMvcWebApplicationContext() {
-        Collection<Filter> filterCollection = webApplicationContext.getBeansOfType(Filter.class).values();
-        Filter[] filters = filterCollection.toArray(new Filter[0]);
-        MockMvcConfigurer mockMvcConfigurer = new MockMvcConfigurer() {
+        var filterCollection = webApplicationContext.getBeansOfType(Filter.class).values();
+        var filters = filterCollection.toArray(new Filter[0]);
+        var mockMvcConfigurer = new MockMvcConfigurer() {
             @Override
             public void afterConfigurerAdded(ConfigurableMockMvcBuilder<?> builder) {
                 builder.addFilters(filters);
             }
         };
-        RestAssuredMockMvc.webAppContextSetup(webApplicationContext, mockMvcConfigurer);
+        webAppContextSetup(webApplicationContext, mockMvcConfigurer);
     }
 
     @Test
@@ -94,4 +97,4 @@ private String token(String issuerId, String subject, String audience){
             )
         ).serialize();
     }
-}
+}
diff --git a/token-validation-spring/pom.xml b/token-validation-spring/pom.xml
@@ -159,29 +159,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <parameters>true</parameters>
-                </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>
         </plugins>
     </build>
     <profiles>