Skip to content

Commit 7bdd3ef

Browse files
smcvbsmcvb
committed
Merge branch 'axon-spring-aot-4.11.x'
# Conflicts: # pom.xml
2 parents 9219fbc + 2cb9e4d commit 7bdd3ef

File tree

4 files changed

+83
-57
lines changed

4 files changed

+83
-57
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: 9
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: 9
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
@@ -36,7 +36,7 @@ jobs:
3636
- name: Build with Coverage reports
3737
if: matrix.sonar-enabled
3838
run: |
39-
./mvnw -B -U -Dstyle.color=always -Possrh -Dcoverage clean verify
39+
./mvnw -B -U -Dstyle.color=always -Dcoverage clean verify
4040
4141
- name: Sonar Analysis
4242
if: ${{ success() && matrix.sonar-enabled && github.event.pull_request.head.repo.full_name == github.repository }}

‎pom.xml‎

Lines changed: 81 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
~ limitations under the License.
1616
-->
1717

18-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
18+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1920

2021
<groupId>org.axonframework.extensions.spring-aot</groupId>
2122
<artifactId>axon-spring-aot</artifactId>
@@ -59,11 +60,11 @@
5960
<mockito.version>5.18.0</mockito.version>
6061
<netty.version>4.2.1.Final</netty.version>
6162
<!-- Build / Plugin -->
63+
<central-publishing-maven-plugin.version>0.7.0</central-publishing-maven-plugin.version>
6264
<jacoco-maven.version>0.8.13</jacoco-maven.version>
6365
<maven-assembly.version>3.7.1</maven-assembly.version>
6466
<maven-clean.version>3.4.1</maven-clean.version>
6567
<maven-compiler.version>3.14.0</maven-compiler.version>
66-
<maven-deploy.version>3.1.4</maven-deploy.version>
6768
<maven-gpg.version>3.2.7</maven-gpg.version>
6869
<maven-install.version>3.1.4</maven-install.version>
6970
<maven-jar.version>3.4.2</maven-jar.version>
@@ -268,51 +269,29 @@
268269
</archive>
269270
</configuration>
270271
</plugin>
272+
<!-- deploy -->
271273
<plugin>
272-
<artifactId>maven-javadoc-plugin</artifactId>
273-
<version>${maven-javadoc.version}</version>
274-
<executions>
275-
<execution>
276-
<id>attach-javadoc</id>
277-
<phase>package</phase>
278-
<goals>
279-
<goal>jar</goal>
280-
</goals>
281-
</execution>
282-
</executions>
274+
<groupId>org.sonatype.central</groupId>
275+
<artifactId>central-publishing-maven-plugin</artifactId>
276+
<version>${central-publishing-maven-plugin.version}</version>
277+
<extensions>true</extensions>
283278
<configuration>
284-
<doclint>none</doclint>
279+
<publishingServerId>central</publishingServerId>
285280
</configuration>
286281
</plugin>
287-
<plugin>
288-
<artifactId>maven-source-plugin</artifactId>
289-
<version>${maven-source.version}</version>
290-
<executions>
291-
<execution>
292-
<id>attach-sources</id>
293-
<phase>package</phase>
294-
<goals>
295-
<goal>jar-no-fork</goal>
296-
</goals>
297-
</execution>
298-
</executions>
299-
</plugin>
300-
<!-- deploy -->
301-
<plugin>
302-
<artifactId>maven-deploy-plugin</artifactId>
303-
<version>${maven-deploy.version}</version>
304-
</plugin>
305282
<plugin>
306283
<artifactId>maven-release-plugin</artifactId>
307284
<version>${maven-release.version}</version>
308285
<configuration>
309286
<!-- prepare goal configuration -->
310287
<mavenExecutorId>forked-path</mavenExecutorId>
311288
<pushChanges>false</pushChanges>
289+
<autoVersionSubmodules>true</autoVersionSubmodules>
312290
<!-- perform goal configuration -->
313291
<mavenExecutorId>forked-path</mavenExecutorId>
314292
<localCheckout>true</localCheckout>
315-
<releaseProfiles>release-sign-artifacts</releaseProfiles>
293+
<releaseProfiles>javadoc,sources,sign</releaseProfiles>
294+
<tagNameFormat>axon-spring-aot-@{project.version}</tagNameFormat>
316295
</configuration>
317296
</plugin>
318297
<plugin>
@@ -355,7 +334,71 @@
355334
</profile>
356335

