Merge pull request #1314 from PacoVK/1292-replace-http-builder

#1292 remove http builder and httpmime

Config.groovy

@@ -112,6 +112,9 @@ confluence.with {
     // https://[yourServer]
     api = 'https://[yourServer]'
 
+    // requests per second for confluence API calls
+    rateLimit = 10
+
 //    Additionally, spaceKey, subpagesForSections, pagePrefix and pageSuffix can be globally defined here. The assignment in the input array has precedence
 
     // the key of the confluence space to write to
@@ -238,6 +241,9 @@ jira.with {
     // endpoint of the JiraAPI (REST) to be used
     api = 'https://your-jira-instance'
 
+    // requests per second for Jira API calls
+    rateLimit = 10
+
     /*
     WARNING: It is strongly recommended to store credentials securely instead of commiting plain text values to your git repository!!!
 
@@ -279,26 +285,19 @@ jira.with {
     User can configure custom fields IDs and name those for column header,
     i.e. customfield_10026:'Story Points' for Jira instance that has custom field with that name and will be saved in a coloumn named "Story Points"
     */
-    requests = [
-        new JiraRequest(
+    exports = [
+        [
             filename:"File1_Done_issues",
             jql:"project='%jiraProject%' AND status='Done' ORDER BY duedate ASC",
             customfields: [customfield_10026:'Story Points']
-        ),
-        new JiraRequest(
+        ],
+        [
             filename:'CurrentSprint',
             jql:"project='%jiraProject%' AND Sprint in openSprints() ORDER BY priority DESC, duedate ASC",
             customfields: [customfield_10026:'Story Points']
-        ),
+        ]
     ]
 }
-
-@groovy.transform.Immutable
-class JiraRequest {
-    String filename  //filename (without extension) of the file in which JQL results will be saved. Extension will be determined automatically for Asciidoc or Excel file
-    String jql // Jira Query Language syntax
-    Map<String,String> customfields // map of customFieldId:displayName values for Jira fields which don't have default names, i.e. customfield_10026:StoryPoints
-}
 //end::jiraConfig[]
 
 //tag::openApiConfig[]

build.gradle

@@ -56,14 +56,11 @@ dependencies {
             (libs.junit),
             (libs.spock.core),
             gradleTestKit(),
-            //for the renderToConfluence Task
-            (libs.httpmime),
             (libs.jsoup),
-            (libs.http.builder),
             ("org.docToolchain:core")
     )
     testRuntimeOnly(libs.byte.buddy)
-    compileClasspath((libs.http.builder))
+    compileClasspath((libs.http.client))
 }
 
 test {

changelog.adoc

@@ -19,6 +19,7 @@ and this project tries to adhere to https://semver.org/spec/v2.0.0.html[Semantic
 
 * https://github.com/docToolchain/docToolchain/issues/1231[#1231: docker: port mapping only needed for previewSite]
 * https://github.com/docToolchain/docToolchain/issues/1309[#1309: deprecate previewSite task]
+* https://github.com/docToolchain/docToolchain/issues/1292[#1292: remove http builder and httpmime]
 
 == 3.1.2 - 2023-11-16
 

core/build.gradle

@@ -12,9 +12,10 @@ group = "org.docToolchain"
 
 dependencies {
     compileOnly((libs.groovy.all))
-    implementation((libs.http.builder))
-    implementation((libs.httpmime))
+    implementation((libs.http.client))
     implementation((libs.jsoup))
+    implementation((libs.poi.ooxml))
+    implementation((libs.guava))
 
     testImplementation(libs.spock.reports) {
         exclude group: 'org.codehaus.groovy', module: 'groovy-xml'