Merge pull request #9495 from mcalmer/httpclient-and-more-lib-update

update httpclient and other java libs
uyuni-project · Nov 19, 2024 · b78ad81 · b78ad81
2 parents b89c832 + 0a27ae2
commit b78ad81
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 21 deletions.
diff --git a/java/buildconf/ivy/ivy-suse.xml b/java/buildconf/ivy/ivy-suse.xml
@@ -4,7 +4,7 @@
         <!-- Runtime dependencies -->
         <dependency org="suse" name="antlr" rev="2.7.7" />
         <dependency org="suse" name="asm" rev="9.3" />
-        <dependency org="suse" name="bcel" rev="5.2" />
+        <dependency org="suse" name="bcel" rev="6.10.0" />
         <dependency org="suse" name="byte-buddy" rev="1.14.16" />
         <dependency org="suse" name="byte-buddy-dep" rev="1.14.16" />
         <dependency org="suse" name="c3p0" rev="0.9.5.5" />
@@ -25,7 +25,7 @@
         <dependency org="suse" name="commons-fileupload" rev="1.5" />
         <dependency org="suse" name="commons-io" rev="2.15.1" />
         <dependency org="suse" name="commons-jexl" rev="2.1.1" />
-        <dependency org="suse" name="commons-lang3" rev="3.12.0" />
+        <dependency org="suse" name="commons-lang3" rev="3.16.0" />
         <dependency org="suse" name="commons-logging" rev="1.2" />
         <dependency org="suse" name="commons-validator" rev="1.3.1" />
         <dependency org="suse" name="commons-compress" rev="1.26.0" />
@@ -40,9 +40,9 @@
         <dependency org="suse" name="hibernate-ehcache" rev="5.3.25" />
         <dependency org="suse" name="hibernate-types-52" rev="2.16.2" />
         <dependency org="suse" name="httpasyncclient" rev="4.1.4" />
-        <dependency org="suse" name="httpclient" rev="4.5.12" />
-        <dependency org="suse" name="httpcore" rev="4.4.13" />
-        <dependency org="suse" name="httpcore-nio" rev="4.4.13" />
+        <dependency org="suse" name="httpclient" rev="4.5.14" />
+        <dependency org="suse" name="httpcore" rev="4.4.14" />
+        <dependency org="suse" name="httpcore-nio" rev="4.4.14" />
         <dependency org="suse" name="ical4j" rev="3.0.18" />
         <dependency org="suse" name="jackson-annotations" rev="2.15.2" />
         <dependency org="suse" name="jackson-core" rev="2.15.2" />
@@ -96,8 +96,8 @@
         <dependency org="suse" name="taglibs-standard-jstlel" rev="1.2.5" />
         <dependency org="suse" name="taglibs-standard-spec" rev="1.2.5" />
         <dependency org="suse" name="woodstox-core-asl" rev="4.4.2" />
-        <dependency org="suse" name="xalan-j2" rev="2.7.2" />
-        <dependency org="suse" name="xalan-j2-serializer" rev="2.7.2" />
+        <dependency org="suse" name="xalan-j2" rev="2.7.3" />
+        <dependency org="suse" name="xalan-j2-serializer" rev="2.7.3" />
         <dependency org="suse" name="xerces-j2" rev="2.12.2" />
         <dependency org="suse" name="xmlsec" rev="2.0.7" />
         <dependency org="suse" name="glassfish-jaxb-api" rev="2.4.0" />

diff --git a/java/buildconf/ivy/obs-maven-config.yaml b/java/buildconf/ivy/obs-maven-config.yaml
@@ -19,7 +19,7 @@ artifacts:
     package: antlr-java
     repository: Leap
   - artifact: bcel
-    repository: Leap
+    repository: Leap_sle
   - artifact: byte-buddy
     package: byte-buddy
     repository: Leap_sle
@@ -72,7 +72,7 @@ artifacts:
     repository: Leap
   - artifact: commons-lang3
     package: apache-commons-lang3
-    repository: Leap
+    repository: Leap_sle
   - artifact: commons-logging
     package: apache-commons-logging
     jar: apache-commons-logging\.jar
@@ -123,14 +123,14 @@ artifacts:
     repository: Leap
   - artifact: httpclient
     package: httpcomponents-client
-    repository: Leap
+    repository: Leap_sle
   - artifact: httpcore
     package: httpcomponents-core
     jar: httpcore.jar
-    repository: Leap
+    repository: Leap_sle
   - artifact: httpcore-nio
     package: httpcomponents-core
-    repository: Leap
+    repository: Leap_sle
   - artifact: jade4j
     repository: Uyuni_Other
   - artifact: jakarta-persistence-api
@@ -287,10 +287,10 @@ artifacts:
     repository: Uyuni_Other
   - artifact: xalan-j2
     jar: xalan-j2.jar
-    repository: Leap
+    repository: Leap_sle
   - artifact: xalan-j2-serializer
     package: xalan-j2
-    repository: Leap
+    repository: Leap_sle
   - artifact: xerces-j2
     repository: Leap
   - artifact: xmlsec

diff --git a/search-server/spacewalk-search/buildconf/obs-maven-config.yaml b/search-server/spacewalk-search/buildconf/obs-maven-config.yaml
@@ -1,13 +1,15 @@
 repositories:
   Leap:
-    project: openSUSE:Leap:15.4
+    project: openSUSE:Leap:15.6
     repository: standard
   Uyuni_Other:
     project: systemsmanagement:Uyuni:Master:Other
-    repository: openSUSE_Leap_15.4
+    repository: openSUSE_Leap_15.6
   Uyuni:
     project: systemsmanagement:Uyuni:Master
-    repository: openSUSE_Leap_15.4
+    repository: openSUSE_Leap_15.6
+  Leap_sle:
+    url: https://download.opensuse.org/update/leap/15.6/sle
 artifacts:
   - artifact: simple-core
     # How comes that package is not noarch?
@@ -23,7 +25,7 @@ artifacts:
     repository: Uyuni_Other
   - artifact: commons-lang3
     package: apache-commons-lang3
-    repository: Leap
+    repository: Leap_sle
   - artifact: commons-logging
     package: apache-commons-logging
     jar: apache-commons-logging\.jar

diff --git a/search-server/spacewalk-search/ivy.xml b/search-server/spacewalk-search/ivy.xml
@@ -4,13 +4,13 @@
         <dependency org="suse" name="simple-core" rev="3.1.3" />
         <dependency org="suse" name="lucene-core" rev="2.4" />
         <dependency org="suse" name="lucene-analyzers" rev="2.4" />
-        <dependency org="suse" name="commons-lang3" rev="3.8.1" />
+        <dependency org="suse" name="commons-lang3" rev="3.16.0" />
         <dependency org="suse" name="commons-logging" rev="1.2" />
         <dependency org="suse" name="redstone-xmlrpc" rev="1.1_20071120" />
         <dependency org="suse" name="mybatis" rev="3.5.6" />
         <dependency org="suse" name="quartz" rev="2.3.0" />
-        <dependency org="suse" name="log4j-api" rev="2.17.1" />
-        <dependency org="suse" name="log4j-core" rev="2.17.1" />
+        <dependency org="suse" name="log4j-api" rev="2.17.2" />
+        <dependency org="suse" name="log4j-core" rev="2.17.2" />
         <dependency org="suse" name="c3p0" rev="0.9.5.5" />
         <dependency org="suse" name="mchange-commons-java" rev="0.2.20" />
         <dependency org="suse" name="picocontainer" rev="1.3" />