avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon/framework maven.xml project.xml
Date Fri, 30 Apr 2004 08:45:33 GMT
mcconnell    2004/04/30 01:45:32

  Modified:    framework/api project.xml
               framework/impl project.xml
               framework maven.xml project.xml
  Log:
  Update to generate rc1 build.
  
  Revision  Changes    Path
  1.4       +6 -3      avalon/framework/api/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/framework/api/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	8 Apr 2004 13:03:43 -0000	1.3
  +++ project.xml	30 Apr 2004 08:45:32 -0000	1.4
  @@ -5,7 +5,7 @@
   
   <project>
   
  -  <extend>${basedir}/../project.xml</extend>
  +  <extend>${basedir}/../../project.xml</extend>
   
     <groupId>&avalon-framework-id;</groupId>
     <id>&avalon-framework-api-id;</id>
  @@ -16,10 +16,13 @@
     <description>Avalon Framework API</description>
   
     <dependencies>
  +
       <dependency>
  -      <id>logkit</id>
  -      <version>1.2</version>
  +      <groupId>&avalon-logkit-id;</groupId>
  +      <artifactId>&avalon-logkit-id;</artifactId>
  +      <version>&avalon-logkit-version;</version>
       </dependency>
  +
     </dependencies>
   
     <build>
  
  
  
  1.5       +7 -5      avalon/framework/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/framework/impl/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml	8 Apr 2004 13:03:43 -0000	1.4
  +++ project.xml	30 Apr 2004 08:45:32 -0000	1.5
  @@ -4,7 +4,7 @@
   
   <project>
   
  -  <extend>${basedir}/../project.xml</extend>
  +  <extend>${basedir}/../../project.xml</extend>
   
     <groupId>&avalon-framework-id;</groupId>
     <id>&avalon-framework-impl-id;</id>
  @@ -25,6 +25,12 @@
       </dependency>
       
       <dependency>
  +      <groupId>&avalon-logkit-id;</groupId>
  +      <artifactId>&avalon-logkit-id;</artifactId>
  +      <version>&avalon-logkit-version;</version>
  +    </dependency>
  +
  +    <dependency>
         <id>xml-apis</id>
         <version>2.0.2</version>
       </dependency>
  @@ -45,10 +51,6 @@
       <dependency>
         <id>log4j</id>
         <version>1.2.7</version>
  -    </dependency>
  -    <dependency>
  -      <id>logkit</id>
  -      <version>1.2</version>
       </dependency>
       <dependency>
         <id>junit</id>
  
  
  
  1.9       +32 -10    avalon/framework/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/framework/maven.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- maven.xml	22 Apr 2004 03:58:17 -0000	1.8
  +++ maven.xml	30 Apr 2004 08:45:32 -0000	1.9
  @@ -1,3 +1,8 @@
  +<?xml version="1.0" encoding="ISO-8859-1"?>
  +<!DOCTYPE project [
  +  <!ENTITY % index SYSTEM "file:index.ent"> %index;
  +]>
  +
   <project default="avalon:build"  xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util"
xmlns:ant="jelly:ant">
   
     <ant:property name="maven.dist.assembly.dir"
  @@ -39,18 +44,36 @@
       <maven:reactor
         basedir="${basedir}"
         includes="*/project.xml"
  -      excludes="project.xml,site/project.xml"
  +      excludes="project.xml,site/project.xml,target/**"
         goals="jar:install"
         banner="Building:"
  -      ignoreFailures="false"/>
  +      ignoreFailures="false"
  +      postProcessing="true" />
  +
       <ant:copy todir="${maven.build.dir}">
  -      <ant:fileset dir="${basedir}/api/target">
  -        <ant:include name="${pom.artifactId}-api-${pom.currentVersion}.jar"/>
  -      </ant:fileset>
  -      <ant:fileset dir="${basedir}/impl/target">
  -        <ant:include name="${pom.artifactId}-impl-${pom.currentVersion}.jar"/>
  -      </ant:fileset>
  +      <j:forEach var="child" items="${reactorProjects}">
  +        <ant:fileset dir="${child.file.parentFile}/target">
  +          <ant:include name="${child.artifactId}-${child.currentVersion}.jar"/>
  +        </ant:fileset>
  +      </j:forEach>
       </ant:copy>
  +
  +    <j:forEach var="child" items="${reactorProjects}">
  +      <j:set var="path" value="${child.artifactId}-${child.currentVersion}"/>
  +      <util:file var="jarFile" name="${maven.build.dir}/${path}.jar"/>
  +      <j:if test="${jarFile.exists()}">
  +        <checksum file="${jarFile}" fileext=".md5" />
  +        <j:if test="${maven_gpg_exe != null}">
  +          <ant:exec executable="${maven_gpg_exe}">
  +            <ant:arg value="-a"/>
  +            <ant:arg value="--yes"/>
  +            <ant:arg value="-b"/>
  +            <ant:arg value="${jarFile}"/>
  +          </ant:exec>
  +        </j:if>
  +      </j:if>
  +    </j:forEach>
  +
     </goal>
   
     <goal name="avalon:build-snapshot">
  @@ -106,8 +129,7 @@
       <!-- Copy Jars -->
       <ant:copy todir="${maven.dist.bin.assembly.dir}">
         <ant:fileset dir="${maven.build.dir}">
  -        <ant:include name="${pom.artifactId}-api-${pom.currentVersion}.jar"/>
  -        <ant:include name="${pom.artifactId}-impl-${pom.currentVersion}.jar"/>
  +        <ant:include name="*.jar"/>
         </ant:fileset>
         <ant:fileset dir="${maven.build.dir}">
           <ant:include name="docs/**"/>
  
  
  
  1.8       +8 -4      avalon/framework/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/framework/project.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- project.xml	28 Feb 2004 14:10:18 -0000	1.7
  +++ project.xml	30 Apr 2004 08:45:32 -0000	1.8
  @@ -1,4 +1,8 @@
  -<?xml version="1.0" encoding="UTF-8"?>
  +<?xml version="1.0" encoding="ISO-8859-1"?>
  +<!DOCTYPE project [
  +  <!ENTITY % index SYSTEM "file:index.ent"> %index;
  +]>
  +
   <!-- 
   Copyright 2004 The Apache Software Foundation
   Licensed  under the  Apache License,  Version 2.0  (the "License");
  @@ -18,9 +22,9 @@
   <project>
   
     <name>Avalon Framework</name>
  -  <groupId>avalon-framework</groupId>
  -  <id>avalon-framework</id>
  -  <currentVersion>4.1.5</currentVersion>
  +  <groupId>&avalon-framework-id;</groupId>
  +  <id>&avalon-framework-id;</id>
  +  <currentVersion>&avalon-framework-version;</currentVersion>
     <inceptionYear>2000</inceptionYear>
   
     <organization>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message