Skip to content

Commit 9b2aefb

Browse files
committed
Merge branch 'release/2023.10.0'
2 parents f08af72 + f676e68 commit 9b2aefb

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

.mvn/wrapper/maven-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
17+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
1818
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
1919

pom.xml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>io.toolisticon.maven.parent</groupId>
66
<artifactId>maven-parent-kotlin-base</artifactId>
7-
<version>2023.9.1</version>
7+
<version>2023.10.0</version>
88

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

3131
<!-- set to true to skip deployment (of submodule e.g.) -->
3232
<kp.plugin.skipDeploy>false</kp.plugin.skipDeploy>
@@ -214,6 +214,9 @@
214214
<testResources>
215215
<testResource>
216216
<directory>${kp.testResources}</directory>
217+
<includes>
218+
219+
</includes>
217220
<excludes>
218221
<exclude>.gitkeep</exclude>
219222
</excludes>
@@ -413,7 +416,7 @@
413416
<plugin>
414417
<groupId>org.apache.maven.plugins</groupId>
415418
<artifactId>maven-enforcer-plugin</artifactId>
416-
<version>3.4.0</version>
419+
<version>3.4.1</version>
417420
<executions>
418421
<execution>
419422
<id>enforce-maven</id>

0 commit comments

Comments
 (0)