Skip to content

Commit 9dffa3d

Browse files
bnasslahsenbnasslahsen
committed
pom.xml cleanup for #2944 
1 parent a68b42e commit 9dffa3d

File tree

3 files changed

+24
-129
lines changed
  • pom.xml
  • springdoc-openapi-tests
    • springdoc-openapi-kotlin-webmvc-tests
    • springdoc-openapi-security-tests

3 files changed

+24
-129
lines changed

‎pom.xml‎

Lines changed: 23 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,6 @@
3737
</developerConnection>
3838
<tag>HEAD</tag>
3939
</scm>
40-
<distributionManagement>
41-
<snapshotRepository>
42-
<id>ossrh</id>
43-
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
44-
</snapshotRepository>
45-
<repository>
46-
<id>ossrh</id>
47-
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
48-
</repository>
49-
</distributionManagement>
5040

5141
<modules>
5242
<module>springdoc-openapi-starter-common</module>
@@ -60,15 +50,16 @@
6050
<properties>
6151
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
6252
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
63-
<nexus-staging-maven-plugin>1.6.8</nexus-staging-maven-plugin>
53+
<central-publishing-maven-plugin.version>0.7.0
54+
</central-publishing-maven-plugin.version>
6455
<flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
6556
<swagger-api.version>2.2.30</swagger-api.version>
6657
<swagger-ui.version>5.21.0</swagger-ui.version>
6758
<gmavenplus-plugin.version>1.13.1</gmavenplus-plugin.version>
6859
<jjwt.version>0.9.1</jjwt.version>
6960
<therapi-runtime-javadoc.version>0.15.0</therapi-runtime-javadoc.version>
7061
<spring-cloud-function.version>4.2.2</spring-cloud-function.version>
71-
<spring-security-oauth2-authorization-server.version>1.4.0</spring-security-oauth2-authorization-server.version>
62+
<spring-security-oauth2-authorization-server.version>1.4.3</spring-security-oauth2-authorization-server.version>
7263
</properties>
7364

