Skip to content

Commit 09af112

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop'
2 parents 0d03f1f + f3cd4fe commit 09af112

File tree

8 files changed

+44
-24
lines changed

8 files changed

+44
-24
lines changed

‎.github/dependabot.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "maven"
4+
directory: "/"
5+
schedule:
6+
interval: "daily"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,20 @@ jobs:
1919
runs-on: ${{ matrix.os }}
2020
strategy:
2121
matrix:
22-
java: [8, 11, 17]
22+
java: [11, 17]
2323
os: [ubuntu-latest]
2424
distribution: [temurin]
2525

2626
steps:
2727
- name: Checkout code
28-
uses: actions/checkout@v2
28+
uses: actions/checkout@v3
2929

3030
- name: Setup JDK
31-
uses: actions/setup-java@v2
31+
uses: actions/setup-java@v3
3232
with:
3333
distribution: ${{ matrix.distribution }}
3434
java-version: ${{ matrix.java }}
35-
cache: 'maven'
35+
cache: maven
3636

3737
- name: Build and verify
3838
run: ./mvnw -s ./.maven-settings.xml -Pcontinuous-integration -B -U clean verify

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Deploy snapshots to Sonatpe OSS repository and deploy site to GitHub Pages
1+
# Deploy snapshots to Sonatype OSS repository and deploy site to GitHub Pages
22

33
name: Deploy
44

@@ -15,19 +15,19 @@ jobs:
1515

1616
steps:
1717
- name: Checkout code
18-
uses: actions/checkout@v2
18+
uses: actions/checkout@v3
1919

2020
- name: Configure GIT
2121
run: |
2222
git config --global user.email "${{ secrets.GH_SITE_DEPLOY_EMAIL }}"
2323
git config --global user.name "${{ secrets.GH_SITE_DEPLOY_NAME }}"
2424
2525
- name: Setup JDK
26-
uses: actions/setup-java@v2
26+
uses: actions/setup-java@v3
2727
with:
2828
distribution: temurin
29-
java-version: 8
30-
cache: 'maven'
29+
java-version: 11
30+
cache: maven
3131

3232
- name: Build, verify, deploy, generate site
3333
env:

‎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.0" date="2023-01-12">
27+
<action type="update" dev="sseifert">
28+
Switch to Java 11 as minimum version.
29+
</action>
30+
<action type="update" dev="sseifert">
31+
Update to global-parent 50.
32+
</action>
33+
<action type="update" dev="sseifert">
34+
Update testing dependencies.
35+
</action>
36+
</release>
37+
2638
<release version="1.3.2" date="2022-05-10">
2739
<action type="update" dev="sseifert">
2840
Update to global-parent 44.

‎parent_toplevel/pom.xml‎

Lines changed: 14 additions & 12 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>44</version>
28+
<version>50</version>
2929
<relativePath />
3030
</parent>
3131

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

3737
<name>Toplevel Parent</name>
@@ -53,8 +53,8 @@
5353
</organization>
5454

5555
<issueManagement>
56-
<system>JIRA</system>
57-
<url>https://wcm-io.atlassian.net/browse/</url>
56+
<system>GitHub</system>
57+
<url>https://github.com/wcm-io-devops/${project.artifactId}/issues/</url>
5858
</issueManagement>
5959

6060
<developers>
@@ -75,15 +75,17 @@
7575
<properties>
7676

7777
<!-- Java version -->
78-
<java.version>1.8</java.version>
79-
<build.compiler.release>8</build.compiler.release>
78+
<java.version>11</java.version>
8079

8180
<!-- site settings -->
8281
<site.url.module.prefix>tooling/parent_toplevel</site.url.module.prefix>
8382
<site.url>https://devops.wcm.io</site.url>
8483
<site.deploy.id>ssh-wcm.io</site.deploy.id>
8584
<site.deploy.url>scm:git:https://github.com/wcm-io-devops/wcm-io-devops.github.io.git</site.deploy.url>
8685

86+
<!-- Versions -->
87+
<mockito.version>4.11.0</mockito.version>
88+
8789
<!-- SonarCloud -->
8890
<sonar.organization>wcm-io-devops</sonar.organization>
8991
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
@@ -135,12 +137,12 @@
135137
<dependency>
136138
<groupId>org.slf4j</groupId>
137139
<artifactId>slf4j-api</artifactId>
138-
<version>1.7.32</version>
140+
<version>1.7.36</version>
139141
</dependency>
140142
<dependency>
141143
<groupId>org.slf4j</groupId>
142144
<artifactId>slf4j-simple</artifactId>
143-
<version>1.7.32</version>
145+
<version>1.7.36</version>
144146
</dependency>
145147

146148
<!-- Testing -->
@@ -152,18 +154,18 @@
152154
<dependency>
153155
<groupId>org.mockito</groupId>
154156
<artifactId>mockito-core</artifactId>
155-
<version>4.5.1</version>
157+
<version>${mockito.version}</version>
156158
</dependency>
157159
<dependency>
158160
<groupId>org.mockito</groupId>
159161
<artifactId>mockito-junit-jupiter</artifactId>
160-
<version>4.5.1</version>
162+
<version>${mockito.version}</version>
161163
</dependency>
162164
<!-- Import all JUnit 5 dependencies -->
163165
<dependency>
164166
<groupId>org.junit</groupId>
165167
<artifactId>junit-bom</artifactId>
166-
<version>5.8.2</version>
168+
<version>5.9.2</version>
167169
<type>pom</type>
168170
<scope>import</scope>
169171
</dependency>
@@ -178,7 +180,7 @@
178180
<extension>
179181
<groupId>io.wcm.maven</groupId>
180182
<artifactId>io.wcm.maven.global-build-tools-mixin</artifactId>
181-
<version>1</version>
183+
<version>2</version>
182184
</extension>
183185

184186
</extensions>

‎parent_toplevel/src/site/site.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
</menu>
127127
<menu name="Contribute" inherit="top">
128128
<item name="Contribute" href="https://wcm.io/contribute.html" />
129-
<item name="Issues" href="https://wcm-io.atlassian.net" />
129+
<item name="Issues" href="https://github.com/wcm-io-devops" />
130130
<item name="Wiki" href="https://wcm-io.atlassian.net/wiki/" />
131131
<item name="Mailing Lists" href="https://wcm.io/mailing-lists.html" />
132132
<item name="Fork on GitHub" href="http://github.com/wcm-io-devops" />

‎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.3.1-SNAPSHOT</version>
29+
<version>1.4.0-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.3.1-SNAPSHOT</version>
29+
<version>1.4.0-SNAPSHOT</version>
3030
<relativePath>../parent_toplevel/pom.xml</relativePath>
3131
</parent>
3232

0 commit comments

Comments
 (0)