2 commits - comps-f17.xml.in

[Alexander Kurtakov]

 comps-f17.xml.in |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 85b8d8ae50264596a39265c35e820c3627a186e0
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Tue Jan 24 14:48:07 2012 +0200

    Make java openjdk 1.7.0 the default jvm in the java group.
    
    Keep openjdk 1.6.0 as optional.

diff --git a/comps-f17.xml.in b/comps-f17.xml.in
index 4ea6de3..9312629 100644
--- a/comps-f17.xml.in
+++ b/comps-f17.xml.in
@@ -3497,9 +3497,10 @@
     <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq type="mandatory">java-1.6.0-openjdk</packagereq>
+      <packagereq type="mandatory">java-1.7.0-openjdk</packagereq>
       <packagereq type="default">icedtea-web</packagereq>
       <packagereq type="optional">java-1.5.0-gcj</packagereq>
+      <packagereq type="optional">java-1.6.0-openjdk</packagereq>
       <packagereq type="optional">libgcj</packagereq>
     </packagelist>
   </group>


commit e71ebd4464152bc1c3709fd12fde778399ffabfb
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Tue Jan 24 14:46:42 2012 +0200

    Make java 1.7.0 the default jvm in java-development group.

diff --git a/comps-f17.xml.in b/comps-f17.xml.in
index 1bcabf8..4ea6de3 100644
--- a/comps-f17.xml.in
+++ b/comps-f17.xml.in
@@ -3512,7 +3512,7 @@
     <packagelist>
       <packagereq type="mandatory">ant</packagereq>
       <packagereq type="mandatory">ecj</packagereq>
-      <packagereq type="mandatory">java-1.6.0-openjdk-devel</packagereq>
+      <packagereq type="mandatory">java-1.7.0-openjdk-devel</packagereq>
       <packagereq type="default">ant-antlr</packagereq>
       <packagereq type="default">ant-apache-bcel</packagereq>
       <packagereq type="default">ant-apache-log4j</packagereq>
@@ -3553,9 +3553,9 @@
       <packagereq type="default">gnu-getopt</packagereq>
       <packagereq type="default">jakarta-oro</packagereq>
       <packagereq type="default">jakarta-taglibs-standard</packagereq>
-      <packagereq type="default">java-1.6.0-openjdk-demo</packagereq>
-      <packagereq type="default">java-1.6.0-openjdk-javadoc</packagereq>
-      <packagereq type="default">java-1.6.0-openjdk-src</packagereq>
+      <packagereq type="default">java-1.7.0-openjdk-demo</packagereq>
+      <packagereq type="default">java-1.7.0-openjdk-javadoc</packagereq>
+      <packagereq type="default">java-1.7.0-openjdk-src</packagereq>
       <packagereq type="default">java_cup</packagereq>
       <packagereq type="default">jdepend</packagereq>
       <packagereq type="default">jlex</packagereq>
@@ -3574,6 +3574,10 @@
       <packagereq type="optional">ant-findbugs</packagereq>
       <packagereq type="optional">findbugs</packagereq>
       <packagereq type="optional">findbugs-tools</packagereq>
+      <packagereq type="optional">java-1.6.0-openjdk-demo</packagereq>
+      <packagereq type="optional">java-1.6.0-openjdk-devel</packagereq>
+      <packagereq type="optional">java-1.6.0-openjdk-javadoc</packagereq>
+      <packagereq type="optional">java-1.6.0-openjdk-src</packagereq>
       <packagereq type="optional">jcip-annotations</packagereq>
       <packagereq type="optional">jsr-305</packagereq>
       <packagereq type="optional">pmd</packagereq>