diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index d9c8c74ffc..6d70ca7c4e 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -9,7 +9,7 @@
 	</parent>
 
 	<artifactId>accurest-maven-plugin</artifactId>
-	<packaging>takari-maven-plugin</packaging>
+	<packaging>maven-plugin</packaging>
 
 	<dependencies>
 		<dependency>
@@ -93,14 +93,53 @@
 	</dependencies>
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.codehaus.plexus</groupId>
+				<artifactId>plexus-component-metadata</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>generate-metadata</goal>
+							<goal>generate-test-metadata</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-plugin-plugin</artifactId>
+				<version>${mavenPluginPluginVersion}</version><!--$NO-MVN-MAN-VER$-->
+				<configuration>
+					<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+				</configuration>
+				<executions>
+					<execution>
+						<id>generated-helpmojo</id>
+						<goals>
+							<goal>helpmojo</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>generate-descriptor</id>
+						<goals>
+							<goal>descriptor</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>io.takari.maven.plugins</groupId>
 				<artifactId>takari-lifecycle-plugin</artifactId>
 				<version>1.11.12</version>
 				<extensions>true</extensions>
-				<configuration>
-					<proc>none</proc>
-				</configuration>
+				<executions>
+					<execution>
+						<id>testProperties</id>
+						<phase>process-test-resources</phase>
+						<goals>
+							<goal>testProperties</goal>
+						</goals>
+					</execution>
+				</executions>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -134,7 +173,6 @@
 					</execution>
 				</executions>
 			</plugin>
-
 			<plugin>
 				<groupId>org.eluder.coveralls</groupId>
 				<artifactId>coveralls-maven-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index a65795f8d2..e81d7a7780 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,10 +110,6 @@
 
 		<pluginManagement>
 			<plugins>
-				<plugin>
-					<artifactId>maven-deploy-plugin</artifactId>
-					<version>2.8.2</version>
-				</plugin>
 				<plugin>
 					<artifactId>maven-install-plugin</artifactId>
 					<version>2.5.2</version>