diff options
26 files changed, 136 insertions, 146 deletions
diff --git a/org.eclipse.scout.jaxws.apt/org.eclipse.scout.jaxws.apt.iml b/org.eclipse.scout.jaxws.apt/org.eclipse.scout.jaxws.apt.iml index 4ce787a6da..6db533c122 100644 --- a/org.eclipse.scout.jaxws.apt/org.eclipse.scout.jaxws.apt.iml +++ b/org.eclipse.scout.jaxws.apt/org.eclipse.scout.jaxws.apt.iml @@ -27,20 +27,19 @@ <orderEntry type="module" module-name="org.eclipse.scout.rt.server.commons" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.shared" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.security" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.36.0" level="project" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.36.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.38.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.38.0" level="project" /> <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:30.0-jre" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" /> - <orderEntry type="library" name="Maven: org.checkerframework:checker-compat-qual:2.5.5" level="project" /> + <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.5.0" level="project" /> <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" /> <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-api:0.24.0" level="project" /> <orderEntry type="library" name="Maven: io.grpc:grpc-context:1.22.1" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-contrib-http-util:0.24.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" /> + <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" /> <orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.4" level="project" /> diff --git a/org.eclipse.scout.rt.chart.client/org.eclipse.scout.rt.chart.client.iml b/org.eclipse.scout.rt.chart.client/org.eclipse.scout.rt.chart.client.iml index 47bbce2a92..6734d56936 100644 --- a/org.eclipse.scout.rt.chart.client/org.eclipse.scout.rt.chart.client.iml +++ b/org.eclipse.scout.rt.chart.client/org.eclipse.scout.rt.chart.client.iml @@ -19,20 +19,19 @@ <orderEntry type="module" module-name="org.eclipse.scout.rt.shared" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.security" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.dataobject" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.36.0" level="project" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.36.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.38.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.38.0" level="project" /> <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:30.0-jre" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" /> - <orderEntry type="library" name="Maven: org.checkerframework:checker-compat-qual:2.5.5" level="project" /> + <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.5.0" level="project" /> <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" /> <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-api:0.24.0" level="project" /> <orderEntry type="library" name="Maven: io.grpc:grpc-context:1.22.1" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-contrib-http-util:0.24.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" /> + <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.chart.shared" /> diff --git a/org.eclipse.scout.rt.chart.shared/org.eclipse.scout.rt.chart.shared.iml b/org.eclipse.scout.rt.chart.shared/org.eclipse.scout.rt.chart.shared.iml index d86ea40360..2252193a5d 100644 --- a/org.eclipse.scout.rt.chart.shared/org.eclipse.scout.rt.chart.shared.iml +++ b/org.eclipse.scout.rt.chart.shared/org.eclipse.scout.rt.chart.shared.iml @@ -19,20 +19,19 @@ <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.2" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.security" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.dataobject" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.36.0" level="project" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.36.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.38.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.38.0" level="project" /> <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:30.0-jre" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" /> - <orderEntry type="library" name="Maven: org.checkerframework:checker-compat-qual:2.5.5" level="project" /> + <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.5.0" level="project" /> <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" /> <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-api:0.24.0" level="project" /> <orderEntry type="library" name="Maven: io.grpc:grpc-context:1.22.1" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-contrib-http-util:0.24.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" /> + <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.shared.test" scope="TEST" /> diff --git a/org.eclipse.scout.rt.chart.ui.html/org.eclipse.scout.rt.chart.ui.html.iml b/org.eclipse.scout.rt.chart.ui.html/org.eclipse.scout.rt.chart.ui.html.iml index c1734f4196..57f071ac7e 100644 --- a/org.eclipse.scout.rt.chart.ui.html/org.eclipse.scout.rt.chart.ui.html.iml +++ b/org.eclipse.scout.rt.chart.ui.html/org.eclipse.scout.rt.chart.ui.html.iml @@ -20,20 +20,19 @@ <orderEntry type="module" module-name="org.eclipse.scout.rt.shared" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.security" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.dataobject" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.36.0" level="project" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.36.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.38.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.38.0" level="project" /> <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:30.0-jre" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" /> - <orderEntry type="library" name="Maven: org.checkerframework:checker-compat-qual:2.5.5" level="project" /> + <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.5.0" level="project" /> <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" /> <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-api:0.24.0" level="project" /> <orderEntry type="library" name="Maven: io.grpc:grpc-context:1.22.1" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-contrib-http-util:0.24.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" /> + <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.chart.shared" /> diff --git a/org.eclipse.scout.rt.client.test/org.eclipse.scout.rt.client.test.iml b/org.eclipse.scout.rt.client.test/org.eclipse.scout.rt.client.test.iml index 25a00f01ed..6582f182c4 100644 --- a/org.eclipse.scout.rt.client.test/org.eclipse.scout.rt.client.test.iml +++ b/org.eclipse.scout.rt.client.test/org.eclipse.scout.rt.client.test.iml @@ -19,20 +19,19 @@ <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.2" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.shared" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.security" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.36.0" level="project" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.36.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.38.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.38.0" level="project" /> <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:30.0-jre" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" /> - <orderEntry type="library" name="Maven: org.checkerframework:checker-compat-qual:2.5.5" level="project" /> + <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.5.0" level="project" /> <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" /> <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-api:0.24.0" level="project" /> <orderEntry type="library" name="Maven: io.grpc:grpc-context:1.22.1" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-contrib-http-util:0.24.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" /> + <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.shared.test" /> diff --git a/org.eclipse.scout.rt.client/org.eclipse.scout.rt.client.iml b/org.eclipse.scout.rt.client/org.eclipse.scout.rt.client.iml index 2106c211e4..896bf5d5ce 100644 --- a/org.eclipse.scout.rt.client/org.eclipse.scout.rt.client.iml +++ b/org.eclipse.scout.rt.client/org.eclipse.scout.rt.client.iml @@ -18,20 +18,19 @@ <orderEntry type="module" module-name="org.eclipse.scout.rt.shared" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.security" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.dataobject" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.36.0" level="project" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.36.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.38.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.38.0" level="project" /> <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:30.0-jre" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" /> - <orderEntry type="library" name="Maven: org.checkerframework:checker-compat-qual:2.5.5" level="project" /> + <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.5.0" level="project" /> <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" /> <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-api:0.24.0" level="project" /> <orderEntry type="library" name="Maven: io.grpc:grpc-context:1.22.1" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-contrib-http-util:0.24.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" /> + <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" /> </component> diff --git a/org.eclipse.scout.rt.rest.jersey.client/org.eclipse.scout.rt.rest.jersey.client.iml b/org.eclipse.scout.rt.rest.jersey.client/org.eclipse.scout.rt.rest.jersey.client.iml index 19c44baa79..68a0f8b460 100644 --- a/org.eclipse.scout.rt.rest.jersey.client/org.eclipse.scout.rt.rest.jersey.client.iml +++ b/org.eclipse.scout.rt.rest.jersey.client/org.eclipse.scout.rt.rest.jersey.client.iml @@ -25,7 +25,7 @@ <orderEntry type="library" name="Maven: com.sun.activation:jakarta.activation:1.2.2" level="project" /> <orderEntry type="library" name="Maven: org.glassfish.hk2.external:jakarta.inject:2.6.1" level="project" /> <orderEntry type="library" name="Maven: org.glassfish.jersey.connectors:jersey-apache-connector:2.31" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" /> + <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" /> </component> diff --git a/org.eclipse.scout.rt.rest.jersey.test/org.eclipse.scout.rt.rest.jersey.test.iml b/org.eclipse.scout.rt.rest.jersey.test/org.eclipse.scout.rt.rest.jersey.test.iml index 2a0ce5adfb..ca12e339aa 100644 --- a/org.eclipse.scout.rt.rest.jersey.test/org.eclipse.scout.rt.rest.jersey.test.iml +++ b/org.eclipse.scout.rt.rest.jersey.test/org.eclipse.scout.rt.rest.jersey.test.iml @@ -60,7 +60,7 @@ <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.4.31.v20200723" level="project" /> <orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.4" level="project" /> <orderEntry type="library" name="Maven: org.glassfish.jersey.connectors:jersey-apache-connector:2.31" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" /> + <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" /> <orderEntry type="library" name="Maven: jakarta.ws.rs:jakarta.ws.rs-api:2.1.6" level="project" /> diff --git a/org.eclipse.scout.rt.server.commons.test/org.eclipse.scout.rt.server.commons.test.iml b/org.eclipse.scout.rt.server.commons.test/org.eclipse.scout.rt.server.commons.test.iml index 480df4b879..f62187d52d 100644 --- a/org.eclipse.scout.rt.server.commons.test/org.eclipse.scout.rt.server.commons.test.iml +++ b/org.eclipse.scout.rt.server.commons.test/org.eclipse.scout.rt.server.commons.test.iml @@ -14,20 +14,19 @@ <orderEntry type="module" module-name="org.eclipse.scout.rt.shared" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.security" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.dataobject" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.36.0" level="project" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.36.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.38.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.38.0" level="project" /> <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:30.0-jre" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" /> - <orderEntry type="library" name="Maven: org.checkerframework:checker-compat-qual:2.5.5" level="project" /> + <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.5.0" level="project" /> <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" /> <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-api:0.24.0" level="project" /> <orderEntry type="library" name="Maven: io.grpc:grpc-context:1.22.1" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-contrib-http-util:0.24.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" /> + <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" /> <orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.4" level="project" /> diff --git a/org.eclipse.scout.rt.server.commons/org.eclipse.scout.rt.server.commons.iml b/org.eclipse.scout.rt.server.commons/org.eclipse.scout.rt.server.commons.iml index 8cde7a7bc2..c245e92490 100644 --- a/org.eclipse.scout.rt.server.commons/org.eclipse.scout.rt.server.commons.iml +++ b/org.eclipse.scout.rt.server.commons/org.eclipse.scout.rt.server.commons.iml @@ -18,20 +18,19 @@ <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.2" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.security" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.dataobject" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.36.0" level="project" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.36.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.38.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.38.0" level="project" /> <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:30.0-jre" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" /> - <orderEntry type="library" name="Maven: org.checkerframework:checker-compat-qual:2.5.5" level="project" /> + <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.5.0" level="project" /> <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" /> <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-api:0.24.0" level="project" /> <orderEntry type="library" name="Maven: io.grpc:grpc-context:1.22.1" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-contrib-http-util:0.24.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" /> + <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" /> <orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.4" level="project" /> diff --git a/org.eclipse.scout.rt.server.jaxws.test/org.eclipse.scout.rt.server.jaxws.test.iml b/org.eclipse.scout.rt.server.jaxws.test/org.eclipse.scout.rt.server.jaxws.test.iml index 523b4c71f1..d9cbe0bf8d 100644 --- a/org.eclipse.scout.rt.server.jaxws.test/org.eclipse.scout.rt.server.jaxws.test.iml +++ b/org.eclipse.scout.rt.server.jaxws.test/org.eclipse.scout.rt.server.jaxws.test.iml @@ -26,20 +26,19 @@ <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.2" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.security" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.36.0" level="project" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.36.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.38.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.38.0" level="project" /> <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:30.0-jre" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" /> - <orderEntry type="library" name="Maven: org.checkerframework:checker-compat-qual:2.5.5" level="project" /> + <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.5.0" level="project" /> <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" /> <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-api:0.24.0" level="project" /> <orderEntry type="library" name="Maven: io.grpc:grpc-context:1.22.1" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-contrib-http-util:0.24.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" /> + <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.server.commons" /> diff --git a/org.eclipse.scout.rt.server.jaxws/org.eclipse.scout.rt.server.jaxws.iml b/org.eclipse.scout.rt.server.jaxws/org.eclipse.scout.rt.server.jaxws.iml index 2a3f64d70f..b1dc6b7b81 100644 --- a/org.eclipse.scout.rt.server.jaxws/org.eclipse.scout.rt.server.jaxws.iml +++ b/org.eclipse.scout.rt.server.jaxws/org.eclipse.scout.rt.server.jaxws.iml @@ -18,20 +18,19 @@ <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" /> <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.2" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.security" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.36.0" level="project" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.36.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.38.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.38.0" level="project" /> <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:30.0-jre" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" /> - <orderEntry type="library" name="Maven: org.checkerframework:checker-compat-qual:2.5.5" level="project" /> + <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.5.0" level="project" /> <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" /> <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-api:0.24.0" level="project" /> <orderEntry type="library" name="Maven: io.grpc:grpc-context:1.22.1" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-contrib-http-util:0.24.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" /> + <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.server.commons" /> diff --git a/org.eclipse.scout.rt.server.jdbc.test/org.eclipse.scout.rt.server.jdbc.test.iml b/org.eclipse.scout.rt.server.jdbc.test/org.eclipse.scout.rt.server.jdbc.test.iml index 29c353f2f6..094db2a5c2 100644 --- a/org.eclipse.scout.rt.server.jdbc.test/org.eclipse.scout.rt.server.jdbc.test.iml +++ b/org.eclipse.scout.rt.server.jdbc.test/org.eclipse.scout.rt.server.jdbc.test.iml @@ -18,20 +18,19 @@ <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" /> <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.2" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.security" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.36.0" level="project" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.36.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.38.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.38.0" level="project" /> <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:30.0-jre" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" /> - <orderEntry type="library" name="Maven: org.checkerframework:checker-compat-qual:2.5.5" level="project" /> + <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.5.0" level="project" /> <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" /> <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-api:0.24.0" level="project" /> <orderEntry type="library" name="Maven: io.grpc:grpc-context:1.22.1" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-contrib-http-util:0.24.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" /> + <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.server.commons" /> diff --git a/org.eclipse.scout.rt.server.jdbc/org.eclipse.scout.rt.server.jdbc.iml b/org.eclipse.scout.rt.server.jdbc/org.eclipse.scout.rt.server.jdbc.iml index 6798a0c7ac..3bc0649776 100644 --- a/org.eclipse.scout.rt.server.jdbc/org.eclipse.scout.rt.server.jdbc.iml +++ b/org.eclipse.scout.rt.server.jdbc/org.eclipse.scout.rt.server.jdbc.iml @@ -18,20 +18,19 @@ <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" /> <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.2" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.security" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.36.0" level="project" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.36.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.38.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.38.0" level="project" /> <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:30.0-jre" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" /> - <orderEntry type="library" name="Maven: org.checkerframework:checker-compat-qual:2.5.5" level="project" /> + <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.5.0" level="project" /> <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" /> <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-api:0.24.0" level="project" /> <orderEntry type="library" name="Maven: io.grpc:grpc-context:1.22.1" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-contrib-http-util:0.24.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" /> + <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.server.commons" /> diff --git a/org.eclipse.scout.rt.server.test/org.eclipse.scout.rt.server.test.iml b/org.eclipse.scout.rt.server.test/org.eclipse.scout.rt.server.test.iml index bbe8d6f2b8..23f61ca80a 100644 --- a/org.eclipse.scout.rt.server.test/org.eclipse.scout.rt.server.test.iml +++ b/org.eclipse.scout.rt.server.test/org.eclipse.scout.rt.server.test.iml @@ -27,20 +27,19 @@ <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" /> <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.2" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.security" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.36.0" level="project" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.36.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.38.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.38.0" level="project" /> <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:30.0-jre" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" /> - <orderEntry type="library" name="Maven: org.checkerframework:checker-compat-qual:2.5.5" level="project" /> + <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.5.0" level="project" /> <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" /> <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-api:0.24.0" level="project" /> <orderEntry type="library" name="Maven: io.grpc:grpc-context:1.22.1" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-contrib-http-util:0.24.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" /> + <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.server.commons" /> diff --git a/org.eclipse.scout.rt.server/org.eclipse.scout.rt.server.iml b/org.eclipse.scout.rt.server/org.eclipse.scout.rt.server.iml index db9ce4c3b2..2071610d8b 100644 --- a/org.eclipse.scout.rt.server/org.eclipse.scout.rt.server.iml +++ b/org.eclipse.scout.rt.server/org.eclipse.scout.rt.server.iml @@ -17,20 +17,19 @@ <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" /> <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.2" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.security" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.36.0" level="project" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.36.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.38.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.38.0" level="project" /> <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:30.0-jre" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" /> - <orderEntry type="library" name="Maven: org.checkerframework:checker-compat-qual:2.5.5" level="project" /> + <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.5.0" level="project" /> <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" /> <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-api:0.24.0" level="project" /> <orderEntry type="library" name="Maven: io.grpc:grpc-context:1.22.1" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-contrib-http-util:0.24.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" /> + <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.server.commons" /> diff --git a/org.eclipse.scout.rt.serverbridge/org.eclipse.scout.rt.serverbridge.iml b/org.eclipse.scout.rt.serverbridge/org.eclipse.scout.rt.serverbridge.iml index 4fe520956d..95a160b070 100644 --- a/org.eclipse.scout.rt.serverbridge/org.eclipse.scout.rt.serverbridge.iml +++ b/org.eclipse.scout.rt.serverbridge/org.eclipse.scout.rt.serverbridge.iml @@ -18,20 +18,19 @@ <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.2" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.shared" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.security" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.36.0" level="project" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.36.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.38.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.38.0" level="project" /> <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:30.0-jre" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" /> - <orderEntry type="library" name="Maven: org.checkerframework:checker-compat-qual:2.5.5" level="project" /> + <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.5.0" level="project" /> <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" /> <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-api:0.24.0" level="project" /> <orderEntry type="library" name="Maven: io.grpc:grpc-context:1.22.1" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-contrib-http-util:0.24.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" /> + <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.server" /> diff --git a/org.eclipse.scout.rt.shared.test/org.eclipse.scout.rt.shared.test.iml b/org.eclipse.scout.rt.shared.test/org.eclipse.scout.rt.shared.test.iml index 46aeb952c6..7ca4120358 100644 --- a/org.eclipse.scout.rt.shared.test/org.eclipse.scout.rt.shared.test.iml +++ b/org.eclipse.scout.rt.shared.test/org.eclipse.scout.rt.shared.test.iml @@ -19,20 +19,19 @@ <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.2" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.security" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.dataobject" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.36.0" level="project" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.36.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.38.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.38.0" level="project" /> <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:30.0-jre" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" /> - <orderEntry type="library" name="Maven: org.checkerframework:checker-compat-qual:2.5.5" level="project" /> + <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.5.0" level="project" /> <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" /> <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-api:0.24.0" level="project" /> <orderEntry type="library" name="Maven: io.grpc:grpc-context:1.22.1" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-contrib-http-util:0.24.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" /> + <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform.test" /> diff --git a/org.eclipse.scout.rt.shared/org.eclipse.scout.rt.shared.iml b/org.eclipse.scout.rt.shared/org.eclipse.scout.rt.shared.iml index 6fbb8ae16f..19954bae95 100644 --- a/org.eclipse.scout.rt.shared/org.eclipse.scout.rt.shared.iml +++ b/org.eclipse.scout.rt.shared/org.eclipse.scout.rt.shared.iml @@ -17,20 +17,19 @@ <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.2" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.security" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.dataobject" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.36.0" level="project" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.36.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.38.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.38.0" level="project" /> <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:30.0-jre" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" /> - <orderEntry type="library" name="Maven: org.checkerframework:checker-compat-qual:2.5.5" level="project" /> + <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.5.0" level="project" /> <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" /> <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-api:0.24.0" level="project" /> <orderEntry type="library" name="Maven: io.grpc:grpc-context:1.22.1" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-contrib-http-util:0.24.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" /> + <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" /> </component> diff --git a/org.eclipse.scout.rt.svg.client.test/org.eclipse.scout.rt.svg.client.test.iml b/org.eclipse.scout.rt.svg.client.test/org.eclipse.scout.rt.svg.client.test.iml index 387219c4b3..616c91e543 100644 --- a/org.eclipse.scout.rt.svg.client.test/org.eclipse.scout.rt.svg.client.test.iml +++ b/org.eclipse.scout.rt.svg.client.test/org.eclipse.scout.rt.svg.client.test.iml @@ -15,20 +15,19 @@ <orderEntry type="module" module-name="org.eclipse.scout.rt.shared" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.security" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.dataobject" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.36.0" level="project" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.36.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.38.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.38.0" level="project" /> <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:30.0-jre" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" /> - <orderEntry type="library" name="Maven: org.checkerframework:checker-compat-qual:2.5.5" level="project" /> + <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.5.0" level="project" /> <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" /> <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-api:0.24.0" level="project" /> <orderEntry type="library" name="Maven: io.grpc:grpc-context:1.22.1" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-contrib-http-util:0.24.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" /> + <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" /> <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-swing:1.13" level="project" /> diff --git a/org.eclipse.scout.rt.svg.client/org.eclipse.scout.rt.svg.client.iml b/org.eclipse.scout.rt.svg.client/org.eclipse.scout.rt.svg.client.iml index 878dc93607..ff9cff3aab 100644 --- a/org.eclipse.scout.rt.svg.client/org.eclipse.scout.rt.svg.client.iml +++ b/org.eclipse.scout.rt.svg.client/org.eclipse.scout.rt.svg.client.iml @@ -19,20 +19,19 @@ <orderEntry type="module" module-name="org.eclipse.scout.rt.shared" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.security" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.dataobject" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.36.0" level="project" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.36.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.38.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.38.0" level="project" /> <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:30.0-jre" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" /> - <orderEntry type="library" name="Maven: org.checkerframework:checker-compat-qual:2.5.5" level="project" /> + <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.5.0" level="project" /> <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" /> <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-api:0.24.0" level="project" /> <orderEntry type="library" name="Maven: io.grpc:grpc-context:1.22.1" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-contrib-http-util:0.24.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" /> + <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" /> <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-swing:1.13" level="project" /> diff --git a/org.eclipse.scout.rt.svg.ui.html/org.eclipse.scout.rt.svg.ui.html.iml b/org.eclipse.scout.rt.svg.ui.html/org.eclipse.scout.rt.svg.ui.html.iml index 04750d7434..ecb80b596b 100644 --- a/org.eclipse.scout.rt.svg.ui.html/org.eclipse.scout.rt.svg.ui.html.iml +++ b/org.eclipse.scout.rt.svg.ui.html/org.eclipse.scout.rt.svg.ui.html.iml @@ -20,20 +20,19 @@ <orderEntry type="module" module-name="org.eclipse.scout.rt.shared" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.security" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.dataobject" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.36.0" level="project" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.36.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.38.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.38.0" level="project" /> <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:30.0-jre" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" /> - <orderEntry type="library" name="Maven: org.checkerframework:checker-compat-qual:2.5.5" level="project" /> + <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.5.0" level="project" /> <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" /> <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-api:0.24.0" level="project" /> <orderEntry type="library" name="Maven: io.grpc:grpc-context:1.22.1" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-contrib-http-util:0.24.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" /> + <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" /> <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-swing:1.13" level="project" /> diff --git a/org.eclipse.scout.rt.ui.html.selenium/org.eclipse.scout.rt.ui.html.selenium.iml b/org.eclipse.scout.rt.ui.html.selenium/org.eclipse.scout.rt.ui.html.selenium.iml index eb90f94302..20128b55e0 100644 --- a/org.eclipse.scout.rt.ui.html.selenium/org.eclipse.scout.rt.ui.html.selenium.iml +++ b/org.eclipse.scout.rt.ui.html.selenium/org.eclipse.scout.rt.ui.html.selenium.iml @@ -15,13 +15,13 @@ <orderEntry type="module" module-name="org.eclipse.scout.rt.shared" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.security" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.dataobject" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.36.0" level="project" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.36.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.38.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.38.0" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-api:0.24.0" level="project" /> <orderEntry type="library" name="Maven: io.grpc:grpc-context:1.22.1" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-contrib-http-util:0.24.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" /> + <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> @@ -43,12 +43,12 @@ <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-support:3.141.59" level="project" /> <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.8.15" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-exec:1.3" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:25.0-jre" level="project" /> - <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" /> - <orderEntry type="library" name="Maven: org.checkerframework:checker-compat-qual:2.0.0" level="project" /> - <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.1.3" level="project" /> - <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.1" level="project" /> - <orderEntry type="library" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.14" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:30.0-jre" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" /> + <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" /> + <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.5.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" /> + <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" /> <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.11.0" level="project" /> <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.14.0" level="project" /> </component> diff --git a/org.eclipse.scout.rt.ui.html.test/org.eclipse.scout.rt.ui.html.test.iml b/org.eclipse.scout.rt.ui.html.test/org.eclipse.scout.rt.ui.html.test.iml index ff35e3594b..f69c03fb3a 100644 --- a/org.eclipse.scout.rt.ui.html.test/org.eclipse.scout.rt.ui.html.test.iml +++ b/org.eclipse.scout.rt.ui.html.test/org.eclipse.scout.rt.ui.html.test.iml @@ -15,20 +15,19 @@ <orderEntry type="module" module-name="org.eclipse.scout.rt.shared" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.security" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.dataobject" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.36.0" level="project" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.36.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.38.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.38.0" level="project" /> <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:30.0-jre" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" /> - <orderEntry type="library" name="Maven: org.checkerframework:checker-compat-qual:2.5.5" level="project" /> + <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.5.0" level="project" /> <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" /> <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-api:0.24.0" level="project" /> <orderEntry type="library" name="Maven: io.grpc:grpc-context:1.22.1" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-contrib-http-util:0.24.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" /> + <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" /> <orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.4" level="project" /> diff --git a/org.eclipse.scout.rt.ui.html/org.eclipse.scout.rt.ui.html.iml b/org.eclipse.scout.rt.ui.html/org.eclipse.scout.rt.ui.html.iml index 0642ae14d3..8465e0e6c9 100644 --- a/org.eclipse.scout.rt.ui.html/org.eclipse.scout.rt.ui.html.iml +++ b/org.eclipse.scout.rt.ui.html/org.eclipse.scout.rt.ui.html.iml @@ -14,20 +14,19 @@ <orderEntry type="module" module-name="org.eclipse.scout.rt.shared" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.security" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.dataobject" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.36.0" level="project" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.36.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.38.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.38.0" level="project" /> <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:30.0-jre" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" /> - <orderEntry type="library" name="Maven: org.checkerframework:checker-compat-qual:2.5.5" level="project" /> + <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.5.0" level="project" /> <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" /> <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-api:0.24.0" level="project" /> <orderEntry type="library" name="Maven: io.grpc:grpc-context:1.22.1" level="project" /> <orderEntry type="library" name="Maven: io.opencensus:opencensus-contrib-http-util:0.24.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" /> + <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" /> <orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.4" level="project" /> diff --git a/org.eclipse.scout.rt/pom.xml b/org.eclipse.scout.rt/pom.xml index 2edf932a11..93273269b0 100644 --- a/org.eclipse.scout.rt/pom.xml +++ b/org.eclipse.scout.rt/pom.xml @@ -107,8 +107,8 @@ <batik.version>1.13</batik.version> <activemq.version>5.16.0</activemq.version> <artemis.version>2.15.0</artemis.version> - <com.google.http-client.version>1.36.0</com.google.http-client.version> - <org.apache.httpcomponents.version>4.5.12</org.apache.httpcomponents.version> + <com.google.http-client.version>1.38.0</com.google.http-client.version> + <org.apache.httpcomponents.version>4.5.13</org.apache.httpcomponents.version> <master_coverage_jacoco_destFile>${basedir}/../org.eclipse.scout.rt/target/jacoco-all.exec</master_coverage_jacoco_destFile> <master_test_forkCount>1</master_test_forkCount> @@ -894,6 +894,18 @@ <artifactId>google-http-client</artifactId> <version>${com.google.http-client.version}</version> </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>30.0-jre</version> + <exclusions> + <exclusion> + <!-- is empty anyway --> + <groupId>com.google.guava</groupId> + <artifactId>listenablefuture</artifactId> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> @@ -986,7 +998,7 @@ <reportSets> <reportSet> <id>dual-report</id> - <reports></reports><!-- Empty tag necessary with maven 3.6.1 because of bug https://issues.apache.org/jira/browse/MNG-6636 --> + <reports/><!-- Empty tag necessary with maven 3.6.1 because of bug https://issues.apache.org/jira/browse/MNG-6636 --> <configuration> <displayFileDetailUrl>https://git.eclipse.org/c/scout/org.eclipse.scout.rt.git/tree/%FILE%</displayFileDetailUrl> <displayFileRevDetailUrl>https://git.eclipse.org/c/scout/org.eclipse.scout.rt.git/tree/%FILE%?id=%REV%</displayFileRevDetailUrl> |
