myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lu4...@apache.org
Subject svn commit: r1073596 - in /myfaces/shared/trunk_3.0.x: core/pom.xml pom.xml shared-impl/pom.xml shared-tomahawk/pom.xml
Date Wed, 23 Feb 2011 05:07:07 GMT
Author: lu4242
Date: Wed Feb 23 05:07:07 2011
New Revision: 1073596

URL: http://svn.apache.org/viewvc?rev=1073596&view=rev
Log:
update pom to sync with trunk configuration (and nexus stuff)

Modified:
    myfaces/shared/trunk_3.0.x/core/pom.xml
    myfaces/shared/trunk_3.0.x/pom.xml
    myfaces/shared/trunk_3.0.x/shared-impl/pom.xml
    myfaces/shared/trunk_3.0.x/shared-tomahawk/pom.xml

Modified: myfaces/shared/trunk_3.0.x/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_3.0.x/core/pom.xml?rev=1073596&r1=1073595&r2=1073596&view=diff
==============================================================================
--- myfaces/shared/trunk_3.0.x/core/pom.xml (original)
+++ myfaces/shared/trunk_3.0.x/core/pom.xml Wed Feb 23 05:07:07 2011
@@ -1,5 +1,22 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
 
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
   <parent>
     <artifactId>myfaces-shared-project</artifactId>
     <groupId>org.apache.myfaces.shared</groupId>
@@ -21,6 +38,8 @@
 
   <build>
     <plugins>
+      
+      <!-- 
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <version>2.1.2</version>
@@ -30,6 +49,7 @@
           </excludes>
         </configuration>
       </plugin>
+       -->
       <plugin>
         <artifactId>maven-source-plugin</artifactId>
         <executions>
@@ -72,10 +92,12 @@
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>jxr-maven-plugin</artifactId>
       </plugin>
+      <!-- 
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>surefire-report-maven-plugin</artifactId>
       </plugin>
+       -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>taglist-maven-plugin</artifactId>
@@ -109,4 +131,4 @@
       </plugin>
     </plugins>
   </reporting>
-</project>
\ No newline at end of file
+</project>

Modified: myfaces/shared/trunk_3.0.x/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_3.0.x/pom.xml?rev=1073596&r1=1073595&r2=1073596&view=diff
==============================================================================
--- myfaces/shared/trunk_3.0.x/pom.xml (original)
+++ myfaces/shared/trunk_3.0.x/pom.xml Wed Feb 23 05:07:07 2011
@@ -1,9 +1,26 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
   <parent>
     <groupId>org.apache.myfaces</groupId>
     <artifactId>myfaces</artifactId>
-    <version>9</version>
+    <version>10</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -60,7 +77,7 @@
           -->
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.2</version>
+        <version>2.6</version>
         <executions>
           <execution>
             <id>verify-style</id>
@@ -95,7 +112,7 @@
       <version>1.2.7</version>
       <scope>provided</scope>
     </dependency>
-    
+
     <dependency>
       <groupId>org.apache.myfaces.buildtools</groupId>
       <artifactId>myfaces-builder-annotations</artifactId> 
@@ -200,7 +217,6 @@
       <plugin>
         <!-- disable the plugin for this site project -->
         <artifactId>maven-pmd-plugin</artifactId>
-        <version>2.2</version>
         <reportSets>
           <reportSet />
         </reportSets>
@@ -208,7 +224,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.2</version>
+        <version>2.6</version>
         <configuration>
           <configLocation>default/myfaces-checks-standard.xml</configLocation>
           <headerLocation>default/myfaces-header-spaces.txt</headerLocation>
@@ -224,4 +240,4 @@
       <url>scpexe://people.apache.org/www/myfaces.apache.org/shared12/</url>
     </site>
   </distributionManagement>
-</project>
\ No newline at end of file
+</project>

Modified: myfaces/shared/trunk_3.0.x/shared-impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_3.0.x/shared-impl/pom.xml?rev=1073596&r1=1073595&r2=1073596&view=diff
==============================================================================
--- myfaces/shared/trunk_3.0.x/shared-impl/pom.xml (original)
+++ myfaces/shared/trunk_3.0.x/shared-impl/pom.xml Wed Feb 23 05:07:07 2011
@@ -1,5 +1,22 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -22,17 +39,16 @@
   <build>
 
     <resources>
-      <resource>
-        <!-- because adding an additional resourceRoot not possible with antrun yet -->
-        <directory>target/refactored-shared-sources/main/resources</directory>
-      </resource>
+        <resource>
+          <!-- because adding an additional resourceRoot not possible with antrun yet
-->
+          <directory>target/refactored-shared-sources/main/resources</directory>
+        </resource>
     </resources>
 
     <plugins>
-
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>dependency-maven-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
         <executions>
           <execution>
             <id>unpack-sources</id>

Modified: myfaces/shared/trunk_3.0.x/shared-tomahawk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_3.0.x/shared-tomahawk/pom.xml?rev=1073596&r1=1073595&r2=1073596&view=diff
==============================================================================
--- myfaces/shared/trunk_3.0.x/shared-tomahawk/pom.xml (original)
+++ myfaces/shared/trunk_3.0.x/shared-tomahawk/pom.xml Wed Feb 23 05:07:07 2011
@@ -1,5 +1,22 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -22,17 +39,16 @@
   <build>
 
     <resources>
-      <resource>
-        <!-- because adding an additional resourceRoot not possible with antrun yet -->
-        <directory>target/refactored-shared-sources/main/resources</directory>
-      </resource>
+        <resource>
+          <!-- because adding an additional resourceRoot not possible with antrun yet
-->
+          <directory>target/refactored-shared-sources/main/resources</directory>
+        </resource>
     </resources>
 
     <plugins>
-
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>dependency-maven-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
         <executions>
           <execution>
             <id>unpack-sources</id>
@@ -107,7 +123,7 @@
     </plugins>
 
   </build>
-  
+
   <dependencies>
     <dependency>
       <groupId>org.apache.myfaces.shared</groupId>



Mime
View raw message