mirror of
https://gitee.com/log4j/pig.git
synced 2025-01-03 23:42:22 +08:00
Merge remote-tracking branch 'origin/jdk17-dev' into jdk17-dev
This commit is contained in:
commit
2184b71d5c
4
.github/workflows/image.yml
vendored
4
.github/workflows/image.yml
vendored
@ -14,9 +14,9 @@ jobs:
|
|||||||
matrix:
|
matrix:
|
||||||
java-version: [ 17 ]
|
java-version: [ 17 ]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v4
|
||||||
- name: Set up JDK ${{ matrix.java-version }}
|
- name: Set up JDK ${{ matrix.java-version }}
|
||||||
uses: actions/setup-java@v2
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
java-version: ${{ matrix.java-version }}
|
java-version: ${{ matrix.java-version }}
|
||||||
distribution: 'zulu'
|
distribution: 'zulu'
|
||||||
|
4
.github/workflows/maven.yml
vendored
4
.github/workflows/maven.yml
vendored
@ -16,9 +16,9 @@ jobs:
|
|||||||
matrix:
|
matrix:
|
||||||
java-version: [ 8,11,17,21 ]
|
java-version: [ 8,11,17,21 ]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v4
|
||||||
- name: Set up JDK ${{ matrix.java-version }}
|
- name: Set up JDK ${{ matrix.java-version }}
|
||||||
uses: actions/setup-java@v2
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
java-version: ${{ matrix.java-version }}
|
java-version: ${{ matrix.java-version }}
|
||||||
distribution: 'zulu'
|
distribution: 'zulu'
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM alibabadragonwell/dragonwell:17-anolis
|
FROM alibabadragonwell/dragonwell:21-anolis
|
||||||
|
|
||||||
WORKDIR /pig-auth
|
WORKDIR /pig-auth
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<maven.compiler.source>17</maven.compiler.source>
|
<maven.compiler.source>17</maven.compiler.source>
|
||||||
<maven.compiler.target>17</maven.compiler.target>
|
<maven.compiler.target>17</maven.compiler.target>
|
||||||
<git.commit.plugin>4.9.9</git.commit.plugin>
|
<git.commit.plugin>7.0.0</git.commit.plugin>
|
||||||
<fastjson.version>1.2.83_noneautotype</fastjson.version>
|
<fastjson.version>1.2.83_noneautotype</fastjson.version>
|
||||||
<knife4j.version>3.1.0</knife4j.version>
|
<knife4j.version>3.1.0</knife4j.version>
|
||||||
<springdoc.version>2.3.0</springdoc.version>
|
<springdoc.version>2.3.0</springdoc.version>
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM alibabadragonwell/dragonwell:17-anolis
|
FROM alibabadragonwell/dragonwell:21-anolis
|
||||||
|
|
||||||
WORKDIR /pig-gateway
|
WORKDIR /pig-gateway
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM alibabadragonwell/dragonwell:17-anolis
|
FROM alibabadragonwell/dragonwell:21-anolis
|
||||||
|
|
||||||
WORKDIR /pig-register
|
WORKDIR /pig-register
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM alibabadragonwell/dragonwell:17-anolis
|
FROM alibabadragonwell/dragonwell:21-anolis
|
||||||
|
|
||||||
WORKDIR /pig-upms-biz
|
WORKDIR /pig-upms-biz
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM alibabadragonwell/dragonwell:17-anolis
|
FROM alibabadragonwell/dragonwell:21-anolis
|
||||||
|
|
||||||
WORKDIR /pig-codegen
|
WORKDIR /pig-codegen
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM alibabadragonwell/dragonwell:17-anolis
|
FROM alibabadragonwell/dragonwell:21-anolis
|
||||||
|
|
||||||
WORKDIR /pig-monitor
|
WORKDIR /pig-monitor
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM alibabadragonwell/dragonwell:17-anolis
|
FROM alibabadragonwell/dragonwell:21-anolis
|
||||||
|
|
||||||
WORKDIR /pig-quartz
|
WORKDIR /pig-quartz
|
||||||
|
|
||||||
|
4
pom.xml
4
pom.xml
@ -44,7 +44,7 @@
|
|||||||
<velocity.tool.version>3.1</velocity.tool.version>
|
<velocity.tool.version>3.1</velocity.tool.version>
|
||||||
<configuration.version>1.10</configuration.version>
|
<configuration.version>1.10</configuration.version>
|
||||||
<jasypt.version>3.0.5</jasypt.version>
|
<jasypt.version>3.0.5</jasypt.version>
|
||||||
<jaxb.version>2.3.9</jaxb.version>
|
<jaxb.version>4.0.4</jaxb.version>
|
||||||
<swagger.fox.version>3.0.0</swagger.fox.version>
|
<swagger.fox.version>3.0.0</swagger.fox.version>
|
||||||
<xxl-job.version>2.4.0</xxl-job.version>
|
<xxl-job.version>2.4.0</xxl-job.version>
|
||||||
<docker.plugin.version>0.44.0</docker.plugin.version>
|
<docker.plugin.version>0.44.0</docker.plugin.version>
|
||||||
@ -53,7 +53,7 @@
|
|||||||
<docker.namespace>pig4cloud</docker.namespace>
|
<docker.namespace>pig4cloud</docker.namespace>
|
||||||
<docker.username>username</docker.username>
|
<docker.username>username</docker.username>
|
||||||
<docker.password>password</docker.password>
|
<docker.password>password</docker.password>
|
||||||
<git.commit.plugin>6.0.0</git.commit.plugin>
|
<git.commit.plugin>7.0.0</git.commit.plugin>
|
||||||
<spring.checkstyle.plugin>0.0.41</spring.checkstyle.plugin>
|
<spring.checkstyle.plugin>0.0.41</spring.checkstyle.plugin>
|
||||||
<flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version>
|
<flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version>
|
||||||
<maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
|
||||||
|
Loading…
Reference in New Issue
Block a user