Return-Path: 
 <commits-return-28924-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
X-Original-To: apmail-cxf-commits-archive@www.apache.org
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id DF9B910678
	for <apmail-cxf-commits-archive@www.apache.org>;
 Mon,  9 Sep 2013 17:23:45 +0000 (UTC)
Received: (qmail 42115 invoked by uid 500); 9 Sep 2013 17:23:45 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 42064 invoked by uid 500); 9 Sep 2013 17:23:45 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 42056 invoked by uid 99); 9 Sep 2013 17:23:45 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Sep 2013 17:23:45 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Sep 2013 17:23:42 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 4254E23889ED;
	Mon,  9 Sep 2013 17:23:21 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1521201 - /cxf/branches/2.6.x-fixes/parent/pom.xml
Date: Mon, 09 Sep 2013 17:23:21 -0000
To: commits@cxf.apache.org
From: dkulp@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20130909172321.4254E23889ED@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dkulp
Date: Mon Sep  9 17:23:20 2013
New Revision: 1521201

URL: http://svn.apache.org/r1521201
Log:
Merged revisions 1521178 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

........
  r1521178 | dkulp | 2013-09-09 12:23:25 -0400 (Mon, 09 Sep 2013) | 10 lines

  Merged revisions 1521176 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/trunk

  ........
    r1521176 | dkulp | 2013-09-09 12:19:01 -0400 (Mon, 09 Sep 2013) | 2 lines

    Don't do the custom check that no longer seems to be working

  ........

........

Modified:
    cxf/branches/2.6.x-fixes/parent/pom.xml

Modified: cxf/branches/2.6.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/parent/pom.xml?rev=1521201&r1=1521200&r2=1521201&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/parent/pom.xml Mon Sep  9 17:23:20 2013
@@ -339,7 +339,6 @@
                     <configuration>
                         <rulesets>
                             <ruleset>${cxf.resources.base.path}cxf-pmd-ruleset.xml</ruleset>
-                            <ruleset>${cxf.resources.base.path}cxf-pmd-custom.xml</ruleset>
                         </rulesets>
                         <sourceEncoding>UTF-8</sourceEncoding>
                         <targetJdk>1.5</targetJdk>
@@ -1770,47 +1769,6 @@
                 <defaultGoal>clean</defaultGoal>
             </build>
         </profile>
-        <profile>
-            <id>m2eclipse</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-pmd-plugin</artifactId>
-                        <version>2.7.1</version>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.cxf.build-utils</groupId>
-                                <artifactId>cxf-buildtools</artifactId>
-                                <version>${cxf.build-utils.version}</version>
-                            </dependency>
-                        </dependencies>
-                        <configuration>
-                            <rulesets>
-                                <ruleset>${cxf.resources.base.path}cxf-pmd-ruleset.xml</ruleset>
-                            </rulesets>
-                            <sourceEncoding>UTF-8</sourceEncoding>
-                            <targetJdk>1.5</targetJdk>
-                            <linkXRef>false</linkXRef>
-                            <includeTests>true</includeTests>
-                            <verbose>true</verbose>
-                            <excludeRoots>
-                                <excludeRoot>${basedir}/src/main/generated</excludeRoot>
-                            </excludeRoots>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>validate</id>
-                                <phase>validate</phase>
-                                <goals>
-                                    <goal>check</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 </project>