Skip to content

Commit 2146d3c

Browse files
committed
Update parent POM version to 15.0.0
1 parent 2055064 commit 2146d3c

2 files changed

Lines changed: 12 additions & 12 deletions

File tree

.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
@@ -6,7 +6,7 @@
66
<artifactId>fess-script-example</artifactId>
77
<packaging>jar</packaging>
88
<name>Example Script Plugin</name>
9-
<version>14.19.0-SNAPSHOT</version>
9+
<version>15.0.0-SNAPSHOT</version>
1010
<scm>
1111
<connection>scm:git:git@github.com:codelibs/fess-script-example.git</connection>
1212
<developerConnection>scm:git:git@github.com:codelibs/fess-script-example.git</developerConnection>
@@ -15,7 +15,7 @@
1515
<parent>
1616
<groupId>org.codelibs.fess</groupId>
1717
<artifactId>fess-parent</artifactId>
18-
<version>14.19.1-SNAPSHOT</version>
18+
<version>15.0.0</version>
1919
<relativePath />
2020
</parent>
2121
<build>
@@ -63,15 +63,15 @@
6363
</repositories>
6464
<dependencies>
6565
<dependency>
66-
<groupId>javax.annotation</groupId>
67-
<artifactId>javax.annotation-api</artifactId>
68-
<version>${javax.annotation.api.version}</version>
66+
<groupId>jakarta.annotation</groupId>
67+
<artifactId>jakarta.annotation-api</artifactId>
68+
<version>${jakarta.annotation.api.version}</version>
6969
<scope>provided</scope>
7070
</dependency>
7171
<dependency>
72-
<groupId>javax.servlet</groupId>
73-
<artifactId>javax.servlet-api</artifactId>
74-
<version>${javax.servlet.api.version}</version>
72+
<groupId>jakarta.servlet</groupId>
73+
<artifactId>jakarta.servlet-api</artifactId>
74+
<version>${jakarta.servlet.api.version}</version>
7575
<scope>provided</scope>
7676
</dependency>
7777
<dependency>

0 commit comments

Comments
 (0)