Skip to content

Commit 5ede537

Browse files
committed
sync up with main
2 parents 5d0002e + bacbe4f commit 5ede537

File tree

4 files changed

+23
-12
lines changed

4 files changed

+23
-12
lines changed

.github/workflows/maven.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,31 @@ on:
1515

1616
jobs:
1717
build:
18-
1918
runs-on: ubuntu-latest
20-
19+
env:
20+
PARENT_BRANCH: main
2121
steps:
22-
- uses: actions/checkout@v2
22+
- uses: actions/checkout@v4
2323
- name: Set up JDK 21
24-
uses: actions/setup-java@v2
24+
uses: actions/setup-java@v4
2525
with:
2626
java-version: '21'
2727
distribution: 'temurin'
28-
- uses: actions/cache@v1
28+
- uses: actions/cache@v4
2929
with:
3030
path: ~/.m2/repository
3131
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
3232
restore-keys: |
3333
${{ runner.os }}-maven-
34+
- name: Checkout fess-parent
35+
uses: actions/checkout@v4
36+
with:
37+
repository: codelibs/fess-parent
38+
ref: ${{ env.PARENT_BRANCH }}
39+
path: fess-parent
40+
- name: Install fess-parent
41+
run: |
42+
cd fess-parent
43+
mvn install -Dgpg.skip=true
3444
- name: Build with Maven
3545
run: mvn -B package --file pom.xml

pom.xml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@
44
<artifactId>fess-script-ognl</artifactId>
55
<packaging>jar</packaging>
66
<name>OGNL Script Plugin</name>
7-
<version>15.0.0-SNAPSHOT</version>
7+
<version>15.0.1-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>
1111
<url>https://github.com/codelibs/fess-script-ognl</url>
12-
</scm>
12+
<tag>HEAD</tag>
13+
</scm>
1314
<parent>
1415
<groupId>org.codelibs.fess</groupId>
1516
<artifactId>fess-parent</artifactId>
16-
<version>15.0.0-SNAPSHOT</version>
17+
<version>15.0.0</version>
1718
<relativePath />
1819
</parent>
1920
<properties>
@@ -72,8 +73,8 @@
7273
</build>
7374
<repositories>
7475
<repository>
75-
<id>snapshots.oss.sonatype.org</id>
76-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
76+
<id>snapshots.central.sonatype.com</id>
77+
<url>https://central.sonatype.com/repository/maven-snapshots</url>
7778
<releases>
7879
<enabled>false</enabled>
7980
</releases>

src/main/java/org/codelibs/fess/script/ognl/OgnlEngine.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2023 CodeLibs Project and the Others.
2+
* Copyright 2012-2025 CodeLibs Project and the Others.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/test/java/org/codelibs/fess/script/ognl/OgnlEngineTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2023 CodeLibs Project and the Others.
2+
* Copyright 2012-2025 CodeLibs Project and the Others.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)