You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2015/12/06 11:56:21 UTC

svn commit: r1718159 - in /axis/axis2/java/rampart/trunk: apidocs/pom.xml pom.xml

Author: veithen
Date: Sun Dec  6 10:56:21 2015
New Revision: 1718159

URL: http://svn.apache.org/viewvc?rev=1718159&view=rev
Log:
Simplify the build/release: always include all Maven modules.

Modified:
    axis/axis2/java/rampart/trunk/apidocs/pom.xml
    axis/axis2/java/rampart/trunk/pom.xml

Modified: axis/axis2/java/rampart/trunk/apidocs/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/apidocs/pom.xml?rev=1718159&r1=1718158&r2=1718159&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/apidocs/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/apidocs/pom.xml Sun Dec  6 10:56:21 2015
@@ -58,6 +58,13 @@
                             <goal>javadoc</goal>
                         </goals>
                     </execution>
+                    <execution>
+                        <id>dist-javadoc</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>javadoc</goal>
+                        </goals>
+                    </execution>
                 </executions>
                 <configuration>
                     <reportOutputDirectory>${project.reporting.outputDirectory}</reportOutputDirectory>
@@ -95,25 +102,4 @@
             </plugin>
         </plugins>
     </build>
-    <profiles>
-        <profile>
-            <id>apache-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>dist-javadoc</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>javadoc</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>

Modified: axis/axis2/java/rampart/trunk/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/pom.xml?rev=1718159&r1=1718158&r2=1718159&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/pom.xml Sun Dec  6 10:56:21 2015
@@ -457,9 +457,6 @@
                     <name>release</name>
                 </property>
             </activation>
-            <modules>
-                <module>modules/distribution</module>
-            </modules>
             <build>
                 <plugins>
                     <plugin>
@@ -496,16 +493,6 @@
                 </plugins>
             </build>
         </profile>
-        
-        <profile>
-            <!-- Profile that includes all modules. This is handy when using maven-release-plugin
-                 for anything else than doing a release. -->
-            <id>everything</id>
-            <modules>
-                <module>modules/distribution</module>
-                <module>code-coverage</module>
-            </modules>
-        </profile>
     </profiles>
 
     <modules>
@@ -517,8 +504,9 @@
         <module>modules/rampart-mar</module>
         <module>modules/rampart-trust-mar</module>
         <module>modules/rampart-integration</module>
-        <!-- Compile sample codes -->
-        <module>modules/rampart-samples</module>
+        <module>modules/rampart-samples</module> <!-- Compile sample codes -->
+        <module>modules/distribution</module>
+        <module>code-coverage</module>
     </modules>
 
     <properties>