You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ja...@apache.org on 2010/12/18 02:03:10 UTC

svn commit: r1050561 [1/3] - in /myfaces/core/trunk: api/pom.xml bundle/pom.xml impl/pom.xml implee6/pom.xml pom.xml

Author: jakobk
Date: Sat Dec 18 01:03:10 2010
New Revision: 1050561

URL: http://svn.apache.org/viewvc?rev=1050561&view=rev
Log:
MYFACES-3003 Cleanup and refactor poms (first cleanup - still some work to do)

Modified:
    myfaces/core/trunk/api/pom.xml
    myfaces/core/trunk/bundle/pom.xml
    myfaces/core/trunk/impl/pom.xml
    myfaces/core/trunk/implee6/pom.xml
    myfaces/core/trunk/pom.xml

Modified: myfaces/core/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/pom.xml?rev=1050561&r1=1050560&r2=1050561&view=diff
==============================================================================
--- myfaces/core/trunk/api/pom.xml (original)
+++ myfaces/core/trunk/api/pom.xml Sat Dec 18 01:03:10 2010
@@ -16,12 +16,15 @@
  * limitations under the License.
 -->
 <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">
+
     <parent>
         <groupId>org.apache.myfaces.core</groupId>
         <artifactId>myfaces-core-project</artifactId>
         <version>2.0.4-SNAPSHOT</version>
     </parent>
+
     <modelVersion>4.0.0</modelVersion>
+
     <groupId>org.apache.myfaces.core</groupId>
     <artifactId>myfaces-api</artifactId>
     <name>Apache MyFaces JSF Core-2.0 API</name>
@@ -29,16 +32,22 @@
         The public API classes of the Apache MyFaces CORE JSF-2.0 project
     </description>
     <url>http://myfaces.apache.org/core20/myfaces-api</url>
+
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/trunk/api</connection>
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/trunk/api</developerConnection>
         <url>http://svn.apache.org/repos/asf/myfaces/core/trunk/api</url>
     </scm>
+    
     <build>
+        
         <resources>
+            <!-- standard resources -->
             <resource>
                 <directory>src/main/resources</directory>
             </resource>
+
+            <!-- javascript resources -->
             <resource>
                 <directory>src/main/javascript/META-INF/resources/myfaces/_impl/_util</directory>
                 <targetPath>META-INF/internal-resources/org.apache.myfaces.core.impl.util</targetPath>
@@ -59,14 +68,12 @@
                 <directory>src/main/javascript/META-INF/resources/myfaces/api</directory>
                 <targetPath>META-INF/internal-resources/org.apache.myfaces.core.api</targetPath>
             </resource>
+            
         </resources>
+        
         <plugins>
-           <!--
-           javascript plugin adjusted to our build process
-           please do not delete this it is just disabled for now
-           -->
-
 
+            <!-- compilation and compression of our javascripts -->
             <plugin>
                 <artifactId>myfaces-javascript-plugin</artifactId>
                 <groupId>org.apache.myfaces.buildtools</groupId>
@@ -145,8 +152,8 @@
                     <outputDirectory>${basedir}/target/classes/META-INF/resources/javax.faces/</outputDirectory>
                 </configuration>
             </plugin>
-        
 
+            <!-- we want to use the test cases also in myfacse-impl, thus creating a test-jar -->
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>2.2</version>
@@ -157,41 +164,25 @@
                         </goals>
                     </execution>
                 </executions>
-        <configuration>
-          <archive>  
-            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-          </archive> 
-        </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>2.0.4</version>
-                <executions>
-                    <execution>
-                        <id>attach-source</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
+                <configuration>
+                    <archive>
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                    </archive>
+                </configuration>
             </plugin>
 
             <!-- 
-                berlios jsunit under apache2 license
-                to cover javascript core routines which
-                do not have to rely on a browser
-                or can work on browser mockups!
-
-                for furhter on dom testing we probably have
-                to integrate html based tests
-                with a browser engine
-                but for the core apis this should be sufficient
-                
+                berlios jsunit under apache2 license to cover javascript core routines which
+                do not have to rely on a browser or can work on browser mockups!
+
+                for furhter on dom testing we probably have to integrate html based tests
+                with a browser engine but for the core apis this should be sufficient
             -->
             <plugin>
                 <groupId>de.berlios.jsunit</groupId>
                 <artifactId>jsunit-maven2-plugin</artifactId>
                 <executions>
