Skip to content

Commit

Permalink
Merge branch 'release/2023.10.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
jangalinski committed Oct 16, 2023
2 parents f08af72 + f676e68 commit 9b2aefb
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

9 changes: 6 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>io.toolisticon.maven.parent</groupId>
<artifactId>maven-parent-kotlin-base</artifactId>
<version>2023.9.1</version>
<version>2023.10.0</version>

<name>Maven Parent - Kotlin Base</name>
<description>Maven parent for a holistic kotlin lib project.</description>
Expand All @@ -26,7 +26,7 @@
<kp.mainSources>${project.basedir}/src/main/kotlin</kp.mainSources>
<kp.mainResources>${project.basedir}/src/main/resources</kp.mainResources>
<kp.testSources>${project.basedir}/src/test/kotlin</kp.testSources>
<kp.testResources>${project.basedir}/src/test/kotlin</kp.testResources>
<kp.testResources>${project.basedir}/src/test/resources</kp.testResources>

<!-- set to true to skip deployment (of submodule e.g.) -->
<kp.plugin.skipDeploy>false</kp.plugin.skipDeploy>
Expand Down Expand Up @@ -214,6 +214,9 @@
<testResources>
<testResource>
<directory>${kp.testResources}</directory>
<includes>

</includes>
<excludes>
<exclude>.gitkeep</exclude>
</excludes>
Expand Down Expand Up @@ -413,7 +416,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.4.0</version>
<version>3.4.1</version>
<executions>
<execution>
<id>enforce-maven</id>
Expand Down

0 comments on commit 9b2aefb

Please sign in to comment.