Skip to content

Commit 94100b0

Browse files
funfriedfunfried
authored
Merge pull request #8 from funfried/release/1.x
Updated all dependencies and plugins to latest versions as well as th…
2 parents 8d521a9 + 98d8594 commit 94100b0

File tree

5 files changed

+51
-39
lines changed

5 files changed

+51
-39
lines changed

‎.github/workflows/maven.yaml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,16 @@ jobs:
3131
fail-fast: false
3232
runs-on: ${{ matrix.os }}
3333
steps:
34-
- uses: actions/checkout@v2
35-
- name: Set up JDK 11
36-
uses: actions/setup-java@v2
34+
- uses: actions/checkout@v3
35+
- name: Set up JDK 17
36+
uses: actions/setup-java@v3
3737
with:
38-
java-version: 11
38+
java-version: 17
3939
distribution: zulu
40+
- name: Set up Maven 3.9.4
41+
uses: stCarolas/setup-maven@v4.5
42+
with:
43+
maven-version: 3.9.4
4044
- name: Cache local maven repository
4145
uses: actions/cache@v2
4246
with:

‎.github/workflows/release_maven.yml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,17 @@ jobs:
1212
build:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v2
16-
- name: Set up JDK 11
17-
uses: actions/setup-java@v2
15+
- uses: actions/checkout@v3
16+
- name: Set up JDK 17
17+
uses: actions/setup-java@v3
1818
with:
19-
java-version: '11'
19+
java-version: '17'
2020
distribution: 'adopt'
2121
cache: maven
22+
- name: Set up Maven 3.9.4
23+
uses: stCarolas/setup-maven@v4.5
24+
with:
25+
maven-version: 3.9.4
2226
- name: Build and Deploy with Maven
2327
run: |
2428
git config --global user.email "info@funfried.de"

‎META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ Bundle-SymbolicName: jsdt-core
55
Bundle-Vendor: funfried
66
Bundle-Version: 1.0.3
77
Require-Bundle: org.eclipse.wst.jsdt.core;bundle-version="[1.0.0,10.0.0)"
8-
Bundle-RequiredExecutionEnvironment: JavaSE-11
8+
Bundle-RequiredExecutionEnvironment: JavaSE-17

‎build.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ source.. = src/
22
output.. = target/classes
33
bin.includes = META-INF/,\
44
.
5-
jre.compilation.profile = JavaSE-11
5+
jre.compilation.profile = JavaSE-17

‎pom.xml‎

Lines changed: 33 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -72,19 +72,19 @@
7272

7373
<properties>
7474
<autoVersionSubmodules>true</autoVersionSubmodules>
75-
<eclipse-repo.url>http://download.eclipse.org/releases/2022-12</eclipse-repo.url>
75+
<eclipse-repo.url>http://download.eclipse.org/releases/2023-09</eclipse-repo.url>
7676
<!-- because of https://issues.apache.org/jira/browse/MCOMPILER-485 -->
7777
<maven.compiler.createMissingPackageInfoClass>false</maven.compiler.createMissingPackageInfoClass>
7878
<!-- all 3 are needed, because some plugins might use the source/target variables -->
79-
<maven.compiler.release>11</maven.compiler.release>
80-
<maven.compiler.source>11</maven.compiler.source>
81-
<maven.compiler.target>11</maven.compiler.target>
79+
<maven.compiler.release>17</maven.compiler.release>
80+
<maven.compiler.source>17</maven.compiler.source>
81+
<maven.compiler.target>17</maven.compiler.target>
8282
<!-- no useful site docs to deploy at this time -->
8383
<maven.site.deploy.skip>true</maven.site.deploy.skip>
8484
<project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
8585
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
8686
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
87-
<tychoVersion>2.7.5</tychoVersion>
87+
<tychoVersion>4.0.0</tychoVersion>
8888
</properties>
8989

