Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade Java, plugins and dependencies #71

Merged
merged 5 commits into from May 29, 2022
Merged

Upgrade Java, plugins and dependencies #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
17bfbbb
BREAKING: not really, use Java 18 to run and Java 8 to build
dialex May 8, 2022
942f7d1
chore: with the new java, this is no longer needed
dialex May 8, 2022
cb1f979
feat: script to update javadoc
dialex May 29, 2022
0234714
chore: upgrade dependencies
dialex May 29, 2022
26c0b31
fix: make maven-bundle-plugin a build-only dependency
dialex May 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 1 addition & 5 deletions .github/RUNBOOK.md
View file
Open in desktop
Expand Up @@ -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,
Expand Down
6 changes: 6 additions & 0 deletions .github/update-javadoc.sh
View file
Open in desktop
@@ -0,0 +1,6 @@
#!/usr/bin/env bash

mvn javadoc:javadoc
rm -r docs
cp -R target/site/apidocs docs
open docs/index.html
2 changes: 1 addition & 1 deletion .java-version
View file
Open in desktop
@@ -1 +1 @@
1.8
18
15 changes: 9 additions & 6 deletions pom.xml
View file
Open in desktop
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down