+                    <!-- TODO currently deactivated -->
                     <!--execution>
                         <id>test</id>
                         <goals>
@@ -219,44 +210,14 @@
                             <includes>
                                 <include>test/MockupTest.js</include>
                                 <include>utils/_JSF2UtilsTests.js</include>
-
                                 <include>ajax/AjaxTests.js</include>
-
                             </includes>
                         </testSuite>
                     </testSuites>
                 </configuration>
             </plugin>
 
-            <!--
-           <plugin>
-             <groupId>org.apache.myfaces.buildtools</groupId>
-             <artifactId>myfaces-faces-plugin</artifactId>
-             <configuration>
-               <typePrefix>javax.faces</typePrefix>
-               <packageContains>javax.faces</packageContains>
-               <jsfVersion>2.0</jsfVersion>
-               <force>true</force>
-               <templateSourceDirectory>src/main/java-templates</templateSourceDirectory>
-               <skipApiOrBaseClasses>false</skipApiOrBaseClasses>
-               <disableIdExpressions>true</disableIdExpressions>
-             </configuration>
-             <executions>
-               <execution>
-                 <goals>
-                   <goal>generate-components</goal>
-                 </goals>
-               </execution>
-             </executions>
-             <dependencies>
-                 <dependency>
-                   <groupId>commons-logging</groupId>
-                   <artifactId>commons-logging</artifactId>
-                   <version>1.1.1</version>
-                 </dependency>
-             </dependencies>
-           </plugin>
-            -->
+            <!-- myfaces-builder-plugin for metadata and component classes -->
             <plugin>
                 <groupId>org.apache.myfaces.buildtools</groupId>
                 <artifactId>myfaces-builder-plugin</artifactId>
@@ -278,99 +239,116 @@
                     </execution>
                 </executions>
             </plugin>