357336
<profile>
358-
<id>release-sign-artifacts</id>
337+
<id>sources</id>
338+
<build>
339+
<plugins>
340+
<plugin>
341+
<artifactId>maven-source-plugin</artifactId>
342+
<version>${maven-source.version}</version>
343+
<executions>
344+
<execution>
345+
<id>attach-sources</id>
346+
<phase>package</phase>
347+
<goals>
348+
<goal>jar-no-fork</goal>
349+
</goals>
350+
</execution>
351+
</executions>
352+
</plugin>
353+
</plugins>
354+
</build>
355+
</profile>
356+
357+
<profile>
358+
<id>javadoc</id>
359+
<build>
360+
<plugins>
361+
<plugin>
362+
<artifactId>maven-javadoc-plugin</artifactId>
363+
<version>${maven-javadoc.version}</version>
364+
<executions>
365+
<execution>
366+
<id>attach-javadoc</id>
367+
<phase>package</phase>
368+
<goals>
369+
<goal>jar</goal>
370+
</goals>
371+
</execution>
372+
</executions>
373+
<configuration>
374+
<doclint>none</doclint>
375+
<!-- These parameters are in preparation for resolution of this issue: -->
376+
<!-- https://bugs.openjdk.java.net/browse/JDK-8068562 -->
377+
<tags>
378+
<tag>
379+
<name>apiNote</name>
380+
<placement>a</placement>
381+
<head>API Note:</head>
382+
</tag>
383+
<tag>
384+
<name>implSpec</name>
385+
<placement>a</placement>
386+
<head>Implementation Requirements:</head>
387+
</tag>
388+
<tag>
389+
<name>implNote</name>
390+
<placement>a</placement>
391+
<head>Implementation Note:</head>
392+
</tag>
393+
</tags>
394+
</configuration>
395+
</plugin>
396+
</plugins>
397+
</build>
398+
</profile>
399+
400+
<profile>
401+
<id>sign</id>
359402
<build>
360403
<plugins>
361404
<plugin>
@@ -377,20 +420,6 @@
377420
</profile>
378421
</profiles>
379422

380-
<!-- Deploy and release configuration -->
381-
<distributionManagement>
382-
<snapshotRepository>
383-
<id>sonatype</id>
384-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
385-
<uniqueVersion>true</uniqueVersion>
386-
</snapshotRepository>
387-
<repository>
388-
<id>sonatype</id>
389-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
390-
<uniqueVersion>false</uniqueVersion>
391-
</repository>
392-
</distributionManagement>
393-
394423
<scm>
395424
<connection>scm:git:git://github.com/AxonFramework/extension-spring-aot.git</connection>
396425
<developerConnection>scm:git:git@github.com:AxonFramework/extension-spring-aot.git</developerConnection>
@@ -418,17 +447,17 @@
418447
</roles>
419448
</developer>
420449
<developer>
421-
<name>Gerard Klijs</name>
422-
<email>gerard.klijs@axoniq.io</email>
450+
<name>Mitchell Herrijgers</name>
451+
<email>mitchell.herrijgers@axoniq.io</email>
423452
<organization>AxonIQ</organization>
424453
<organizationUrl>https://axoniq.io</organizationUrl>
425454
<roles>
426455
<role>Developer</role>
427456
</roles>
428457
</developer>
429458
<developer>
430-
<name>Mitchell Herrijgers</name>
431-
<email>mitchell.herrijgers@axoniq.io</email>
459+
<name>Mateusz Nowak</name>
460+
<email>mateusz.nowak@axoniq.io</email>
432461
<organization>AxonIQ</organization>
433462
<organizationUrl>https://axoniq.io</organizationUrl>
434463
<roles>

0 commit comments

Comments
 (0)