3 commits - java/code java/ivy.xml java/spacewalk-java.spec rel-eng/packages

Tomas Lestach tlestach at fedoraproject.org
Thu Jun 21 08:32:12 UTC 2012


 java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml |    6 +++---
 java/ivy.xml                                                             |    2 --
 java/spacewalk-java.spec                                                 |    6 +++++-
 rel-eng/packages/spacewalk-java                                          |    2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

New commits:
commit 4922f965efc350f05bb3fb9ef5842a942123adfc
Author: Tomas Lestach <tlestach at redhat.com>
Date:   Thu Jun 21 10:32:04 2012 +0200

    Automatic commit of package [spacewalk-java] release [1.8.91-1].

diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 7e53639..5f90ad3 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
 Summary: Spacewalk Java site packages
 Group: Applications/Internet
 License: GPLv2
-Version: 1.8.90
+Version: 1.8.91
 Release: 1%{?dist}
 URL:       https://fedorahosted.org/spacewalk
 Source0:   https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz 
@@ -615,6 +615,10 @@ fi
 %{jardir}/postgresql-jdbc.jar
 
 %changelog
+* Thu Jun 21 2012 Tomas Lestach <tlestach at redhat.com> 1.8.91-1
+- enable filtering by synopsis for all the errata tabs
+- remove simple-xml and susestudio-java-client from ivy.xml
+
 * Wed Jun 20 2012 Stephen Herr <sherr at redhat.com> 1.8.90-1
 - 823798 - update API documentation
 - 748331 - remove unused import
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 4069522..a6c773c 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.90-1 java/
+1.8.91-1 java/


commit 302d2b7cb936dda85588d81765d4a22c60e44411
Author: Tomas Lestach <tlestach at redhat.com>
Date:   Thu Jun 21 10:31:18 2012 +0200

    enable filtering by synopsis for all the errata tabs

diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
index 5be404f..f0d135c 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
@@ -38,7 +38,7 @@ ORDER BY  E.update_date DESC, E.id
 
 <mode name="relevant_errata_by_type" class="com.redhat.rhn.frontend.dto.ErrataOverview">
   <query params="user_id, type">
-SELECT E.id, E.update_date
+SELECT E.id, E.update_date, E.synopsis as advisory_synopsis
   FROM rhnErrata E,
        (SELECT SNEC.errata_id, COUNT(SNEC.server_id) C
           FROM rhnServerNeededPackageCache SNEC
@@ -54,7 +54,7 @@ ORDER BY  E.update_date DESC, E.id
 
 <mode name="relevant_errata_by_type_with_cves" class="com.redhat.rhn.frontend.dto.SecurityErrataOverview">
   <query params="user_id, type">
-SELECT E.id, E.update_date
+SELECT E.id, E.update_date, E.synopsis as advisory_synopsis
   FROM rhnErrata E,
        (SELECT SNEC.errata_id, COUNT(SNEC.server_id) C
           FROM rhnServerNeededPackageCache SNEC
@@ -104,7 +104,7 @@ SELECT DISTINCT E.id, E.update_date, E.synopsis AS ADVISORY_SYNOPSIS
 
 <mode name="all_errata_by_type_with_cves" class="com.redhat.rhn.frontend.dto.SecurityErrataOverview">
   <query params="org_id, type">
-SELECT DISTINCT E.id, E.update_date
+SELECT DISTINCT E.id, E.update_date, E.synopsis as advisory_synopsis
   FROM  rhnErrata E, rhnChannelErrata CE, rhnChannel C,
         rhnChannelFamilyMembers CFM,
         rhnOrgChannelFamilyPermissions OCF


commit 0975fafc0a09306edf30d2f86e89aeb51dcb241b
Author: Tomas Lestach <tlestach at redhat.com>
Date:   Thu Jun 21 10:28:03 2012 +0200

    remove simple-xml and susestudio-java-client from ivy.xml
    
    these jars aren't present in the ivy repo and just fail the build process on the devel worksation setup

diff --git a/java/ivy.xml b/java/ivy.xml
index 6c38eb8..159f947 100644
--- a/java/ivy.xml
+++ b/java/ivy.xml
@@ -59,12 +59,10 @@
         <dependency org="redhat" name="servletapi5" rev="5.0.18" />
         <dependency org="redhat" name="sitemesh" rev="2.1" />
         <dependency org="redhat" name="simple-core" rev="3.1.3" />
-        <dependency org="redhat" name="simple-xml" rev="2.6.2" />
         <dependency org="redhat" name="smtp" rev="1.3.1" />
         <dependency org="redhat" name="stringtree-json" rev="2.0.9" />
         <dependency org="redhat" name="struts" rev="1.2.9" />
         <dependency org="redhat" name="strutstest" rev="2.1.3" />
-        <dependency org="redhat" name="susestudio-java-client" rev="0.1.2" />
         <dependency org="redhat" name="taglibs-core" rev="1.1.0" />
         <dependency org="redhat" name="taglibs-standard" rev="1.1.0" />
         <dependency org="redhat" name="tanukiwrapper" rev="3.1.2" />




More information about the spacewalk-commits mailing list