-      <plugin>   
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.1.0</version>
-        <executions>
-          <execution>
-            <id>bundle-manifest</id>
-            <phase>process-classes</phase>
-            <goals>    
-              <goal>manifest</goal>
-            </goals>
-            <configuration>
-              <instructions>
-                <Bundle-SymbolicName>org.apache.myfaces.core.api</Bundle-SymbolicName>
-                <Bundle-Classpath>.</Bundle-Classpath>
-                <Build-Jdk>${java.version}</Build-Jdk>
-                <Implementation-Title>${project.name}</Implementation-Title>
-                <Implementation-Version>${project.version}</Implementation-Version>
-                <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
-                <Implementation-Vendor-Id>${project.groupId}</Implementation-Vendor-Id>
-                <Export-Package>
-                  *;version="${project.version}"
-                </Export-Package>
-                <Import-Package>
-                  javax.el;version="[1.0.0, 3.0.0)",
-                  javax.validation*;version="[1.0.0, 2.0.0)",
-                  javax.servlet;version="[2.5.0, 3.1)",
-                  javax.servlet.http;version="[2.5.0, 3.1)",
-                  javax.servlet.jsp;version="[2.1.0, 3.1)",
-                  javax.servlet.jsp.jstl.core;version="[1.1.2, 2.0.0)",
-                  javax.servlet.jsp.jstl.sql;version="[1.1.2, 2.0.0)",
-                  javax.servlet.jsp.tagext;version="[2.1.0, 3.1)",
-                  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
-                  javax.faces.*;version="${project.version}"
-                </Import-Package>
-                <Require-Bundle>org.apache.myfaces.core.impl;bundle-version="${project.version}"</Require-Bundle>
-              </instructions>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <executions>
-            <execution>
-                <phase>test</phase>
-                <goals>
-                    <goal>test</goal>
-                </goals>
-                <configuration> 
-                    <testNGArtifactName>none:none</testNGArtifactName>
-                    <!-- Exclude all TestNG tests -->
-                    <excludes>
-                      <exclude>**/UIViewRootTest*</exclude>
-                      <exclude>**/_MessageUtilsTest*</exclude>
-                      <exclude>**/UIGraphicTest*</exclude>
-                      <exclude>**/UIComponentValueExpressionTest*</exclude>
-                      <exclude>**/UIComponentTest*</exclude>
-                      <exclude>**/UIComponentInvokeOnComponentTest*</exclude>
-                      <exclude>**/UIComponentEncodeAllTest*</exclude>
-                      <exclude>**/UIComponentBaseValueBindingTest*</exclude>
-                      <exclude>**/UIComponentBaseTest*</exclude>
-                      <exclude>**/UIComponentBaseProcessSaveRestoreStateTest*</exclude>
-                      <exclude>**/UIComponentBaseFacesListenerTest*</exclude>
-                      <exclude>**/HtmlOutputLinkTest*</exclude>
-                    </excludes>
-                </configuration>
-            </execution>
-            <execution>
-                <id>test-testng</id>
-                <phase>test</phase>
-                <goals>
-                    <goal>test</goal>
-                </goals>
-                <configuration> 
-                    <junitArtifactName>none:none</junitArtifactName>
-                </configuration>
-            </execution>
-        </executions>
-      </plugin>      
+
+            <!-- create manifest.mf for OSGi -->
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>2.1.0</version>
+                <executions>
+                    <execution>
+                        <id>bundle-manifest</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>manifest</goal>
+                        </goals>
+                        <configuration>
+                            <instructions>
+                                <Bundle-SymbolicName>org.apache.myfaces.core.api</Bundle-SymbolicName>
+                                <Bundle-Classpath>.</Bundle-Classpath>
+                                <Build-Jdk>${java.version}</Build-Jdk>
+                                <Implementation-Title>${project.name}</Implementation-Title>
+                                <Implementation-Version>${project.version}</Implementation-Version>
+                                <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
+                                <Implementation-Vendor-Id>${project.groupId}</Implementation-Vendor-Id>
+                                <Export-Package>
+                                    *;version="${project.version}"
+                                </Export-Package>
+                                <Import-Package>
+                                    javax.el;version="[1.0.0, 3.0.0)",
+                                    javax.validation*;version="[1.0.0, 2.0.0)",
+                                    javax.servlet;version="[2.5.0, 3.1)",
+                                    javax.servlet.http;version="[2.5.0, 3.1)",
+                                    javax.servlet.jsp;version="[2.1.0, 3.1)",
+                                    javax.servlet.jsp.jstl.core;version="[1.1.2, 2.0.0)",
+                                    javax.servlet.jsp.jstl.sql;version="[1.1.2, 2.0.0)",
+                                    javax.servlet.jsp.tagext;version="[2.1.0, 3.1)",
+                                    org.apache.commons.logging;version="[1.1.1, 2.0.0)",
+                                    javax.faces.*;version="${project.version}"
+                                </Import-Package>
+                                <Require-Bundle>
+                                    org.apache.myfaces.core.impl;bundle-version="${project.version}"
+                                </Require-Bundle>
+                            </instructions>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- execute tests (JUnit and TestNG) -->
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <executions>
+
+                    <!-- JUnit -->
+                    <execution>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <configuration>
+                            <testNGArtifactName>none:none</testNGArtifactName>
+                            <!-- Exclude all TestNG tests -->
+                            <excludes>
+                                <exclude>**/UIViewRootTest*</exclude>
+                                <exclude>**/_MessageUtilsTest*</exclude>
+                                <exclude>**/UIGraphicTest*</exclude>
+                                <exclude>**/UIComponentValueExpressionTest*</exclude>
+                                <exclude>**/UIComponentTest*</exclude>
+                                <exclude>**/UIComponentInvokeOnComponentTest*</exclude>
+                                <exclude>**/UIComponentEncodeAllTest*</exclude>
+                                <exclude>**/UIComponentBaseValueBindingTest*</exclude>
+                                <exclude>**/UIComponentBaseTest*</exclude>
+                                <exclude>**/UIComponentBaseProcessSaveRestoreStateTest*</exclude>
+                                <exclude>**/UIComponentBaseFacesListenerTest*</exclude>
+                                <exclude>**/HtmlOutputLinkTest*</exclude>
+                            </excludes>
+                        </configuration>
+                    </execution>
+
+                    <!-- TestNG -->
+                    <execution>
+                        <id>test-testng</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <configuration>
+                            <junitArtifactName>none:none</junitArtifactName>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
         </plugins>
+        
     </build>
+
+    
     <profiles>
+
+        <!-- TODO jakobk: we could change this to -Papache-release -->
+        <!--
+        - Generate files that are good to have when doing a release to main
+        - repositories, but which are not wanted when doing a quick
+        - "mvn install" before testing some code modifications.
+        -->
         <profile>
