Skip to content

Commit 2763e26

Browse files
committed
Update parent POM version to 15.0.0
1 parent 907bfb3 commit 2763e26

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

.github/workflows/maven.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ jobs:
1717
build:
1818
runs-on: ubuntu-latest
1919
env:
20-
PARENT_BRANCH: ${{ github.ref_name == 'master' && 'main' || github.ref_name }}
20+
PARENT_BRANCH: main
2121
steps:
2222
- uses: actions/checkout@v4
23-
- name: Set up JDK 17
23+
- name: Set up JDK 21
2424
uses: actions/setup-java@v4
2525
with:
26-
java-version: '17'
26+
java-version: '21'
2727
distribution: 'temurin'
2828
- uses: actions/cache@v4
2929
with:
@@ -35,7 +35,7 @@ jobs:
3535
uses: actions/checkout@v4
3636
with:
3737
repository: codelibs/fess-parent
38-
ref: "14.19.x" # ${{ env.PARENT_BRANCH }}
38+
ref: ${{ env.PARENT_BRANCH }}
3939
path: fess-parent
4040
- name: Install fess-parent
4141
run: |

pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<artifactId>fess-script-ognl</artifactId>
55
<packaging>jar</packaging>
66
<name>OGNL Script Plugin</name>
7-
<version>14.19.1-SNAPSHOT</version>
7+
<version>15.0.0-SNAPSHOT</version>
88
<scm>
99
<connection>scm:git:[email protected]:codelibs/fess-script-ognl.git</connection>
1010
<developerConnection>scm:git:[email protected]:codelibs/fess-script-ognl.git</developerConnection>
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>org.codelibs.fess</groupId>
1515
<artifactId>fess-parent</artifactId>
16-
<version>14.19.1-SNAPSHOT</version>
16+
<version>15.0.0</version>
1717
<relativePath />
1818
</parent>
1919
<properties>
@@ -89,15 +89,15 @@
8989
<version>${ognl.version}</version>
9090
</dependency>
9191
<dependency>
92-
<groupId>javax.annotation</groupId>
93-
<artifactId>javax.annotation-api</artifactId>
94-
<version>${javax.annotation.api.version}</version>
92+
<groupId>jakarta.annotation</groupId>
93+
<artifactId>jakarta.annotation-api</artifactId>
94+
<version>${jakarta.annotation.api.version}</version>
9595
<scope>provided</scope>
9696
</dependency>
9797
<dependency>
98-
<groupId>javax.servlet</groupId>
99-
<artifactId>javax.servlet-api</artifactId>
100-
<version>${javax.servlet.api.version}</version>
98+
<groupId>jakarta.servlet</groupId>
99+
<artifactId>jakarta.servlet-api</artifactId>
100+
<version>${jakarta.servlet.api.version}</version>
101101
<scope>provided</scope>
102102
</dependency>
103103
<dependency>

0 commit comments

Comments
 (0)