Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanseifert committed Jan 25, 2024
2 parents 47a9664 + 00339f8 commit 386d3a1
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 6 deletions.
9 changes: 9 additions & 0 deletions parent_toplevel/changes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,15 @@
xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
<body>

<release version="1.4.4" date="2024-01-25">
<action type="update" dev="sseifert">
Update to global-parent 56.
</action>
<action type="update" dev="sseifert">
Update testing dependencies.
</action>
</release>

<release version="1.4.2" date="2023-10-18">
<action type="update" dev="sseifert">
Update to global-parent 54.
Expand Down
8 changes: 4 additions & 4 deletions parent_toplevel/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
<parent>
<groupId>io.wcm.maven</groupId>
<artifactId>io.wcm.maven.global-parent</artifactId>
<version>54</version>
<version>56</version>
<relativePath />
</parent>

<groupId>io.wcm.devops</groupId>
<artifactId>io.wcm.devops.parent_toplevel</artifactId>
<version>1.4.2</version>
<version>1.4.4</version>
<packaging>pom</packaging>

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

<!-- Versions -->
<mockito.version>5.6.0</mockito.version>
<mockito.version>5.10.0</mockito.version>

<!-- SonarCloud -->
<sonar.organization>wcm-io-devops</sonar.organization>
Expand Down Expand Up @@ -165,7 +165,7 @@
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.10.0</version>
<version>5.10.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>io.wcm.devops</groupId>
<artifactId>io.wcm.devops.parent_toplevel</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.4.2</version>
<relativePath>parent_toplevel/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion public_site/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>io.wcm.devops</groupId>
<artifactId>io.wcm.devops.parent_toplevel</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.4.2</version>
<relativePath>../parent_toplevel/pom.xml</relativePath>
</parent>

Expand Down

0 comments on commit 386d3a1

Please sign in to comment.