Skip to content

Commit a7e38b7

Browse files
smcvbsmcvb
committed
Merge branch 'axon-springcloud-4.11.x'
# Conflicts: # pom.xml
2 parents 3bb97f9 + 8665c2d commit a7e38b7

File tree

5 files changed

+93
-85
lines changed

5 files changed

+93
-85
lines changed

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @AxonFramework/framework-developers

‎.github/dependabot.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ updates:
1111
- "Type: Dependency Upgrade"
1212
- "Priority 1: Must"
1313
milestone: 15
14-
reviewers:
15-
- "AxonFramework/framework-developers"
1614
groups:
1715
github-dependencies:
1816
update-types:
@@ -30,8 +28,6 @@ updates:
3028
- "Type: Dependency Upgrade"
3129
- "Priority 1: Must"
3230
milestone: 15
33-
reviewers:
34-
- "AxonFramework/framework-developers"
3531
groups:
3632
maven-dependencies:
3733
update-types:

‎.github/workflows/pullrequest.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- name: Build with Coverage reports
4141
if: matrix.sonar-enabled
4242
run: |
43-
./mvnw -B -U -Dstyle.color=always -Possrh -Dcoverage clean verify
43+
./mvnw -B -U -Dstyle.color=always -Dcoverage clean verify
4444
4545
- name: Sonar Analysis
4646
if: ${{ success() && matrix.sonar-enabled && github.event.pull_request.head.repo.full_name == github.repository }}

‎pom.xml‎

Lines changed: 83 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@
6969
<javax-jaxb-api.version>2.3.1</javax-jaxb-api.version>
7070
<junit-jupiter.version>5.10.1</junit-jupiter.version>
7171
<mockito.version>4.11.0</mockito.version>
72-
72+
<!-- Build / Plugin -->
73+
<central-publishing-maven-plugin.version>0.7.0</central-publishing-maven-plugin.version>
7374
<jacoco-maven.version>0.8.11</jacoco-maven.version>
7475
<maven-assembly.version>3.7.1</maven-assembly.version>
7576
<maven-clean.version>3.4.1</maven-clean.version>
7677
<maven-compiler.version>3.14.0</maven-compiler.version>
77-
<maven-deploy.version>3.1.2</maven-deploy.version>
7878
<maven-enforcer.version>3.5.0</maven-enforcer.version>
7979
<maven-gpg.version>3.2.7</maven-gpg.version>
8080
<maven-install.version>3.1.4</maven-install.version>
@@ -301,40 +301,16 @@
301301
</archive>
302302
</configuration>
303303
</plugin>
304+
<!-- deploy -->
304305
<plugin>
305-
<artifactId>maven-javadoc-plugin</artifactId>
306-
<version>${maven-javadoc.version}</version>
307-
<executions>
308-
<execution>
309-
<id>attach-javadoc</id>
310-
<phase>package</phase>
311-
<goals>
312-
<goal>jar</goal>
313-
</goals>
314-
</execution>
315-
</executions>
306+
<groupId>org.sonatype.central</groupId>
307+
<artifactId>central-publishing-maven-plugin</artifactId>
308+
<version>${central-publishing-maven-plugin.version}</version>
309+
<extensions>true</extensions>
316310
<configuration>
317-
<doclint>none</doclint>
311+
<publishingServerId>central</publishingServerId>
318312
</configuration>
319313
</plugin>
320-
<plugin>
321-
<artifactId>maven-source-plugin</artifactId>
322-
<version>${maven-source.version}</version>
323-
<executions>
324-
<execution>
325-
<id>attach-sources</id>
326-
<phase>package</phase>
327-
<goals>
328-
<goal>jar-no-fork</goal>
329-
</goals>
330-
</execution>
331-
</executions>
332-
</plugin>
333-
<!-- deploy -->
334-
<plugin>
335-
<artifactId>maven-deploy-plugin</artifactId>
336-
<version>${maven-deploy.version}</version>
337-
</plugin>
338314
<plugin>
339315
<!-- just to make sure deployed artifacts are always built (and tested) using JDK 8+ -->
340316
<artifactId>maven-enforcer-plugin</artifactId>
@@ -363,10 +339,14 @@
363339
<artifactId>maven-release-plugin</artifactId>
364340
<version>${maven-release.version}</version>
365341
<configuration>
342+
<!-- prepare goal configuration -->
366343
<mavenExecutorId>forked-path</mavenExecutorId>
367-
<localCheckout>true</localCheckout>
368344
<pushChanges>false</pushChanges>
369-
<releaseProfiles>release-sign-artifacts</releaseProfiles>
345+
<autoVersionSubmodules>true</autoVersionSubmodules>
346+
<!-- perform goal configuration -->
347+
<mavenExecutorId>forked-path</mavenExecutorId>
348+
<localCheckout>true</localCheckout>
349+
<releaseProfiles>javadoc,sources,sign</releaseProfiles>
370350
<tagNameFormat>axon-springcloud-@{project.version}</tagNameFormat>
371351
</configuration>
372352
</plugin>
@@ -434,7 +414,71 @@
434414
</profile>
435415

