Skip to content

Commit ecde28d

Browse files
committed
CI and dependency management upgrade
1 parent 953805c commit ecde28d

File tree

9 files changed

+327
-1501
lines changed

9 files changed

+327
-1501
lines changed

.github/dependabot.yml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "maven"
4+
target-branch: "master"
5+
directory: "/"
6+
schedule:
7+
interval: "daily"
8+
ignore:
9+
- dependency-name: "*"
10+
update-types: ["version-update:semver-major"]
11+
- package-ecosystem: "maven"
12+
target-branch: "3.0.0"
13+
directory: "/"
14+
schedule:
15+
interval: "daily"
16+
ignore:
17+
- dependency-name: "*"
18+
update-types: ["version-update:semver-major"]
+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: 'Dependency Review'
2+
on: [pull_request]
3+
4+
permissions:
5+
contents: read
6+
7+
jobs:
8+
dependency-review:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: 'Checkout Repository'
12+
uses: actions/checkout@v4
13+
- name: Dependency Review
14+
uses: actions/dependency-review-action@v3
15+
with:
16+
fail-on-severity: high
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
name: Build And Push Docker Release Master
2+
3+
on:
4+
workflow_dispatch:
5+
branches: [ "master" ]
6+
inputs:
7+
tag:
8+
description: tag/version to release
9+
required: true
10+
jobs:
11+
build_push_docker_release_master:
12+
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- uses: actions/checkout@v3
17+
name: git checkout master
18+
with:
19+
ref: master
20+
- name: Set up Java
21+
uses: actions/setup-java@v3
22+
with:
23+
java-version: 17
24+
distribution: temurin
25+
cache: maven
26+
- name: preliminary checks
27+
run: |
28+
docker login --username=${{ secrets.DOCKERHUB_SB_USERNAME }} --password=${{ secrets.DOCKERHUB_SB_PASSWORD }}
29+
set -e
30+
# fail if templates/generators contain carriage return '\r'
31+
/bin/bash ./bin/utils/detect_carriage_return.sh
32+
# fail if generators contain merge conflicts
33+
/bin/bash ./bin/utils/detect_merge_conflict.sh
34+
# fail if generators contain tab '\t'
35+
/bin/bash ./bin/utils/detect_tab_in_java_class.sh
36+
- uses: s4u/[email protected]
37+
name: setup maven settings.xml
38+
with:
39+
servers: |
40+
[{
41+
"id": "sonatype-nexus-staging",
42+
"username": "${{ secrets.OSSRH_USERNAME }}",
43+
"password": "${{ secrets.OSSRH_TOKEN }}"
44+
},
45+
{
46+
"id": "sonatype-nexus-snapshots",
47+
"username": "${{ secrets.OSSRH_USERNAME }}",
48+
"password": "${{ secrets.OSSRH_TOKEN }}"
49+
}]
50+
- name: Build with Maven
51+
run: |
52+
# mvn clean install -U
53+
- name: docker build and push
54+
run: |
55+
export DOCKER_GENERATOR_IMAGE_NAME=swaggerapi/swagger-generator
56+
export DOCKER_CODEGEN_CLI_IMAGE_NAME=swaggerapi/swagger-codegen-cli
57+
export MY_POM_VERSION=`mvn -q -Dexec.executable="echo" -Dexec.args='${projects.version}' --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec`
58+
59+
docker build --rm=false -t $DOCKER_GENERATOR_IMAGE_NAME:${{ env.TAG }} ./modules/swagger-generator
60+
docker tag $DOCKER_GENERATOR_IMAGE_NAME:${{ env.TAG }} $DOCKER_GENERATOR_IMAGE_NAME:latest
61+
docker push $DOCKER_GENERATOR_IMAGE_NAME:${{ env.TAG }}
62+
docker push $DOCKER_GENERATOR_IMAGE_NAME:latest
63+
docker build --rm=false -t $DOCKER_CODEGEN_CLI_IMAGE_NAME:${{ env.TAG }} ./modules/swagger-codegen-cli
64+
docker tag $DOCKER_CODEGEN_CLI_IMAGE_NAME:${{ env.TAG }} $DOCKER_CODEGEN_CLI_IMAGE_NAME:latest
65+
docker push $DOCKER_CODEGEN_CLI_IMAGE_NAME:${{ env.TAG }}
66+
docker push $DOCKER_CODEGEN_CLI_IMAGE_NAME:latest
67+
env:
68+
TAG: ${{ github.event.inputs.tag }}

modules/swagger-codegen-maven-plugin/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<dependency>
4444
<groupId>org.apache.maven.plugin-tools</groupId>
4545
<artifactId>maven-plugin-annotations</artifactId>
46-
<version>3.4</version>
46+
<version>3.10.2</version>
4747
</dependency>
4848
<dependency>
4949
<groupId>io.swagger</groupId>

modules/swagger-generator/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,6 @@
334334
<servlet-api-version>2.5</servlet-api-version>
335335
<zip-version>2.11.5</zip-version>
336336
<jetty-version>9.4.53.v20231009</jetty-version>
337-
<jersey2-version>2.40</jersey2-version>
337+
<jersey2-version>2.41</jersey2-version>
338338
</properties>
339339
</project>

0 commit comments

Comments
 (0)