-            <!--
-            - Generate files that are good to have when doing a release to main
-            - repositories, but which are not wanted when doing a quick
-            - "mvn install" before testing some code modifications.
-            -->
             <id>generate-assembly</id>
             <build>
                 <plugins>
                     <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
                         <version>2.4</version>
                         <executions>
@@ -382,22 +360,12 @@
                             </execution>
                         </executions>
                     </plugin>
-                    <!--
-                           JSUnit Testing setup
-                           to test the affected javascript
-                           sources in a proper way!
-                           -->
-
                 </plugins>
             </build>
         </profile>
+
+        <!-- This profile verifies the binary compablity with the jsf api of the RI -->
         <profile>
-            <!-- This plugin verifies the binary compablity with the jsf api of the RI
-           TODO: add this to the normal build if 2.1 (or higher) of clirr-maven-plugin is released
-           In the meantime to use this plugin it must be installed manually from
-           https://svn.codehaus.org/mojo/trunk/mojo/clirr-maven-plugin
-           There is also a pending bug which patch must be applied before using this plugin:
-           http://jira.codehaus.org/browse/MCLIRR-5 -->
             <id>checkCompability</id>
             <build>
                 <plugins>
@@ -426,6 +394,8 @@
                 </plugins>
             </build>
         </profile>
+
+        <!-- check for Java 1.5 -->
         <profile>
             <id>checkJDK</id>
             <activation>
@@ -437,26 +407,28 @@
             <build>
                 <plugins>
                     <plugin>
-                      <groupId>org.jvnet</groupId>
-                      <artifactId>animal-sniffer</artifactId>
-                      <version>1.2</version>
-                      <executions>
-                        <execution>
-                          <goals>
-                            <goal>check</goal>
-                          </goals>
-                          <configuration>
-                            <signature>
-                              <groupId>org.jvnet.animal-sniffer</groupId>
-                              <artifactId>java1.5</artifactId>
-                              <version>1.0</version>
-                            </signature>
-                          </configuration>
-                        </execution>
-                      </executions>
+                        <groupId>org.jvnet</groupId>
+                        <artifactId>animal-sniffer</artifactId>
+                        <version>1.2</version>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>check</goal>
+                                </goals>
+                                <configuration>
+                                    <signature>
+                                        <groupId>org.jvnet.animal-sniffer</groupId>
+                                        <artifactId>java1.5</artifactId>
+                                        <version>1.0</version>
+                                    </signature>
+                                </configuration>
+                            </execution>
+                        </executions>
                     </plugin>            
                 </plugins>
             </build>
+
+            <!-- mojarra is only available on java.net -->
             <pluginRepositories>
                 <pluginRepository>
                     <id>java.net.repo</id>
@@ -465,128 +437,114 @@
                 </pluginRepository>
             </pluginRepositories>
         </profile>
+
     </profiles>
+
+    
     <dependencies>
+        <!--
+            NOTE that all versions and scopes are defined in the parent dependencyManagement section
+            (except for optional=true due to a maven bug). 
+        -->
+
+        <!-- Servlet 2.5 -->
         <dependency>
-            <!-- el-api 2.1 is included in jsp-api, so this one has to be on top of it -->
-            <groupId>javax.el</groupId>
-            <artifactId>el-api</artifactId>
-            <version>2.2</version>
-            <optional>true</optional>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.5_spec</artifactId>
         </dependency>
+
+        <!-- JSP 2.1 -->
         <dependency>
-            <groupId>de.berlios.jsunit</groupId>
-            <artifactId>jsunit-maven2-plugin</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jsp_2.1_spec</artifactId>
         </dependency>
+
+        <!-- JSTL 1.2 -->
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-            <scope>provided</scope>
+            <artifactId>jstl</artifactId>
         </dependency>
+
+        <!-- el 2.2 (javax.el.*) -->
         <dependency>
-            <groupId>javax.servlet.jsp</groupId>
-            <artifactId>jsp-api</artifactId>
-            <version>2.1</version>
-            <scope>provided</scope>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-el_2.2_spec</artifactId>
         </dependency>