9090
<dependencyManagement>
@@ -97,12 +97,12 @@
9797
<dependency>
9898
<groupId>com.google.code.gson</groupId>
9999
<artifactId>gson</artifactId>
100-
<version>2.9.1</version>
100+
<version>2.10.1</version>
101101
</dependency>
102102
<dependency>
103103
<groupId>com.google.errorprone</groupId>
104104
<artifactId>error_prone_annotations</artifactId>
105-
<version>2.15.0</version>
105+
<version>2.20.0</version>
106106
</dependency>
107107
<dependency>
108108
<groupId>com.google.guava</groupId>
@@ -112,17 +112,17 @@
112112
<dependency>
113113
<groupId>com.google.guava</groupId>
114114
<artifactId>guava</artifactId>
115-
<version>31.1-jre</version>
115+
<version>32.1.2-jre</version>
116116
</dependency>
117117
<dependency>
118118
<groupId>com.google.j2objc</groupId>
119119
<artifactId>j2objc-annotations</artifactId>
120-
<version>1.3</version>
120+
<version>2.8</version>
121121
</dependency>
122122
<dependency>
123123
<groupId>com.google.javascript</groupId>
124124
<artifactId>closure-compiler-unshaded</artifactId>
125-
<version>v20220905</version>
125+
<version>v20230502</version>
126126
</dependency>
127127
<dependency>
128128
<groupId>com.google.protobuf</groupId>
@@ -132,12 +132,12 @@
132132
<dependency>
133133
<groupId>org.checkerframework</groupId>
134134
<artifactId>checker-qual</artifactId>
135-
<version>3.25.0</version>
135+
<version>3.36.0</version>
136136
</dependency>
137137
<dependency>
138138
<groupId>com.ibm.icu</groupId>
139139
<artifactId>icu4j</artifactId>
140-
<version>71.1</version>
140+
<version>73.2</version>
141141
</dependency>
142142
</dependencies>
143143
</dependencyManagement>
@@ -191,37 +191,37 @@
191191
<plugin>
192192
<groupId>org.apache.maven.plugins</groupId>
193193
<artifactId>maven-clean-plugin</artifactId>
194-
<version>3.2.0</version>
194+
<version>3.3.1</version>
195195
</plugin>
196196
<plugin>
197197
<groupId>org.apache.maven.plugins</groupId>
198198
<artifactId>maven-compiler-plugin</artifactId>
199-
<version>3.10.1</version>
199+
<version>3.11.0</version>
200200
</plugin>
201201
<plugin>
202202
<groupId>org.apache.maven.plugins</groupId>
203203
<artifactId>maven-dependency-plugin</artifactId>
204-
<version>3.3.0</version>
204+
<version>3.6.0</version>
205205
</plugin>
206206
<plugin>
207207
<groupId>org.apache.maven.plugins</groupId>
208208
<artifactId>maven-deploy-plugin</artifactId>
209-
<version>3.0.0</version>
209+
<version>3.1.1</version>
210210
</plugin>
211211
<plugin>
212212
<groupId>org.apache.maven.plugins</groupId>
213213
<artifactId>maven-enforcer-plugin</artifactId>
214-
<version>3.1.0</version>
214+
<version>3.3.0</version>
215215
</plugin>
216216
<plugin>
217217
<groupId>org.apache.maven.plugins</groupId>
218218
<artifactId>maven-gpg-plugin</artifactId>
219-
<version>3.0.1</version>
219+
<version>3.1.0</version>
220220
</plugin>
221221
<plugin>
222222
<groupId>org.apache.maven.plugins</groupId>
223223
<artifactId>maven-install-plugin</artifactId>
224-
<version>3.0.1</version>
224+
<version>3.1.1</version>
225225
</plugin>
226226
<plugin>
227227
<groupId>org.apache.maven.plugins</groupId>
@@ -231,7 +231,7 @@
231231
<plugin>
232232
<groupId>org.apache.maven.plugins</groupId>
233233
<artifactId>maven-javadoc-plugin</artifactId>
234-
<version>3.4.1</version>
234+
<version>3.5.0</version>
235235
<configuration>
236236
<quiet>true</quiet>
237237
<doclint>all,-missing</doclint>
@@ -240,27 +240,32 @@
240240
<plugin>
241241
<groupId>org.apache.maven.plugins</groupId>
242242
<artifactId>maven-source-plugin</artifactId>
243-
<version>3.2.1</version>
243+
<version>3.3.0</version>
244244
</plugin>
245245
<plugin>
246246
<groupId>org.apache.maven.plugins</groupId>
247247
<artifactId>maven-resources-plugin</artifactId>
248-
<version>3.3.0</version>
248+
<version>3.3.1</version>
249249
</plugin>
250250
<plugin>
251251
<groupId>org.apache.maven.plugins</groupId>
252252
<artifactId>maven-scm-plugin</artifactId>
253-
<version>2.0.0-M2</version>
253+
<version>2.0.1</version>
254254
</plugin>
255255
<plugin>
256256
<groupId>org.apache.maven.plugins</groupId>
257257
<artifactId>maven-surefire-plugin</artifactId>
258-
<version>3.0.0-M7</version>
258+
<version>3.1.2</version>
259+
</plugin>
260+
<plugin>
261+
<groupId>com.google.code.maven-replacer-plugin</groupId>
262+
<artifactId>replacer</artifactId>
263+
<version>1.5.3</version>
259264
</plugin>
260265
<plugin>
261266
<groupId>org.codehaus.mojo</groupId>
262267
<artifactId>versions-maven-plugin</artifactId>
263-
<version>2.12.0</version>
268+
<version>2.16.0</version>
264269
</plugin>
265270
<plugin>
266271
<groupId>org.sonatype.plugins</groupId>
@@ -299,7 +304,6 @@
299304
<plugin>
300305
<groupId>com.google.code.maven-replacer-plugin</groupId>
301306
<artifactId>replacer</artifactId>
302-
<version>1.5.3</version>
303307
<executions>
304308
<execution>
305309
<id>update-manifest-version-from-pom</id>
@@ -365,11 +369,11 @@
365369
<configuration>
366370
<rules>
367371
<requireMavenVersion>
368-
<!-- require min 3.6.2+ for https://issues.apache.org/jira/browse/MNG-6669 -->
369-
<version>[3.6.3,)</version>
372+
<!-- require min 3.9.0+ for Eclipse Tycho -->
373+
<version>[3.9.0,)</version>
370374
</requireMavenVersion>
371375
<requireJavaVersion>
372-
<version>[11,)</version>
376+
<version>[17,)</version>
373377
</requireJavaVersion>
374378
</rules>
375379
</configuration>

0 commit comments

Comments
 (0)