portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject cvs commit: jakarta-jetspeed/etc artifact-versions.ent
Date Mon, 18 Apr 2005 04:40:53 GMT
taylor      2005/04/17 21:40:53

  Modified:    .        maven.xml locator.ent project.xml
  Added:       .        locator.path
               etc      artifact-versions.ent
  Log:
  centralize version numbering under etc/artifact-versions.ent
  switch over build to using torque-om jar
  
  Revision  Changes    Path
  1.41      +8 -1      jakarta-jetspeed/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/maven.xml,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- maven.xml	12 Apr 2005 22:40:09 -0000	1.40
  +++ maven.xml	18 Apr 2005 04:40:53 -0000	1.41
  @@ -288,7 +288,14 @@
               marshal="true"/>
           -->
           <attainGoal name="prepare.apis"/>
  -        <attainGoal name="torque:om"/>
  +        <maven:reactor
  +               basedir="${basedir}"
  +               includes="torque-om/project.xml"
  +               excludes=""
  +               goals="jar"
  +               banner="Building Torque OM specific bindings"
  +               ignoreFailures="true"/>
  +
       </preGoal>
       <!-- ================================================================== -->
       <!--C L E A N - U P   T O R Q U E   O M                     -->
  
  
  
  1.7       +6 -0      jakarta-jetspeed/locator.ent
  
  Index: locator.ent
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/locator.ent,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- locator.ent	12 Apr 2005 23:19:13 -0000	1.6
  +++ locator.ent	18 Apr 2005 04:40:53 -0000	1.7
  @@ -13,6 +13,12 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
  +<!-- derive root relative locator-path -->
  +<!ENTITY % locator-path SYSTEM "file:locator.path">
  +
  +<!-- Artifact versions -->
  +<!ENTITY % artifact-versions-ent '<!ENTITY &#37; artifact-versions SYSTEM "file:%locator-path;etc/artifact-versions.ent">
&#37;artifact-versions;'> %artifact-versions-ent;
  +
   <!ENTITY fusion SYSTEM "file:etc/project-dependencies/use-fusion.xml">	
   <!ENTITY spring SYSTEM "file:etc/project-dependencies/spring-deps.xml">	
   <!ENTITY activemq SYSTEM "file:etc/project-dependencies/activemq.xml">	
  
  
  
  1.62      +1 -1      jakarta-jetspeed/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/project.xml,v
  retrieving revision 1.61
  retrieving revision 1.62
  diff -u -r1.61 -r1.62
  --- project.xml	12 Apr 2005 23:19:13 -0000	1.61
  +++ project.xml	18 Apr 2005 04:40:53 -0000	1.62
  @@ -21,7 +21,7 @@
       <pomVersion>3</pomVersion>
       <id>jetspeed</id>
       <name>Jetspeed 1 Enterprise Portal</name>
  -    <currentVersion>1.6-dev</currentVersion>
  +    <currentVersion>&jetspeed-version;</currentVersion>
       <organization>
           <name>Apache Software Foundation</name>
           <url>http://portals.apache.org/</url>
  
  
  
  1.1                  jakarta-jetspeed/locator.path
  
  Index: locator.path
  ===================================================================
  ./
  
  
  1.1                  jakarta-jetspeed/etc/artifact-versions.ent
  
  Index: artifact-versions.ent
  ===================================================================
  <!ENTITY jetspeed-version "1.6-dev">
  <!ENTITY jetspeed-fusion-version "1.6-dev">
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message