diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 18159ad..c9e1bd7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,10 +9,10 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [11, 17, 21] + java: [11, 17, 21, 24] steps: - name: Checkout sources - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK uses: actions/setup-java@v4 @@ -27,12 +27,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout sources - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK uses: actions/setup-java@v4 with: - java-version: 21 + java-version: 24 distribution: 'zulu' - name: Build with coverage diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 642589c..1943866 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,16 +14,17 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout sources - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up Maven Central repository - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '11' distribution: 'temurin' - server-id: ossrh - server-username: MAVEN_USERNAME # env variable to use for username in release - server-password: MAVEN_PASSWORD # env variable to use for password in release + # See https://central.sonatype.org/publish/publish-portal-maven/ + server-id: central + server-username: CENTRAL_USERNAME # env variable to use for username in release + server-password: CENTRAL_PASSWORD # env variable to use for password in release gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable to use for passphrase in release @@ -37,6 +38,6 @@ jobs: mvn -B -Dpassword=${{ secrets.GITHUB_TOKEN }} release:prepare mvn -B release:perform env: - MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + CENTRAL_USERNAME: ${{ secrets.CENTRAL_USERNAME }} + CENTRAL_PASSWORD: ${{ secrets.CENTRAL_PASSWORD }} MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} diff --git a/CHANGELOG.md b/CHANGELOG.md index bd1b3ca..1b7aa5c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). -## [Unreleased] +## [0.12.0] - 2025-06-04 +### Added +- Include OSGi metadata in jar +### Changed - Require at least Java 11 ## [0.11.0] - 2023-02-27 @@ -84,6 +87,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Initial release! +[0.12.0]: https://github.com/robinst/autolink-java/compare/autolink-0.11.0...autolink-0.12.0 [0.11.0]: https://github.com/robinst/autolink-java/compare/autolink-0.10.1...autolink-0.11.0 [0.10.1]: https://github.com/robinst/autolink-java/compare/autolink-0.10.0...autolink-0.10.1 [0.10.0]: https://github.com/robinst/autolink-java/compare/autolink-0.9.0...autolink-0.10.0 diff --git a/README.md b/README.md index d2f320b..8f58e1d 100644 --- a/README.md +++ b/README.md @@ -37,14 +37,14 @@ This library is supported on Java 11 or later. It works on Android Maven coordinates (see -[here](https://central.sonatype.com/artifact/org.nibor.autolink/autolink/0.11.0/overview) +[here](https://central.sonatype.com/artifact/org.nibor.autolink/autolink/0.12.0/overview) for other build systems): ```xml org.nibor.autolink autolink - 0.11.0 + 0.12.0 ``` @@ -209,6 +209,6 @@ See CONTRIBUTING.md file. License ------- -Copyright (c) 2015-2022 Robin Stocker and others, see Git history +Copyright (c) 2015, Robin Stocker and others, see Git history MIT licensed, see LICENSE file. diff --git a/pom.xml b/pom.xml index 3341293..ddf6190 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.nibor.autolink autolink - 0.11.1-SNAPSHOT + 0.12.1-SNAPSHOT autolink-java @@ -47,6 +47,7 @@ org.apache.felix maven-bundle-plugin + 5.1.9 @@ -74,7 +75,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.12.1 + 3.14.0 11 @@ -82,7 +83,7 @@ com.github.siom79.japicmp japicmp-maven-plugin - 0.15.7 + 0.23.1 @@ -118,22 +119,22 @@ + - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.13 + org.sonatype.central + central-publishing-maven-plugin + 0.7.0 true - ossrh - https://oss.sonatype.org/ - true - 10 + central + true + published org.apache.maven.plugins maven-release-plugin - 3.0.0-M7 + 3.1.1 true false @@ -167,7 +168,7 @@ org.jacoco jacoco-maven-plugin - 0.8.8 + 0.8.13 prepare-agent @@ -187,7 +188,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.1 attach-sources @@ -200,7 +201,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.4.1 + 3.11.2 attach-javadocs @@ -216,7 +217,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.0.1 + 3.2.7 sign-artifacts @@ -238,17 +239,9 @@ - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - Robin Stocker - robin@nibor.org https://github.com/robinst/ diff --git a/src/main/java/org/nibor/autolink/LinkExtractor.java b/src/main/java/org/nibor/autolink/LinkExtractor.java index 8229571..0312eec 100644 --- a/src/main/java/org/nibor/autolink/LinkExtractor.java +++ b/src/main/java/org/nibor/autolink/LinkExtractor.java @@ -90,6 +90,17 @@ public static class Builder { private Builder() { } + /** + * @param linkTypes the link types that should be extracted (by default, all types are extracted) + * @return this builder + */ + public Builder linkTypes(LinkType... linkTypes) { + if (linkTypes == null) { + throw new NullPointerException("linkTypes must not be null"); + } + return this.linkTypes(Set.of(linkTypes)); + } + /** * @param linkTypes the link types that should be extracted (by default, all types are extracted) * @return this builder