Skip to content

Commit 7705b04

Browse files
smcvbsmcvb
committed
Merge branch 'axon-kafka-4.11.x'
# Conflicts: # .github/dependabot.yml # pom.xml
2 parents 7bd8117 + 209a43a commit 7705b04

File tree

5 files changed

+95
-80
lines changed

5 files changed

+95
-80
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: 18
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: 18
33-
reviewers:
34-
- "AxonFramework/framework-developers"
3531
groups:
3632
maven-dependencies:
3733
update-types:

‎kafka-axon-example/pom.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -129,14 +129,6 @@
129129
<encoding>UTF-8</encoding>
130130
</configuration>
131131
</plugin>
132-
<plugin>
133-
<groupId>org.apache.maven.plugins</groupId>
134-
<artifactId>maven-deploy-plugin</artifactId>
135-
<version>${maven-deploy.version}</version>
136-
<configuration>
137-
<skip>true</skip>
138-
</configuration>
139-
</plugin>
140132
<plugin>
141133
<groupId>org.springframework.boot</groupId>
142134
<artifactId>spring-boot-maven-plugin</artifactId>

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
<profiles>
4747
<profile>
48-
<id>release-sign-artifacts</id>
48+
<id>sign</id>
4949
<activation>
5050
<property>
5151
<name>performRelease</name>
@@ -96,8 +96,13 @@
9696
</configuration>
9797
</plugin>
9898
<plugin>
99-
<artifactId>maven-deploy-plugin</artifactId>
100-
<version>${maven-deploy.version}</version>
99+
<groupId>org.sonatype.central</groupId>
100+
<artifactId>central-publishing-maven-plugin</artifactId>
101+
<version>0.7.0</version>
102+
<extensions>true</extensions>
103+
<configuration>
104+
<publishingServerId>central</publishingServerId>
105+
</configuration>
101106
</plugin>
102107
<plugin>
103108
<artifactId>maven-compiler-plugin</artifactId>

‎pom.xml

Lines changed: 86 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@
6969
<mockito.version>4.11.0</mockito.version>
7070
<awaitility.version>4.2.0</awaitility.version>
7171
<!-- Plugins -->
72+
<central-publishing-maven-plugin.version>0.7.0</central-publishing-maven-plugin.version>
7273
<jacoco-maven.version>0.8.11</jacoco-maven.version>
7374
<maven-assembly.version>3.7.1</maven-assembly.version>
7475
<maven-clean-plugin.version>3.4.1</maven-clean-plugin.version>
7576
<maven-compiler.version>3.14.0</maven-compiler.version>
76-
<maven-deploy.version>3.1.2</maven-deploy.version>
7777
<maven-enforcer.version>3.5.0</maven-enforcer.version>
7878
<maven-failsafe.version>3.5.3</maven-failsafe.version>
7979
<maven-gpg.version>3.2.7</maven-gpg.version>
@@ -326,41 +326,19 @@
326326
</archive>
327327
</configuration>
328328
</plugin>
329+
<!-- deploy -->
329330
<plugin>
330-
<artifactId>maven-javadoc-plugin</artifactId>
331-
<version>${maven-javadoc.version}</version>
332-
<executions>
333-
<execution>
334-
<id>attach-javadoc</id>
335-
<phase>package</phase>
336-
<goals>
337-
<goal>jar</goal>
338-
</goals>
339-
</execution>
340-
</executions>
331+
<groupId>org.sonatype.central</groupId>
332+
<artifactId>central-publishing-maven-plugin</artifactId>
333+
<version>${central-publishing-maven-plugin.version}</version>
334+
<extensions>true</extensions>
341335
<configuration>
342-
<doclint>none</doclint>
343-
<detectJavaApiLink>false</detectJavaApiLink>
336+
<excludeArtifacts>
337+
kafka-axon-example
338+
</excludeArtifacts>
339+
<publishingServerId>central</publishingServerId>
344340
</configuration>
345341
</plugin>
346-
<plugin>
347-
<artifactId>maven-source-plugin</artifactId>
348-
<version>${maven-source.version}</version>
349-
<executions>
350-
<execution>
351-
<id>attach-sources</id>
352-
<phase>package</phase>
353-
<goals>
354-
<goal>jar-no-fork</goal>
355-
</goals>
356-
</execution>
357-
</executions>
358-
</plugin>
359-
<!-- deploy -->
360-
<plugin>
361-
<artifactId>maven-deploy-plugin</artifactId>
362-
<version>${maven-deploy.version}</version>
363-
</plugin>
364342
<plugin>
365343
<!-- just to make sure deployed artifacts are always built (and tested) using JDK 8+ -->
366344
<artifactId>maven-enforcer-plugin</artifactId>
@@ -389,10 +367,14 @@
389367
<artifactId>maven-release-plugin</artifactId>
390368
<version>${maven-release.version}</version>
391369
<configuration>
370+
<!-- prepare goal configuration -->
392371
<mavenExecutorId>forked-path</mavenExecutorId>
393-
<localCheckout>true</localCheckout>
394372
<pushChanges>false</pushChanges>
395-
<releaseProfiles>release-sign-artifacts</releaseProfiles>
373+
<autoVersionSubmodules>true</autoVersionSubmodules>
374+
<!-- perform goal configuration -->
375+
<mavenExecutorId>forked-path</mavenExecutorId>
376+
<localCheckout>true</localCheckout>
377+
<releaseProfiles>javadoc,sources,sign</releaseProfiles>
396378
<tagNameFormat>axon-kafka-@{project.version}</tagNameFormat>
397379
</configuration>
398380
</plugin>
@@ -526,7 +508,72 @@
526508
</profile>
527509

