Bugfix for release configs (#539)

### What's done: * Fixes for maven configuration for gradle plugin marker release * Changed parent for gradle-plugin-marker * Disable dokka for plugin marker
saveourtool · Nov 17, 2020 · c2c47fb · c2c47fb
1 parent 4d19224
commit c2c47fb
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 23 deletions.
diff --git a/diktat-gradle-plugin/gradle-plugin-marker/pom.xml b/diktat-gradle-plugin/gradle-plugin-marker/pom.xml
@@ -1,15 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>diktat-gradle-plugin</artifactId>
+        <groupId>org.cqfn.diktat</groupId>
+        <version>0.1.4-SNAPSHOT</version>
+    </parent>
     <modelVersion>4.0.0</modelVersion>
+
     <groupId>org.cqfn.diktat.diktat-gradle-plugin</groupId>
     <artifactId>org.cqfn.diktat.diktat-gradle-plugin.gradle.plugin</artifactId>
-    <version>0.1.4-SNAPSHOT</version>
     <packaging>pom</packaging>
+    <version>0.1.4-SNAPSHOT</version>
+
     <dependencies>
         <dependency>
             <groupId>org.cqfn.diktat</groupId>
             <artifactId>diktat-gradle-plugin</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jetbrains.dokka</groupId>
+                <artifactId>dokka-maven-plugin</artifactId>
+                <version>${dokka.version}</version>
+                <executions>
+                    <execution>
+                        <phase>none</phase>
+                        <goals>
+                            <goal>javadocJar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/diktat-gradle-plugin/pom.xml b/diktat-gradle-plugin/pom.xml
@@ -48,6 +48,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>
+                <inherited>false</inherited>
                 <configuration>
                     <filesets>
                         <fileset>
@@ -59,6 +60,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
+                <inherited>false</inherited>
                 <executions>
                     <execution>
                         <id>gradle</id>
@@ -85,6 +87,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
+                <inherited>false</inherited>
                 <executions>
                     <execution>
                         <id>attach-artifacts</id>
@@ -110,27 +113,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>deploy-gradle-plugin-marker</id>
-                        <goals>
-                            <goal>deploy-file</goal>
-                        </goals>
-                        <phase>deploy</phase>
-                        <configuration>
-                            <file>${gradle.builddir}/publications/diktatPluginPluginMarkerMaven/pom-default.xml</file>
-                            <pomFile>${gradle.builddir}/publications/diktatPluginPluginMarkerMaven/pom-default.xml</pomFile>
-                            <generatePom>false</generatePom>
-                            <url>r</url>
-                            <groupId>org.cqfn.diktat.diktat-gradle-plugin</groupId>
-                            <artifactId>org.cqfn.diktat.diktat-gradle-plugin.gradle.plugin</artifactId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>com.github.ozsie</groupId>
                 <artifactId>detekt-maven-plugin</artifactId>