diff --git a/gradle-plugin-rpm/src/main/groovy/org/xbib/gradle/plugin/RpmPlugin.groovy b/gradle-plugin-rpm/src/main/groovy/org/xbib/gradle/plugin/RpmPlugin.groovy
index d6b082e..87e51bc 100644
--- a/gradle-plugin-rpm/src/main/groovy/org/xbib/gradle/plugin/RpmPlugin.groovy
+++ b/gradle-plugin-rpm/src/main/groovy/org/xbib/gradle/plugin/RpmPlugin.groovy
@@ -4,7 +4,6 @@ import org.gradle.api.GradleException
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.plugins.BasePlugin
-import org.gradle.api.tasks.TaskProvider
 import org.gradle.util.GradleVersion
 
 class RpmPlugin implements Plugin<Project> {
@@ -17,9 +16,6 @@ class RpmPlugin implements Plugin<Project> {
         project.with {
             createExtension(project)
         }
-        /*project.afterEvaluate {
-            addTasks(project)
-        }*/
     }
 
     private static void checkVersion() {
@@ -32,12 +28,4 @@ class RpmPlugin implements Plugin<Project> {
     private static void createExtension(Project project) {
         project.extensions.create('rpm', RpmExtension)
     }
-
-    /*private static void addTasks(Project project) {
-        TaskProvider<Rpm> taskProvider = project.tasks.register('buildRpm', Rpm) {
-            group = 'rpm'
-            description = 'Generate RPM archive'
-        }
-        project.tasks.findByName('build').dependsOn taskProvider
-    }*/
 }
diff --git a/gradle.properties b/gradle.properties
index 82bfc07..5d2edc3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,17 +1,19 @@
 group = org.xbib
 name = rpm
-version = 2.0.1
+version = 2.1.0
 
-gradle.wrapper.version = 6.4.1
-gradle.publish.plugin.version = 0.11.0
-bouncycastle.version = 1.64
+gradle.wrapper.version = 6.6.1
+gradle.publish.plugin.version = 0.14.0
+bouncycastle.version = 1.68
 xbib-archive.version = 1.0.1
-ant.version = 1.10.8
-maven.version = 3.6.3
-maven-plugin-annotations.version = 3.6.0
-maven-plugin-plugin.version = 3.6.0
-maven-wagon.version = 3.3.4
+ant.version = 1.10.10
+maven.version = 3.8.1
+maven-plugin-annotations.version = 3.6.1
+maven-plugin-plugin.version = 3.6.1
+maven-wagon.version = 3.4.3
 aether-connector-basic.version = 1.1.0
 aether-transport-wagon.version = 1.1.0
-slf4j.version = 1.7.25
-mvel.version = 2.4.5.Final
+slf4j.version = 1.7.30
+mvel.version = 2.4.12.Final
+
+org.gradle.warning.mode = ALL
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 62d4c05..e708b1c 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 21e622d..33682bb 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index fbd7c51..4f906e0 100755
--- a/gradlew
+++ b/gradlew
@@ -130,7 +130,7 @@ fi
 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
diff --git a/gradlew.bat b/gradlew.bat
index a9f778a..ac1b06f 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,21 +64,6 @@ 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
 
@@ -86,7 +71,7 @@ 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%
+"%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
diff --git a/maven-plugin-rpm/src/main/java/org/xbib/maven/plugin/rpm/package-info.java b/maven-plugin-rpm/src/main/java/org/xbib/maven/plugin/rpm/package-info.java
deleted file mode 100644
index ccdc9ea..0000000
--- a/maven-plugin-rpm/src/main/java/org/xbib/maven/plugin/rpm/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- *
- */
-package org.xbib.maven.plugin.rpm;
diff --git a/maven-plugin-rpm/src/test/java/org/xbib/maven/plugin/rpm/package-info.java b/maven-plugin-rpm/src/test/java/org/xbib/maven/plugin/rpm/package-info.java
deleted file mode 100644
index ccdc9ea..0000000
--- a/maven-plugin-rpm/src/test/java/org/xbib/maven/plugin/rpm/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- *
- */
-package org.xbib.maven.plugin.rpm;