You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2016/01/18 12:50:24 UTC
svn commit: r1725243 - in /webservices/wss4j/trunk: build-tools/pom.xml build-tools/src/main/resources/wss4j-checkstyle.xml build-tools/src/main/resources/wss4j-pmd-ruleset.xml build-tools/wss4j-checkstyle.xml build-tools/wss4j-pmd-ruleset.xml pom.xml

Author: coheigea
Date: Mon Jan 18 11:50:24 2016
New Revision: 1725243

URL: http://svn.apache.org/viewvc?rev=1725243&view=rev
Log:
Build-tools refactor

Added:
    webservices/wss4j/trunk/build-tools/wss4j-checkstyle.xml
      - copied, changed from r1725234, webservices/wss4j/trunk/build-tools/src/main/resources/wss4j-checkstyle.xml
    webservices/wss4j/trunk/build-tools/wss4j-pmd-ruleset.xml
      - copied, changed from r1725234, webservices/wss4j/trunk/build-tools/src/main/resources/wss4j-pmd-ruleset.xml
Removed:
    webservices/wss4j/trunk/build-tools/pom.xml
    webservices/wss4j/trunk/build-tools/src/main/resources/wss4j-checkstyle.xml
    webservices/wss4j/trunk/build-tools/src/main/resources/wss4j-pmd-ruleset.xml
Modified:
    webservices/wss4j/trunk/pom.xml

Copied: webservices/wss4j/trunk/build-tools/wss4j-checkstyle.xml (from r1725234, webservices/wss4j/trunk/build-tools/src/main/resources/wss4j-checkstyle.xml)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/build-tools/wss4j-checkstyle.xml?p2=webservices/wss4j/trunk/build-tools/wss4j-checkstyle.xml&p1=webservices/wss4j/trunk/build-tools/src/main/resources/wss4j-checkstyle.xml&r1=1725234&r2=1725243&rev=1725243&view=diff
==============================================================================
    (empty)

Copied: webservices/wss4j/trunk/build-tools/wss4j-pmd-ruleset.xml (from r1725234, webservices/wss4j/trunk/build-tools/src/main/resources/wss4j-pmd-ruleset.xml)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/build-tools/wss4j-pmd-ruleset.xml?p2=webservices/wss4j/trunk/build-tools/wss4j-pmd-ruleset.xml&p1=webservices/wss4j/trunk/build-tools/src/main/resources/wss4j-pmd-ruleset.xml&r1=1725234&r2=1725243&rev=1725243&view=diff
==============================================================================
    (empty)

Modified: webservices/wss4j/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/pom.xml?rev=1725243&r1=1725242&r2=1725243&view=diff
==============================================================================
--- webservices/wss4j/trunk/pom.xml (original)
+++ webservices/wss4j/trunk/pom.xml Mon Jan 18 11:50:24 2016
@@ -109,10 +109,10 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <targetJdk>1.8</targetJdk>
+        <buildtools.dir>${basedir}/build-tools</buildtools.dir>
     </properties>
 
     <modules>
-        <module>build-tools</module>
         <module>parent</module>
         <module>bindings</module>
         <module>policy</module>
@@ -132,7 +132,7 @@
                 <version>3.5</version>
                 <configuration>
                     <rulesets>
-                        <ruleset>wss4j-pmd-ruleset.xml</ruleset>
+                        <ruleset>${buildtools.dir}/wss4j-pmd-ruleset.xml</ruleset>
                     </rulesets>
                     <sourceEncoding>UTF-8</sourceEncoding>
                     <failOnViolation>true</failOnViolation>
@@ -144,13 +144,6 @@
                         <excludeRoot>${basedir}/src/main/generated</excludeRoot>
                     </excludeRoots>
                 </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.wss4j</groupId>
-                        <artifactId>build-tools</artifactId>
-                        <version>${project.version}</version>
-                    </dependency>
-                </dependencies>
                 <executions>
                     <execution>
                         <id>validate</id>
@@ -167,18 +160,11 @@
                 <artifactId>maven-checkstyle-plugin</artifactId>
                 <version>2.15</version>
                 <configuration>
-                    <configLocation>wss4j-checkstyle.xml</configLocation>
+                    <configLocation>${buildtools.dir}/wss4j-checkstyle.xml</configLocation>
                     <includeTestSourceDirectory>false</includeTestSourceDirectory>
                     <encoding>UTF-8</encoding>
                     <failOnViolation>true</failOnViolation>
                 </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.wss4j</groupId>
-                        <artifactId>build-tools</artifactId>
-                        <version>${project.version}</version>
-                    </dependency>
-                </dependencies>
                 <executions>
                     <execution>
                        <id>validate</id>
@@ -425,6 +411,28 @@
                 </pluginManagement>
             </build>
         </profile>
+        <profile>
+            <id>activate-buildtools-in-module</id>
+            <activation>
+                <file>
+                    <exists>${basedir}/../build-tools/wss4j-checkstyle.xml</exists>
+                </file>
+            </activation>
+            <properties>
+                <buildtools.dir>${basedir}/../build-tools</buildtools.dir>
+            </properties>
+        </profile>
+        <profile>
+            <id>activate-buildtools-in-submodule</id>
+            <activation>
+                <file>
+                    <exists>${basedir}/../../build-tools/wss4j-checkstyle.xml</exists>
+                </file>
+            </activation>
+            <properties>
+                <buildtools.dir>${basedir}/../../build-tools</buildtools.dir>
+            </properties>
+        </profile>
 
     </profiles>