[jboss-cvs] jboss-seam/build ...

[Peter Muir]

  User: pmuir   
  Date: 07/09/22 11:39:12

  Modified:    build     ui.pom.xml utilities.build.xml core.pom.xml
                        root.pom.xml
  Log:
  Temp fix for commons-beanutils nightmare
  
  Revision  Changes    Path
  1.7       +8 -4      jboss-seam/build/ui.pom.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ui.pom.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/build/ui.pom.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- ui.pom.xml	22 Sep 2007 13:41:43 -0000	1.6
  +++ ui.pom.xml	22 Sep 2007 15:39:12 -0000	1.7
  @@ -96,6 +96,10 @@
             <artifactId>commons-logging</artifactId>
           </exclusion>
           <exclusion>
  +          <groupId>commons-beanutils</groupId>
  +          <artifactId>commons-beanutils</artifactId>
  +        </exclusion>
  +        <exclusion>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
           </exclusion>
  @@ -116,6 +120,10 @@
             <artifactId>commons-logging</artifactId>
           </exclusion>
           <exclusion>
  +          <groupId>commons-beanutils</groupId>
  +          <artifactId>commons-beanutils</artifactId>
  +        </exclusion>
  +        <exclusion>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
           </exclusion>
  @@ -153,10 +161,6 @@
         <scope>provided</scope>
         <exclusions>
           <exclusion>
  -          <groupId>commons-collections</groupId>
  -          <artifactId>commons-collections</artifactId>
  -        </exclusion>
  -        <exclusion>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
           </exclusion>
  
  
  
  1.6       +4 -1      jboss-seam/build/utilities.build.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: utilities.build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/build/utilities.build.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- utilities.build.xml	22 Sep 2007 13:41:43 -0000	1.5
  +++ utilities.build.xml	22 Sep 2007 15:39:12 -0000	1.6
  @@ -80,7 +80,10 @@
   			<dependencies id="@{id}" scope="@{scope}" pom="@{pom}" />
   			<copy todir="@{todir}">
   				<fileset refid="@{scope}.@{id}.fileset" />
  +				<chainedmapper>
   				<mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${@{scope}.@{id}.versions}" to="flatten" />
  +					<flattenmapper />
  +				</chainedmapper>
   			</copy>
   		</sequential>
   	</macrodef>
  
  
  
  1.12      +7 -0      jboss-seam/build/core.pom.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: core.pom.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/build/core.pom.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- core.pom.xml	22 Sep 2007 13:41:43 -0000	1.11
  +++ core.pom.xml	22 Sep 2007 15:39:12 -0000	1.12
  @@ -439,6 +439,13 @@
         </exclusions>
       </dependency>
   
  +    <dependency>
  +      <groupId>commons-beanutils</groupId>
  +      <artifactId>commons-beanutils</artifactId>
  +      <version>1.7.0.seam</version>
  +      <optional>true</optional>
  +    </dependency>
  +
     </dependencies>
   
   </project>
  \ No newline at end of file
  
  
  
  1.7       +6 -0      jboss-seam/build/root.pom.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: root.pom.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/build/root.pom.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- root.pom.xml	22 Sep 2007 13:41:43 -0000	1.6
  +++ root.pom.xml	22 Sep 2007 15:39:12 -0000	1.7
  @@ -211,6 +211,12 @@
         </dependency>
   
         <dependency>
  +      	<groupId>commons-collections</groupId>
  +      	<artifactId>commons-collections</artifactId>
  +      	<version>3.2</version>
  +      </dependency>
  +
  +      <dependency>
           <groupId>javax.persistence</groupId>
           <artifactId>persistence-api</artifactId>
           <version>1.0</version>