Skip to content

Commit 82eb0eb

Browse files
committed
Merge branch 'axon-kotlin-4.11.x'
# Conflicts: # pom.xml
2 parents 67f7604 + d32a9d9 commit 82eb0eb

File tree

4 files changed

+45
-65
lines changed

4 files changed

+45
-65
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: 10
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: 10
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: 43 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@
6666
<junit.jupiter.version>5.10.1</junit.jupiter.version>
6767
<mockk.version>1.12.4</mockk.version>
6868
<!-- Build -->
69+
<central-publishing-maven-plugin.version>0.7.0</central-publishing-maven-plugin.version>
6970
<dokka.version>1.9.20</dokka.version>
7071
<jacoco-maven.version>0.8.11</jacoco-maven.version>
7172
<maven-assembly.version>3.7.1</maven-assembly.version>
7273
<maven-clean.version>3.4.1</maven-clean.version>
7374
<maven-compiler.version>3.14.0</maven-compiler.version>
74-
<maven-deploy.version>3.1.4</maven-deploy.version>
7575
<maven-enforcer.version>3.5.0</maven-enforcer.version>
7676
<maven-gpg.version>3.2.7</maven-gpg.version>
7777
<maven-install.version>3.1.4</maven-install.version>
@@ -420,23 +420,15 @@
420420
</archive>
421421
</configuration>
422422
</plugin>
423-
<plugin>
424-
<artifactId>maven-source-plugin</artifactId>
425-
<version>${maven-source.version}</version>
426-
<executions>
427-
<execution>
428-
<id>attach-sources</id>
429-
<phase>package</phase>
430-
<goals>
431-
<goal>jar-no-fork</goal>
432-
</goals>
433-
</execution>
434-
</executions>
435-
</plugin>
436423
<!-- deploy -->
437424
<plugin>
438-
<artifactId>maven-deploy-plugin</artifactId>
439-
<version>${maven-deploy.version}</version>
425+
<groupId>org.sonatype.central</groupId>
426+
<artifactId>central-publishing-maven-plugin</artifactId>
427+
<version>${central-publishing-maven-plugin.version}</version>
428+
<extensions>true</extensions>
429+
<configuration>
430+
<publishingServerId>central</publishingServerId>
431+
</configuration>
440432
</plugin>
441433
<plugin>
442434
<!-- just to make sure deployed artifacts are always built (and tested) using JDK 8+ -->
@@ -466,10 +458,14 @@
466458
<artifactId>maven-release-plugin</artifactId>
467459
<version>${maven-release.version}</version>
468460
<configuration>
461+
<!-- prepare goal configuration -->
469462
<mavenExecutorId>forked-path</mavenExecutorId>
470-
<localCheckout>true</localCheckout>
471463
<pushChanges>false</pushChanges>
472-
<releaseProfiles>release-sign-artifacts,docs-and-sources</releaseProfiles>
464+
<autoVersionSubmodules>true</autoVersionSubmodules>
465+
<!-- perform goal configuration -->
466+
<mavenExecutorId>forked-path</mavenExecutorId>
467+
<localCheckout>true</localCheckout>
468+
<releaseProfiles>sources,sign,docs-and-sources</releaseProfiles>
473469
<tagNameFormat>axon-kotlin-@{project.version}</tagNameFormat>
474470
</configuration>
475471
</plugin>
@@ -518,6 +514,27 @@
518514
</build>
519515
</profile>
520516

517+
<profile>
518+
<id>sources</id>
519+
<build>
520+
<plugins>
521+
<plugin>
522+
<artifactId>maven-source-plugin</artifactId>
523+
<version>${maven-source.version}</version>
524+
<executions>
525+
<execution>
526+
<id>attach-sources</id>
527+
<phase>package</phase>
528+
<goals>
529+
<goal>jar-no-fork</goal>
530+
</goals>
531+
</execution>
532+
</executions>
533+
</plugin>
534+
</plugins>
535+
</build>
536+
</profile>
537+
521538
<profile>
522539
<id>docs-and-sources</id>
523540
<build>
@@ -534,7 +551,7 @@
534551
</profile>
535552

536553
<profile>
537-
<id>release-sign-artifacts</id>
554+
<id>sign</id>
538555
<activation>
539556
<property>
540557
<name>performRelease</name>
@@ -562,18 +579,6 @@
562579
</profile>
563580
</profiles>
564581

565-
<repositories>
566-
<repository>
567-
<id>sonatype</id>
568-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
569-
<snapshots>
570-
<enabled>true</enabled>
571-
<updatePolicy>always</updatePolicy>
572-
<checksumPolicy>fail</checksumPolicy>
573-
</snapshots>
574-
</repository>
575-
</repositories>
576-
577582
<pluginRepositories>
578583
<pluginRepository>
579584
<id>jcenter</id>
@@ -582,19 +587,6 @@
582587
</pluginRepository>
583588
</pluginRepositories>
584589

585-
<!-- deploy and release configuration -->
586-
<distributionManagement>
587-
<snapshotRepository>
588-
<id>sonatype</id>
589-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
590-
<uniqueVersion>true</uniqueVersion>
591-
</snapshotRepository>
592-
<repository>
593-
<id>sonatype</id>
594-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
595-
<uniqueVersion>false</uniqueVersion>
596-
</repository>
597-
</distributionManagement>
598590

599591
<scm>
600592
<connection>scm:git:git://github.com/AxonFramework/extension-kotlin.git</connection>
@@ -623,15 +615,6 @@
623615
<role>Lead Developer</role>
624616
</roles>
625617
</developer>
626-
<developer>
627-
<name>Gerard Klijs</name>
628-
<email>gerard.klijs@axoniq.io</email>
629-
<organization>AxonIQ</organization>
630-
<organizationUrl>https://axoniq.io</organizationUrl>
631-
<roles>
632-
<role>Developer</role>
633-
</roles>
634-
</developer>
635618
<developer>
636619
<name>Mitchell Herrijgers</name>
637620
<email>mitchell.herrijgers@axoniq.io</email>
@@ -642,13 +625,13 @@
642625
</roles>
643626
</developer>
644627
<developer>
645-
<name>Stefan Andjelkovic</name>
646-
<email>stefan.andjelkovic@axoniq.io</email>
647-
<organization>AxonIQ</organization>
648-
<organizationUrl>https://axoniq.io</organizationUrl>
649-
<roles>
650-
<role>Developer</role>
651-
</roles>
628+
<name>Mateusz Nowak</name>
629+
<email>mateusz.nowak@axoniq.io</email>
630+
<organization>AxonIQ</organization>
631+
<organizationUrl>https://axoniq.io</organizationUrl>
632+
<roles>
633+
<role>Developer</role>
634+
</roles>
652635
</developer>
653636
<developer>
654637
<name>Simon Zambrovski</name>

0 commit comments

Comments
 (0)