Skip to content

Commit 5baa720

Browse files
jan-olaveidejan-olaveide
authored
Merge pull request #753 from navikt/plugin-fix
plugin cleanup
2 parents bc657fa + 4243c86 commit 5baa720

File tree

12 files changed

+40
-283
lines changed

12 files changed

+40
-283
lines changed

‎pom.xml

Lines changed: 37 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -83,31 +83,6 @@
8383
<artifactId>maven-surefire-plugin</artifactId>
8484
<version>3.1.2</version>
8585
</plugin>
86-
<plugin>
87-
<groupId>org.jetbrains.kotlin</groupId>
88-
<artifactId>kotlin-maven-plugin</artifactId>
89-
<version>${kotlin.version}</version>
90-
<executions>
91-
<execution>
92-
<id>compile</id>
93-
<phase>compile</phase>
94-
<goals>
95-
<goal>compile</goal>
96-
</goals>
97-
</execution>
98-
<execution>
99-
<id>test-compile</id>
100-
<phase>test-compile</phase>
101-
<goals>
102-
<goal>test-compile</goal>
103-
</goals>
104-
</execution>
105-
</executions>
106-
<configuration>
107-
<jvmTarget>17</jvmTarget>
108-
</configuration>
109-
</plugin>
110-
11186
<plugin>
11287
<groupId>org.jacoco</groupId>
11388
<artifactId>jacoco-maven-plugin</artifactId>
@@ -129,6 +104,43 @@
129104
</plugins>
130105
<pluginManagement>
131106
<plugins>
107+
<plugin>
108+
<groupId>org.jetbrains.kotlin</groupId>
109+
<artifactId>kotlin-maven-plugin</artifactId>
110+
<executions>
111+
<execution>
112+
<id>compile</id>
113+
<phase>compile</phase>
114+
<goals>
115+
<goal>compile</goal>
116+
</goals>
117+
</execution>
118+
<execution>
119+
<id>test-compile</id>
120+
<phase>test-compile</phase>
121+
<goals>
122+
<goal>test-compile</goal>
123+
</goals>
124+
</execution>
125+
</executions>
126+
<configuration>
127+
<args>
128+
<arg>-Xjsr305=strict</arg>
129+
</args>
130+
<compilerPlugins>
131+
<plugin>all-open</plugin>
132+
<plugin>spring</plugin>
133+
</compilerPlugins>
134+
<jvmTarget>${maven.compiler.target}</jvmTarget>
135+
</configuration>
136+
<dependencies>
137+
<dependency>
138+
<groupId>org.jetbrains.kotlin</groupId>
139+
<artifactId>kotlin-maven-allopen</artifactId>
140+
<version>${kotlin.version}</version>
141+
</dependency>
142+
</dependencies>
143+
</plugin>
132144
<plugin>
133145
<groupId>org.apache.maven.plugins</groupId>
134146
<artifactId>maven-source-plugin</artifactId>

‎token-client-kotlin-demo/pom.xml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -94,26 +94,6 @@
9494
<plugin>
9595
<groupId>org.jetbrains.kotlin</groupId>
9696
<artifactId>kotlin-maven-plugin</artifactId>
97-
<version>${kotlin.version}</version>
98-
<executions>
99-
<execution>
100-
<id>compile</id>
101-
<goals>
102-
<goal>compile</goal>
103-
</goals>
104-
</execution>
105-
<execution>
106-
<id>test-compile</id>
107-
<goals>
108-
<goal>test-compile</goal>
109-
</goals>
110-
<configuration>
111-
<sourceDirs>
112-
<sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
113-
</sourceDirs>
114-
</configuration>
115-
</execution>
116-
</executions>
11797
</plugin>
11898
<plugin>
11999
<groupId>org.apache.maven.plugins</groupId>

‎token-client-spring-demo/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
<plugin>
5555
<groupId>org.springframework.boot</groupId>
5656
<artifactId>spring-boot-maven-plugin</artifactId>
57-
<version>${spring-boot.version}</version>
5857
</plugin>
5958
<plugin>
6059
<groupId>org.apache.maven.plugins</groupId>

