Merge pull request #71 from dialex/upgrade-java-and-plugins

Upgrade Java, plugins and dependencies
dialex · May 29, 2022 · 972a49b · 972a49b
2 parents 71655ec + 26c0b31
commit 972a49b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/.github/RUNBOOK.md b/.github/RUNBOOK.md
@@ -25,13 +25,9 @@ How to do stuff
 ## Generate Javadoc
 
 ```sh
-jenv shell 16
-mvn javadoc:javadoc
-rm -r docs
-cp -R target/site/apidocs docs
+./.github/update-javadoc.sh
 git add .
 git commit -m "doc: update javadoc to latest version"
-jenv shell 1.8
 ```
 
 - Locally,

diff --git a/.github/update-javadoc.sh b/.github/update-javadoc.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+mvn javadoc:javadoc
+rm -r docs
+cp -R target/site/apidocs docs
+open docs/index.html
diff --git a/.java-version b/.java-version
@@ -1 +1 @@
-1.8
+18
diff --git a/pom.xml b/pom.xml
@@ -12,8 +12,10 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <!-- code needs to be compatible with this version of Java -->
         <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <!-- code is executed using this version of Java -->
+        <maven.compiler.target>18</maven.compiler.target>
     </properties>
 
     <licenses>
@@ -55,7 +57,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>3.10.1</version>
                 <configuration>
                     <source>${maven.compiler.source}</source>
                     <target>${maven.compiler.target}</target>
@@ -64,7 +66,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>5.1.2</version>
+                <version>5.1.5</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
@@ -77,7 +79,7 @@
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.8</version>
+                <version>1.6.13</version>
                 <extensions>true</extensions>
                 <configuration>
                     <serverId>ossrh</serverId>
@@ -88,7 +90,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.2.1</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -181,8 +183,9 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>maven-bundle-plugin</artifactId>
-            <version>5.1.5</version>
+            <version>5.1.6</version>
             <type>maven-plugin</type>
+            <scope>test</scope>
         </dependency>
         <!-- Dependencies of test framework -->
         <dependency>