ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bimargul...@apache.org
Subject svn commit: r1039356 - in /webservices/xmlschema/trunk: .gitignore pom.xml xmlschema-bundle-test/pom.xml
Date Fri, 26 Nov 2010 13:55:50 GMT
Author: bimargulies
Date: Fri Nov 26 13:55:49 2010
New Revision: 1039356

URL: http://svn.apache.org/viewvc?rev=1039356&view=rev
Log:
turn checkstyle back on

Modified:
    webservices/xmlschema/trunk/.gitignore
    webservices/xmlschema/trunk/pom.xml
    webservices/xmlschema/trunk/xmlschema-bundle-test/pom.xml

Modified: webservices/xmlschema/trunk/.gitignore
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/.gitignore?rev=1039356&r1=1039355&r2=1039356&view=diff
==============================================================================
--- webservices/xmlschema/trunk/.gitignore (original)
+++ webservices/xmlschema/trunk/.gitignore Fri Nov 26 13:55:49 2010
@@ -27,3 +27,5 @@ xmlschema-eclipse/.project
 xmlschema-eclipse/.ruleset
 xmlschema-eclipse/.settings/
 xmlschema-eclipse/target/
+.project
+.settings/

Modified: webservices/xmlschema/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/pom.xml?rev=1039356&r1=1039355&r2=1039356&view=diff
==============================================================================
--- webservices/xmlschema/trunk/pom.xml (original)
+++ webservices/xmlschema/trunk/pom.xml Fri Nov 26 13:55:49 2010
@@ -151,9 +151,6 @@
                             </goals>
                         </execution>
                     </executions>
-                    <configuration>
-                        <attach>true</attach>
-                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -162,16 +159,6 @@
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-site-plugin</artifactId>
-                    <version>2.1.1</version>
-                    <configuration>
-                        <chmod>true</chmod>
-                        <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
-                        <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
                     <version>2.7</version>
                     <configuration>
@@ -179,8 +166,26 @@
                         <quiet>true</quiet>
                     </configuration>
                 </plugin>
+		<plugin>
+		  <groupId>org.apache.maven.plugins</groupId>
+		  <artifactId>maven-site-plugin</artifactId>
+		  <version>3.0-beta-3</version>
+		</plugin>
             </plugins>
         </pluginManagement>
+	<plugins>
+	  <plugin>
+	    <artifactId>maven-site-plugin</artifactId>
+	    <executions>
+	      <execution>
+		<id>attach-descriptor</id>
+		<goals>
+		  <goal>attach-descriptor</goal>
+		</goals>
+	      </execution>
+	    </executions>
+	  </plugin>
+	</plugins>
     </build>
     <profiles>
         <profile>
@@ -474,39 +479,6 @@
                 <checkstyle.skip>true</checkstyle.skip>
             </properties>
         </profile>
-        <profile>
-            <id>maven-3</id>
-            <activation>
-                <file>
-                    <!--  This employs that the basedir expression is only recognized
by Maven 3.x (see MNG-2363) -->
-                    <exists>${basedir}</exists>
-                </file>
-            </activation>
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-site-plugin</artifactId>
-                            <version>3.0-beta-3</version>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-site-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-descriptor</id>
-                                <goals>
-                                    <goal>attach-descriptor</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
     <dependencyManagement>
         <dependencies>

Modified: webservices/xmlschema/trunk/xmlschema-bundle-test/pom.xml
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-bundle-test/pom.xml?rev=1039356&r1=1039355&r2=1039356&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-bundle-test/pom.xml (original)
+++ webservices/xmlschema/trunk/xmlschema-bundle-test/pom.xml Fri Nov 26 13:55:49 2010
@@ -26,9 +26,9 @@
     </parent>
     <groupId>org.apache.ws.xmlschema</groupId>
     <artifactId>xmlschema-bundle-test</artifactId>
+    <version>2.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>XmlSchema OSGi bundle test</name>
-    <version>2.0-SNAPSHOT</version>
     <build>
         <defaultGoal>install</defaultGoal>
     </build>



Mime
View raw message