528510
<profile>
529-
<id>release-sign-artifacts</id>
511+
<id>sources</id>
512+
<build>
513+
<plugins>
514+
<plugin>
515+
<artifactId>maven-source-plugin</artifactId>
516+
<version>${maven-source.version}</version>
517+
<executions>
518+
<execution>
519+
<id>attach-sources</id>
520+
<phase>package</phase>
521+
<goals>
522+
<goal>jar-no-fork</goal>
523+
</goals>
524+
</execution>
525+
</executions>
526+
</plugin>
527+
</plugins>
528+
</build>
529+
</profile>
530+
531+
<profile>
532+
<id>javadoc</id>
533+
<build>
534+
<plugins>
535+
<plugin>
536+
<artifactId>maven-javadoc-plugin</artifactId>
537+
<version>${maven-javadoc.version}</version>
538+
<executions>
539+
<execution>
540+
<id>attach-javadoc</id>
541+
<phase>package</phase>
542+
<goals>
543+
<goal>jar</goal>
544+
</goals>
545+
</execution>
546+
</executions>
547+
<configuration>
548+
<doclint>none</doclint>
549+
<detectJavaApiLink>false</detectJavaApiLink>
550+
<!-- These parameters are in preparation for resolution of this issue: -->
551+
<!-- https://bugs.openjdk.java.net/browse/JDK-8068562 -->
552+
<tags>
553+
<tag>
554+
<name>apiNote</name>
555+
<placement>a</placement>
556+
<head>API Note:</head>
557+
</tag>
558+
<tag>
559+
<name>implSpec</name>
560+
<placement>a</placement>
561+
<head>Implementation Requirements:</head>
562+
</tag>
563+
<tag>
564+
<name>implNote</name>
565+
<placement>a</placement>
566+
<head>Implementation Note:</head>
567+
</tag>
568+
</tags>
569+
</configuration>
570+
</plugin>
571+
</plugins>
572+
</build>
573+
</profile>
574+
575+
<profile>
576+
<id>sign</id>
530577
<build>
531578
<plugins>
532579
<plugin>
@@ -548,32 +595,6 @@
548595
</profile>
549596
</profiles>
550597

551-
<repositories>
552-
<repository>
553-
<id>sonatype</id>
554-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
555-
<snapshots>
556-
<enabled>true</enabled>
557-
<updatePolicy>always</updatePolicy>
558-
<checksumPolicy>fail</checksumPolicy>
559-
</snapshots>
560-
</repository>
561-
</repositories>
562-
563-
<!-- deploy and release configuration -->
564-
<distributionManagement>
565-
<snapshotRepository>
566-
<id>sonatype</id>
567-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
568-
<uniqueVersion>true</uniqueVersion>
569-
</snapshotRepository>
570-
<repository>
571-
<id>sonatype</id>
572-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
573-
<uniqueVersion>false</uniqueVersion>
574-
</repository>
575-
</distributionManagement>
576-
577598
<scm>
578599
<connection>scm:git:git://github.com/AxonFramework/extension-kafka.git</connection>
579600
<developerConnection>scm:git:git@github.com:AxonFramework/extension-kafka.git</developerConnection>
@@ -601,17 +622,17 @@
601622
</roles>
602623
</developer>
603624
<developer>
604-
<name>Gerard Klijs</name>
605-
<email>gerard.klijs@axoniq.io</email>
625+
<name>Mitchell Herrijgers</name>
626+
<email>mitchell.herrijgers@axoniq.io</email>
606627
<organization>AxonIQ</organization>
607628
<organizationUrl>https://axoniq.io</organizationUrl>
608629
<roles>
609630
<role>Developer</role>
610631
</roles>
611632
</developer>
612633
<developer>
613-
<name>Mitchell Herrijgers</name>
614-
<email>mitchell.herrijgers@axoniq.io</email>
634+
<name>Mateusz Nowak</name>
635+
<email>mateusz.nowak@axoniq.io</email>
615636
<organization>AxonIQ</organization>
616637
<organizationUrl>https://axoniq.io</organizationUrl>
617638
<roles>

0 commit comments

Comments
 (0)