7465
<dependencyManagement>
@@ -85,100 +76,35 @@
8576
<artifactId>swagger-ui</artifactId>
8677
<version>${swagger-ui.version}</version>
8778
</dependency>
88-
<dependency>
89-
<groupId>javax.xml</groupId>
90-
<artifactId>jaxb-impl</artifactId>
91-
<version>${jaxb-impl.version}</version>
92-
</dependency>
93-
<dependency>
94-
<groupId>javax.jws</groupId>
95-
<artifactId>javax.jws-api</artifactId>
96-
<version>${javax.jws-api.version}</version>
97-
<scope>test</scope>
98-
</dependency>
9979
<dependency>
10080
<groupId>io.jsonwebtoken</groupId>
10181
<artifactId>jjwt</artifactId>
10282
<version>${jjwt.version}</version>
103-
<scope>test</scope>
104-
</dependency>
105-
<!-- spring Cloud -->
106-
<dependency>
107-
<groupId>org.springframework.cloud</groupId>
108-
<artifactId>spring-cloud-function-core</artifactId>
109-
<version>${spring-cloud-function.version}</version>
110-
</dependency>
111-
<dependency>
112-
<groupId>org.springframework.cloud</groupId>
113-
<artifactId>spring-cloud-function-web</artifactId>
114-
<version>${spring-cloud-function.version}</version>
115-
</dependency>
116-
<dependency>
117-
<groupId>org.springframework.cloud</groupId>
118-
<artifactId>spring-cloud-starter-function-web</artifactId>
119-
<version>${spring-cloud-function.version}</version>
12083
</dependency>
84+
<!-- spring Cloud Function-->
12185
<dependency>
12286
<groupId>org.springframework.cloud</groupId>
123-
<artifactId>spring-cloud-starter-function-webflux</artifactId>
87+
<artifactId>spring-cloud-function-dependencies</artifactId>
12488
<version>${spring-cloud-function.version}</version>
89+
<type>pom</type>
90+
<scope>import</scope>
12591
</dependency>
92+
<!-- spring Security Oauth2 Authorization Server-->
12693
<dependency>
12794
<groupId>org.springframework.security</groupId>
12895
<artifactId>spring-security-oauth2-authorization-server</artifactId>
12996
<version>${spring-security-oauth2-authorization-server.version}</version>
13097
</dependency>
131-
<!-- SpringDoc -->
132-
<dependency>
133-
<groupId>org.springdoc</groupId>
134-
<artifactId>springdoc-openapi-starter-common</artifactId>
135-
<version>${project.version}</version>
136-
</dependency>
137-
<dependency>
138-
<groupId>org.springdoc</groupId>
139-
<artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
140-
<version>${project.version}</version>
141-
</dependency>
142-
<dependency>
143-
<groupId>org.springdoc</groupId>
144-
<artifactId>springdoc-openapi-starter-webflux-api</artifactId>
145-
<version>${project.version}</version>
146-
</dependency>
147-
<dependency>
148-
<groupId>org.springdoc</groupId>
149-
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
150-
<version>${project.version}</version>
151-
</dependency>
152-
<dependency>
153-
<groupId>org.springdoc</groupId>
154-
<artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
155-
<version>${project.version}</version>
156-
</dependency>
15798
</dependencies>
15899
</dependencyManagement>
159100
<dependencies>
160101
<dependency>
161102
<groupId>org.springframework.boot</groupId>
162103
<artifactId>spring-boot-starter-test</artifactId>
163104
<scope>test</scope>
164-
<exclusions>
165-
<exclusion>
166-
<groupId>org.junit.vintage</groupId>
167-
<artifactId>junit-vintage-engine</artifactId>
168-
</exclusion>
169-
</exclusions>
170105
</dependency>
171106
</dependencies>
172107
<build>
173-
<pluginManagement>
174-
<plugins>
175-
<plugin>
176-
<groupId>org.codehaus.gmavenplus</groupId>
177-
<artifactId>gmavenplus-plugin</artifactId>
178-
<version>${gmavenplus-plugin.version}</version>
179-
</plugin>
180-
</plugins>
181-
</pluginManagement>
182108
<plugins>
183109
<plugin>
184110
<groupId>org.apache.maven.plugins</groupId>
@@ -270,22 +196,15 @@
270196
</executions>
271197
</plugin>
272198
<plugin>
273-
<groupId>org.sonatype.plugins</groupId>
274-
<artifactId>nexus-staging-maven-plugin</artifactId>
275-
<version>${nexus-staging-maven-plugin}</version>
199+
<groupId>org.sonatype.central</groupId>
200+
<artifactId>central-publishing-maven-plugin</artifactId>
201+
<version>${central-publishing-maven-plugin.version}</version>
276202
<extensions>true</extensions>
277203
<configuration>
278-
<serverId>ossrh</serverId>
279-
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
280-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
204+
<publishingServerId>central</publishingServerId>
205+
<autoPublish>true</autoPublish>
206+
<waitUntil>published</waitUntil>
281207
</configuration>
282-
<dependencies>
283-
<dependency>
284-
<groupId>com.thoughtworks.xstream</groupId>
285-
<artifactId>xstream</artifactId>
286-
<version>1.4.15</version>
287-
</dependency>
288-
</dependencies>
289208
</plugin>
290209
<plugin>
291210
<artifactId>maven-release-plugin</artifactId>
@@ -303,43 +222,26 @@
303222
</profile>
304223
</profiles>
305224
<repositories>
306-
<repository>
307-
<id>central</id>
308-
<url>https://repo.maven.apache.org/maven2</url>
309-
<snapshots>
310-
<enabled>false</enabled>
311-
</snapshots>
312-
</repository>
313-
<repository>
314-
<id>spring-release</id>
315-
<name>Spring release</name>
316-
<url>https://repo.spring.io/release</url>
317-
<snapshots>
318-
<enabled>false</enabled>
319-
</snapshots>
320-
</repository>
321-
<repository>
322-
<id>spring-snapshot</id>
323-
<name>Spring Snapshots</name>
324-
<url>https://repo.spring.io/snapshot</url>
325-
<snapshots>
326-
<enabled>true</enabled>
327-
</snapshots>
328-
</repository>
329225
<repository>
330226
<id>spring-milestones</id>
331227
<name>Spring Milestones</name>
332228
<url>https://repo.spring.io/milestone</url>
229+
<releases>
230+
<enabled>true</enabled>
231+
</releases>
333232
<snapshots>
334233
<enabled>false</enabled>
335234
</snapshots>
336235
</repository>
337236
</repositories>
338237
<pluginRepositories>
339238
<pluginRepository>
340-
<id>spring-releases</id>
341-
<name>Spring Releases</name>
342-
<url>https://repo.spring.io/release</url>
239+
<id>spring-milestones</id>
240+
<name>Spring Milestones</name>
241+
<url>https://repo.spring.io/milestone</url>
242+
<releases>
243+
<enabled>true</enabled>
244+
</releases>
343245
<snapshots>
344246
<enabled>false</enabled>
345247
</snapshots>

‎springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/pom.xml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<dependency>
1717
<groupId>org.springdoc</groupId>
1818
<artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
19+
<version>${project.version}</version>
1920
<scope>test</scope>
2021
</dependency>
2122
<dependency>
@@ -28,11 +29,6 @@
2829
<artifactId>spring-boot-starter-web</artifactId>
2930
<scope>test</scope>
3031
</dependency>
31-
<dependency>
32-
<groupId>org.springframework.boot</groupId>
33-
<artifactId>spring-boot-starter-test</artifactId>
34-
<scope>test</scope>
35-
</dependency>
3632
</dependencies>
3733

3834
<build>

‎springdoc-openapi-tests/springdoc-openapi-security-tests/pom.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
<version>2.8.7-SNAPSHOT</version>
77
</parent>
88
<artifactId>springdoc-openapi-security-tests</artifactId>
9-
<properties>
10-
<jaxb-impl.version>2.1</jaxb-impl.version>
11-
</properties>
129
<dependencies>
1310
<dependency>
1411
<groupId>org.springframework.security</groupId>

0 commit comments

Comments
 (0)