Merge pull request #72 from cybozu/dist-version

tomoya yokota · web-flow · commit ca5d343f8dbf · 2022-07-07T15:39:08.000+09:00
Update CI environment using JDK17, update plugin elasticsearch version
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        jdk: [ '11', '17' ]
+        jdk: [ '17' ]
     name: CI using JDK ${{ matrix.jdk }}
     steps:
       - uses: actions/checkout@v3
diff --git a/build.gradle b/build.gradle
@@ -3,8 +3,8 @@ plugins {
     id "com.diffplug.spotless" version "6.8.0"
 }
 
-sourceCompatibility = 11
-targetCompatibility = 11
+sourceCompatibility = 17
+targetCompatibility = 17
 
 apply plugin: 'distribution'
 
diff --git a/src/main/dist/plugin-descriptor.properties b/src/main/dist/plugin-descriptor.properties
@@ -32,10 +32,10 @@ classname=com.github.yokotaso.elasticsearch.plugin.analysis.classic.ckj.ClassicC
 # use the system property java.specification.version
 # version string must be a sequence of nonnegative decimal integers
 # separated by "."'s and may have leading zeros
-java.version=11
+java.version=17
 #
 # 'elasticsearch.version': version of elasticsearch compiled against
-elasticsearch.version=7.15.2
+elasticsearch.version=7.17.5
 ### optional elements for plugins:
 #
 #  'extended.plugins': other plugins this plugin extends through SPI

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ plugins {`
`3`	`3`	`id "com.diffplug.spotless" version "6.8.0"`
`4`	`4`	`}`
`5`	`5`
`6`		`-sourceCompatibility = 11`
`7`		`-targetCompatibility = 11`
	`6`	`+sourceCompatibility = 17`
	`7`	`+targetCompatibility = 17`
`8`	`8`
`9`	`9`	`apply plugin: 'distribution'`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -32,10 +32,10 @@ classname=com.github.yokotaso.elasticsearch.plugin.analysis.classic.ckj.ClassicC`
`32`	`32`	`# use the system property java.specification.version`
`33`	`33`	`# version string must be a sequence of nonnegative decimal integers`
`34`	`34`	`# separated by "."'s and may have leading zeros`
`35`		`-java.version=11`
	`35`	`+java.version=17`
`36`	`36`	`#`
`37`	`37`	`# 'elasticsearch.version': version of elasticsearch compiled against`
`38`		`-elasticsearch.version=7.15.2`
	`38`	`+elasticsearch.version=7.17.5`
`39`	`39`	`### optional elements for plugins:`
`40`	`40`	`#`
`41`	`41`	`# 'extended.plugins': other plugins this plugin extends through SPI`