‎token-client-spring/pom.xml

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -99,39 +99,6 @@
9999
<plugin>
100100
<groupId>org.jetbrains.kotlin</groupId>
101101
<artifactId>kotlin-maven-plugin</artifactId>
102-
<version>${kotlin.version}</version>
103-
<executions>
104-
<execution>
105-
<id>compile</id>
106-
<phase>compile</phase>
107-
<goals>
108-
<goal>compile</goal>
109-
</goals>
110-
</execution>
111-
<execution>
112-
<id>test-compile</id>
113-
<phase>test-compile</phase>
114-
<goals>
115-
<goal>test-compile</goal>
116-
</goals>
117-
</execution>
118-
</executions>
119-
<configuration>
120-
<args>
121-
<arg>-Xjsr305=strict</arg>
122-
</args>
123-
<compilerPlugins>
124-
<plugin>spring</plugin>
125-
</compilerPlugins>
126-
<jvmTarget>${java.version}</jvmTarget>
127-
</configuration>
128-
<dependencies>
129-
<dependency>
130-
<groupId>org.jetbrains.kotlin</groupId>
131-
<artifactId>kotlin-maven-allopen</artifactId>
132-
<version>${kotlin.version}</version>
133-
</dependency>
134-
</dependencies>
135102
</plugin>
136103
<plugin>
137104
<groupId>org.apache.maven.plugins</groupId>

‎token-client-spring/src/main/kotlin/no/nav/security/token/support/client/spring/oauth2/DefaultOAuth2HttpClient.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ import org.springframework.http.RequestEntity
1111
import org.springframework.util.LinkedMultiValueMap
1212
import org.springframework.web.client.HttpStatusCodeException
1313
import org.springframework.web.client.RestOperations
14-
15-
open class DefaultOAuth2HttpClient(val restOperations: RestOperations) : OAuth2HttpClient {
14+
class DefaultOAuth2HttpClient(val restOperations: RestOperations) : OAuth2HttpClient {
1615
constructor(builder: RestTemplateBuilder) :this(builder.build())
1716

1817

‎token-validation-jaxrs/tree

Lines changed: 0 additions & 118 deletions
This file was deleted.

‎token-validation-ktor-demo/pom.xml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -83,22 +83,6 @@
8383
<plugin>
8484
<groupId>org.jetbrains.kotlin</groupId>
8585
<artifactId>kotlin-maven-plugin</artifactId>
86-
<version>${kotlin.version}</version>
87-
<executions>
88-
<execution>
89-
<id>compile</id>
90-
<goals><goal>compile</goal></goals>
91-
</execution>
92-
<execution>
93-
<id>test-compile</id>
94-
<goals><goal>test-compile</goal></goals>
95-
<configuration>
96-
<sourceDirs>
97-
<sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
98-
</sourceDirs>
99-
</configuration>
100-
</execution>
101-
</executions>
10286
</plugin>
10387
<plugin>
10488
<artifactId>maven-compiler-plugin</artifactId>

‎token-validation-ktor-v2/pom.xml

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -94,22 +94,6 @@
9494
<plugin>
9595
<groupId>org.jetbrains.kotlin</groupId>
9696
<artifactId>kotlin-maven-plugin</artifactId>
97-
<version>${kotlin.version}</version>
98-
<executions>
99-
<execution>
100-
<id>compile</id>
101-
<goals><goal>compile</goal></goals>
102-
</execution>
103-
<execution>
104-
<id>test-compile</id>
105-
<goals><goal>test-compile</goal></goals>
106-
<configuration>
107-
<sourceDirs>
108-
<sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
109-
</sourceDirs>
110-
</configuration>
111-
</execution>
112-
</executions>
11397
</plugin>
11498
<plugin>
11599
<groupId>org.apache.maven.plugins</groupId>
@@ -149,4 +133,4 @@
149133
</build>
150134
</profile>
151135
</profiles>
152-
</project>
136+
</project>

‎token-validation-ktor/pom.xml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -89,22 +89,6 @@
8989
<plugin>
9090
<groupId>org.jetbrains.kotlin</groupId>
9191
<artifactId>kotlin-maven-plugin</artifactId>
92-
<version>${kotlin.version}</version>
93-
<executions>
94-
<execution>
95-
<id>compile</id>
96-
<goals><goal>compile</goal></goals>
97-
</execution>
98-
<execution>
99-
<id>test-compile</id>
100-
<goals><goal>test-compile</goal></goals>
101-
<configuration>
102-
<sourceDirs>
103-
<sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
104-
</sourceDirs>
105-
</configuration>
106-
</execution>
107-
</executions>
10892
</plugin>
10993
<plugin>
11094
<groupId>org.apache.maven.plugins</groupId>

‎token-validation-spring-demo/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
<plugin>
5858
<groupId>org.springframework.boot</groupId>
5959
<artifactId>spring-boot-maven-plugin</artifactId>
60-
<version>${spring-boot.version}</version>
6160
</plugin>
6261
<plugin>
6362
<groupId>org.apache.maven.plugins</groupId>

0 commit comments

Comments
 (0)