You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ws.apache.org by bi...@apache.org on 2010/10/24 18:43:35 UTC

svn commit: r1026836 - in /webservices/xmlschema/trunk: etc/xmlschema-eclipse-checkstyle pom.xml

Author: bimargulies
Date: Sun Oct 24 16:43:34 2010
New Revision: 1026836

URL: http://svn.apache.org/viewvc?rev=1026836&view=rev
Log:
commit version that demonstrated a maven bug

Modified:
    webservices/xmlschema/trunk/etc/xmlschema-eclipse-checkstyle
    webservices/xmlschema/trunk/pom.xml

Modified: webservices/xmlschema/trunk/etc/xmlschema-eclipse-checkstyle
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/etc/xmlschema-eclipse-checkstyle?rev=1026836&r1=1026835&r2=1026836&view=diff
==============================================================================
--- webservices/xmlschema/trunk/etc/xmlschema-eclipse-checkstyle (original)
+++ webservices/xmlschema/trunk/etc/xmlschema-eclipse-checkstyle Sun Oct 24 16:43:34 2010
@@ -22,6 +22,5 @@
         <file-match-pattern match-pattern="^src[/\\]." include-pattern="true"/>
         <file-match-pattern match-pattern="^src[/\\]main[/\\]generated[/\\]." include-pattern="false"/>
         <file-match-pattern match-pattern="^src[/\\]test[/\\]generated[/\\]." include-pattern="false"/>
-        <file-match-pattern match-pattern="^src[/\\]main[/\\]release[/\\]samples[/\\]jax_rs[/\\]basic_https[/\\]contrib[/\\]." include-pattern="false"/>
     </fileset>
 </fileset-config>
\ No newline at end of file

Modified: webservices/xmlschema/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/pom.xml?rev=1026836&r1=1026835&r2=1026836&view=diff
==============================================================================
--- webservices/xmlschema/trunk/pom.xml (original)
+++ webservices/xmlschema/trunk/pom.xml Sun Oct 24 16:43:34 2010
@@ -80,43 +80,6 @@
         <pluginManagement>
             <plugins>
                 <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-eclipse-plugin</artifactId>
-                    <version>2.8</version>
-                    <configuration>
-                        <outputDirectory>${eclipse.outputDirectory}</outputDirectory>
-                        <buildcommands>
-                            <java.lang.String>org.eclipse.jdt.core.javabuilder</java.lang.String>
-                            <java.lang.String>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</java.lang.String>
-                            <java.lang.String>net.sourceforge.pmd.eclipse.plugin.pmdBuilder</java.lang.String>
-                        </buildcommands>
-                        <projectnatures>
-                            <nature>org.eclipse.jdt.core.javanature</nature>
-                            <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
-                            <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>
-                        </projectnatures>
-                        <additionalConfig>
-                            <file>
-                                <name>.checkstyle</name>
-                                <location>${basedir}/../etc/xmlschema-eclipse-checkstyle</location>
-                            </file>
-                            <file>
-                                <name>.pmd</name>
-                                <location>${basedir}/../etc/xmlschema-eclipse-pmd</location>
-                            </file>
-                            <file>
-                                <name>.ruleset</name>
-                                <location>${basedir}/../etc/xmlschema-pmd-ruleset.xml</location>
-                            </file>
-                        </additionalConfig>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-scm-plugin</artifactId>
-                    <version>1.4</version>
-                </plugin>
-                <plugin>
                     <artifactId>maven-release-plugin</artifactId>
                     <version>2.0</version>
                     <configuration>
@@ -200,11 +163,11 @@
                         <attach>true</attach>
                     </configuration>
                 </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-			<version>1.1</version>
-		    </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-gpg-plugin</artifactId>
+                    <version>1.1</version>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>
@@ -327,21 +290,57 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-eclipse-plugin</artifactId>
-<!-- This is the execution that we run only at the top level. -->
-                        <inherited>false</inherited>
+                        <version>2.8</version>
                         <executions>
                             <execution>
                                 <id>setup.eclipse.workspace</id>
+                                <!-- This is the execution that we run only at the top level. -->
+                                <inherited>false</inherited>
                                 <phase>process-test-sources</phase>
                                 <goals>
                                     <goal>configure-workspace</goal>
                                 </goals>
+                                <configuration>
+                                    <workspace>${eclipse.workspace.dir}</workspace>
+                                    <workspaceCodeStylesURL>file:${basedir}/etc/eclipse/XmlSchemaCodeFormatter.xml</workspaceCodeStylesURL>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>setup.project</id>
+                                <inherited>true</inherited>
+                                <goals>
+                                    <goal>eclipse</goal>
+                                </goals>
+                                <configuration>
+                                    <outputDirectory>${eclipse.outputDirectory}</outputDirectory>
+                                    <buildcommands>
+                                        <java.lang.String>org.eclipse.jdt.core.javabuilder</java.lang.String>
+                                        <java.lang.String>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</java.lang.String>
+                                        <java.lang.String>net.sourceforge.pmd.eclipse.plugin.pmdBuilder</java.lang.String>
+                                    </buildcommands>
+                                    <projectnatures>
+                                        <nature>org.eclipse.jdt.core.javanature</nature>
+                                        <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
+                                        <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>
+                                    </projectnatures>
+                                    <additionalConfig>
+                                        <file>
+                                            <name>.checkstyle</name>
+                                            <location>/xmlschema-eclipse-checkstyle</location>
+                                        </file>
+                                        <file>
+                                            <name>.pmd</name>
+                                            <location>/xmlschema-eclipse-pmd</location>
+                                        </file>
+                                        <file>
+                                            <name>.ruleset</name>
+                                            <location>/etc/xmlschema-pmd-ruleset.xml</location>
+                                        </file>
+                                    </additionalConfig>
+                                    <workspace>${eclipse.workspace.dir}</workspace>
+                                </configuration>
                             </execution>
                         </executions>
-                        <configuration>
-                            <workspace>${eclipse.workspace.dir}</workspace>
-                            <workspaceCodeStylesURL>file:${basedir}/etc/eclipse/XmlSchemaCodeFormatter.xml</workspaceCodeStylesURL>
-                        </configuration>
                     </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>