+
+        <!-- bean-validation 1.0 (javax.validation.*) -->
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
-            <!-- version defined in parent -->
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <artifactId>jsp-api</artifactId>
-                    <groupId>javax.servlet</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.1.1</version>
-        </dependency -->
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-validation_1.0_spec</artifactId>
+            <optional>true</optional> <!-- optional does not completely work in dependencyManagement (MNG-1630) -->
+        </dependency>
+
+        <!-- builder-annotations like @JSFWebConfigParam -->
         <dependency>
             <groupId>org.apache.myfaces.buildtools</groupId>
             <artifactId>myfaces-builder-annotations</artifactId>
-            <scope>provided</scope>
         </dependency>
         
+        
         <!-- TEST DEPENDENCIES -->
+        
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.8.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
-            <version>1.8.3</version>
-            <scope>test</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
             <classifier>jdk15</classifier>
-            <version>5.1</version>
-            <scope>test</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.myfaces.test</groupId>
             <artifactId>myfaces-test20</artifactId>
-            <version>1.0.0</version>
-            <scope>test</scope>
         </dependency>
+
+        <!-- easymock -->
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymockclassextension</artifactId>
+        </dependency>
+
+        <!-- jmock -->
         <dependency>
             <groupId>jmock</groupId>
             <artifactId>jmock</artifactId>
-            <version>1.2.0</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>jmock</groupId>
             <artifactId>jmock-cglib</artifactId>
-            <version>1.2.0</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <version>2.3</version>
-            <scope>test</scope>
         </dependency>
+        
         <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
-            <version>2.3</version>
-            <scope>test</scope>
+            <groupId>de.berlios.jsunit</groupId>
+            <artifactId>jsunit-maven2-plugin</artifactId>
         </dependency>
+
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-            <version>1.0.CR3</version>
-            <optional>true</optional>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+            <scope>test</scope> <!-- normally scope=compile, but here only for tests needed - TODO jakobk really? -->
         </dependency>
+        
     </dependencies>
 
-    <repositories>
-        <repository>
-            <id>jboss releases</id>
-            <name>JBoss Releases</name>
-            <url>http://repository.jboss.org/maven2/</url>
-            <layout>default</layout>
-        </repository>
-    </repositories>
-
+    
     <reporting>
+        
         <plugins>
+            
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
             </plugin>
+
             <plugin>
                 <artifactId>maven-changelog-plugin</artifactId>
                 <version>2.2</version>
@@ -605,19 +563,23 @@
                     </reportSet>
                 </reportSets>
             </plugin>
+
             <plugin>
                 <artifactId>maven-jxr-plugin</artifactId>
                 <version>2.2</version>
             </plugin>
+
             <plugin>
                 <artifactId>maven-surefire-report-plugin</artifactId>
                 <version>2.5</version>
             </plugin>
+            
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>taglist-maven-plugin</artifactId>
                 <version>2.4</version>
             </plugin>
+            
             <!-- override PMD settings to set targetJdk -->
             <plugin>
                 <artifactId>maven-pmd-plugin</artifactId>
@@ -644,7 +606,9 @@
                     </reportSet>
                 </reportSets>
             </plugin>
+
         </plugins>
+        
     </reporting>
 
 </project>

Modified: myfaces/core/trunk/bundle/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/bundle/pom.xml?rev=1050561&r1=1050560&r2=1050561&view=diff
==============================================================================
--- myfaces/core/trunk/bundle/pom.xml (original)
+++ myfaces/core/trunk/bundle/pom.xml Sat Dec 18 01:03:10 2010
@@ -16,7 +16,6 @@
  * limitations under the License.
 -->
 <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/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache.myfaces.core</groupId>
@@ -24,9 +23,17 @@
         <version>2.0.4-SNAPSHOT</version>
     </parent>
 
+    <modelVersion>4.0.0</modelVersion>
+
     <artifactId>myfaces-bundle</artifactId>
     <name>Apache MyFaces JSF-2.0 Core OSGi Bundle</name>
     <packaging>bundle</packaging>
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/trunk/bundle</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/trunk/bundle</developerConnection>
+        <url>http://svn.apache.org/repos/asf/myfaces/core/trunk/bundle</url>
+    </scm>
     
     <build>
         <plugins>
@@ -96,17 +103,17 @@
         </plugins>
     </build>
 
+    
     <dependencies>
+        <!-- include myfaces-api and myfaces-impl in the bundle -->
         <dependency>
             <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-api</artifactId>
-            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-impl</artifactId>
-            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>