Skip to content

Commit 06674e8

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop'
2 parents 386d3a1 + ea1bbc0 commit 06674e8

File tree

8 files changed

+35
-11
lines changed

8 files changed

+35
-11
lines changed

‎.github/workflows/maven-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
uses: actions/checkout@v4
2929

3030
- name: Setup JDK
31-
uses: actions/setup-java@v3
31+
uses: actions/setup-java@v4
3232
with:
3333
distribution: ${{ matrix.distribution }}
3434
java-version: ${{ matrix.java }}

‎.github/workflows/maven-deploy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
git config --global user.name "${{ secrets.GH_SITE_DEPLOY_NAME }}"
2626
2727
- name: Setup JDK
28-
uses: actions/setup-java@v3
28+
uses: actions/setup-java@v4
2929
with:
3030
distribution: temurin
3131
java-version: 11

‎parent_toplevel/changes.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,18 @@
2323
xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
2424
<body>
2525

26+
<release version="1.4.6" date="not released">
27+
<action type="update" dev="sseifert">
28+
Update to global-parent 60.
29+
</action>
30+
<action type="update" dev="sseifert">
31+
Update to reflow-maven-skin 1.2.0.
32+
</action>
33+
<action type="update" dev="sseifert">
34+
Update testing dependencies.
35+
</action>
36+
</release>
37+
2638
<release version="1.4.4" date="2024-01-25">
2739
<action type="update" dev="sseifert">
2840
Update to global-parent 56.

‎parent_toplevel/pom.xml‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<parent>
2626
<groupId>io.wcm.maven</groupId>
2727
<artifactId>io.wcm.maven.global-parent</artifactId>
28-
<version>56</version>
28+
<version>60</version>
2929
<relativePath />
3030
</parent>
3131

3232
<groupId>io.wcm.devops</groupId>
3333
<artifactId>io.wcm.devops.parent_toplevel</artifactId>
34-
<version>1.4.4</version>
34+
<version>1.4.6</version>
3535
<packaging>pom</packaging>
3636

3737
<name>Toplevel Parent</name>
@@ -84,7 +84,7 @@
8484
<site.deploy.url>scm:git:https://github.com/wcm-io-devops/wcm-io-devops.github.io.git</site.deploy.url>
8585

8686
<!-- Versions -->
87-
<mockito.version>5.10.0</mockito.version>
87+
<mockito.version>5.14.2</mockito.version>
8888

8989
<!-- SonarCloud -->
9090
<sonar.organization>wcm-io-devops</sonar.organization>
@@ -149,7 +149,7 @@
149149
<dependency>
150150
<groupId>org.hamcrest</groupId>
151151
<artifactId>hamcrest-library</artifactId>
152-
<version>2.2</version>
152+
<version>3.0</version>
153153
</dependency>
154154
<dependency>
155155
<groupId>org.mockito</groupId>
@@ -165,7 +165,7 @@
165165
<dependency>
166166
<groupId>org.junit</groupId>
167167
<artifactId>junit-bom</artifactId>
168-
<version>5.10.1</version>
168+
<version>5.11.3</version>
169169
<type>pom</type>
170170
<scope>import</scope>
171171
</dependency>
@@ -304,8 +304,19 @@
304304
</dependencies>
305305
</plugin>
306306

307-
</plugins>
307+
<!-- Stick with old versions of site plugins because latest ones use Doxia 2.x, which is not compatible with our io.wcm.maven.skins.reflow-velocity-tools -->
308+
<plugin>
309+
<groupId>org.apache.maven.plugins</groupId>
310+
<artifactId>maven-site-plugin</artifactId>
311+
<version>3.12.1</version>
312+
</plugin>
313+
<plugin>
314+
<groupId>org.apache.maven.plugins</groupId>
315+
<artifactId>maven-project-info-reports-plugin</artifactId>
316+
<version>3.5.0</version>
317+
</plugin>
308318

319+
</plugins>
309320
</pluginManagement>
310321
</build>
311322

‎parent_toplevel/src/site/site.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<skin>
3636
<groupId>io.wcm.maven.skins</groupId>
3737
<artifactId>reflow-maven-skin</artifactId>
38-
<version>1.1.0</version>
38+
<version>1.2.0</version>
3939
</skin>
4040
<custom>
4141
<reflowSkin>

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<parent>
2727
<groupId>io.wcm.devops</groupId>
2828
<artifactId>io.wcm.devops.parent_toplevel</artifactId>
29-
<version>1.4.2</version>
29+
<version>1.4.5-SNAPSHOT</version>
3030
<relativePath>parent_toplevel/pom.xml</relativePath>
3131
</parent>
3232

‎public_site/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<parent>
2727
<groupId>io.wcm.devops</groupId>
2828
<artifactId>io.wcm.devops.parent_toplevel</artifactId>
29-
<version>1.4.2</version>
29+
<version>1.4.5-SNAPSHOT</version>
3030
<relativePath>../parent_toplevel/pom.xml</relativePath>
3131
</parent>
3232

‎public_site/src/site/markdown/index.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ wcm.io DevOps is an Open Source project which provides tools for configuration m
1818

1919
* [Ansible Automation for AEM](ansible-aem/)
2020
* [Jenkins Pipeline Library for CI/CD](https://github.com/wcm-io-devops/jenkins-pipeline-library)
21+
* [pippo - CLI Tool for Cloud Manager](https://github.com/wcm-io-devops/pippo)
2122

2223
##### Maven
2324

0 commit comments

Comments
 (0)