diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..27fc7c2
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,4 @@
+* text=auto eol=lf
+
+*.bat text eol=crlf
+*.jar binary
\ No newline at end of file
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000..8c666b2
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,27 @@
+name: Main
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        os: [ ubuntu-latest ]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: 17
+      - uses: gradle/wrapper-validation-action@v1
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+
+      - name: Execute Gradle build
+        run: ./gradlew build
diff --git a/README.md b/README.md
index e9151de..5282170 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,6 @@ If you're still using the deprecated `osgi` Gradle plugin in Gradle 6, you can u
 
 ## How to use
 
-Just replace the original `apply plugin: 'osgi'` with `apply plugin: 'com.github.blindpirate.osgi'`.
+[![Download](https://img.shields.io/gradle-plugin-portal/v/com.github.blindpirate.osgi)](https://plugins.gradle.org/plugin/com.github.blindpirate.osgi)
 
-See [it on Gradle plugin portal](https://plugins.gradle.org/plugin/com.github.blindpirate.osgi). 
+Just replace the original `apply plugin: 'osgi'` with `apply plugin: 'com.github.blindpirate.osgi'`.
diff --git a/build.gradle b/build.gradle
index 73afb8a..31f0311 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java-library'
     id 'groovy'
-    id "com.gradle.plugin-publish" version "0.12.0"
+    id "com.gradle.plugin-publish" version "1.2.0"
 }
 
 repositories {
@@ -10,33 +10,42 @@ repositories {
 
 group 'com.github.blindpirate'
 version '0.0.6'
-sourceCompatibility = '1.8'
-targetCompatibility = '1.8'
+
+java {
+    sourceCompatibility = '1.8'
+    targetCompatibility = '1.8'
+}
 
 dependencies {
     api gradleApi()
     api localGroovy()
-    api 'biz.aQute.bnd:biz.aQute.bndlib:5.2.0'
+    api 'biz.aQute.bnd:biz.aQute.bndlib:6.4.1'
 
-    testImplementation 'org.spockframework:spock-core:2.0-groovy-3.0'
-    testImplementation 'net.bytebuddy:byte-buddy:1.10.6'
-    testImplementation(platform('org.junit:junit-bom:5.8.0'))
+    testImplementation 'org.spockframework:spock-core:2.3-groovy-3.0'
+    testImplementation 'net.bytebuddy:byte-buddy:1.14.5'
+    testImplementation(platform('org.junit:junit-bom:5.9.3'))
     testImplementation('org.junit.vintage:junit-vintage-engine')
 }
 
-pluginBundle {
+gradlePlugin {
+    website = 'https://github.com/blindpirate/gradle-legacy-osgi-plugin'
+    vcsUrl = 'https://github.com/blindpirate/gradle-legacy-osgi-plugin'
+
     plugins {
         osgiPlugin {
-            website = 'https://github.com/blindpirate/gradle-legacy-osgi-plugin'
-            vcsUrl = 'https://github.com/blindpirate/gradle-legacy-osgi-plugin'
-            description = 'A legacy osgi plugin in Gradle 5'
-            tags = ['legacy', 'osgi']
             id = 'com.github.blindpirate.osgi'
+            implementationClass = "com.github.blindpirate.osgi.plugins.osgi.OsgiPlugin"
             displayName = 'A legacy osgi plugin in Gradle 5'
+            description = 'A legacy osgi plugin in Gradle 5'
+            tags.set(['legacy', 'osgi'])
         }
     }
 }
 
+tasks.named('publishPlugins') {
+    notCompatibleWithConfigurationCache("https://github.com/gradle/gradle/issues/21283")
+}
+
 publishPlugins.dependsOn 'check'
 
 test {
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..139007c
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,4 @@
+org.gradle.jvmargs=-Xmx4g -Dfile.encoding=UTF-8
+org.gradle.parallel=true
+org.gradle.caching=true
+org.gradle.configuration-cache=true
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index f3d88b1..c1962a7 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ffed3a2..37aef8d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 2fe81a7..aeb74cb 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,78 +17,110 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -97,7 +129,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -105,79 +137,109 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=`expr $i + 1`
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 9109989..93e3f59 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,103 +1,92 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/renovate.json b/renovate.json
new file mode 100644
index 0000000..39a2b6e
--- /dev/null
+++ b/renovate.json
@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base"
+  ]
+}
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..24491ae
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+enableFeaturePreview("STABLE_CONFIGURATION_CACHE")
diff --git a/src/main/java/com/github/blindpirate/osgi/internal/plugins/osgi/OsgiHelper.java b/src/main/java/com/github/blindpirate/osgi/internal/plugins/osgi/OsgiHelper.java
index be3e1d5..d955e53 100644
--- a/src/main/java/com/github/blindpirate/osgi/internal/plugins/osgi/OsgiHelper.java
+++ b/src/main/java/com/github/blindpirate/osgi/internal/plugins/osgi/OsgiHelper.java
@@ -17,7 +17,7 @@
 
 import org.gradle.api.GradleException;
 import org.gradle.api.Project;
-import org.gradle.api.plugins.BasePluginConvention;
+import org.gradle.api.plugins.BasePluginExtension;
 
 import java.util.StringTokenizer;
 import java.util.regex.Matcher;
@@ -59,7 +59,7 @@ public class OsgiHelper {
      */
     public String getBundleSymbolicName(Project project) {
         String group = project.getGroup().toString();
-        String archiveBaseName = project.getConvention().getPlugin(BasePluginConvention.class).getArchivesBaseName();
+        String archiveBaseName = project.getExtensions().getByType(BasePluginExtension.class).getArchivesName().get();
         if (archiveBaseName.startsWith(group)) {
             return archiveBaseName;
         }
diff --git a/src/main/java/com/github/blindpirate/osgi/plugins/osgi/OsgiPluginConvention.java b/src/main/java/com/github/blindpirate/osgi/plugins/osgi/OsgiExtension.java
similarity index 90%
rename from src/main/java/com/github/blindpirate/osgi/plugins/osgi/OsgiPluginConvention.java
rename to src/main/java/com/github/blindpirate/osgi/plugins/osgi/OsgiExtension.java
index e659cb6..9ee6bd6 100644
--- a/src/main/java/com/github/blindpirate/osgi/plugins/osgi/OsgiPluginConvention.java
+++ b/src/main/java/com/github/blindpirate/osgi/plugins/osgi/OsgiExtension.java
@@ -22,26 +22,26 @@
 import org.gradle.api.internal.ConventionMapping;
 import org.gradle.api.internal.IConventionAware;
 import org.gradle.api.internal.project.ProjectInternal;
-import org.gradle.api.plugins.BasePluginConvention;
+import org.gradle.api.plugins.BasePluginExtension;
 import org.gradle.internal.Actions;
 import org.gradle.internal.reflect.Instantiator;
 
+import javax.inject.Inject;
 import java.util.concurrent.Callable;
 
-import static org.gradle.util.ConfigureUtil.configure;
-
 /**
  * Is mixed into the project when applying the {@link OsgiPlugin}.
  */
-public class OsgiPluginConvention {
+public class OsgiExtension {
     private final ProjectInternal project;
 
     /**
-     * Creates an {@link OsgiPluginConvention} instance.
+     * Creates an {@link OsgiExtension} instance.
      *
      * @param project the project instance
      */
-    public OsgiPluginConvention(ProjectInternal project) {
+    @Inject
+    public OsgiExtension(ProjectInternal project) {
         this.project = project;
     }
 
@@ -78,7 +78,9 @@ public OsgiManifest osgiManifest() {
      * @return the created OsgiManifest instance
      */
     public OsgiManifest osgiManifest(Closure closure) {
-        return configure(closure, createDefaultOsgiManifest());
+        OsgiManifest manifest = createDefaultOsgiManifest();
+        project.configure(manifest, closure);
+        return manifest;
     }
 
     /**
@@ -108,7 +110,7 @@ public Object call() throws Exception {
         mapping.map("name", new Callable<Object>() {
             @Override
             public Object call() throws Exception {
-                return project.getConvention().getPlugin(BasePluginConvention.class).getArchivesBaseName();
+                return project.getExtensions().getByType(BasePluginExtension.class).getArchivesName().get();
             }
         });
         mapping.map("symbolicName", new Callable<Object>() {
diff --git a/src/main/java/com/github/blindpirate/osgi/plugins/osgi/OsgiPlugin.java b/src/main/java/com/github/blindpirate/osgi/plugins/osgi/OsgiPlugin.java
index 541b507..3671c5b 100644
--- a/src/main/java/com/github/blindpirate/osgi/plugins/osgi/OsgiPlugin.java
+++ b/src/main/java/com/github/blindpirate/osgi/plugins/osgi/OsgiPlugin.java
@@ -22,7 +22,7 @@
 import org.gradle.api.internal.project.ProjectInternal;
 import org.gradle.api.plugins.JavaBasePlugin;
 import org.gradle.api.plugins.JavaPlugin;
-import org.gradle.api.plugins.JavaPluginConvention;
+import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.tasks.Sync;
 import org.gradle.api.tasks.bundling.Jar;
 
@@ -36,8 +36,7 @@ public class OsgiPlugin implements Plugin<Project> {
     public void apply(final Project project) {
         project.getPluginManager().apply(JavaBasePlugin.class);
 
-        final OsgiPluginConvention osgiConvention = new OsgiPluginConvention((ProjectInternal) project);
-        project.getConvention().getPlugins().put("osgi", osgiConvention);
+        final OsgiExtension extension = project.getExtensions().create("osgi", OsgiExtension.class, project);
 
         project.getPlugins().withType(JavaPlugin.class, new Action<JavaPlugin>() {
             @Override
@@ -45,7 +44,7 @@ public void execute(JavaPlugin javaPlugin) {
 
                 // When creating the OSGi manifest, we must have a single view of all of the classes included in the jar.
                 Sync prepareOsgiClasses = project.getTasks().create("osgiClasses", Sync.class);
-                FileCollection classes = project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().getByName("main").getOutput().getClassesDirs();
+                FileCollection classes = project.getExtensions().getByType(JavaPluginExtension.class).getSourceSets().getByName("main").getOutput().getClassesDirs();
                 File singleClassesDirectory = new File(project.getBuildDir(), "osgi-classes");
                 prepareOsgiClasses.setDescription("Prepares a single classes directory required for OSGi analysis.");
                 prepareOsgiClasses.from(classes);
@@ -53,7 +52,7 @@ public void execute(JavaPlugin javaPlugin) {
 
                 Jar jarTask = (Jar) project.getTasks().getByName("jar");
                 jarTask.dependsOn(prepareOsgiClasses);
-                OsgiManifest osgiManifest = osgiConvention.osgiManifest();
+                OsgiManifest osgiManifest = extension.osgiManifest();
                 osgiManifest.setClassesDir(singleClassesDirectory);
                 osgiManifest.setClasspath(project.getConfigurations().getByName("runtimeClasspath"));
 
diff --git a/src/main/resources/META-INF/gradle-plugins/com.github.blindpirate.osgi.properties b/src/main/resources/META-INF/gradle-plugins/com.github.blindpirate.osgi.properties
deleted file mode 100644
index 652ae74..0000000
--- a/src/main/resources/META-INF/gradle-plugins/com.github.blindpirate.osgi.properties
+++ /dev/null
@@ -1 +0,0 @@
-implementation-class=com.github.blindpirate.osgi.plugins.osgi.OsgiPlugin
diff --git a/src/test/groovy/com/github/blindpirate/osgi/plugins/osgi/OsgiPluginConventionTest.groovy b/src/test/groovy/com/github/blindpirate/osgi/plugins/osgi/OsgiExtensionTest.groovy
similarity index 83%
rename from src/test/groovy/com/github/blindpirate/osgi/plugins/osgi/OsgiPluginConventionTest.groovy
rename to src/test/groovy/com/github/blindpirate/osgi/plugins/osgi/OsgiExtensionTest.groovy
index 713c00c..8c1b0bd 100644
--- a/src/test/groovy/com/github/blindpirate/osgi/plugins/osgi/OsgiPluginConventionTest.groovy
+++ b/src/test/groovy/com/github/blindpirate/osgi/plugins/osgi/OsgiExtensionTest.groovy
@@ -21,24 +21,24 @@ import org.gradle.api.Action
 import org.gradle.api.plugins.JavaBasePlugin
 import spock.lang.Issue
 
-class OsgiPluginConventionTest extends AbstractProjectBuilderSpec {
+class OsgiExtensionTest extends AbstractProjectBuilderSpec {
 
-    OsgiPluginConvention osgiPluginConvention
+    OsgiExtension extension
 
     def setup() {
-        osgiPluginConvention = new OsgiPluginConvention(project)
+        extension = new OsgiExtension(project)
         project.pluginManager.apply(JavaBasePlugin)
     }
 
     def osgiManifestWithNoClosure() {
-        OsgiManifest osgiManifest = osgiPluginConvention.osgiManifest()
+        OsgiManifest osgiManifest = extension.osgiManifest()
 
         expect:
         matchesExpectedConfig(osgiManifest)
     }
 
     def osgiManifestWithClosure() {
-        OsgiManifest osgiManifest = osgiPluginConvention.osgiManifest {
+        OsgiManifest osgiManifest = extension.osgiManifest {
             description = 'myDescription'
         }
 
@@ -48,7 +48,7 @@ class OsgiPluginConventionTest extends AbstractProjectBuilderSpec {
     }
 
     def osgiManifestWithAction() {
-        OsgiManifest osgiManifest = osgiPluginConvention.osgiManifest({ OsgiManifest manifest ->
+        OsgiManifest osgiManifest = extension.osgiManifest({ OsgiManifest manifest ->
             manifest.description = 'myDescription'
         } as Action<OsgiManifest>)
 
@@ -64,7 +64,7 @@ class OsgiPluginConventionTest extends AbstractProjectBuilderSpec {
                 "2.1"
             }
         }
-        def manifest = osgiPluginConvention.osgiManifest()
+        def manifest = extension.osgiManifest()
 
         expect:
         manifest.version == "2.1"
@@ -72,7 +72,7 @@ class OsgiPluginConventionTest extends AbstractProjectBuilderSpec {
 
     @Issue("GRADLE-1670")
     def "computes its defaults lazily"() {
-        def manifest = osgiPluginConvention.osgiManifest()
+        def manifest = extension.osgiManifest()
         def i = 0
         project.version = "${-> ++i}"
         project.group = "my.group"
diff --git a/src/test/groovy/com/github/blindpirate/osgi/plugins/osgi/OsgiPluginTest.groovy b/src/test/groovy/com/github/blindpirate/osgi/plugins/osgi/OsgiPluginTest.groovy
index 579523c..948b966 100644
--- a/src/test/groovy/com/github/blindpirate/osgi/plugins/osgi/OsgiPluginTest.groovy
+++ b/src/test/groovy/com/github/blindpirate/osgi/plugins/osgi/OsgiPluginTest.groovy
@@ -25,7 +25,7 @@ class OsgiPluginTest extends AbstractProjectBuilderSpec {
 
         expect:
         project.plugins.hasPlugin('java-base')
-        project.convention.plugins.osgi instanceof OsgiPluginConvention
+        project.extensions.getByName('osgi') instanceof OsgiExtension
     }
 
     void addsAnOsgiManifestToTheDefaultJar() {