436416
<profile>
437-
<id>release-sign-artifacts</id>
417+
<id>sources</id>
418+
<build>
419+
<plugins>
420+
<plugin>
421+
<artifactId>maven-source-plugin</artifactId>
422+
<version>${maven-source.version}</version>
423+
<executions>
424+
<execution>
425+
<id>attach-sources</id>
426+
<phase>package</phase>
427+
<goals>
428+
<goal>jar-no-fork</goal>
429+
</goals>
430+
</execution>
431+
</executions>
432+
</plugin>
433+
</plugins>
434+
</build>
435+
</profile>
436+
437+
<profile>
438+
<id>javadoc</id>
439+
<build>
440+
<plugins>
441+
<plugin>
442+
<artifactId>maven-javadoc-plugin</artifactId>
443+
<version>${maven-javadoc.version}</version>
444+
<executions>
445+
<execution>
446+
<id>attach-javadoc</id>
447+
<phase>package</phase>
448+
<goals>
449+
<goal>jar</goal>
450+
</goals>
451+
</execution>
452+
</executions>
453+
<configuration>
454+
<doclint>none</doclint>
455+
<!-- These parameters are in preparation for resolution of this issue: -->
456+
<!-- https://bugs.openjdk.java.net/browse/JDK-8068562 -->
457+
<tags>
458+
<tag>
459+
<name>apiNote</name>
460+
<placement>a</placement>
461+
<head>API Note:</head>
462+
</tag>
463+
<tag>
464+
<name>implSpec</name>
465+
<placement>a</placement>
466+
<head>Implementation Requirements:</head>
467+
</tag>
468+
<tag>
469+
<name>implNote</name>
470+
<placement>a</placement>
471+
<head>Implementation Note:</head>
472+
</tag>
473+
</tags>
474+
</configuration>
475+
</plugin>
476+
</plugins>
477+
</build>
478+
</profile>
479+
480+
<profile>
481+
<id>sign</id>
438482
<activation>
439483
<property>
440484
<name>performRelease</name>
@@ -462,32 +506,6 @@
462506
</profile>
463507
</profiles>
464508

465-
<repositories>
466-
<repository>
467-
<id>sonatype</id>
468-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
469-
<snapshots>
470-
<enabled>true</enabled>
471-
<updatePolicy>always</updatePolicy>
472-
<checksumPolicy>fail</checksumPolicy>
473-
</snapshots>
474-
</repository>
475-
</repositories>
476-
477-
<!-- deploy and release configuration -->
478-
<distributionManagement>
479-
<snapshotRepository>
480-
<id>sonatype</id>
481-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
482-
<uniqueVersion>true</uniqueVersion>
483-
</snapshotRepository>
484-
<repository>
485-
<id>sonatype</id>
486-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
487-
<uniqueVersion>false</uniqueVersion>
488-
</repository>
489-
</distributionManagement>
490-
491509
<scm>
492510
<connection>scm:git:git://github.com/AxonFramework/extension-springcloud.git</connection>
493511
<developerConnection>scm:git:[email protected]:AxonFramework/extension-springcloud.git</developerConnection>
@@ -515,17 +533,17 @@
515533
</roles>
516534
</developer>
517535
<developer>
518-
<name>Gerard Klijs</name>
519-
<email>gerard.klijs@axoniq.io</email>
536+
<name>Mitchell Herrijgers</name>
537+
<email>mitchell.herrijgers@axoniq.io</email>
520538
<organization>AxonIQ</organization>
521539
<organizationUrl>https://axoniq.io</organizationUrl>
522540
<roles>
523541
<role>Developer</role>
524542
</roles>
525543
</developer>
526544
<developer>
527-
<name>Mitchell Herrijgers</name>
528-
<email>mitchell.herrijgers@axoniq.io</email>
545+
<name>Mateusz Nowak</name>
546+
<email>mateusz.nowak@axoniq.io</email>
529547
<organization>AxonIQ</organization>
530548
<organizationUrl>https://axoniq.io</organizationUrl>
531549
<roles>

‎springcloud-spring-boot-starter/pom.xml‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757

5858
<profiles>
5959
<profile>
60-
<id>release-sign-artifacts</id>
60+
<id>sign</id>
6161
<activation>
6262
<property>
6363
<name>performRelease</name>
@@ -108,8 +108,13 @@
108108
</configuration>
109109
</plugin>
110110
<plugin>
111-
<artifactId>maven-deploy-plugin</artifactId>
112-
<version>3.1.1</version>
111+
<groupId>org.sonatype.central</groupId>
112+
<artifactId>central-publishing-maven-plugin</artifactId>
113+
<version>0.7.0</version>
114+
<extensions>true</extensions>
115+
<configuration>
116+
<publishingServerId>central</publishingServerId>
117+
</configuration>
113118
</plugin>
114119
<plugin>
115120
<artifactId>maven-compiler-plugin</artifactId>
@@ -139,18 +144,6 @@
139144
</plugins>
140145
</build>
141146

142-
<distributionManagement>
143-
<snapshotRepository>
144-
<id>sonatype</id>
145-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
146-
<uniqueVersion>true</uniqueVersion>
147-
</snapshotRepository>
148-
<repository>
149-
<id>sonatype</id>
150-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
151-
<uniqueVersion>false</uniqueVersion>
152-
</repository>
153-
</distributionManagement>
154147
<scm>
155148
<connection>scm:git:git://github.com/AxonFramework/extension-springcloud.git</connection>
156149
<developerConnection>scm:git:[email protected]:AxonFramework/extension-springcloud.git</developerConnection>

0 commit comments

Comments
 (0)