Skip to content

Commit

Permalink
Merge branch 'release/v1.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
John-Chan committed Mar 26, 2024
2 parents 8e90474 + 559e59a commit e829d86
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 18 deletions.
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.power4j.archetype</groupId>
<artifactId>oss-lib-multi</artifactId>
<version>1.0.1</version>
<version>1.1.0</version>
<packaging>maven-archetype</packaging>

<name>${project.artifactId}</name>
Expand Down Expand Up @@ -44,9 +44,9 @@

<!-- plugin -->
<maven-archetype-plugin.version>3.2.1</maven-archetype-plugin.version>
<maven-flatten-plugin.version>1.3.0</maven-flatten-plugin.version>
<maven-flatten-plugin.version>1.6.0</maven-flatten-plugin.version>
<maven-source-plugin.version>3.3.0</maven-source-plugin.version>
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
</properties>

<build>
Expand Down Expand Up @@ -162,7 +162,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.3</version>
<configuration>
<encoding>UTF-8</encoding>
<charset>UTF-8</charset>
Expand All @@ -183,7 +183,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.1</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<groupId>${groupId}</groupId>
<artifactId>${rootArtifactId}-dependencies</artifactId>
<version>#[[${revision}]]#</version>
<relativePath>../${rootArtifactId}-dependencies</relativePath>
<relativePath>../${rootArtifactId}-dependencies/pom.xml</relativePath>
</parent>

<artifactId>${rootArtifactId}-build</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<groupId>${groupId}</groupId>
<artifactId>${rootArtifactId}-build</artifactId>
<version>#[[${revision}]]#</version>
<relativePath>../${rootArtifactId}-build</relativePath>
<relativePath>../${rootArtifactId}-build/pom.xml</relativePath>
</parent>

<artifactId>${rootArtifactId}-core</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<groupId>${groupId}</groupId>
<artifactId>${rootArtifactId}</artifactId>
<version>#[[${revision}]]#</version>
<relativePath>../</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>${rootArtifactId}-dependencies</artifactId>
Expand Down
22 changes: 12 additions & 10 deletions src/main/resources/archetype-resources/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,21 +50,23 @@
<maven.compiler.source>1.8</maven.compiler.source>

<!-- Plugin versions -->
<spring-javaformat.plugin.version>0.0.39</spring-javaformat.plugin.version>
<flatten-maven-plugin.version>1.3.0</flatten-maven-plugin.version>
<spring-javaformat.plugin.version>0.0.41</spring-javaformat.plugin.version>
<flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
<maven-source-plugin.version>3.3.0</maven-source-plugin.version>
<git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
<maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
<maven-dependency-plugin.version>3.6.0</maven-dependency-plugin.version>
<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
<maven-dependency-plugin.version>3.6.1</maven-dependency-plugin.version>
<maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
<maven-gpg-plugin.version>3.2.1</maven-gpg-plugin.version>

<!-- library versions -->
<spring-boot.version>3.0.9</spring-boot.version>
<spring-boot.version>3.2.4</spring-boot.version>
<commons-io.version>2.13.0</commons-io.version>
<commons-codec.version>1.16.0</commons-codec.version>
<commons-codec.version>1.16.1</commons-codec.version>
<commons-lang3.version>3.12.0</commons-lang3.version>
<commons-compress.version>1.23.0</commons-compress.version>
<commons-compress.version>1.26.1</commons-compress.version>
<commons-collections4.version>4.4</commons-collections4.version>
</properties>

Expand Down Expand Up @@ -228,7 +230,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.5.0</version>
<version>#[[${maven-javadoc-plugin.version}]]#</version>
<configuration>
<encoding>UTF-8</encoding>
<charset>UTF-8</charset>
Expand All @@ -249,7 +251,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.1.0</version>
<version>#[[${maven-gpg-plugin.version}]]#</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand Down

0 comments on commit e829d86

Please sign in to comment.