Fix inability to promote

mdsal-docs not having the main artifact causes the repository
fail to promote. Work this around by packaging guides into a jar
rather than as a separate classifier.

Change-Id: I3c228e425da04b645f0a1a6dbd3e58cffe6e9f6f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 1c72ef266ec1f5628f4a7c25f69ac64339533f54..4fe1ee5cecf0fe6e10752bce9c06800e9163d04f 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -871,20 +871,6 @@
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-docs</artifactId>
                 <version>2.0.9-SNAPSHOT</version>
-                <type>zip</type>
-                <classifier>guides</classifier>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yangtools-docs</artifactId>
-                <version>2.0.9-SNAPSHOT</version>
-                <classifier>javadoc</classifier>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yangtools-docs</artifactId>
-                <version>2.0.9-SNAPSHOT</version>
-                <classifier>sources</classifier>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/docs/pom.xml b/docs/pom.xml
index 1f14cbb2eef63347d92aa5aa9c2118bbb78902a8..c1ab0af88e55e3bcb62abd549c82ae2edd207417 100644 (file)
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -410,7 +410,8 @@
                         </configuration>
                     </execution>
                 </executions>
-                <configuration>
+                    <configuration>
+                    <outputDirectory>${project.build.directory}/classes</outputDirectory>
                     <attributes>
                         <revnumber>${project.version}</revnumber>
                         <revdate>${maven.build.timestamp}</revdate>
@@ -419,31 +420,6 @@
                 </configuration>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <descriptor>assembly/guides.xml</descriptor>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <!-- We do not want the jar to be created -->
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>default-jar</id>
-                        <phase>none</phase>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>