diff options
| author | Matthias Villiger | 2020-09-03 12:34:05 +0000 |
|---|---|---|
| committer | Matthias Villiger | 2020-09-11 09:14:20 +0000 |
| commit | 99e741bfdb5bb70eb4621daa9ea8133001ae9155 (patch) | |
| tree | 121e08be4f6aa57ef6dd204b7d1741774dbbaf9a | |
| parent | 6c34eed74a813af1696b0576c2fa8109bdbd59d0 (diff) | |
| download | org.eclipse.scout.rt-99e741bfdb5bb70eb4621daa9ea8133001ae9155.tar.gz org.eclipse.scout.rt-99e741bfdb5bb70eb4621daa9ea8133001ae9155.tar.xz org.eclipse.scout.rt-99e741bfdb5bb70eb4621daa9ea8133001ae9155.zip | |
Update Java dependencies
99 files changed, 1022 insertions, 1336 deletions
diff --git a/org.eclipse.scout.dev.jetty.test/org.eclipse.scout.dev.jetty.test.iml b/org.eclipse.scout.dev.jetty.test/org.eclipse.scout.dev.jetty.test.iml index fb5f150e35..8e5fb11a38 100644 --- a/org.eclipse.scout.dev.jetty.test/org.eclipse.scout.dev.jetty.test.iml +++ b/org.eclipse.scout.dev.jetty.test/org.eclipse.scout.dev.jetty.test.iml @@ -23,36 +23,36 @@ <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-plus:9.4.14.v20181114" level="project" /> <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-jndi:9.4.14.v20181114" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.dev.jetty" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-webapp:9.4.30.v20200611" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-xml:9.4.30.v20200611" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.4.30.v20200611" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlet:9.4.30.v20200611" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-security:9.4.30.v20200611" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.4.30.v20200611" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.4.30.v20200611" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.4.30.v20200611" level="project" /> - <orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.3" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-annotations:9.4.30.v20200611" level="project" /> - <orderEntry type="library" name="Maven: org.ow2.asm:asm:7.1" level="project" /> - <orderEntry type="library" name="Maven: org.ow2.asm:asm-commons:7.1" level="project" /> - <orderEntry type="library" name="Maven: org.ow2.asm:asm-tree:7.1" level="project" /> - <orderEntry type="library" name="Maven: org.ow2.asm:asm-analysis:7.1" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-plus:9.4.30.v20200611" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-jndi:9.4.30.v20200611" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-webapp:9.4.31.v20200723" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-xml:9.4.31.v20200723" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.4.31.v20200723" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlet:9.4.31.v20200723" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-security:9.4.31.v20200723" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.4.31.v20200723" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.4.31.v20200723" level="project" /> + <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.eclipse.jetty:jetty-annotations:9.4.31.v20200723" level="project" /> + <orderEntry type="library" name="Maven: org.ow2.asm:asm:7.3.1" level="project" /> + <orderEntry type="library" name="Maven: org.ow2.asm:asm-commons:7.3.1" level="project" /> + <orderEntry type="library" name="Maven: org.ow2.asm:asm-tree:7.3.1" level="project" /> + <orderEntry type="library" name="Maven: org.ow2.asm:asm-analysis:7.3.1" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-plus:9.4.31.v20200723" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-jndi:9.4.31.v20200723" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> <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="library" name="Maven: junit:junit:4.12" level="project" /> + <orderEntry type="library" name="Maven: junit:junit:4.13" level="project" /> <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> - <orderEntry type="library" name="Maven: org.mockito:mockito-core:2.23.4" level="project" /> - <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.3" level="project" /> - <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.3" level="project" /> - <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" /> + <orderEntry type="library" name="Maven: org.mockito:mockito-core:3.5.7" level="project" /> + <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.13" level="project" /> + <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.13" level="project" /> + <orderEntry type="library" name="Maven: org.objenesis:objenesis:3.1" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform.test" /> <orderEntry type="module" module-name="org.eclipse.scout.dev.jetty.test.affix" /> <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" /> <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> </component> </module>
\ No newline at end of file diff --git a/org.eclipse.scout.dev.jetty/org.eclipse.scout.dev.jetty.iml b/org.eclipse.scout.dev.jetty/org.eclipse.scout.dev.jetty.iml index c72a95c2d9..4335e2b7fc 100644 --- a/org.eclipse.scout.dev.jetty/org.eclipse.scout.dev.jetty.iml +++ b/org.eclipse.scout.dev.jetty/org.eclipse.scout.dev.jetty.iml @@ -21,25 +21,25 @@ <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-annotations:9.4.14.v20181114" level="project" /> <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-plus:9.4.14.v20181114" level="project" /> <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-jndi:9.4.14.v20181114" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-webapp:9.4.30.v20200611" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-xml:9.4.30.v20200611" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.4.30.v20200611" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlet:9.4.30.v20200611" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-security:9.4.30.v20200611" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.4.30.v20200611" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.4.30.v20200611" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.4.30.v20200611" level="project" /> - <orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.3" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-annotations:9.4.30.v20200611" level="project" /> - <orderEntry type="library" name="Maven: org.ow2.asm:asm:7.1" level="project" /> - <orderEntry type="library" name="Maven: org.ow2.asm:asm-commons:7.1" level="project" /> - <orderEntry type="library" name="Maven: org.ow2.asm:asm-tree:7.1" level="project" /> - <orderEntry type="library" name="Maven: org.ow2.asm:asm-analysis:7.1" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-plus:9.4.30.v20200611" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-jndi:9.4.30.v20200611" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-webapp:9.4.31.v20200723" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-xml:9.4.31.v20200723" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.4.31.v20200723" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlet:9.4.31.v20200723" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-security:9.4.31.v20200723" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.4.31.v20200723" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.4.31.v20200723" level="project" /> + <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.eclipse.jetty:jetty-annotations:9.4.31.v20200723" level="project" /> + <orderEntry type="library" name="Maven: org.ow2.asm:asm:7.3.1" level="project" /> + <orderEntry type="library" name="Maven: org.ow2.asm:asm-commons:7.3.1" level="project" /> + <orderEntry type="library" name="Maven: org.ow2.asm:asm-tree:7.3.1" level="project" /> + <orderEntry type="library" name="Maven: org.ow2.asm:asm-analysis:7.3.1" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-plus:9.4.31.v20200723" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-jndi:9.4.31.v20200723" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> <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" /> </component> diff --git a/org.eclipse.scout.dev.jetty/src/main/java/org/eclipse/scout/dev/jetty/JettyServer.java b/org.eclipse.scout.dev.jetty/src/main/java/org/eclipse/scout/dev/jetty/JettyServer.java index 8f4fdf0058..8801d9ebb3 100644 --- a/org.eclipse.scout.dev.jetty/src/main/java/org/eclipse/scout/dev/jetty/JettyServer.java +++ b/org.eclipse.scout.dev.jetty/src/main/java/org/eclipse/scout/dev/jetty/JettyServer.java @@ -267,7 +267,7 @@ public class JettyServer { } protected SslContextFactory createSslContextFactory() { - SslContextFactory sslContextFactory = new SslContextFactory(); + SslContextFactory sslContextFactory = new SslContextFactory.Server(); String keyStorePath = resolveKeyStorePath(CONFIG.getPropertyValue(ScoutJettyKeyStorePathProperty.class)); String autoCertName = CONFIG.getPropertyValue(ScoutJettyAutoCreateSelfSignedCertificateProperty.class); String storepass = CONFIG.getPropertyValue(ScoutJettyKeyStorePasswordProperty.class); 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 f549d0c87f..4ce787a6da 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 @@ -10,10 +10,10 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" name="Maven: com.unquietcode.tools.jcodemodel:codemodel:1.0.3" level="project" /> + <orderEntry type="library" name="Maven: org.glassfish.jaxb:codemodel:2.3.3" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> <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.server.jaxws" /> @@ -23,14 +23,14 @@ <orderEntry type="library" name="Maven: jakarta.xml.ws:jakarta.xml.ws-api:2.3.3" level="project" /> <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" /> <orderEntry type="library" name="Maven: jakarta.xml.soap:jakarta.xml.soap-api:1.4.2" level="project" /> - <orderEntry type="library" name="Maven: jakarta.jws:jakarta.jws-api:1.1.1" level="project" /> + <orderEntry type="library" name="Maven: jakarta.jws:jakarta.jws-api:2.1.0" level="project" /> <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:1.34.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> + <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.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:28.2-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" 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" /> @@ -39,9 +39,10 @@ <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: commons-codec:commons-codec:1.11" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" level="project" /> - <orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.3" 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" /> </component> </module>
\ No newline at end of file diff --git a/org.eclipse.scout.jaxws.apt/pom.xml b/org.eclipse.scout.jaxws.apt/pom.xml index 57d38f7cfc..470be64fe5 100644 --- a/org.eclipse.scout.jaxws.apt/pom.xml +++ b/org.eclipse.scout.jaxws.apt/pom.xml @@ -1,21 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + ~ Copyright (c) 2010-2020 BSI Business Systems Integration AG. + ~ All rights reserved. This program and the accompanying materials + ~ are made available under the terms of the Eclipse Public License v1.0 + ~ which accompanies this distribution, and is available at + ~ http://www.eclipse.org/legal/epl-v10.html + ~ + ~ Contributors: + ~ BSI Business Systems Integration AG - initial API and implementation + --> - Copyright (c) 2010-2018 BSI Business Systems Integration AG. - All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 - which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html - - Contributors: - BSI Business Systems Integration AG - initial API and implementation - ---> -<!-- Copyright (c) 2010-2015 BSI Business Systems Integration AG. All rights - reserved. This program and the accompanying materials are made available - under the terms of the Eclipse Public License v1.0 which accompanies this - distribution, and is available at http://www.eclipse.org/legal/epl-v10.html - Contributors: BSI Business Systems Integration AG - initial API and implementation --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -34,10 +28,9 @@ <dependencies> <!-- Build Dependencies --> <dependency> - <!-- do not use 'com.sun.codemodel' and not 'org.glassfish.jaxb' because out-of-date --> - <groupId>com.unquietcode.tools.jcodemodel</groupId> + <groupId>org.glassfish.jaxb</groupId> <artifactId>codemodel</artifactId> - <version>1.0.3</version> + <version>2.3.3</version> </dependency> <dependency> <groupId>org.eclipse.scout.rt</groupId> diff --git a/org.eclipse.scout.json/org.eclipse.scout.json.iml b/org.eclipse.scout.json/org.eclipse.scout.json.iml index 0ae417af2e..ec55b4b068 100644 --- a/org.eclipse.scout.json/org.eclipse.scout.json.iml +++ b/org.eclipse.scout.json/org.eclipse.scout.json.iml @@ -10,7 +10,7 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> </component> </module>
\ No newline at end of file diff --git a/org.eclipse.scout.migration.ecma6/org.eclipse.scout.migration.ecma6.iml b/org.eclipse.scout.migration.ecma6/org.eclipse.scout.migration.ecma6.iml index fe8e8a083e..162257c9f0 100644 --- a/org.eclipse.scout.migration.ecma6/org.eclipse.scout.migration.ecma6.iml +++ b/org.eclipse.scout.migration.ecma6/org.eclipse.scout.migration.ecma6.iml @@ -11,15 +11,15 @@ <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> <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="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.10.3" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.10" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.10" level="project" /> - <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.12.1" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.2" level="project" /> + <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.2" level="project" /> + <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.2" level="project" /> + <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.13.1" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" /> <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" /> <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" /> </component> diff --git a/org.eclipse.scout.migration.ecma6/pom.xml b/org.eclipse.scout.migration.ecma6/pom.xml index a7d6bd9044..402088f013 100644 --- a/org.eclipse.scout.migration.ecma6/pom.xml +++ b/org.eclipse.scout.migration.ecma6/pom.xml @@ -1,16 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - - Copyright (c) 2010-2018 BSI Business Systems Integration AG. - All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 - which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html - - Contributors: - BSI Business Systems Integration AG - initial API and implementation - ---> + ~ Copyright (c) 2010-2020 BSI Business Systems Integration AG. + ~ All rights reserved. This program and the accompanying materials + ~ are made available under the terms of the Eclipse Public License v1.0 + ~ which accompanies this distribution, and is available at + ~ http://www.eclipse.org/legal/epl-v10.html + ~ + ~ Contributors: + ~ BSI Business Systems Integration AG - initial API and implementation + --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -39,7 +37,7 @@ <dependency> <groupId>org.jsoup</groupId> <artifactId>jsoup</artifactId> - <version>1.12.1</version> + <version>1.13.1</version> </dependency> <!-- Log4j --> <dependency> 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 10f2155919..170c81af68 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 @@ -14,15 +14,15 @@ <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.client" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> <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.shared" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.security" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.34.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> + <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.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:28.2-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" 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" /> @@ -31,27 +31,28 @@ <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: commons-codec:commons-codec:1.11" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" 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" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform.test" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.dataobject.test" scope="TEST" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.dataobject" /> - <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" /> + <orderEntry type="library" name="Maven: junit:junit:4.13" level="project" /> <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> - <orderEntry type="library" name="Maven: org.mockito:mockito-core:2.23.4" level="project" /> - <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.3" level="project" /> - <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.3" level="project" /> - <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" /> + <orderEntry type="library" name="Maven: org.mockito:mockito-core:3.5.7" level="project" /> + <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.13" level="project" /> + <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.13" level="project" /> + <orderEntry type="library" name="Maven: org.objenesis:objenesis:3.1" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.jackson.test" scope="TEST" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.jackson" scope="TEST" /> - <orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.10.3" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.10" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.10" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.2" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.2" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.2" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> </component> </module>
\ No newline at end of file diff --git a/org.eclipse.scout.rt.client.test/src/test/java/org/eclipse/scout/rt/client/ui/basic/cell/CellTest.java b/org.eclipse.scout.rt.client.test/src/test/java/org/eclipse/scout/rt/client/ui/basic/cell/CellTest.java index d5d3b7e6a4..126bef4171 100644 --- a/org.eclipse.scout.rt.client.test/src/test/java/org/eclipse/scout/rt/client/ui/basic/cell/CellTest.java +++ b/org.eclipse.scout.rt.client.test/src/test/java/org/eclipse/scout/rt/client/ui/basic/cell/CellTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2017 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -15,6 +15,7 @@ import static org.mockito.Mockito.*; import org.eclipse.scout.rt.client.ui.form.fields.ParsingFailedStatus; import org.eclipse.scout.rt.platform.exception.ProcessingException; +import org.eclipse.scout.rt.platform.status.IMultiStatus; import org.eclipse.scout.rt.platform.status.IStatus; import org.eclipse.scout.rt.platform.status.MultiStatus; import org.eclipse.scout.rt.platform.status.Status; @@ -92,7 +93,7 @@ public class CellTest { assertTrue(c.isHtmlEnabled()); assertSame(observer, c.getObserver()); - verifyZeroInteractions(observer); + verifyNoInteractions(observer); } @Test @@ -111,7 +112,7 @@ public class CellTest { assertNull(c.getCssClass()); assertFalse(c.isHtmlEnabled()); assertSame(observer, c.getObserver()); - verifyZeroInteractions(observer); + verifyNoInteractions(observer); } @Test @@ -227,7 +228,7 @@ public class CellTest { ICellObserver observer = installMockObserver(c); c.setTooltipText(null); assertNull(c.getTooltipText()); - verifyZeroInteractions(observer); + verifyNoInteractions(observer); } @Test @@ -294,7 +295,7 @@ public class CellTest { ICellObserver observer = Mockito.mock(ICellObserver.class); c.setObserver(observer); assertSame(observer, c.getObserver()); - verifyZeroInteractions(observer); + verifyNoInteractions(observer); } private ICellObserver installMockObserver(Cell c) { @@ -305,7 +306,7 @@ public class CellTest { /** * When creating a cell. The errorstatus should not be set. - * {@link Cell#setErrorStatus(org.eclipse.scout.rt.platform.status.IStatus)} + * {@link Cell#setErrorStatusInternal(IMultiStatus)} */ @Test public void testInitialErrorStatus() { @@ -314,7 +315,7 @@ public class CellTest { } /** - * {@link Cell#setErrorStatus(org.eclipse.scout.rt.platform.status.IStatus)} + * {@link Cell#setErrorStatusInternal(IMultiStatus)} */ @Test public void testSetErrorStatus() { @@ -325,7 +326,7 @@ public class CellTest { /** * When creating a cell. The errorstatus should not be set. - * {@link Cell#setErrorStatus(org.eclipse.scout.rt.platform.status.IStatus)} + * {@link Cell#setErrorStatusInternal(IMultiStatus)} */ @Test public void testClearErrorStatus() { @@ -337,7 +338,7 @@ public class CellTest { /** * When creating a cell. The errorstatus should not be set. - * {@link Cell#setErrorStatus(org.eclipse.scout.rt.platform.status.IStatus)} + * {@link Cell#setErrorStatusInternal(IMultiStatus)} */ @Test public void testIconCellSetErrorStatus() { @@ -354,7 +355,7 @@ public class CellTest { } /** - * {@link Cell#setErrorStatus(org.eclipse.scout.rt.platform.status.IStatus)} + * {@link Cell#setErrorStatusInternal(IMultiStatus)} */ @Test public void testAddRemoveMultistatus() { 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 109be7edd4..2106c211e4 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 @@ -11,17 +11,17 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> <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.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:1.34.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> + <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.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:28.2-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" 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" /> @@ -30,8 +30,9 @@ <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: commons-codec:commons-codec:1.11" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" 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> </module>
\ No newline at end of file diff --git a/org.eclipse.scout.rt.dataformat/org.eclipse.scout.rt.dataformat.iml b/org.eclipse.scout.rt.dataformat/org.eclipse.scout.rt.dataformat.iml index e9cf7a36ad..4a2c25849a 100644 --- a/org.eclipse.scout.rt.dataformat/org.eclipse.scout.rt.dataformat.iml +++ b/org.eclipse.scout.rt.dataformat/org.eclipse.scout.rt.dataformat.iml @@ -12,17 +12,17 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> <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="library" name="Maven: commons-codec:commons-codec:1.11" level="project" /> + <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform.test" scope="TEST" /> - <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.23.4" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.9.3" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.3" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:3.5.7" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.10.13" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.13" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:3.1" level="project" /> </component> </module>
\ No newline at end of file diff --git a/org.eclipse.scout.rt.dataobject.test/org.eclipse.scout.rt.dataobject.test.iml b/org.eclipse.scout.rt.dataobject.test/org.eclipse.scout.rt.dataobject.test.iml index 7490ed62c9..648ae7a884 100644 --- a/org.eclipse.scout.rt.dataobject.test/org.eclipse.scout.rt.dataobject.test.iml +++ b/org.eclipse.scout.rt.dataobject.test/org.eclipse.scout.rt.dataobject.test.iml @@ -14,19 +14,19 @@ <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.dataobject" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> <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.platform.test" /> - <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" /> + <orderEntry type="library" name="Maven: junit:junit:4.13" level="project" /> <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> - <orderEntry type="library" name="Maven: org.mockito:mockito-core:2.23.4" level="project" /> - <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.3" level="project" /> - <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.3" level="project" /> - <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" /> + <orderEntry type="library" name="Maven: org.mockito:mockito-core:3.5.7" level="project" /> + <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.13" level="project" /> + <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.13" level="project" /> + <orderEntry type="library" name="Maven: org.objenesis:objenesis:3.1" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: log4j:log4j:1.2.17" level="project" /> </component> </module>
\ No newline at end of file diff --git a/org.eclipse.scout.rt.dataobject.test/src/test/java/org/eclipse/scout/rt/dataobject/DataObjectHelperTest.java b/org.eclipse.scout.rt.dataobject.test/src/test/java/org/eclipse/scout/rt/dataobject/DataObjectHelperTest.java index b3fe330af3..a1f25213a2 100644 --- a/org.eclipse.scout.rt.dataobject.test/src/test/java/org/eclipse/scout/rt/dataobject/DataObjectHelperTest.java +++ b/org.eclipse.scout.rt.dataobject.test/src/test/java/org/eclipse/scout/rt/dataobject/DataObjectHelperTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2018 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -28,8 +28,8 @@ import org.eclipse.scout.rt.platform.Platform; import org.eclipse.scout.rt.platform.util.Assertions.AssertionException; import org.eclipse.scout.rt.platform.util.date.DateUtility; import org.eclipse.scout.rt.testing.platform.runner.PlatformTestRunner; -import org.eclipse.scout.rt.testing.platform.util.ScoutAssert; import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -180,10 +180,10 @@ public class DataObjectHelperTest { .withId(TEST_UUID) .withName1("Hugo"); - ScoutAssert.assertThrows(AssertionException.class, () -> m_helper.assertValue(null)); - ScoutAssert.assertThrows(AssertionException.class, () -> m_helper.assertValue(testObj.createDate())); - ScoutAssert.assertThrows(AssertionException.class, () -> m_helper.assertValue(testObj.name2())); - ScoutAssert.assertThrows(AssertionException.class, () -> m_helper.assertValue((DoValue<?>) testObj.get("doesNotExist"))); + Assert.assertThrows(AssertionException.class, () -> m_helper.assertValue(null)); + Assert.assertThrows(AssertionException.class, () -> m_helper.assertValue(testObj.createDate())); + Assert.assertThrows(AssertionException.class, () -> m_helper.assertValue(testObj.name2())); + Assert.assertThrows(AssertionException.class, () -> m_helper.assertValue((DoValue<?>) testObj.get("doesNotExist"))); assertEquals(TEST_UUID, m_helper.assertValue(testObj.id())); assertEquals("Hugo", m_helper.assertValue(testObj.name1())); } @@ -194,11 +194,11 @@ public class DataObjectHelperTest { .withId(TEST_UUID) .withName1("Hugo"); - ScoutAssert.assertThrows(AssertionException.class, () -> m_helper.assertValueHasText(null)); - ScoutAssert.assertThrows(AssertionException.class, () -> m_helper.assertValueHasText(testObj.name2())); + Assert.assertThrows(AssertionException.class, () -> m_helper.assertValueHasText(null)); + Assert.assertThrows(AssertionException.class, () -> m_helper.assertValueHasText(testObj.name2())); @SuppressWarnings("unchecked") DoValue<String> dummyDoValue = (DoValue<String>) testObj.get("doesNotExist"); - ScoutAssert.assertThrows(AssertionException.class, () -> m_helper.assertValueHasText(dummyDoValue)); + Assert.assertThrows(AssertionException.class, () -> m_helper.assertValueHasText(dummyDoValue)); assertEquals("Hugo", m_helper.assertValueHasText(testObj.name1())); } } diff --git a/org.eclipse.scout.rt.dataobject.test/src/test/java/org/eclipse/scout/rt/dataobject/EnumResolverTest.java b/org.eclipse.scout.rt.dataobject.test/src/test/java/org/eclipse/scout/rt/dataobject/EnumResolverTest.java index a515ed7692..2dbed3f37a 100644 --- a/org.eclipse.scout.rt.dataobject.test/src/test/java/org/eclipse/scout/rt/dataobject/EnumResolverTest.java +++ b/org.eclipse.scout.rt.dataobject.test/src/test/java/org/eclipse/scout/rt/dataobject/EnumResolverTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2019 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,8 +10,7 @@ */ package org.eclipse.scout.rt.dataobject; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.Assert.*; import org.eclipse.scout.rt.dataobject.enumeration.EnumResolver; import org.eclipse.scout.rt.dataobject.fixture.FixtureEnum; @@ -19,7 +18,7 @@ import org.eclipse.scout.rt.dataobject.fixture.FixtureEnumWithCustomResolve; import org.eclipse.scout.rt.platform.BEANS; import org.eclipse.scout.rt.platform.exception.PlatformException; import org.eclipse.scout.rt.platform.util.Assertions.AssertionException; -import org.eclipse.scout.rt.testing.platform.util.ScoutAssert; +import org.junit.Assert; import org.junit.Test; public class EnumResolverTest { @@ -30,7 +29,7 @@ public class EnumResolverTest { assertEquals(FixtureEnum.TWO, BEANS.get(EnumResolver.class).resolve(FixtureEnum.class, "two")); assertEquals(FixtureEnum.THREE, BEANS.get(EnumResolver.class).resolve(FixtureEnum.class, "three")); assertNull(BEANS.get(EnumResolver.class).resolve(FixtureEnum.class, null)); - ScoutAssert.assertThrows(AssertionException.class, () -> BEANS.get(EnumResolver.class).resolve(FixtureEnum.class, "foo")); + Assert.assertThrows(AssertionException.class, () -> BEANS.get(EnumResolver.class).resolve(FixtureEnum.class, "foo")); } @Test @@ -39,6 +38,6 @@ public class EnumResolverTest { assertEquals(FixtureEnumWithCustomResolve.TWO, BEANS.get(EnumResolver.class).resolve(FixtureEnumWithCustomResolve.class, "Two")); assertEquals(FixtureEnumWithCustomResolve.THREE, BEANS.get(EnumResolver.class).resolve(FixtureEnumWithCustomResolve.class, "thRee")); assertNull(BEANS.get(EnumResolver.class).resolve(FixtureEnumWithCustomResolve.class, null)); - ScoutAssert.assertThrows(PlatformException.class, () -> BEANS.get(EnumResolver.class).resolve(FixtureEnumWithCustomResolve.class, "foo")); + Assert.assertThrows(PlatformException.class, () -> BEANS.get(EnumResolver.class).resolve(FixtureEnumWithCustomResolve.class, "foo")); } } diff --git a/org.eclipse.scout.rt.dataobject.test/src/test/java/org/eclipse/scout/rt/dataobject/IdFactoryTest.java b/org.eclipse.scout.rt.dataobject.test/src/test/java/org/eclipse/scout/rt/dataobject/IdFactoryTest.java index 9249664d18..195a7f14c7 100644 --- a/org.eclipse.scout.rt.dataobject.test/src/test/java/org/eclipse/scout/rt/dataobject/IdFactoryTest.java +++ b/org.eclipse.scout.rt.dataobject.test/src/test/java/org/eclipse/scout/rt/dataobject/IdFactoryTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2019 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -22,7 +22,7 @@ import org.eclipse.scout.rt.dataobject.id.AbstractUuId; import org.eclipse.scout.rt.dataobject.id.IdFactory; import org.eclipse.scout.rt.platform.BEANS; import org.eclipse.scout.rt.platform.exception.PlatformException; -import org.eclipse.scout.rt.testing.platform.util.ScoutAssert; +import org.junit.Assert; import org.junit.Test; /** @@ -98,7 +98,7 @@ public class IdFactoryTest { FixtureUuId id1 = BEANS.get(IdFactory.class).createFromString(FixtureUuId.class, goodUuuid); assertEquals(goodUuuid, id1.unwrapAsString()); - ScoutAssert.assertThrows(PlatformException.class, () -> BEANS.get(IdFactory.class).createFromString(FixtureUuId.class, badUuid)); + Assert.assertThrows(PlatformException.class, () -> BEANS.get(IdFactory.class).createFromString(FixtureUuId.class, badUuid)); FixtureUuIdWithCustomFromString id2 = BEANS.get(IdFactory.class).createFromString(FixtureUuIdWithCustomFromString.class, badUuid); assertEquals(goodUuuid, id2.unwrapAsString()); diff --git a/org.eclipse.scout.rt.dataobject.test/src/test/java/org/eclipse/scout/rt/dataobject/lookup/LookupHelperTest.java b/org.eclipse.scout.rt.dataobject.test/src/test/java/org/eclipse/scout/rt/dataobject/lookup/LookupHelperTest.java index 45e61f591a..03da46d519 100644 --- a/org.eclipse.scout.rt.dataobject.test/src/test/java/org/eclipse/scout/rt/dataobject/lookup/LookupHelperTest.java +++ b/org.eclipse.scout.rt.dataobject.test/src/test/java/org/eclipse/scout/rt/dataobject/lookup/LookupHelperTest.java @@ -10,7 +10,6 @@ */ package org.eclipse.scout.rt.dataobject.lookup; -import static org.eclipse.scout.rt.testing.platform.util.ScoutAssert.assertThrows; import static org.junit.Assert.*; import java.util.Arrays; @@ -23,6 +22,11 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import org.eclipse.scout.rt.dataobject.fixture.FixtureEnum; +import org.eclipse.scout.rt.dataobject.lookup.fixture.FixtureData; +import org.eclipse.scout.rt.dataobject.lookup.fixture.FixtureDataLookupRestrictionDo; +import org.eclipse.scout.rt.dataobject.lookup.fixture.FixtureDataLookupRowDo; +import org.eclipse.scout.rt.dataobject.lookup.fixture.FixtureEnumLookupRestrictionDo; +import org.eclipse.scout.rt.dataobject.lookup.fixture.FixtureEnumLookupRowDo; import org.eclipse.scout.rt.platform.BEANS; import org.eclipse.scout.rt.platform.util.Assertions.AssertionException; import org.eclipse.scout.rt.testing.platform.runner.PlatformTestRunner; @@ -30,12 +34,6 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.eclipse.scout.rt.dataobject.lookup.fixture.FixtureData; -import org.eclipse.scout.rt.dataobject.lookup.fixture.FixtureDataLookupRestrictionDo; -import org.eclipse.scout.rt.dataobject.lookup.fixture.FixtureDataLookupRowDo; -import org.eclipse.scout.rt.dataobject.lookup.fixture.FixtureEnumLookupRestrictionDo; -import org.eclipse.scout.rt.dataobject.lookup.fixture.FixtureEnumLookupRowDo; - @RunWith(PlatformTestRunner.class) public class LookupHelperTest { @@ -178,7 +176,7 @@ public class LookupHelperTest { // get all FixtureEnumLookupRestrictionDo restriction = BEANS.get(FixtureEnumLookupRestrictionDo.class); assertLookupResponse(helper.filterEnumKeepSorting(restriction, FixtureEnum.class, FixtureEnumLookupRowDo.class), - FixtureEnum.ONE, FixtureEnum.TWO, FixtureEnum.THREE); + FixtureEnum.ONE, FixtureEnum.TWO, FixtureEnum.THREE); // get by id restriction = BEANS.get(FixtureEnumLookupRestrictionDo.class).withIds(FixtureEnum.THREE); @@ -192,7 +190,7 @@ public class LookupHelperTest { // get by text using wildcard restriction = BEANS.get(FixtureEnumLookupRestrictionDo.class).withText("*"); assertLookupResponse(helper.filterEnumKeepSorting(restriction, FixtureEnum.class, FixtureEnumLookupRowDo.class), - FixtureEnum.ONE, FixtureEnum.TWO, FixtureEnum.THREE); + FixtureEnum.ONE, FixtureEnum.TWO, FixtureEnum.THREE); } @Test diff --git a/org.eclipse.scout.rt.dataobject/org.eclipse.scout.rt.dataobject.iml b/org.eclipse.scout.rt.dataobject/org.eclipse.scout.rt.dataobject.iml index b86eecd464..055472f15d 100644 --- a/org.eclipse.scout.rt.dataobject/org.eclipse.scout.rt.dataobject.iml +++ b/org.eclipse.scout.rt.dataobject/org.eclipse.scout.rt.dataobject.iml @@ -11,8 +11,8 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> <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" /> </component> diff --git a/org.eclipse.scout.rt.jackson.test/org.eclipse.scout.rt.jackson.test.iml b/org.eclipse.scout.rt.jackson.test/org.eclipse.scout.rt.jackson.test.iml index 4998cc181d..10f4e369a7 100644 --- a/org.eclipse.scout.rt.jackson.test/org.eclipse.scout.rt.jackson.test.iml +++ b/org.eclipse.scout.rt.jackson.test/org.eclipse.scout.rt.jackson.test.iml @@ -14,23 +14,23 @@ <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.jackson" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> <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.dataobject" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.10.3" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.10" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.10" level="project" /> + <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.2" level="project" /> + <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.2" level="project" /> + <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.2" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform.test" /> - <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" /> + <orderEntry type="library" name="Maven: junit:junit:4.13" level="project" /> <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> - <orderEntry type="library" name="Maven: org.mockito:mockito-core:2.23.4" level="project" /> - <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.3" level="project" /> - <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.3" level="project" /> - <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" /> + <orderEntry type="library" name="Maven: org.mockito:mockito-core:3.5.7" level="project" /> + <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.13" level="project" /> + <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.13" level="project" /> + <orderEntry type="library" name="Maven: org.objenesis:objenesis:3.1" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.dataobject.test" /> <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> </component> </module>
\ No newline at end of file diff --git a/org.eclipse.scout.rt.jackson.test/src/test/java/org/eclipse/scout/rt/jackson/dataobject/JsonDataObjectsSerializationTest.java b/org.eclipse.scout.rt.jackson.test/src/test/java/org/eclipse/scout/rt/jackson/dataobject/JsonDataObjectsSerializationTest.java index 7d1dc4d432..7f69a5516f 100644 --- a/org.eclipse.scout.rt.jackson.test/src/test/java/org/eclipse/scout/rt/jackson/dataobject/JsonDataObjectsSerializationTest.java +++ b/org.eclipse.scout.rt.jackson.test/src/test/java/org/eclipse/scout/rt/jackson/dataobject/JsonDataObjectsSerializationTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2018 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,7 +10,7 @@ */ package org.eclipse.scout.rt.jackson.dataobject; -import static org.eclipse.scout.rt.testing.platform.util.ScoutAssert.*; +import static org.eclipse.scout.rt.testing.platform.util.ScoutAssert.assertEqualsWithComparisonFailure; import static org.junit.Assert.*; import java.io.IOException; @@ -101,6 +101,7 @@ import org.eclipse.scout.rt.platform.util.NumberUtility; import org.eclipse.scout.rt.platform.util.date.DateUtility; import org.eclipse.scout.rt.platform.util.date.StrictSimpleDateFormat; import org.eclipse.scout.rt.testing.platform.BeanTestingHelper; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -1003,7 +1004,7 @@ public class JsonDataObjectsSerializationTest { public void testDeserialize_TestItemDoListAsObjectList() throws Exception { String json = readResourceAsString("TestItemDoList.json"); // read value as raw DoList without concrete bind type information - DoList<TestItemDo> testDo = s_dataObjectMapper.readValue(json, new TypeReference<DoList<Object>>() { + DoList<TestItemDo> testDo = s_dataObjectMapper.readValue(json, new TypeReference<DoList<TestItemDo>>() { }); assertEquals("foo", testDo.get(0).getId()); assertEquals("bar", testDo.get(0).getStringAttribute()); @@ -2168,23 +2169,23 @@ public class JsonDataObjectsSerializationTest { entity = s_dataObjectMapper.readValue(createTestComplexEntityJson("bigDecimalAttribute", "\"123.456\""), TestComplexEntityDo.class); assertEquals(new BigDecimal("123.456"), entity.getBigDecimalAttribute()); - assertThrows(JsonParseException.class, () -> s_dataObjectMapper.readValue(createTestComplexEntityJson("floatAttribute", "123-456"), TestComplexEntityDo.class)); - assertThrows(JsonParseException.class, () -> s_dataObjectMapper.readValue(createTestComplexEntityJson("floatAttribute", "123-456-100"), TestComplexEntityDo.class)); - assertThrows(InvalidFormatException.class, () -> s_dataObjectMapper.readValue(createTestComplexEntityJson("floatAttribute", "\"123-456\""), TestComplexEntityDo.class)); - assertThrows(InvalidFormatException.class, () -> s_dataObjectMapper.readValue(createTestComplexEntityJson("floatAttribute", "\"10-03-2019\""), TestComplexEntityDo.class)); - assertThrows(InvalidFormatException.class, () -> s_dataObjectMapper.readValue(createTestComplexEntityJson("floatAttribute", "\"123,456\""), TestComplexEntityDo.class)); - - assertThrows(JsonParseException.class, () -> s_dataObjectMapper.readValue(createTestComplexEntityJson("doublelAttribute", "123-456"), TestComplexEntityDo.class)); - assertThrows(JsonParseException.class, () -> s_dataObjectMapper.readValue(createTestComplexEntityJson("doubleAttribute", "123-456-100"), TestComplexEntityDo.class)); - assertThrows(InvalidFormatException.class, () -> s_dataObjectMapper.readValue(createTestComplexEntityJson("doubleAttribute", "\"123-456\""), TestComplexEntityDo.class)); - assertThrows(InvalidFormatException.class, () -> s_dataObjectMapper.readValue(createTestComplexEntityJson("doubleAttribute", "\"10-03-2019\""), TestComplexEntityDo.class)); - assertThrows(InvalidFormatException.class, () -> s_dataObjectMapper.readValue(createTestComplexEntityJson("doubleAttribute", "\"123,456\""), TestComplexEntityDo.class)); - - assertThrows(JsonParseException.class, () -> s_dataObjectMapper.readValue(createTestComplexEntityJson("bigDecimalAttribute", "123-456"), TestComplexEntityDo.class)); - assertThrows(JsonParseException.class, () -> s_dataObjectMapper.readValue(createTestComplexEntityJson("bigDecimalAttribute", "123-456-100"), TestComplexEntityDo.class)); - assertThrows(InvalidFormatException.class, () -> s_dataObjectMapper.readValue(createTestComplexEntityJson("bigDecimalAttribute", "\"123-456\""), TestComplexEntityDo.class)); - assertThrows(InvalidFormatException.class, () -> s_dataObjectMapper.readValue(createTestComplexEntityJson("bigDecimalAttribute", "\"10-03-2019\""), TestComplexEntityDo.class)); - assertThrows(InvalidFormatException.class, () -> s_dataObjectMapper.readValue(createTestComplexEntityJson("bigDecimalAttribute", "\"123,456\""), TestComplexEntityDo.class)); + Assert.assertThrows(JsonParseException.class, () -> s_dataObjectMapper.readValue(createTestComplexEntityJson("floatAttribute", "123-456"), TestComplexEntityDo.class)); + Assert.assertThrows(JsonParseException.class, () -> s_dataObjectMapper.readValue(createTestComplexEntityJson("floatAttribute", "123-456-100"), TestComplexEntityDo.class)); + Assert.assertThrows(InvalidFormatException.class, () -> s_dataObjectMapper.readValue(createTestComplexEntityJson("floatAttribute", "\"123-456\""), TestComplexEntityDo.class)); + Assert.assertThrows(InvalidFormatException.class, () -> s_dataObjectMapper.readValue(createTestComplexEntityJson("floatAttribute", "\"10-03-2019\""), TestComplexEntityDo.class)); + Assert.assertThrows(InvalidFormatException.class, () -> s_dataObjectMapper.readValue(createTestComplexEntityJson("floatAttribute", "\"123,456\""), TestComplexEntityDo.class)); + + Assert.assertThrows(JsonParseException.class, () -> s_dataObjectMapper.readValue(createTestComplexEntityJson("doublelAttribute", "123-456"), TestComplexEntityDo.class)); + Assert.assertThrows(JsonParseException.class, () -> s_dataObjectMapper.readValue(createTestComplexEntityJson("doubleAttribute", "123-456-100"), TestComplexEntityDo.class)); + Assert.assertThrows(InvalidFormatException.class, () -> s_dataObjectMapper.readValue(createTestComplexEntityJson("doubleAttribute", "\"123-456\""), TestComplexEntityDo.class)); + Assert.assertThrows(InvalidFormatException.class, () -> s_dataObjectMapper.readValue(createTestComplexEntityJson("doubleAttribute", "\"10-03-2019\""), TestComplexEntityDo.class)); + Assert.assertThrows(InvalidFormatException.class, () -> s_dataObjectMapper.readValue(createTestComplexEntityJson("doubleAttribute", "\"123,456\""), TestComplexEntityDo.class)); + + Assert.assertThrows(JsonParseException.class, () -> s_dataObjectMapper.readValue(createTestComplexEntityJson("bigDecimalAttribute", "123-456"), TestComplexEntityDo.class)); + Assert.assertThrows(JsonParseException.class, () -> s_dataObjectMapper.readValue(createTestComplexEntityJson("bigDecimalAttribute", "123-456-100"), TestComplexEntityDo.class)); + Assert.assertThrows(InvalidFormatException.class, () -> s_dataObjectMapper.readValue(createTestComplexEntityJson("bigDecimalAttribute", "\"123-456\""), TestComplexEntityDo.class)); + Assert.assertThrows(InvalidFormatException.class, () -> s_dataObjectMapper.readValue(createTestComplexEntityJson("bigDecimalAttribute", "\"10-03-2019\""), TestComplexEntityDo.class)); + Assert.assertThrows(InvalidFormatException.class, () -> s_dataObjectMapper.readValue(createTestComplexEntityJson("bigDecimalAttribute", "\"123,456\""), TestComplexEntityDo.class)); } protected String createTestComplexEntityJson(String attributeName, String value) { diff --git a/org.eclipse.scout.rt.jackson/org.eclipse.scout.rt.jackson.iml b/org.eclipse.scout.rt.jackson/org.eclipse.scout.rt.jackson.iml index 863fc14384..b34b0ce647 100644 --- a/org.eclipse.scout.rt.jackson/org.eclipse.scout.rt.jackson.iml +++ b/org.eclipse.scout.rt.jackson/org.eclipse.scout.rt.jackson.iml @@ -11,13 +11,13 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> <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.dataobject" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.10.3" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.10" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.10" level="project" /> + <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.2" level="project" /> + <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.2" level="project" /> + <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.2" level="project" /> </component> </module>
\ No newline at end of file diff --git a/org.eclipse.scout.rt.jackson/src/main/java/org/eclipse/scout/rt/jackson/dataobject/DataObjectTypeResolverBuilder.java b/org.eclipse.scout.rt.jackson/src/main/java/org/eclipse/scout/rt/jackson/dataobject/DataObjectTypeResolverBuilder.java index 3e014e6f68..a383ebf308 100644 --- a/org.eclipse.scout.rt.jackson/src/main/java/org/eclipse/scout/rt/jackson/dataobject/DataObjectTypeResolverBuilder.java +++ b/org.eclipse.scout.rt.jackson/src/main/java/org/eclipse/scout/rt/jackson/dataobject/DataObjectTypeResolverBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2018 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -16,13 +16,14 @@ import org.eclipse.scout.rt.platform.Bean; import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.ObjectMapper.DefaultTypeResolverBuilder; import com.fasterxml.jackson.databind.ObjectMapper.DefaultTyping; +import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator; @Bean public class DataObjectTypeResolverBuilder extends DefaultTypeResolverBuilder { private static final long serialVersionUID = 1L; public DataObjectTypeResolverBuilder() { - super(DefaultTyping.NON_FINAL); + super(DefaultTyping.NON_FINAL, LaissezFaireSubTypeValidator.instance); } @Override diff --git a/org.eclipse.scout.rt.mail.test/org.eclipse.scout.rt.mail.test.iml b/org.eclipse.scout.rt.mail.test/org.eclipse.scout.rt.mail.test.iml index 7f4a3f55b4..5875cb77bc 100644 --- a/org.eclipse.scout.rt.mail.test/org.eclipse.scout.rt.mail.test.iml +++ b/org.eclipse.scout.rt.mail.test/org.eclipse.scout.rt.mail.test.iml @@ -12,20 +12,20 @@ <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.mail" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> <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="library" name="Maven: com.sun.mail:jakarta.mail:1.6.5" level="project" /> <orderEntry type="library" name="Maven: com.sun.activation:jakarta.activation:1.2.2" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform.test" /> - <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" /> + <orderEntry type="library" name="Maven: junit:junit:4.13" level="project" /> <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> - <orderEntry type="library" name="Maven: org.mockito:mockito-core:2.23.4" level="project" /> - <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.3" level="project" /> - <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.3" level="project" /> - <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" /> + <orderEntry type="library" name="Maven: org.mockito:mockito-core:3.5.7" level="project" /> + <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.13" level="project" /> + <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.13" level="project" /> + <orderEntry type="library" name="Maven: org.objenesis:objenesis:3.1" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> </component> </module>
\ No newline at end of file diff --git a/org.eclipse.scout.rt.mail/org.eclipse.scout.rt.mail.iml b/org.eclipse.scout.rt.mail/org.eclipse.scout.rt.mail.iml index 405b1519c3..862606aaf9 100644 --- a/org.eclipse.scout.rt.mail/org.eclipse.scout.rt.mail.iml +++ b/org.eclipse.scout.rt.mail/org.eclipse.scout.rt.mail.iml @@ -11,8 +11,8 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> <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="library" name="Maven: com.sun.mail:jakarta.mail:1.6.5" level="project" /> diff --git a/org.eclipse.scout.rt.mom.api.test/org.eclipse.scout.rt.mom.api.test.iml b/org.eclipse.scout.rt.mom.api.test/org.eclipse.scout.rt.mom.api.test.iml index 696732648a..d0207f3165 100644 --- a/org.eclipse.scout.rt.mom.api.test/org.eclipse.scout.rt.mom.api.test.iml +++ b/org.eclipse.scout.rt.mom.api.test/org.eclipse.scout.rt.mom.api.test.iml @@ -14,21 +14,21 @@ <orderEntry type="module" module-name="org.eclipse.scout.rt.dataobject" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform.test" scope="TEST" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> <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="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.23.4" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.9.3" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.3" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:3.5.7" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.10.13" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.13" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:3.1" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.jackson.test" scope="TEST" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.jackson" scope="TEST" /> - <orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.10.3" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.10" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.10" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.2" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.2" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.2" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.dataobject.test" scope="TEST" /> </component> </module>
\ No newline at end of file diff --git a/org.eclipse.scout.rt.mom.api.test/src/test/java/org/eclipse/scout/rt/mom/api/marshaller/JsonDataObjectMarshallerTest.java b/org.eclipse.scout.rt.mom.api.test/src/test/java/org/eclipse/scout/rt/mom/api/marshaller/JsonDataObjectMarshallerTest.java index b622d97e21..2cc670d553 100644 --- a/org.eclipse.scout.rt.mom.api.test/src/test/java/org/eclipse/scout/rt/mom/api/marshaller/JsonDataObjectMarshallerTest.java +++ b/org.eclipse.scout.rt.mom.api.test/src/test/java/org/eclipse/scout/rt/mom/api/marshaller/JsonDataObjectMarshallerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2017 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,7 +10,6 @@ */ package org.eclipse.scout.rt.mom.api.marshaller; -import static org.eclipse.scout.rt.testing.platform.util.ScoutAssert.assertThrows; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsEqual.equalTo; import static org.hamcrest.core.IsInstanceOf.instanceOf; @@ -28,6 +27,8 @@ import org.eclipse.scout.rt.dataobject.IDoEntity; import org.eclipse.scout.rt.dataobject.TypeName; import org.eclipse.scout.rt.platform.BEANS; import org.eclipse.scout.rt.platform.util.Assertions.AssertionException; +import org.hamcrest.MatcherAssert; +import org.junit.Assert; import org.junit.Test; public class JsonDataObjectMarshallerTest { @@ -40,11 +41,11 @@ public class JsonDataObjectMarshallerTest { assertEquals(data, marshallAndUnmarshallAsDataObject(data, context)); context = new HashMap<>(); - assertThat(marshallAndUnmarshallAsDataObject(new JsonMarshallerTestEntity(), context), instanceOf(JsonMarshallerTestEntity.class)); + MatcherAssert.assertThat(marshallAndUnmarshallAsDataObject(new JsonMarshallerTestEntity(), context), instanceOf(JsonMarshallerTestEntity.class)); context = new HashMap<>(); JsonMarshallerTestEntity testee = new JsonMarshallerTestEntity(); - assertThat(marshallAndUnmarshallAsDataObject(testee, context), is(equalTo(testee))); + MatcherAssert.assertThat(marshallAndUnmarshallAsDataObject(testee, context), is(equalTo(testee))); } @Test @@ -65,7 +66,7 @@ public class JsonDataObjectMarshallerTest { @Test public void testNonDataObject() { - assertThrows(AssertionException.class, () -> BEANS.get(JsonDataObjectMarshaller.class).marshall("foo", null)); + Assert.assertThrows(AssertionException.class, () -> BEANS.get(JsonDataObjectMarshaller.class).marshall("foo", null)); } private static Object marshallAndUnmarshallAsDataObject(Object object, Map<String, String> context) { diff --git a/org.eclipse.scout.rt.mom.api.test/src/test/java/org/eclipse/scout/rt/mom/api/marshaller/JsonMarshallerTest.java b/org.eclipse.scout.rt.mom.api.test/src/test/java/org/eclipse/scout/rt/mom/api/marshaller/JsonMarshallerTest.java index 857f7ead5d..ca8799bc42 100644 --- a/org.eclipse.scout.rt.mom.api.test/src/test/java/org/eclipse/scout/rt/mom/api/marshaller/JsonMarshallerTest.java +++ b/org.eclipse.scout.rt.mom.api.test/src/test/java/org/eclipse/scout/rt/mom/api/marshaller/JsonMarshallerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2017 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,14 +13,14 @@ package org.eclipse.scout.rt.mom.api.marshaller; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsEqual.equalTo; import static org.hamcrest.core.IsInstanceOf.instanceOf; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.*; import java.util.HashMap; import java.util.Map; import org.eclipse.scout.rt.platform.BEANS; import org.eclipse.scout.rt.platform.util.ObjectUtility; +import org.hamcrest.MatcherAssert; import org.junit.Test; public class JsonMarshallerTest { @@ -33,13 +33,13 @@ public class JsonMarshallerTest { assertEquals("ABC", marshallAndUnmarshallAsBytes("ABC", context)); context = new HashMap<>(); - assertThat(marshallAndUnmarshallAsText(new TestObject(), context), instanceOf(TestObject.class)); - assertThat(marshallAndUnmarshallAsBytes(new TestObject(), context), instanceOf(TestObject.class)); + MatcherAssert.assertThat(marshallAndUnmarshallAsText(new TestObject(), context), instanceOf(TestObject.class)); + MatcherAssert.assertThat(marshallAndUnmarshallAsBytes(new TestObject(), context), instanceOf(TestObject.class)); context = new HashMap<>(); TestObject testee = new TestObject(); - assertThat((TestObject) marshallAndUnmarshallAsText(testee, context), is(equalTo(testee))); - assertThat((TestObject) marshallAndUnmarshallAsBytes(testee, context), is(equalTo(testee))); + MatcherAssert.assertThat(marshallAndUnmarshallAsText(testee, context), is(equalTo(testee))); + MatcherAssert.assertThat(marshallAndUnmarshallAsBytes(testee, context), is(equalTo(testee))); } @Test @@ -58,10 +58,10 @@ public class JsonMarshallerTest { Map<String, String> context = new HashMap<>(); String jsonText = (String) BEANS.get(JsonMarshaller.class).marshall(null, context); - assertEquals(null, BEANS.get(JsonMarshaller.class).unmarshall(jsonText, context)); + assertNull(BEANS.get(JsonMarshaller.class).unmarshall(jsonText, context)); byte[] jsonBytes = (byte[]) BEANS.get(JsonAsBytesMarshaller.class).marshall(null, context); - assertEquals(null, BEANS.get(JsonAsBytesMarshaller.class).unmarshall(jsonBytes, context)); + assertNull(BEANS.get(JsonAsBytesMarshaller.class).unmarshall(jsonBytes, context)); } private static Object marshallAndUnmarshallAsText(Object object, Map<String, String> context) { diff --git a/org.eclipse.scout.rt.mom.api.test/src/test/java/org/eclipse/scout/rt/mom/api/marshaller/ObjectMarshallerTest.java b/org.eclipse.scout.rt.mom.api.test/src/test/java/org/eclipse/scout/rt/mom/api/marshaller/ObjectMarshallerTest.java index d1871c03c0..eb0ae39c39 100644 --- a/org.eclipse.scout.rt.mom.api.test/src/test/java/org/eclipse/scout/rt/mom/api/marshaller/ObjectMarshallerTest.java +++ b/org.eclipse.scout.rt.mom.api.test/src/test/java/org/eclipse/scout/rt/mom/api/marshaller/ObjectMarshallerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2017 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,9 +13,7 @@ package org.eclipse.scout.rt.mom.api.marshaller; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsEqual.equalTo; import static org.hamcrest.core.IsInstanceOf.instanceOf; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; +import static org.junit.Assert.*; import java.io.NotSerializableException; import java.io.Serializable; @@ -24,6 +22,7 @@ import java.util.Map; import org.eclipse.scout.rt.platform.BEANS; import org.eclipse.scout.rt.platform.util.ObjectUtility; +import org.hamcrest.MatcherAssert; import org.junit.Test; public class ObjectMarshallerTest { @@ -36,11 +35,11 @@ public class ObjectMarshallerTest { assertEquals("ABC", marshaller.unmarshall(marshaller.marshall("ABC", context), context)); context = new HashMap<>(); - assertThat(marshaller.unmarshall(marshaller.marshall(new TestObject(), context), context), instanceOf(TestObject.class)); + MatcherAssert.assertThat(marshaller.unmarshall(marshaller.marshall(new TestObject(), context), context), instanceOf(TestObject.class)); context = new HashMap<>(); TestObject testee = new TestObject(); - assertThat((TestObject) marshaller.unmarshall(marshaller.marshall(testee, context), context), is(equalTo(testee))); + MatcherAssert.assertThat(marshaller.unmarshall(marshaller.marshall(testee, context), context), is(equalTo(testee))); } @Test @@ -51,7 +50,7 @@ public class ObjectMarshallerTest { fail("NotSerializableException expected"); } catch (Exception e) { - assertThat(e.getCause(), is(instanceOf(NotSerializableException.class))); + MatcherAssert.assertThat(e.getCause(), is(instanceOf(NotSerializableException.class))); } } @@ -70,7 +69,7 @@ public class ObjectMarshallerTest { Map<String, String> context = new HashMap<>(); byte[] bytes = (byte[]) marshaller.marshall(null, context); - assertEquals(null, marshaller.unmarshall(bytes, context)); + assertNull(marshaller.unmarshall(bytes, context)); } public static class TestObject implements Serializable { diff --git a/org.eclipse.scout.rt.mom.api.test/src/test/java/org/eclipse/scout/rt/mom/api/marshaller/TextMarshallerTest.java b/org.eclipse.scout.rt.mom.api.test/src/test/java/org/eclipse/scout/rt/mom/api/marshaller/TextMarshallerTest.java index d249a7cef1..450090b7a2 100644 --- a/org.eclipse.scout.rt.mom.api.test/src/test/java/org/eclipse/scout/rt/mom/api/marshaller/TextMarshallerTest.java +++ b/org.eclipse.scout.rt.mom.api.test/src/test/java/org/eclipse/scout/rt/mom/api/marshaller/TextMarshallerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2017 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,15 +12,14 @@ package org.eclipse.scout.rt.mom.api.marshaller; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsEqual.equalTo; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.*; import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; import org.eclipse.scout.rt.platform.BEANS; +import org.hamcrest.MatcherAssert; import org.junit.Test; public class TextMarshallerTest { @@ -34,10 +33,10 @@ public class TextMarshallerTest { assertEquals("ABC", BEANS.get(TextMarshaller.class).unmarshall("ABC", context)); byte[] testee = (byte[]) BEANS.get(TextAsBytesMarshaller.class).marshall("ABC", context); - assertThat(testee, is(equalTo(toBytes("ABC")))); + MatcherAssert.assertThat(testee, is(equalTo(toBytes("ABC")))); testee = (byte[]) BEANS.get(TextAsBytesMarshaller.class).marshall(new TestObject(), context); - assertThat(testee, is(equalTo(toBytes("TestObject.toString()")))); + MatcherAssert.assertThat(testee, is(equalTo(toBytes("TestObject.toString()")))); assertEquals("ABC", BEANS.get(TextAsBytesMarshaller.class).unmarshall(toBytes("ABC"), context)); } @@ -60,7 +59,7 @@ public class TextMarshallerTest { assertEquals("", BEANS.get(TextMarshaller.class).unmarshall("", context)); byte[] testee = (byte[]) BEANS.get(TextAsBytesMarshaller.class).marshall("", context); - assertThat(testee, is(equalTo(toBytes("")))); + MatcherAssert.assertThat(testee, is(equalTo(toBytes("")))); assertEquals("", BEANS.get(TextAsBytesMarshaller.class).unmarshall(toBytes(""), context)); } diff --git a/org.eclipse.scout.rt.mom.api/org.eclipse.scout.rt.mom.api.iml b/org.eclipse.scout.rt.mom.api/org.eclipse.scout.rt.mom.api.iml index ce2c27fed8..d0775f2e7b 100644 --- a/org.eclipse.scout.rt.mom.api/org.eclipse.scout.rt.mom.api.iml +++ b/org.eclipse.scout.rt.mom.api/org.eclipse.scout.rt.mom.api.iml @@ -12,8 +12,8 @@ <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.dataobject" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> <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" /> </component> diff --git a/org.eclipse.scout.rt.mom.jms.test/org.eclipse.scout.rt.mom.jms.test.iml b/org.eclipse.scout.rt.mom.jms.test/org.eclipse.scout.rt.mom.jms.test.iml index cc675f87f3..97d0f6eb8c 100644 --- a/org.eclipse.scout.rt.mom.jms.test/org.eclipse.scout.rt.mom.jms.test.iml +++ b/org.eclipse.scout.rt.mom.jms.test/org.eclipse.scout.rt.mom.jms.test.iml @@ -15,64 +15,68 @@ <orderEntry type="module" module-name="org.eclipse.scout.rt.dataobject" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform.test" scope="TEST" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> <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="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.23.4" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.9.3" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.3" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:3.5.7" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.10.13" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.13" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:3.1" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.jackson.test" scope="TEST" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.jackson" scope="TEST" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.dataobject.test" scope="TEST" /> <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.apache.activemq:activemq-broker:5.15.12" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.apache.activemq:activemq-client:5.15.12" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.apache.activemq:activemq-broker:5.16.0" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.apache.activemq:activemq-client:5.16.0" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.fusesource.hawtbuf:hawtbuf:1.11" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec:1.0.1" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: com.google.guava:guava:28.2-jre" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.checkerframework:checker-qual:2.10.0" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.10.3" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.10" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.10" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.apache.activemq:artemis-jms-client:2.6.3" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.apache.activemq:artemis-core-client:2.6.3" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.2" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.2" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.2" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.apache.activemq:artemis-jms-client:2.15.0" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.apache.activemq:artemis-core-client:2.15.0" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.jgroups:jgroups:3.6.13.Final" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.apache.johnzon:johnzon-core:0.9.5" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-transport-native-epoll:linux-x86_64:4.1.24.Final" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-transport-native-unix-common:4.1.24.Final" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-transport-native-kqueue:osx-x86_64:4.1.24.Final" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-codec-http:4.1.24.Final" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-buffer:4.1.24.Final" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-transport:4.1.24.Final" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-resolver:4.1.24.Final" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-handler:4.1.24.Final" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-codec:4.1.24.Final" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-common:4.1.24.Final" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.apache.activemq:artemis-selector:2.6.3" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.apache.geronimo.specs:geronimo-jms_2.0_spec:1.0-alpha-2" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.apache.activemq:artemis-jms-server:2.6.3" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.jboss.logging:jboss-logging:3.3.1.Final" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.apache.activemq:artemis-server:2.6.3" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.apache.activemq:artemis-jdbc-store:2.6.3" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.apache.activemq:artemis-native:2.6.3" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: commons-beanutils:commons-beanutils:1.9.3" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-transport-native-epoll:linux-x86_64:4.1.48.Final" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-transport-native-unix-common:4.1.48.Final" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-transport-native-kqueue:osx-x86_64:4.1.48.Final" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-codec-http:4.1.48.Final" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-buffer:4.1.48.Final" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-transport:4.1.48.Final" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-resolver:4.1.48.Final" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-handler:4.1.48.Final" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-handler-proxy:4.1.48.Final" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-codec:4.1.48.Final" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-codec-socks:4.1.48.Final" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-common:4.1.48.Final" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.apache.activemq:artemis-commons:2.15.0" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: commons-collections:commons-collections:3.2.2" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.apache.activemq:artemis-selector:2.15.0" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.apache.geronimo.specs:geronimo-jms_2.0_spec:1.0-alpha-2" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.apache.activemq:artemis-jms-server:2.15.0" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.jboss.logging:jboss-logging:3.4.0.Final" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.apache.activemq:artemis-server:2.15.0" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.jboss.logmanager:jboss-logmanager:2.1.10.Final" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.wildfly.common:wildfly-common:1.5.1.Final" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.apache.activemq:artemis-jdbc-store:2.15.0" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.apache.activemq:activemq-artemis-native:1.0.2" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.jctools:jctools-core:2.1.2" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.apache.commons:commons-configuration2:2.7" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.apache.commons:commons-text:1.8" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: io.micrometer:micrometer-core:1.1.4" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: commons-io:commons-io:2.6" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.apache.activemq:artemis-journal:2.6.3" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.apache.activemq:artemis-commons:2.6.3" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.apache.activemq:artemis-service-extensions:2.6.3" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.apache.activemq:artemis-journal:2.15.0" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.apache.activemq:artemis-service-extensions:2.15.0" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1.1" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.apache.geronimo.specs:geronimo-json_1.0_spec:1.0-alpha-1" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" /> </component> </module>
\ No newline at end of file diff --git a/org.eclipse.scout.rt.mom.jms.test/src/test/java/org/eclipse/scout/rt/mom/jms/AbstractJmsMomTest.java b/org.eclipse.scout.rt.mom.jms.test/src/test/java/org/eclipse/scout/rt/mom/jms/AbstractJmsMomTest.java index 4cdb6c1676..66756b5094 100644 --- a/org.eclipse.scout.rt.mom.jms.test/src/test/java/org/eclipse/scout/rt/mom/jms/AbstractJmsMomTest.java +++ b/org.eclipse.scout.rt.mom.jms.test/src/test/java/org/eclipse/scout/rt/mom/jms/AbstractJmsMomTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,19 +10,14 @@ */ package org.eclipse.scout.rt.mom.jms; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; +import static org.junit.Assert.*; +import static org.mockito.ArgumentMatchers.*; +import static org.mockito.Mockito.*; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.Objects; import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.function.Predicate; @@ -36,9 +31,11 @@ import org.apache.activemq.broker.BrokerService; import org.eclipse.scout.rt.mom.api.IDestination; import org.eclipse.scout.rt.mom.api.marshaller.IMarshaller; import org.eclipse.scout.rt.platform.AnnotationFactory; +import org.eclipse.scout.rt.platform.ApplicationScoped; import org.eclipse.scout.rt.platform.BEANS; import org.eclipse.scout.rt.platform.BeanMetaData; import org.eclipse.scout.rt.platform.IBean; +import org.eclipse.scout.rt.platform.Order; import org.eclipse.scout.rt.platform.exception.ProcessingException; import org.eclipse.scout.rt.platform.job.IFuture; import org.eclipse.scout.rt.platform.job.JobState; @@ -96,9 +93,13 @@ public abstract class AbstractJmsMomTest { } @After - public void after() throws Exception { + public void after() { dispose(m_disposables); cancelJobs(); + + // remember used used brokers here because they might be removed after mom.destroy() + // but it is necessary to wait for broker stop completion later because stopping is executed asynchronously. + List<BrokerService> brokers = new ArrayList<>(BrokerRegistry.getInstance().getBrokers().values()); if (m_mom != null) { m_mom.destroy(); m_mom = null; @@ -106,12 +107,16 @@ public abstract class AbstractJmsMomTest { BeanTestingHelper.get().unregisterBeans(m_beans); m_beans.clear(); - // ensure activeMQ is stopped - BrokerService brokerService = BrokerRegistry.getInstance().findFirst(); - if (brokerService != null) { - brokerService.stop(); - brokerService.waitUntilStopped(); - } + // ensure activeMQ is stopped and wait for it + brokers.stream().filter(Objects::nonNull).forEach(brokerService -> { + try { + brokerService.stop(); + brokerService.waitUntilStopped(); + } + catch (Exception e) { + throw new ProcessingException("Unable to stop broker {}.", brokerService, e); + } + }); LOG.info("Finished test in {} ms", StringUtility.formatNanos(System.nanoTime() - m_testStarted)); LOG.info("</{}>", m_testName.getMethodName()); @@ -125,8 +130,24 @@ public abstract class AbstractJmsMomTest { protected <MOM extends FixtureMom> MOM installMom(Class<MOM> transportType) { assertNull("installMom was already called in this test", m_mom); IJmsMessageHandler messageHandler = mock(IJmsMessageHandler.class); + LOG.info("Registering IJmsMessageHandler mock '{}'.", messageHandler, new Exception("Register Stack")); m_beans.add(BeanTestingHelper.get().registerBean(new BeanMetaData(IJmsMessageHandler.class, messageHandler).withAnnotation(AnnotationFactory.createApplicationScoped()))); - assertSame(messageHandler, BEANS.get(IJmsMessageHandler.class)); + if (messageHandler != BEANS.get(IJmsMessageHandler.class)) { + StringBuilder registeredBeans = new StringBuilder(); + for (IBean<IJmsMessageHandler> bean : BEANS.getBeanManager().getBeans(IJmsMessageHandler.class)) { + registeredBeans.append("\n - instance=").append(bean.getInstance()).append(", beanClass=").append(bean.getBeanClazz()); + Order orderAnnotation = bean.getBeanAnnotation(Order.class); + if (orderAnnotation != null) { + registeredBeans.append(", order=").append(orderAnnotation.value()); + } + ApplicationScoped applicationScopedAnnotation = bean.getBeanAnnotation(ApplicationScoped.class); + if (applicationScopedAnnotation != null) { + registeredBeans.append(", ApplicationScoped"); + } + + } + fail("IJmsMessageHandler mock registration unsuccessful. Registered mock is not returned from BEANS.get. Available beans:" + registeredBeans); + } FixtureMom transport = BeanUtility.createInstance(transportType, m_testParameter); m_beans.add(BEANS.getBeanManager().registerBean(new BeanMetaData(transportType, transport))); diff --git a/org.eclipse.scout.rt.mom.jms.test/src/test/java/org/eclipse/scout/rt/mom/jms/ArtemisJmsBrokerTestRule.java b/org.eclipse.scout.rt.mom.jms.test/src/test/java/org/eclipse/scout/rt/mom/jms/ArtemisJmsBrokerTestRule.java index 713f130d86..b4945e9bef 100644 --- a/org.eclipse.scout.rt.mom.jms.test/src/test/java/org/eclipse/scout/rt/mom/jms/ArtemisJmsBrokerTestRule.java +++ b/org.eclipse.scout.rt.mom.jms.test/src/test/java/org/eclipse/scout/rt/mom/jms/ArtemisJmsBrokerTestRule.java @@ -1,15 +1,5 @@ /* - * Copyright (c) 2010-2017 BSI Business Systems Integration AG. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * BSI Business Systems Integration AG - initial API and implementation - */ -/* - * Copyright (c) 2019 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -18,6 +8,7 @@ * Contributors: * BSI Business Systems Integration AG - initial API and implementation */ + package org.eclipse.scout.rt.mom.jms; import java.io.IOException; @@ -29,10 +20,10 @@ import java.nio.file.SimpleFileVisitor; import java.nio.file.attribute.BasicFileAttributes; import java.util.concurrent.TimeUnit; +import org.apache.activemq.artemis.api.core.QueueConfiguration; import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.core.config.Configuration; -import org.apache.activemq.artemis.core.config.CoreQueueConfiguration; import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl; import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory; import org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ; @@ -144,8 +135,8 @@ public class ArtemisJmsBrokerTestRule extends ExternalResource { return config; } - protected CoreQueueConfiguration createQueue(String name) { - return new CoreQueueConfiguration().setName(name).setAddress(name); + protected QueueConfiguration createQueue(String name) { + return new QueueConfiguration(name).setAddress(name); } protected void stopArtemisJmsServer() { diff --git a/org.eclipse.scout.rt.mom.jms.test/src/test/java/org/eclipse/scout/rt/mom/jms/JmsMomPubSubTest.java b/org.eclipse.scout.rt.mom.jms.test/src/test/java/org/eclipse/scout/rt/mom/jms/JmsMomPubSubTest.java index 7a6ab6b2fe..9e7238d0f0 100644 --- a/org.eclipse.scout.rt.mom.jms.test/src/test/java/org/eclipse/scout/rt/mom/jms/JmsMomPubSubTest.java +++ b/org.eclipse.scout.rt.mom.jms.test/src/test/java/org/eclipse/scout/rt/mom/jms/JmsMomPubSubTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -57,6 +57,7 @@ import org.eclipse.scout.rt.testing.platform.runner.Times; import org.eclipse.scout.rt.testing.platform.runner.parameterized.NonParameterized; import org.eclipse.scout.rt.testing.platform.testcategory.SlowTest; import org.eclipse.scout.rt.testing.platform.util.BlockingCountDownLatch; +import org.hamcrest.MatcherAssert; import org.junit.Assume; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -616,7 +617,7 @@ public class JmsMomPubSubTest extends AbstractJmsMomTest { assertNotNull(testee); assertEquals("smith", testee.getTransferObject().getLastname()); assertEquals("anna", testee.getTransferObject().getFirstname()); - assertThat(testee.getAdapter(Message.class), instanceOf(Message.class)); + MatcherAssert.assertThat(testee.getAdapter(Message.class), instanceOf(Message.class)); } finally { CorrelationId.CURRENT.remove(); diff --git a/org.eclipse.scout.rt.mom.jms.test/src/test/java/org/eclipse/scout/rt/mom/jms/JmsMomWithFailoverTest.java b/org.eclipse.scout.rt.mom.jms.test/src/test/java/org/eclipse/scout/rt/mom/jms/JmsMomWithFailoverTest.java index 0565f21e8d..3ac25c93bf 100644 --- a/org.eclipse.scout.rt.mom.jms.test/src/test/java/org/eclipse/scout/rt/mom/jms/JmsMomWithFailoverTest.java +++ b/org.eclipse.scout.rt.mom.jms.test/src/test/java/org/eclipse/scout/rt/mom/jms/JmsMomWithFailoverTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -43,7 +43,7 @@ public class JmsMomWithFailoverTest extends AbstractJmsMomTest { public void testSubscribeFailover() throws InterruptedException { Assume.assumeFalse(J2eeJmsMomImplementor.class.isAssignableFrom(m_testParameter.getImplementor())); - //retryCount=3, retryInterval=1s, sesionRetryInterval=2s + //retryCount=3, retryInterval=1s, sessionRetryInterval=2s FixtureMomWithFailover mom = installMom(FixtureMomWithFailover.class); IDestination<String> queue = MOM.newDestination("test/mom/testSubscribeFailover", DestinationType.QUEUE, ResolveMethod.DEFINE, null); diff --git a/org.eclipse.scout.rt.mom.jms.test/src/test/java/org/eclipse/scout/rt/mom/jms/JmsMomWithRequestReplyTest.java b/org.eclipse.scout.rt.mom.jms.test/src/test/java/org/eclipse/scout/rt/mom/jms/JmsMomWithRequestReplyTest.java index 5c80f11258..9c86e201a7 100644 --- a/org.eclipse.scout.rt.mom.jms.test/src/test/java/org/eclipse/scout/rt/mom/jms/JmsMomWithRequestReplyTest.java +++ b/org.eclipse.scout.rt.mom.jms.test/src/test/java/org/eclipse/scout/rt/mom/jms/JmsMomWithRequestReplyTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -66,6 +66,7 @@ import org.eclipse.scout.rt.testing.platform.runner.JUnitExceptionHandler; import org.eclipse.scout.rt.testing.platform.runner.Times; import org.eclipse.scout.rt.testing.platform.testcategory.SlowTest; import org.eclipse.scout.rt.testing.platform.util.BlockingCountDownLatch; +import org.hamcrest.MatcherAssert; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -152,7 +153,7 @@ public class JmsMomWithRequestReplyTest extends AbstractJmsMomTest { assertNotNull(testee); assertEquals("smith", testee.getTransferObject().getLastname()); assertEquals("anna", testee.getTransferObject().getFirstname()); - assertThat(testee.getAdapter(Message.class), instanceOf(Message.class)); + MatcherAssert.assertThat(testee.getAdapter(Message.class), instanceOf(Message.class)); assertEquals("cid_test", testee.getAdapter(Message.class).getJMSCorrelationID()); } finally { diff --git a/org.eclipse.scout.rt.mom.jms/org.eclipse.scout.rt.mom.jms.iml b/org.eclipse.scout.rt.mom.jms/org.eclipse.scout.rt.mom.jms.iml index 2ee17fd500..589b2c0c3a 100644 --- a/org.eclipse.scout.rt.mom.jms/org.eclipse.scout.rt.mom.jms.iml +++ b/org.eclipse.scout.rt.mom.jms/org.eclipse.scout.rt.mom.jms.iml @@ -13,8 +13,8 @@ <orderEntry type="module" module-name="org.eclipse.scout.rt.mom.api" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.dataobject" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> <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="library" scope="PROVIDED" name="Maven: jakarta.jms:jakarta.jms-api:2.0.3" level="project" /> diff --git a/org.eclipse.scout.rt.platform.test/org.eclipse.scout.rt.platform.test.iml b/org.eclipse.scout.rt.platform.test/org.eclipse.scout.rt.platform.test.iml index 1f73abe68c..7a7daa01d2 100644 --- a/org.eclipse.scout.rt.platform.test/org.eclipse.scout.rt.platform.test.iml +++ b/org.eclipse.scout.rt.platform.test/org.eclipse.scout.rt.platform.test.iml @@ -13,16 +13,16 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> <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="library" name="Maven: junit:junit:4.12" level="project" /> + <orderEntry type="library" name="Maven: junit:junit:4.13" level="project" /> <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> - <orderEntry type="library" name="Maven: org.mockito:mockito-core:2.23.4" level="project" /> - <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.3" level="project" /> - <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.3" level="project" /> - <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" /> + <orderEntry type="library" name="Maven: org.mockito:mockito-core:3.5.7" level="project" /> + <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.13" level="project" /> + <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.13" level="project" /> + <orderEntry type="library" name="Maven: org.objenesis:objenesis:3.1" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: log4j:log4j:1.2.17" level="project" /> diff --git a/org.eclipse.scout.rt.platform.test/src/main/java/org/eclipse/scout/rt/testing/platform/runner/statement/BeanAnnotationsInitStatement.java b/org.eclipse.scout.rt.platform.test/src/main/java/org/eclipse/scout/rt/testing/platform/runner/statement/BeanAnnotationsInitStatement.java index e39b3d1887..e87ce16051 100644 --- a/org.eclipse.scout.rt.platform.test/src/main/java/org/eclipse/scout/rt/testing/platform/runner/statement/BeanAnnotationsInitStatement.java +++ b/org.eclipse.scout.rt.platform.test/src/main/java/org/eclipse/scout/rt/testing/platform/runner/statement/BeanAnnotationsInitStatement.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2017 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -42,7 +42,7 @@ public class BeanAnnotationsInitStatement extends Statement { @Override public void evaluate() throws Throwable { BEANS.get(BeanAnnotations.class).init(m_target); - MockitoAnnotations.initMocks(m_target); + MockitoAnnotations.openMocks(m_target).close(); m_next.evaluate(); } } diff --git a/org.eclipse.scout.rt.platform.test/src/main/java/org/eclipse/scout/rt/testing/platform/util/ITestExecutable.java b/org.eclipse.scout.rt.platform.test/src/main/java/org/eclipse/scout/rt/testing/platform/util/ITestExecutable.java index cb481dbd90..65dc4721e3 100644 --- a/org.eclipse.scout.rt.platform.test/src/main/java/org/eclipse/scout/rt/testing/platform/util/ITestExecutable.java +++ b/org.eclipse.scout.rt.platform.test/src/main/java/org/eclipse/scout/rt/testing/platform/util/ITestExecutable.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2018 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,9 +10,13 @@ */ package org.eclipse.scout.rt.testing.platform.util; +import org.junit.function.ThrowingRunnable; + /** * Functional interface allowing lambda expressions that are throwing any {@link Throwable}. + * @deprecated Use {@link ThrowingRunnable} instead. Will be removed in Scout 12. */ +@Deprecated @FunctionalInterface public interface ITestExecutable { diff --git a/org.eclipse.scout.rt.platform.test/src/main/java/org/eclipse/scout/rt/testing/platform/util/ScoutAssert.java b/org.eclipse.scout.rt.platform.test/src/main/java/org/eclipse/scout/rt/testing/platform/util/ScoutAssert.java index 425bc8b8c7..ee6052291d 100644 --- a/org.eclipse.scout.rt.platform.test/src/main/java/org/eclipse/scout/rt/testing/platform/util/ScoutAssert.java +++ b/org.eclipse.scout.rt.platform.test/src/main/java/org/eclipse/scout/rt/testing/platform/util/ScoutAssert.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2018 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -22,7 +22,9 @@ import java.util.Objects; import org.eclipse.scout.rt.platform.util.IOUtility; import org.eclipse.scout.rt.platform.util.ObjectUtility; +import org.junit.Assert; import org.junit.ComparisonFailure; +import org.junit.function.ThrowingRunnable; public final class ScoutAssert { @@ -140,9 +142,11 @@ public final class ScoutAssert { } /** - * Asserts that the given {@link ITestExecutable} throws an exception of expected type. <br/> - * This method was motivated by Junit 5 and could be replaced when upgrading form Junit 4. + * Asserts that the given {@link ITestExecutable} throws an exception of expected type. + * + * @deprecated Use {@link Assert#assertThrows(Class, ThrowingRunnable)} instead. Will be removed in Scout 12. */ + @Deprecated public static <T extends Throwable> T assertThrows(Class<T> expectedType, ITestExecutable r) { try { r.execute(); diff --git a/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/platform/config/IntegerConfigPropertyTest.java b/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/platform/config/IntegerConfigPropertyTest.java index 94715a0946..5fe883461e 100644 --- a/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/platform/config/IntegerConfigPropertyTest.java +++ b/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/platform/config/IntegerConfigPropertyTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2017 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,36 +12,36 @@ package org.eclipse.scout.rt.platform.config; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNull.nullValue; -import static org.junit.Assert.assertThat; import org.eclipse.scout.rt.platform.Bean; import org.eclipse.scout.rt.platform.exception.PlatformException; +import org.hamcrest.MatcherAssert; import org.junit.Test; /** - * Tests for {@link AbsteactLongConfigProperty} + * Tests for {@link AbstractLongConfigProperty} */ public class IntegerConfigPropertyTest { @Test public void testDefaultForEmptyValue() { Integer propertyValue = CONFIG.getPropertyValue(SampleTestProperty.class); - assertThat(propertyValue, is(42)); + MatcherAssert.assertThat(propertyValue, is(42)); propertyValue = CONFIG.getPropertyValue(PositiveSampleTestProperty.class); - assertThat(propertyValue, is(42)); + MatcherAssert.assertThat(propertyValue, is(42)); } @Test public void testParse() { - assertThat(new SampleTestProperty().parse(null), is(nullValue())); - assertThat(new SampleTestProperty().parse("0"), is(0)); - assertThat(new SampleTestProperty().parse("123"), is(123)); - assertThat(new SampleTestProperty().parse("-123"), is(-123)); - - assertThat(new PositiveSampleTestProperty().parse(null), is(nullValue())); - assertThat(new PositiveSampleTestProperty().parse("0"), is(0)); - assertThat(new PositiveSampleTestProperty().parse("123"), is(123)); + MatcherAssert.assertThat(new SampleTestProperty().parse(null), is(nullValue())); + MatcherAssert.assertThat(new SampleTestProperty().parse("0"), is(0)); + MatcherAssert.assertThat(new SampleTestProperty().parse("123"), is(123)); + MatcherAssert.assertThat(new SampleTestProperty().parse("-123"), is(-123)); + + MatcherAssert.assertThat(new PositiveSampleTestProperty().parse(null), is(nullValue())); + MatcherAssert.assertThat(new PositiveSampleTestProperty().parse("0"), is(0)); + MatcherAssert.assertThat(new PositiveSampleTestProperty().parse("123"), is(123)); } @Test(expected = NumberFormatException.class) diff --git a/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/platform/config/LongConfigPropertyTest.java b/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/platform/config/LongConfigPropertyTest.java index 2776c1bde7..4d4ee7ecfa 100644 --- a/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/platform/config/LongConfigPropertyTest.java +++ b/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/platform/config/LongConfigPropertyTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2017 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,26 +12,26 @@ package org.eclipse.scout.rt.platform.config; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNull.nullValue; -import static org.junit.Assert.assertThat; import org.eclipse.scout.rt.platform.Bean; +import org.hamcrest.MatcherAssert; import org.junit.Test; /** - * Tests for {@link AbsteactLongConfigProperty} + * Tests for {@link AbstractLongConfigProperty} */ public class LongConfigPropertyTest { @Test public void testDefaultForEmptyValue() { Long propertyValue = CONFIG.getPropertyValue(SampleTestProperty.class); - assertThat(propertyValue, is(42L)); + MatcherAssert.assertThat(propertyValue, is(42L)); } @Test public void testParse() { - assertThat(new SampleTestProperty().parse(null), is(nullValue())); - assertThat(new SampleTestProperty().parse("0"), is(0L)); + MatcherAssert.assertThat(new SampleTestProperty().parse(null), is(nullValue())); + MatcherAssert.assertThat(new SampleTestProperty().parse("0"), is(0L)); } @Bean diff --git a/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/platform/context/RunMonitorTest.java b/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/platform/context/RunMonitorTest.java index 7fc95a9322..67dfd13e5b 100644 --- a/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/platform/context/RunMonitorTest.java +++ b/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/platform/context/RunMonitorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2017 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,12 +10,9 @@ */ package org.eclipse.scout.rt.platform.context; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import static org.junit.Assert.*; +import static org.mockito.ArgumentMatchers.*; +import static org.mockito.Mockito.*; import org.eclipse.scout.rt.platform.util.concurrent.ICancellable; import org.eclipse.scout.rt.testing.platform.runner.PlatformTestRunner; @@ -35,8 +32,8 @@ public class RunMonitorTest { private ICancellable m_cancellable2; @Before - public void before() { - MockitoAnnotations.initMocks(this); + public void before() throws Exception { + MockitoAnnotations.openMocks(this).close(); } @Test diff --git a/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/platform/exception/PlatformExceptionTest.java b/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/platform/exception/PlatformExceptionTest.java index c676160ed9..c405cda33e 100644 --- a/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/platform/exception/PlatformExceptionTest.java +++ b/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/platform/exception/PlatformExceptionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2017 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,9 +11,7 @@ package org.eclipse.scout.rt.platform.exception; import static org.eclipse.scout.rt.platform.util.CollectionUtility.arrayList; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; +import static org.junit.Assert.*; import java.util.Arrays; @@ -152,6 +150,7 @@ public class PlatformExceptionTest { System.err.println("formatting " + msg); System.err.println("=============="); System.err.println("Sys.err.println(t)"); + //noinspection ThrowablePrintedToSystemOut System.err.println(t); System.err.println("-------"); System.err.println("t.printStackTrace()"); diff --git a/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/platform/filter/AndFilterTest.java b/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/platform/filter/AndFilterTest.java index 7caa92ba81..e974b25aa7 100644 --- a/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/platform/filter/AndFilterTest.java +++ b/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/platform/filter/AndFilterTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2017 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,8 +10,7 @@ */ package org.eclipse.scout.rt.platform.filter; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; @@ -33,8 +32,8 @@ public class AndFilterTest { private Predicate<Object> m_filter3; @Before - public void before() { - MockitoAnnotations.initMocks(this); + public void before() throws Exception { + MockitoAnnotations.openMocks(this).close(); } @Test(expected = AssertionException.class) diff --git a/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/platform/resource/BinaryRefTest.java b/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/platform/resource/BinaryRefTest.java index 79b7cb871c..4ada258a8b 100644 --- a/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/platform/resource/BinaryRefTest.java +++ b/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/platform/resource/BinaryRefTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2018 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,7 +10,6 @@ */ package org.eclipse.scout.rt.platform.resource; -import static org.eclipse.scout.rt.testing.platform.util.ScoutAssert.assertThrows; import static org.junit.Assert.*; import java.net.URI; @@ -28,6 +27,7 @@ import org.eclipse.scout.rt.platform.BeanMetaData; import org.eclipse.scout.rt.platform.IBean; import org.eclipse.scout.rt.testing.platform.BeanTestingHelper; import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -145,9 +145,9 @@ public class BinaryRefTest { public void testLoadBinaryResource() { assertNull(BinaryRefs.loadBinaryResource(null)); assertNull(BinaryRefs.loadBinaryResource(NO_BINREF_URI)); - assertThrows(IllegalStateException.class, () -> BinaryRefs.loadBinaryResource(NO_HANDLER_BINREF_URI)); - assertThrows(IllegalStateException.class, () -> BinaryRefs.loadBinaryResource(UNKNOWN_BINREF_URI)); - assertThrows(IllegalStateException.class, () -> BinaryRefs.loadBinaryResource(RELATIVE_BINREF_URI)); + Assert.assertThrows(IllegalStateException.class, () -> BinaryRefs.loadBinaryResource(NO_HANDLER_BINREF_URI)); + Assert.assertThrows(IllegalStateException.class, () -> BinaryRefs.loadBinaryResource(UNKNOWN_BINREF_URI)); + Assert.assertThrows(IllegalStateException.class, () -> BinaryRefs.loadBinaryResource(RELATIVE_BINREF_URI)); assertEquals(new BinaryResource("existing1.txt", new byte[0]), BinaryRefs.loadBinaryResource(EXISTING_1_BINREF_URI)); assertEquals(new BinaryResource("existing2.png", new byte[0]), BinaryRefs.loadBinaryResource(EXISTING_2_BINREF_URI)); } diff --git a/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/platform/transaction/TransactionProcessorTest.java b/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/platform/transaction/TransactionProcessorTest.java index 4132f470f9..4bde153e53 100644 --- a/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/platform/transaction/TransactionProcessorTest.java +++ b/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/platform/transaction/TransactionProcessorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2017 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,7 +10,6 @@ */ package org.eclipse.scout.rt.platform.transaction; -import static org.eclipse.scout.rt.testing.platform.util.ScoutAssert.assertThrows; import static org.junit.Assert.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; @@ -48,8 +47,8 @@ public class TransactionProcessorTest { private ITransaction m_transaction; @Before - public void before() { - MockitoAnnotations.initMocks(this); + public void before() throws Exception { + MockitoAnnotations.openMocks(this).close(); m_transaction = Mockito.spy(BEANS.get(ITransaction.class)); @@ -120,8 +119,8 @@ public class TransactionProcessorTest { assertEquals("result", result); assertSame(callingTransaction, actualTransaction.getValue()); - verifyZeroInteractions(m_transaction); - verifyZeroInteractions(callingTransaction); + verifyNoInteractions(m_transaction); + verifyNoInteractions(callingTransaction); } @Test @@ -147,8 +146,8 @@ public class TransactionProcessorTest { assertSame(callingTransaction, actualTransaction.getValue()); assertFalse(supplierWasInvoked.get()); - verifyZeroInteractions(m_transaction); - verifyZeroInteractions(callingTransaction); + verifyNoInteractions(m_transaction); + verifyNoInteractions(callingTransaction); } @Test @@ -173,7 +172,7 @@ public class TransactionProcessorTest { assertSame(exception, e); assertSame(callingTransaction, actualTransaction.getValue()); - verifyZeroInteractions(m_transaction); + verifyNoInteractions(m_transaction); verify(callingTransaction, never()).commitPhase1(); verify(callingTransaction, never()).commitPhase2(); verify(callingTransaction, never()).rollback(); @@ -322,7 +321,7 @@ public class TransactionProcessorTest { assertSame(m_transaction, actualTransaction.getValue()); assertEquals("result", result); - verifyZeroInteractions(callingTransaction); + verifyNoInteractions(callingTransaction); verify(m_transaction, times(1)).release(); InOrder inOrder = Mockito.inOrder(m_transaction); @@ -345,15 +344,15 @@ public class TransactionProcessorTest { supplierWasInvoked.set(true); return null; })); - assertThrows(AssertionException.class, () -> chain.call(() -> { + Assert.assertThrows(AssertionException.class, () -> chain.call(() -> { Assert.fail("callable is not expected to be invoked"); return null; })); // verify assertTrue(supplierWasInvoked.get()); - verifyZeroInteractions(callingTransaction); - verifyZeroInteractions(m_transaction); + verifyNoInteractions(callingTransaction); + verifyNoInteractions(m_transaction); } @Test @@ -380,7 +379,7 @@ public class TransactionProcessorTest { assertEquals("result", result); assertTrue(supplierWasInvoked.get()); - verifyZeroInteractions(callingTransaction); + verifyNoInteractions(callingTransaction); verify(m_transaction, times(1)).release(); InOrder inOrder = Mockito.inOrder(m_transaction); @@ -413,7 +412,7 @@ public class TransactionProcessorTest { assertSame(exception, e); assertSame(m_transaction, actualTransaction.getValue()); - verifyZeroInteractions(callingTransaction); + verifyNoInteractions(callingTransaction); verify(m_transaction, times(1)).release(); InOrder inOrder = Mockito.inOrder(m_transaction); @@ -571,8 +570,8 @@ public class TransactionProcessorTest { assertEquals("result", result); assertSame(callingTransaction, actualTransaction.getValue()); - verifyZeroInteractions(m_transaction); - verifyZeroInteractions(callingTransaction); + verifyNoInteractions(m_transaction); + verifyNoInteractions(callingTransaction); } @Test @@ -599,8 +598,8 @@ public class TransactionProcessorTest { assertSame(callingTransaction, actualTransaction.getValue()); assertFalse(supplierWasInvoked.get()); - verifyZeroInteractions(m_transaction); - verifyZeroInteractions(callingTransaction); + verifyNoInteractions(m_transaction); + verifyNoInteractions(callingTransaction); } @Test @@ -626,7 +625,7 @@ public class TransactionProcessorTest { assertSame(exception, e); assertSame(callingTransaction, actualTransaction.getValue()); - verifyZeroInteractions(m_transaction); + verifyNoInteractions(m_transaction); verify(callingTransaction, never()).commitPhase1(); verify(callingTransaction, never()).commitPhase2(); diff --git a/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/platform/util/date/StrictSimpleDateFormatTest.java b/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/platform/util/date/StrictSimpleDateFormatTest.java index f27cb6df32..b58f627e81 100644 --- a/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/platform/util/date/StrictSimpleDateFormatTest.java +++ b/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/platform/util/date/StrictSimpleDateFormatTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,7 +14,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import org.eclipse.scout.rt.platform.holders.StringHolder; -import org.eclipse.scout.rt.testing.platform.util.ScoutAssert; +import org.junit.Assert; import org.junit.Test; public class StrictSimpleDateFormatTest { @@ -29,33 +29,33 @@ public class StrictSimpleDateFormatTest { pattern.setValue("yyyy-MM-dd hh:mm.ss.SSS"); input.setValue("2019-01-18"); - ScoutAssert.assertThrows(ParseException.class, () -> new SimpleDateFormat(pattern.getValue()).parse(input.getValue())); - ScoutAssert.assertThrows(ParseException.class, () -> new StrictSimpleDateFormat(pattern.getValue()).parse(input.getValue())); + Assert.assertThrows(ParseException.class, () -> new SimpleDateFormat(pattern.getValue()).parse(input.getValue())); + Assert.assertThrows(ParseException.class, () -> new StrictSimpleDateFormat(pattern.getValue()).parse(input.getValue())); pattern.setValue("yyyy-MM-dd"); input.setValue("2019-18"); - ScoutAssert.assertThrows(ParseException.class, () -> new SimpleDateFormat(pattern.getValue()).parse(input.getValue())); - ScoutAssert.assertThrows(ParseException.class, () -> new StrictSimpleDateFormat(pattern.getValue()).parse(input.getValue())); + Assert.assertThrows(ParseException.class, () -> new SimpleDateFormat(pattern.getValue()).parse(input.getValue())); + Assert.assertThrows(ParseException.class, () -> new StrictSimpleDateFormat(pattern.getValue()).parse(input.getValue())); pattern.setValue("yyyy-MM-dd"); input.setValue("2019-1-18"); new SimpleDateFormat(pattern.getValue()).parse(input.getValue()); - ScoutAssert.assertThrows(ParseException.class, () -> new StrictSimpleDateFormat(pattern.getValue()).parse(input.getValue())); + Assert.assertThrows(ParseException.class, () -> new StrictSimpleDateFormat(pattern.getValue()).parse(input.getValue())); pattern.setValue("yyyyMMdd"); input.setValue("20190118xyz"); new SimpleDateFormat(pattern.getValue()).parse(input.getValue()); - ScoutAssert.assertThrows(ParseException.class, () -> new StrictSimpleDateFormat(pattern.getValue()).parse(input.getValue())); + Assert.assertThrows(ParseException.class, () -> new StrictSimpleDateFormat(pattern.getValue()).parse(input.getValue())); pattern.setValue("yyyy-MM-dd"); input.setValue("2019-01-18 23:00:00.000"); new SimpleDateFormat(pattern.getValue()).parse(input.getValue()); - ScoutAssert.assertThrows(ParseException.class, () -> new StrictSimpleDateFormat(pattern.getValue()).parse(input.getValue())); + Assert.assertThrows(ParseException.class, () -> new StrictSimpleDateFormat(pattern.getValue()).parse(input.getValue())); pattern.setValue("yyyy/yyyy"); input.setValue("2018/2019"); new SimpleDateFormat(pattern.getValue()).parse(input.getValue()); - ScoutAssert.assertThrows(ParseException.class, () -> new StrictSimpleDateFormat(pattern.getValue()).parse(input.getValue())); + Assert.assertThrows(ParseException.class, () -> new StrictSimpleDateFormat(pattern.getValue()).parse(input.getValue())); } /** @@ -71,15 +71,15 @@ public class StrictSimpleDateFormatTest { final String input = "2019-01-18T12:42:03.409Z"; pattern.setValue("yyyy-MM-dd HH:mm:ss.SSS"); - ScoutAssert.assertThrows(ParseException.class, () -> new SimpleDateFormat(pattern.getValue()).parse(input)); - ScoutAssert.assertThrows(ParseException.class, () -> new StrictSimpleDateFormat(pattern.getValue()).parse(input)); + Assert.assertThrows(ParseException.class, () -> new SimpleDateFormat(pattern.getValue()).parse(input)); + Assert.assertThrows(ParseException.class, () -> new StrictSimpleDateFormat(pattern.getValue()).parse(input)); pattern.setValue("yyyy-MM-dd HH:mm:ss.SSS Z"); - ScoutAssert.assertThrows(ParseException.class, () -> new SimpleDateFormat(pattern.getValue()).parse(input)); - ScoutAssert.assertThrows(ParseException.class, () -> new StrictSimpleDateFormat(pattern.getValue()).parse(input)); + Assert.assertThrows(ParseException.class, () -> new SimpleDateFormat(pattern.getValue()).parse(input)); + Assert.assertThrows(ParseException.class, () -> new StrictSimpleDateFormat(pattern.getValue()).parse(input)); pattern.setValue("yyyy-MM-dd"); new SimpleDateFormat(pattern.getValue()).parse(input); - ScoutAssert.assertThrows(ParseException.class, () -> new StrictSimpleDateFormat(pattern.getValue()).parse(input)); + Assert.assertThrows(ParseException.class, () -> new StrictSimpleDateFormat(pattern.getValue()).parse(input)); } } diff --git a/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/testing/platform/util/ScoutAssertTest.java b/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/testing/platform/util/ScoutAssertTest.java index ceb6b1eff8..052f4dddd3 100644 --- a/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/testing/platform/util/ScoutAssertTest.java +++ b/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/testing/platform/util/ScoutAssertTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2018 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,16 +10,13 @@ */ package org.eclipse.scout.rt.testing.platform.util; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.Assert.*; import java.math.BigDecimal; import org.eclipse.scout.rt.platform.exception.PlatformError; import org.eclipse.scout.rt.platform.exception.VetoException; +import org.junit.Assert; import org.junit.ComparisonFailure; import org.junit.Test; @@ -103,12 +100,12 @@ public class ScoutAssertTest { public void testAssertThrows() { // runtime exception final VetoException runtimeException = new VetoException("msg"); - assertSame(runtimeException, ScoutAssert.assertThrows(VetoException.class, () -> raise(runtimeException))); - assertSame(runtimeException, ScoutAssert.assertThrows(RuntimeException.class, () -> raise(runtimeException))); - assertSame(runtimeException, ScoutAssert.assertThrows(Exception.class, () -> raise(runtimeException))); - assertSame(runtimeException, ScoutAssert.assertThrows(Throwable.class, () -> raise(runtimeException))); + assertSame(runtimeException, Assert.assertThrows(VetoException.class, () -> raise(runtimeException))); + assertSame(runtimeException, Assert.assertThrows(RuntimeException.class, () -> raise(runtimeException))); + assertSame(runtimeException, Assert.assertThrows(Exception.class, () -> raise(runtimeException))); + assertSame(runtimeException, Assert.assertThrows(Throwable.class, () -> raise(runtimeException))); try { - ScoutAssert.assertThrows(Error.class, () -> raise(runtimeException)); + Assert.assertThrows(Error.class, () -> raise(runtimeException)); fail("expecting assertion to fail"); } catch (AssertionError expected) { @@ -116,11 +113,11 @@ public class ScoutAssertTest { // runtime exception final InterruptedException exception = new InterruptedException("msg"); - assertSame(exception, ScoutAssert.assertThrows(InterruptedException.class, () -> raise(exception))); - assertSame(exception, ScoutAssert.assertThrows(Exception.class, () -> raise(exception))); - assertSame(exception, ScoutAssert.assertThrows(Throwable.class, () -> raise(exception))); + assertSame(exception, Assert.assertThrows(InterruptedException.class, () -> raise(exception))); + assertSame(exception, Assert.assertThrows(Exception.class, () -> raise(exception))); + assertSame(exception, Assert.assertThrows(Throwable.class, () -> raise(exception))); try { - ScoutAssert.assertThrows(Error.class, () -> raise(exception)); + Assert.assertThrows(Error.class, () -> raise(exception)); fail("expecting assertion to fail"); } catch (AssertionError expected) { @@ -128,11 +125,11 @@ public class ScoutAssertTest { // error final PlatformError error = new PlatformError("msg"); - assertSame(error, ScoutAssert.assertThrows(PlatformError.class, () -> raise(error))); - assertSame(error, ScoutAssert.assertThrows(Error.class, () -> raise(error))); - assertSame(error, ScoutAssert.assertThrows(Throwable.class, () -> raise(error))); + assertSame(error, Assert.assertThrows(PlatformError.class, () -> raise(error))); + assertSame(error, Assert.assertThrows(Error.class, () -> raise(error))); + assertSame(error, Assert.assertThrows(Throwable.class, () -> raise(error))); try { - ScoutAssert.assertThrows(Exception.class, () -> raise(error)); + Assert.assertThrows(Exception.class, () -> raise(error)); fail("expecting assertion to fail"); } catch (AssertionError expected) { diff --git a/org.eclipse.scout.rt.platform/org.eclipse.scout.rt.platform.iml b/org.eclipse.scout.rt.platform/org.eclipse.scout.rt.platform.iml index 67277cffdd..b4ff56dbb6 100644 --- a/org.eclipse.scout.rt.platform/org.eclipse.scout.rt.platform.iml +++ b/org.eclipse.scout.rt.platform/org.eclipse.scout.rt.platform.iml @@ -10,15 +10,15 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> <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="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" /> <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" /> <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.30" level="project" /> <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-jdk14:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-jdk14:1.7.30" level="project" /> </component> </module>
\ No newline at end of file diff --git a/org.eclipse.scout.rt.rest.jackson/org.eclipse.scout.rt.rest.jackson.iml b/org.eclipse.scout.rt.rest.jackson/org.eclipse.scout.rt.rest.jackson.iml index bfb386a99e..ded37ca731 100644 --- a/org.eclipse.scout.rt.rest.jackson/org.eclipse.scout.rt.rest.jackson.iml +++ b/org.eclipse.scout.rt.rest.jackson/org.eclipse.scout.rt.rest.jackson.iml @@ -16,12 +16,12 @@ <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.jackson" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.2" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.10.3" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.10" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.10" level="project" /> + <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.2" level="project" /> + <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.2" level="project" /> + <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.2" level="project" /> <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" /> </component> </module>
\ No newline at end of file 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 d07192b3fb..19c44baa79 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 @@ -13,20 +13,20 @@ <orderEntry type="module" module-name="org.eclipse.scout.rt.rest" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.dataobject" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.2" level="project" /> <orderEntry type="library" name="Maven: jakarta.ws.rs:jakarta.ws.rs-api:2.1.6" level="project" /> <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" /> <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" /> - <orderEntry type="library" name="Maven: org.glassfish.jersey.core:jersey-client:2.30.1" level="project" /> - <orderEntry type="library" name="Maven: org.glassfish.jersey.core:jersey-common:2.30.1" level="project" /> + <orderEntry type="library" name="Maven: org.glassfish.jersey.core:jersey-client:2.31" level="project" /> + <orderEntry type="library" name="Maven: org.glassfish.jersey.core:jersey-common:2.31" level="project" /> <orderEntry type="library" name="Maven: org.glassfish.hk2:osgi-resource-locator:1.0.3" level="project" /> <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.30.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:httpcore:4.4.13" level="project" /> - <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" /> + <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" /> </component> </module>
\ No newline at end of file diff --git a/org.eclipse.scout.rt.rest.jersey.client/src/main/java/org/glassfish/jersey/apache/connector/ClosingApacheConnector.java b/org.eclipse.scout.rt.rest.jersey.client/src/main/java/org/glassfish/jersey/apache/connector/ClosingApacheConnector.java index e3352df4ec..0cb01890cd 100644 --- a/org.eclipse.scout.rt.rest.jersey.client/src/main/java/org/glassfish/jersey/apache/connector/ClosingApacheConnector.java +++ b/org.eclipse.scout.rt.rest.jersey.client/src/main/java/org/glassfish/jersey/apache/connector/ClosingApacheConnector.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -106,7 +106,7 @@ class ClosingApacheConnector extends ApacheConnector { context.setAuthCache(authCache); } response = getClient().execute(getHost(request), request, context); - HeaderUtils.checkHeaderChanges(clientHeadersSnapshot, clientRequest.getHeaders(), this.getClass().getName()); + HeaderUtils.checkHeaderChanges(clientHeadersSnapshot, clientRequest.getHeaders(), this.getClass().getName(), null); final Response.StatusType status = response.getStatusLine().getReasonPhrase() == null ? Statuses.from(response.getStatusLine().getStatusCode()) 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 7ebcf42f22..009e29438b 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 @@ -24,10 +24,10 @@ <orderEntry type="module" module-name="org.eclipse.scout.rt.rest" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.dataobject" /> <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" /> - <orderEntry type="library" name="Maven: org.glassfish.jersey.core:jersey-client:2.30.1" level="project" /> + <orderEntry type="library" name="Maven: org.glassfish.jersey.core:jersey-client:2.31" 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.inject:jersey-hk2:2.30.1" level="project" /> - <orderEntry type="library" name="Maven: org.glassfish.jersey.core:jersey-common:2.30.1" level="project" /> + <orderEntry type="library" name="Maven: org.glassfish.jersey.inject:jersey-hk2:2.31" level="project" /> + <orderEntry type="library" name="Maven: org.glassfish.jersey.core:jersey-common:2.31" level="project" /> <orderEntry type="library" name="Maven: org.glassfish.hk2:osgi-resource-locator:1.0.3" level="project" /> <orderEntry type="library" name="Maven: com.sun.activation:jakarta.activation:1.2.2" level="project" /> <orderEntry type="library" name="Maven: org.glassfish.hk2:hk2-locator:2.6.1" level="project" /> @@ -38,40 +38,40 @@ <orderEntry type="module" module-name="org.eclipse.scout.rt.jackson.test" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.jackson" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> + <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.platform.test" /> - <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" /> + <orderEntry type="library" name="Maven: junit:junit:4.13" level="project" /> <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> - <orderEntry type="library" name="Maven: org.mockito:mockito-core:2.23.4" level="project" /> - <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.3" level="project" /> - <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.3" level="project" /> - <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" /> + <orderEntry type="library" name="Maven: org.mockito:mockito-core:3.5.7" level="project" /> + <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.13" level="project" /> + <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.13" level="project" /> + <orderEntry type="library" name="Maven: org.objenesis:objenesis:3.1" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.dataobject.test" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.rest.jackson" /> <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-webapp:9.4.30.v20200611" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-xml:9.4.30.v20200611" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.4.30.v20200611" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlet:9.4.30.v20200611" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-security:9.4.30.v20200611" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.4.30.v20200611" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.4.30.v20200611" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.4.30.v20200611" level="project" /> - <orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.3" level="project" /> - <orderEntry type="library" name="Maven: org.glassfish.jersey.connectors:jersey-apache-connector:2.30.1" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-webapp:9.4.31.v20200723" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-xml:9.4.31.v20200723" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.4.31.v20200723" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlet:9.4.31.v20200723" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-security:9.4.31.v20200723" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.4.31.v20200723" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.4.31.v20200723" level="project" /> + <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:httpcore:4.4.13" level="project" /> - <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" 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" /> - <orderEntry type="library" name="Maven: org.glassfish.jersey.media:jersey-media-json-jackson:2.30.1" level="project" /> - <orderEntry type="library" name="Maven: org.glassfish.jersey.ext:jersey-entity-filtering:2.30.1" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.10" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.10.3" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.10" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.9.10" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.glassfish.jersey.media:jersey-media-json-jackson:2.31" level="project" /> + <orderEntry type="library" name="Maven: org.glassfish.jersey.ext:jersey-entity-filtering:2.31" level="project" /> + <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.2" level="project" /> + <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.2" level="project" /> + <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.2" level="project" /> + <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.11.2" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" /> </component> diff --git a/org.eclipse.scout.rt.rest.jersey.test/src/test/java/org/eclipse/scout/rt/rest/jersey/client/ApacheHttpClientCancelRequestTest.java b/org.eclipse.scout.rt.rest.jersey.test/src/test/java/org/eclipse/scout/rt/rest/jersey/client/ApacheHttpClientCancelRequestTest.java index 4049ce90a8..8a14e3c5e6 100644 --- a/org.eclipse.scout.rt.rest.jersey.test/src/test/java/org/eclipse/scout/rt/rest/jersey/client/ApacheHttpClientCancelRequestTest.java +++ b/org.eclipse.scout.rt.rest.jersey.test/src/test/java/org/eclipse/scout/rt/rest/jersey/client/ApacheHttpClientCancelRequestTest.java @@ -1,5 +1,5 @@ -/******************************************************************************* - * Copyright (c) 2019 BSI Business Systems Integration AG. +/* + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,7 +7,7 @@ * * Contributors: * BSI Business Systems Integration AG - initial API and implementation - ******************************************************************************/ + */ package org.eclipse.scout.rt.rest.jersey.client; import static org.junit.Assert.assertTrue; @@ -32,9 +32,9 @@ import org.eclipse.scout.rt.rest.jersey.JerseyTestApplication; import org.eclipse.scout.rt.rest.jersey.JerseyTestRestClientHelper; import org.eclipse.scout.rt.rest.jersey.RequestSynchronizer; import org.eclipse.scout.rt.testing.platform.runner.PlatformTestRunner; -import org.eclipse.scout.rt.testing.platform.util.ScoutAssert; import org.glassfish.jersey.apache.connector.RestEnsureHttpHeaderConnectionCloseProperty; import org.junit.AfterClass; +import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -100,7 +100,7 @@ public class ApacheHttpClientCancelRequestTest { }, Jobs.newInput().withRunContext(RunContexts.copyCurrent())); requestSynchronizer.awaitRequest(requestId, 5); - ScoutAssert.assertThrows(TimedOutError.class, () -> future.awaitDoneAndGet(300, TimeUnit.MILLISECONDS)); + Assert.assertThrows(TimedOutError.class, () -> future.awaitDoneAndGet(300, TimeUnit.MILLISECONDS)); future.cancel(true); assertTrue(cancellable.isCancelled()); diff --git a/org.eclipse.scout.rt.rest.jersey.test/src/test/java/org/eclipse/scout/rt/rest/jersey/client/proxy/RestClientProxyInvocationTest.java b/org.eclipse.scout.rt.rest.jersey.test/src/test/java/org/eclipse/scout/rt/rest/jersey/client/proxy/RestClientProxyInvocationTest.java index e5d5ff4941..cfb559f4d0 100644 --- a/org.eclipse.scout.rt.rest.jersey.test/src/test/java/org/eclipse/scout/rt/rest/jersey/client/proxy/RestClientProxyInvocationTest.java +++ b/org.eclipse.scout.rt.rest.jersey.test/src/test/java/org/eclipse/scout/rt/rest/jersey/client/proxy/RestClientProxyInvocationTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,7 +12,6 @@ package org.eclipse.scout.rt.rest.jersey.client.proxy; import static org.eclipse.scout.rt.platform.util.Assertions.assertInstance; import static org.eclipse.scout.rt.rest.jersey.EchoServletParameters.*; -import static org.eclipse.scout.rt.testing.platform.util.ScoutAssert.assertThrows; import static org.junit.Assert.*; import java.net.URI; @@ -60,6 +59,7 @@ import org.eclipse.scout.rt.rest.jersey.RequestSynchronizer; import org.eclipse.scout.rt.rest.jersey.RestClientTestEchoResponse; import org.eclipse.scout.rt.testing.platform.runner.PlatformTestRunner; import org.glassfish.jersey.apache.connector.ApacheClientProperties; +import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -105,25 +105,25 @@ public class RestClientProxyInvocationTest { @Test public void testSyncGetForbidden() { - VetoException ve = assertThrows(VetoException.class, () -> webTargetGet(Response.Status.FORBIDDEN, Content.DEFAULT, Execution.SYNC)); + VetoException ve = Assert.assertThrows(VetoException.class, () -> webTargetGet(Status.FORBIDDEN, Content.DEFAULT, Execution.SYNC)); assertEquals("REST Client Test: Forbidden", ve.getDisplayMessage()); } @Test public void testSyncGetForbiddenEmptyBody() { - VetoException ve = assertThrows(VetoException.class, () -> webTargetGet(Response.Status.FORBIDDEN, Content.EMPTY_BODY, Execution.SYNC)); + VetoException ve = Assert.assertThrows(VetoException.class, () -> webTargetGet(Status.FORBIDDEN, Content.EMPTY_BODY, Execution.SYNC)); assertEquals("Forbidden", ve.getDisplayMessage()); } @Test public void testSyncGetNotFound() { - ProcessingException pe = assertThrows(ProcessingException.class, () -> webTargetGet(Response.Status.NOT_FOUND, Content.DEFAULT, Execution.SYNC)); + ProcessingException pe = Assert.assertThrows(ProcessingException.class, () -> webTargetGet(Status.NOT_FOUND, Content.DEFAULT, Execution.SYNC)); assertEquals("REST Client Test: Not Found", pe.getDisplayMessage()); } @Test public void testSyncGetNotFoundEmptyBody() { - ProcessingException pe = assertThrows(ProcessingException.class, () -> webTargetGet(Response.Status.NOT_FOUND, Content.EMPTY_BODY, Execution.SYNC)); + ProcessingException pe = Assert.assertThrows(ProcessingException.class, () -> webTargetGet(Status.NOT_FOUND, Content.EMPTY_BODY, Execution.SYNC)); assertEquals("Not Found", pe.getDisplayMessage()); } @@ -149,25 +149,25 @@ public class RestClientProxyInvocationTest { @Test public void testAsyncGetForbidden() { - VetoException ve = assertThrows(VetoException.class, () -> webTargetGet(Response.Status.FORBIDDEN, Content.DEFAULT, Execution.ASYNC)); + VetoException ve = Assert.assertThrows(VetoException.class, () -> webTargetGet(Status.FORBIDDEN, Content.DEFAULT, Execution.ASYNC)); assertEquals("REST Client Test: Forbidden", ve.getDisplayMessage()); } @Test public void testAsyncGetForbiddenEmptyBody() { - VetoException ve = assertThrows(VetoException.class, () -> webTargetGet(Response.Status.FORBIDDEN, Content.EMPTY_BODY, Execution.ASYNC)); + VetoException ve = Assert.assertThrows(VetoException.class, () -> webTargetGet(Status.FORBIDDEN, Content.EMPTY_BODY, Execution.ASYNC)); assertEquals("Forbidden", ve.getDisplayMessage()); } @Test public void testAsyncGetNotFound() { - ResourceNotFoundException pe = assertThrows(ResourceNotFoundException.class, () -> webTargetGet(Response.Status.NOT_FOUND, Content.DEFAULT, Execution.ASYNC)); + ResourceNotFoundException pe = Assert.assertThrows(ResourceNotFoundException.class, () -> webTargetGet(Status.NOT_FOUND, Content.DEFAULT, Execution.ASYNC)); assertEquals("REST Client Test: Not Found", pe.getDisplayMessage()); } @Test public void testAsyncGetNotFoundEmptyBody() { - ResourceNotFoundException pe = assertThrows(ResourceNotFoundException.class, () -> webTargetGet(Response.Status.NOT_FOUND, Content.EMPTY_BODY, Execution.ASYNC)); + ResourceNotFoundException pe = Assert.assertThrows(ResourceNotFoundException.class, () -> webTargetGet(Status.NOT_FOUND, Content.EMPTY_BODY, Execution.ASYNC)); assertEquals("Not Found", pe.getDisplayMessage()); } @@ -232,7 +232,7 @@ public class RestClientProxyInvocationTest { .async() .get(); requestSynchronizer.awaitRequest(requestId, 5); - assertThrows(TimeoutException.class, () -> future.get(300, TimeUnit.MILLISECONDS)); + Assert.assertThrows(TimeoutException.class, () -> future.get(300, TimeUnit.MILLISECONDS)); future.cancel(true); }); } @@ -258,7 +258,7 @@ public class RestClientProxyInvocationTest { return null; }, Jobs.newInput()); requestSynchronizer.awaitRequest(requestId, 5); - assertThrows(TimedOutError.class, () -> future.awaitDone(100, TimeUnit.MILLISECONDS)); + Assert.assertThrows(TimedOutError.class, () -> future.awaitDone(100, TimeUnit.MILLISECONDS)); future.cancel(true); }); } @@ -316,43 +316,43 @@ public class RestClientProxyInvocationTest { @Test public void testSyncGetEntityForbidden() { - VetoException ve = assertThrows(VetoException.class, () -> m_target - .queryParam(STATUS, Response.Status.FORBIDDEN.getStatusCode()) - .request() - .accept(MediaType.APPLICATION_JSON) - .get(RestClientTestEchoResponse.class)); + VetoException ve = Assert.assertThrows(VetoException.class, () -> m_target + .queryParam(STATUS, Status.FORBIDDEN.getStatusCode()) + .request() + .accept(MediaType.APPLICATION_JSON) + .get(RestClientTestEchoResponse.class)); assertEquals("REST Client Test: Forbidden", ve.getDisplayMessage()); } @Test public void testSyncGetEntityForbiddenEmptyBody() { - VetoException ve = assertThrows(VetoException.class, () -> m_target - .queryParam(STATUS, Response.Status.FORBIDDEN.getStatusCode()) - .queryParam(EMPTY_BODY, "true") - .request() - .accept(MediaType.APPLICATION_JSON) - .get(RestClientTestEchoResponse.class)); + VetoException ve = Assert.assertThrows(VetoException.class, () -> m_target + .queryParam(STATUS, Status.FORBIDDEN.getStatusCode()) + .queryParam(EMPTY_BODY, "true") + .request() + .accept(MediaType.APPLICATION_JSON) + .get(RestClientTestEchoResponse.class)); assertEquals("Forbidden", ve.getDisplayMessage()); } @Test public void testSyncGetEntityNotFound() { - ProcessingException pe = assertThrows(ProcessingException.class, () -> m_target - .queryParam(STATUS, Response.Status.NOT_FOUND.getStatusCode()) - .request() - .accept(MediaType.APPLICATION_JSON) - .get(RestClientTestEchoResponse.class)); + ProcessingException pe = Assert.assertThrows(ProcessingException.class, () -> m_target + .queryParam(STATUS, Status.NOT_FOUND.getStatusCode()) + .request() + .accept(MediaType.APPLICATION_JSON) + .get(RestClientTestEchoResponse.class)); assertEquals("REST Client Test: Not Found", pe.getDisplayMessage()); } @Test public void testSyncGetEntityNotFoundEmptyBody() { - ResourceNotFoundException pe = assertThrows(ResourceNotFoundException.class, () -> m_target - .queryParam(STATUS, Response.Status.NOT_FOUND.getStatusCode()) - .queryParam(EMPTY_BODY, "true") - .request() - .accept(MediaType.APPLICATION_JSON) - .get(RestClientTestEchoResponse.class)); + ResourceNotFoundException pe = Assert.assertThrows(ResourceNotFoundException.class, () -> m_target + .queryParam(STATUS, Status.NOT_FOUND.getStatusCode()) + .queryParam(EMPTY_BODY, "true") + .request() + .accept(MediaType.APPLICATION_JSON) + .get(RestClientTestEchoResponse.class)); assertEquals("Not Found", pe.getDisplayMessage()); } @@ -372,54 +372,54 @@ public class RestClientProxyInvocationTest { @Test public void testAsyncGetEntityForbidden() { - ExecutionException ee = assertThrows(ExecutionException.class, () -> m_target - .queryParam(STATUS, Response.Status.FORBIDDEN.getStatusCode()) - .request() - .accept(MediaType.APPLICATION_JSON) - .async() - .get(RestClientTestEchoResponse.class) - .get()); + ExecutionException ee = Assert.assertThrows(ExecutionException.class, () -> m_target + .queryParam(STATUS, Status.FORBIDDEN.getStatusCode()) + .request() + .accept(MediaType.APPLICATION_JSON) + .async() + .get(RestClientTestEchoResponse.class) + .get()); assertEquals(AccessForbiddenException.class, ee.getCause().getClass()); assertEquals("REST Client Test: Forbidden", ((AccessForbiddenException) ee.getCause()).getDisplayMessage()); } @Test public void testAsyncGetEntityForbiddenEmptyBody() { - ExecutionException ee = assertThrows(ExecutionException.class, () -> m_target - .queryParam(STATUS, Response.Status.FORBIDDEN.getStatusCode()) - .queryParam(EMPTY_BODY, "true") - .request() - .accept(MediaType.APPLICATION_JSON) - .async() - .get(RestClientTestEchoResponse.class) - .get()); + ExecutionException ee = Assert.assertThrows(ExecutionException.class, () -> m_target + .queryParam(STATUS, Status.FORBIDDEN.getStatusCode()) + .queryParam(EMPTY_BODY, "true") + .request() + .accept(MediaType.APPLICATION_JSON) + .async() + .get(RestClientTestEchoResponse.class) + .get()); assertEquals(AccessForbiddenException.class, ee.getCause().getClass()); assertEquals("Forbidden", ((AccessForbiddenException) ee.getCause()).getDisplayMessage()); } @Test public void testAsyncGetEntityNotFound() { - ExecutionException ee = assertThrows(ExecutionException.class, () -> m_target - .queryParam(STATUS, Response.Status.NOT_FOUND.getStatusCode()) - .request() - .accept(MediaType.APPLICATION_JSON) - .async() - .get(RestClientTestEchoResponse.class) - .get()); + ExecutionException ee = Assert.assertThrows(ExecutionException.class, () -> m_target + .queryParam(STATUS, Status.NOT_FOUND.getStatusCode()) + .request() + .accept(MediaType.APPLICATION_JSON) + .async() + .get(RestClientTestEchoResponse.class) + .get()); assertEquals(ResourceNotFoundException.class, ee.getCause().getClass()); assertEquals("REST Client Test: Not Found", ((ResourceNotFoundException) ee.getCause()).getDisplayMessage()); } @Test public void testAsyncGetEntityNotFoundEmptyBody() { - ExecutionException ee = assertThrows(ExecutionException.class, () -> m_target - .queryParam(STATUS, Response.Status.NOT_FOUND.getStatusCode()) - .queryParam(EMPTY_BODY, "true") - .request() - .accept(MediaType.APPLICATION_JSON) - .async() - .get(RestClientTestEchoResponse.class) - .get()); + ExecutionException ee = Assert.assertThrows(ExecutionException.class, () -> m_target + .queryParam(STATUS, Status.NOT_FOUND.getStatusCode()) + .queryParam(EMPTY_BODY, "true") + .request() + .accept(MediaType.APPLICATION_JSON) + .async() + .get(RestClientTestEchoResponse.class) + .get()); assertEquals(ResourceNotFoundException.class, ee.getCause().getClass()); assertEquals("Not Found", ((ResourceNotFoundException) ee.getCause()).getDisplayMessage()); } @@ -490,25 +490,25 @@ public class RestClientProxyInvocationTest { @Test public void testClientInvocationSyncGetEntityForbidden() { - VetoException ve = assertThrows(VetoException.class, () -> clientInvocationGetEntity(Response.Status.FORBIDDEN, Content.DEFAULT, Execution.SYNC)); + VetoException ve = Assert.assertThrows(VetoException.class, () -> clientInvocationGetEntity(Status.FORBIDDEN, Content.DEFAULT, Execution.SYNC)); assertEquals("REST Client Test: Forbidden", ve.getDisplayMessage()); } @Test public void testClientInvocationSyncGetEntityForbiddenEmptyBody() { - VetoException ve = assertThrows(VetoException.class, () -> clientInvocationGetEntity(Response.Status.FORBIDDEN, Content.EMPTY_BODY, Execution.SYNC)); + VetoException ve = Assert.assertThrows(VetoException.class, () -> clientInvocationGetEntity(Status.FORBIDDEN, Content.EMPTY_BODY, Execution.SYNC)); assertEquals("Forbidden", ve.getDisplayMessage()); } @Test public void testClientInvocationSyncGetEntityNotFound() { - ProcessingException pe = assertThrows(ProcessingException.class, () -> clientInvocationGetEntity(Response.Status.NOT_FOUND, Content.DEFAULT, Execution.SYNC)); + ProcessingException pe = Assert.assertThrows(ProcessingException.class, () -> clientInvocationGetEntity(Status.NOT_FOUND, Content.DEFAULT, Execution.SYNC)); assertEquals("REST Client Test: Not Found", pe.getDisplayMessage()); } @Test public void testClientInvocationSyncGetEntityNotFoundEmptyBody() { - ProcessingException pe = assertThrows(ProcessingException.class, () -> clientInvocationGetEntity(Response.Status.NOT_FOUND, Content.EMPTY_BODY, Execution.SYNC)); + ProcessingException pe = Assert.assertThrows(ProcessingException.class, () -> clientInvocationGetEntity(Status.NOT_FOUND, Content.EMPTY_BODY, Execution.SYNC)); assertEquals("Not Found", pe.getDisplayMessage()); } @@ -521,28 +521,28 @@ public class RestClientProxyInvocationTest { @Test public void testClientInvocationAsyncGetEntityForbidden() { - ExecutionException ee = assertThrows(ExecutionException.class, () -> clientInvocationGetEntity(Response.Status.FORBIDDEN, Content.DEFAULT, Execution.ASYNC)); + ExecutionException ee = Assert.assertThrows(ExecutionException.class, () -> clientInvocationGetEntity(Status.FORBIDDEN, Content.DEFAULT, Execution.ASYNC)); assertEquals(AccessForbiddenException.class, ee.getCause().getClass()); assertEquals("REST Client Test: Forbidden", ((AccessForbiddenException) ee.getCause()).getDisplayMessage()); } @Test public void testClientInvocationAsyncGetEntityForbiddenEmptyBody() { - ExecutionException ee = assertThrows(ExecutionException.class, () -> clientInvocationGetEntity(Response.Status.FORBIDDEN, Content.EMPTY_BODY, Execution.ASYNC)); + ExecutionException ee = Assert.assertThrows(ExecutionException.class, () -> clientInvocationGetEntity(Status.FORBIDDEN, Content.EMPTY_BODY, Execution.ASYNC)); assertEquals(AccessForbiddenException.class, ee.getCause().getClass()); assertEquals("Forbidden", ((AccessForbiddenException) ee.getCause()).getDisplayMessage()); } @Test public void testClientInvocationAsyncGetEntityNotFound() { - ExecutionException ee = assertThrows(ExecutionException.class, () -> clientInvocationGetEntity(Response.Status.NOT_FOUND, Content.DEFAULT, Execution.ASYNC)); + ExecutionException ee = Assert.assertThrows(ExecutionException.class, () -> clientInvocationGetEntity(Status.NOT_FOUND, Content.DEFAULT, Execution.ASYNC)); assertEquals(ResourceNotFoundException.class, ee.getCause().getClass()); assertEquals("REST Client Test: Not Found", ((ResourceNotFoundException) ee.getCause()).getDisplayMessage()); } @Test public void testClientInvocationAsyncGetEntityNotFoundEmptyBody() { - ExecutionException ee = assertThrows(ExecutionException.class, () -> clientInvocationGetEntity(Response.Status.NOT_FOUND, Content.EMPTY_BODY, Execution.ASYNC)); + ExecutionException ee = Assert.assertThrows(ExecutionException.class, () -> clientInvocationGetEntity(Status.NOT_FOUND, Content.EMPTY_BODY, Execution.ASYNC)); assertEquals(ResourceNotFoundException.class, ee.getCause().getClass()); assertEquals("Not Found", ((ResourceNotFoundException) ee.getCause()).getDisplayMessage()); } @@ -590,7 +590,7 @@ public class RestClientProxyInvocationTest { .accept(MediaType.APPLICATION_JSON) .buildGet(); - VetoException ve = assertThrows(VetoException.class, () -> invocation.invoke(RestClientTestEchoResponse.class)); + VetoException ve = Assert.assertThrows(VetoException.class, () -> invocation.invoke(RestClientTestEchoResponse.class)); assertEquals("REST Client Test: Forbidden", ve.getDisplayMessage()); } @@ -603,7 +603,7 @@ public class RestClientProxyInvocationTest { .accept(MediaType.APPLICATION_JSON) .buildGet(); - VetoException ve = assertThrows(VetoException.class, () -> invocation.invoke(RestClientTestEchoResponse.class)); + VetoException ve = Assert.assertThrows(VetoException.class, () -> invocation.invoke(RestClientTestEchoResponse.class)); assertEquals("Forbidden", ve.getDisplayMessage()); } @@ -629,7 +629,7 @@ public class RestClientProxyInvocationTest { .accept(MediaType.APPLICATION_JSON) .buildGet(); - ExecutionException ee = assertThrows(ExecutionException.class, () -> invocation.submit(RestClientTestEchoResponse.class).get()); + ExecutionException ee = Assert.assertThrows(ExecutionException.class, () -> invocation.submit(RestClientTestEchoResponse.class).get()); assertEquals(AccessForbiddenException.class, ee.getCause().getClass()); assertEquals("REST Client Test: Forbidden", ((AccessForbiddenException) ee.getCause()).getDisplayMessage()); } @@ -643,7 +643,7 @@ public class RestClientProxyInvocationTest { .accept(MediaType.APPLICATION_JSON) .buildGet(); - ExecutionException ee = assertThrows(ExecutionException.class, () -> invocation.submit(RestClientTestEchoResponse.class).get()); + ExecutionException ee = Assert.assertThrows(ExecutionException.class, () -> invocation.submit(RestClientTestEchoResponse.class).get()); assertEquals(AccessForbiddenException.class, ee.getCause().getClass()); assertEquals("Forbidden", ((AccessForbiddenException) ee.getCause()).getDisplayMessage()); } diff --git a/org.eclipse.scout.rt.rest.jersey.test/src/test/java/org/eclipse/scout/rt/rest/jersey/client/proxy/RestClientProxyWebAppExceptionMappingTest.java b/org.eclipse.scout.rt.rest.jersey.test/src/test/java/org/eclipse/scout/rt/rest/jersey/client/proxy/RestClientProxyWebAppExceptionMappingTest.java index b88e4cb0ed..8783e715dc 100644 --- a/org.eclipse.scout.rt.rest.jersey.test/src/test/java/org/eclipse/scout/rt/rest/jersey/client/proxy/RestClientProxyWebAppExceptionMappingTest.java +++ b/org.eclipse.scout.rt.rest.jersey.test/src/test/java/org/eclipse/scout/rt/rest/jersey/client/proxy/RestClientProxyWebAppExceptionMappingTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,8 +10,7 @@ */ package org.eclipse.scout.rt.rest.jersey.client.proxy; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; +import static org.junit.Assert.*; import javax.ws.rs.WebApplicationException; import javax.ws.rs.client.WebTarget; @@ -21,9 +20,9 @@ import org.eclipse.scout.rt.platform.BEANS; import org.eclipse.scout.rt.rest.client.proxy.RestClientProxyFactory; import org.eclipse.scout.rt.rest.jersey.JerseyTestApplication; import org.eclipse.scout.rt.rest.jersey.JerseyTestRestClientHelper; -import org.eclipse.scout.rt.testing.platform.util.ScoutAssert; import org.glassfish.jersey.client.ClientProperties; import org.glassfish.jersey.client.JerseyInvocation; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -52,7 +51,7 @@ public class RestClientProxyWebAppExceptionMappingTest { for (int status = 300; status < 1000; status++) { // invoke REST service and let jersey transform the status code into an exception final int finalStatus = status; - final WebApplicationException remoteException = ScoutAssert.assertThrows(WebApplicationException.class, () -> target + final WebApplicationException remoteException = Assert.assertThrows(WebApplicationException.class, () -> target .queryParam("status", finalStatus) .request() .get()); diff --git a/org.eclipse.scout.rt.rest.test/org.eclipse.scout.rt.rest.test.iml b/org.eclipse.scout.rt.rest.test/org.eclipse.scout.rt.rest.test.iml index 85fa89d02b..090adaaa9b 100644 --- a/org.eclipse.scout.rt.rest.test/org.eclipse.scout.rt.rest.test.iml +++ b/org.eclipse.scout.rt.rest.test/org.eclipse.scout.rt.rest.test.iml @@ -17,22 +17,22 @@ <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform.test" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> + <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="library" name="Maven: junit:junit:4.12" level="project" /> + <orderEntry type="library" name="Maven: junit:junit:4.13" level="project" /> <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> - <orderEntry type="library" name="Maven: org.mockito:mockito-core:2.23.4" level="project" /> - <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.3" level="project" /> - <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.3" level="project" /> - <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" /> + <orderEntry type="library" name="Maven: org.mockito:mockito-core:3.5.7" level="project" /> + <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.13" level="project" /> + <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.13" level="project" /> + <orderEntry type="library" name="Maven: org.objenesis:objenesis:3.1" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.jackson.test" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.jackson" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.10.3" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.10" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.10" level="project" /> + <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.2" level="project" /> + <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.2" level="project" /> + <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.2" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.dataobject.test" /> <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> </component> </module>
\ No newline at end of file diff --git a/org.eclipse.scout.rt.rest.test/src/test/java/org/eclipse/scout/rt/rest/client/proxy/RestClientProxyFactoryTest.java b/org.eclipse.scout.rt.rest.test/src/test/java/org/eclipse/scout/rt/rest/client/proxy/RestClientProxyFactoryTest.java index f6e0c46f41..dcf087d526 100644 --- a/org.eclipse.scout.rt.rest.test/src/test/java/org/eclipse/scout/rt/rest/client/proxy/RestClientProxyFactoryTest.java +++ b/org.eclipse.scout.rt.rest.test/src/test/java/org/eclipse/scout/rt/rest/client/proxy/RestClientProxyFactoryTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,7 +10,6 @@ */ package org.eclipse.scout.rt.rest.client.proxy; -import static org.eclipse.scout.rt.testing.platform.util.ScoutAssert.assertThrows; import static org.junit.Assert.*; import javax.ws.rs.client.AsyncInvoker; @@ -25,6 +24,7 @@ import javax.ws.rs.core.GenericType; import javax.ws.rs.core.MediaType; import org.eclipse.scout.rt.platform.util.Assertions.AssertionException; +import org.junit.Assert; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -86,7 +86,7 @@ public class RestClientProxyFactoryTest { @Test public void testCreateAndConfigureProxiedClient() { - assertThrows(AssertionException.class, () -> getFactory().createClientProxy(null, null)); + Assert.assertThrows(AssertionException.class, () -> getFactory().createClientProxy(null, null)); Client client = mockClient(); // ensure client is not mistakenly considered as async proxy diff --git a/org.eclipse.scout.rt.rest.test/src/test/java/org/eclipse/scout/rt/rest/param/IIdParamConverterProviderTest.java b/org.eclipse.scout.rt.rest.test/src/test/java/org/eclipse/scout/rt/rest/param/IIdParamConverterProviderTest.java index 5aaa076149..70f99323ab 100644 --- a/org.eclipse.scout.rt.rest.test/src/test/java/org/eclipse/scout/rt/rest/param/IIdParamConverterProviderTest.java +++ b/org.eclipse.scout.rt.rest.test/src/test/java/org/eclipse/scout/rt/rest/param/IIdParamConverterProviderTest.java @@ -1,15 +1,16 @@ /* - * Copyright (c) BSI Business Systems Integration AG. All rights reserved. - * http://www.bsiag.com/ + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * BSI Business Systems Integration AG - initial API and implementation */ package org.eclipse.scout.rt.rest.param; -import static org.eclipse.scout.rt.testing.platform.util.ScoutAssert.assertThrows; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; +import static org.junit.Assert.*; import java.util.UUID; @@ -19,7 +20,7 @@ import org.eclipse.scout.rt.dataobject.fixture.FixtureStringId; import org.eclipse.scout.rt.dataobject.fixture.FixtureUuId; import org.eclipse.scout.rt.platform.exception.PlatformException; import org.eclipse.scout.rt.testing.platform.runner.PlatformTestRunner; -import org.eclipse.scout.rt.testing.platform.util.ScoutAssert; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -38,7 +39,7 @@ public class IIdParamConverterProviderTest { @Test public void testGetConverterUnhandeledType() { - ScoutAssert.assertThrows(NullPointerException.class, () -> m_provider.getConverter(null, null, null)); + Assert.assertThrows(NullPointerException.class, () -> m_provider.getConverter(null, null, null)); assertNull(m_provider.getConverter(String.class, null, null)); } @@ -64,7 +65,7 @@ public class IIdParamConverterProviderTest { ParamConverter<FixtureUuId> conv = m_provider.getConverter(FixtureUuId.class, null, null); assertNull(conv.fromString(null)); - assertThrows(PlatformException.class, () -> conv.fromString("invalid UUID")); + Assert.assertThrows(PlatformException.class, () -> conv.fromString("invalid UUID")); assertNotNull(conv); FixtureUuId id = conv.fromString(TEST_UUID.toString()); diff --git a/org.eclipse.scout.rt.rest/org.eclipse.scout.rt.rest.iml b/org.eclipse.scout.rt.rest/org.eclipse.scout.rt.rest.iml index c24099a895..cddbcea1a8 100644 --- a/org.eclipse.scout.rt.rest/org.eclipse.scout.rt.rest.iml +++ b/org.eclipse.scout.rt.rest/org.eclipse.scout.rt.rest.iml @@ -13,19 +13,19 @@ <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.dataobject" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.2" level="project" /> <orderEntry type="library" name="Maven: jakarta.ws.rs:jakarta.ws.rs-api:2.1.6" level="project" /> <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" /> <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" /> - <orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.3" level="project" /> + <orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.4" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform.test" scope="TEST" /> - <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.23.4" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.9.3" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.3" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:3.5.7" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.10.13" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.13" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:3.1" level="project" /> </component> </module>
\ No newline at end of file diff --git a/org.eclipse.scout.rt.rest/src/test/java/org/eclipse/scout/rt/rest/cancellation/RestRequestCancellationRegistryTest.java b/org.eclipse.scout.rt.rest/src/test/java/org/eclipse/scout/rt/rest/cancellation/RestRequestCancellationRegistryTest.java index a51cde6b68..9ba9edce23 100644 --- a/org.eclipse.scout.rt.rest/src/test/java/org/eclipse/scout/rt/rest/cancellation/RestRequestCancellationRegistryTest.java +++ b/org.eclipse.scout.rt.rest/src/test/java/org/eclipse/scout/rt/rest/cancellation/RestRequestCancellationRegistryTest.java @@ -10,7 +10,6 @@ */ package org.eclipse.scout.rt.rest.cancellation; -import static org.eclipse.scout.rt.testing.platform.util.ScoutAssert.assertThrows; import static org.junit.Assert.*; import org.eclipse.scout.rt.dataobject.exception.AccessForbiddenException; @@ -19,6 +18,7 @@ import org.eclipse.scout.rt.platform.context.RunMonitor; import org.eclipse.scout.rt.platform.util.Assertions.AssertionException; import org.eclipse.scout.rt.platform.util.IRegistrationHandle; import org.eclipse.scout.rt.testing.platform.runner.PlatformTestRunner; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -37,10 +37,10 @@ public class RestRequestCancellationRegistryTest { @Test public void testRegisterInvalid() { - assertThrows(AssertionException.class, () -> m_registry.register(null, null, null)); - assertThrows(AssertionException.class, () -> m_registry.register("1", null, null)); - assertThrows(AssertionException.class, () -> m_registry.register(null, "1", null)); - assertThrows(AssertionException.class, () -> m_registry.register(null, null, m_runMonitor)); + Assert.assertThrows(AssertionException.class, () -> m_registry.register(null, null, null)); + Assert.assertThrows(AssertionException.class, () -> m_registry.register("1", null, null)); + Assert.assertThrows(AssertionException.class, () -> m_registry.register(null, "1", null)); + Assert.assertThrows(AssertionException.class, () -> m_registry.register(null, null, m_runMonitor)); m_registry.register("1", null, m_runMonitor); } @@ -72,10 +72,10 @@ public class RestRequestCancellationRegistryTest { assertFalse(m_runMonitor.isCancelled()); assertNotNull(m_registry.register("1", "alice", m_runMonitor)); - assertThrows(AccessForbiddenException.class, () -> m_registry.cancel("1", null)); + Assert.assertThrows(AccessForbiddenException.class, () -> m_registry.cancel("1", null)); assertFalse(m_runMonitor.isCancelled()); - assertThrows(AccessForbiddenException.class, () -> m_registry.cancel("1", "eve")); + Assert.assertThrows(AccessForbiddenException.class, () -> m_registry.cancel("1", "eve")); assertFalse(m_runMonitor.isCancelled()); assertTrue(m_registry.cancel("1", "alice")); diff --git a/org.eclipse.scout.rt.security.test/org.eclipse.scout.rt.security.test.iml b/org.eclipse.scout.rt.security.test/org.eclipse.scout.rt.security.test.iml index 623e0c4c05..ff33e8269f 100644 --- a/org.eclipse.scout.rt.security.test/org.eclipse.scout.rt.security.test.iml +++ b/org.eclipse.scout.rt.security.test/org.eclipse.scout.rt.security.test.iml @@ -13,20 +13,20 @@ <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.security" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> <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.dataobject" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform.test" /> - <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" /> + <orderEntry type="library" name="Maven: junit:junit:4.13" level="project" /> <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> - <orderEntry type="library" name="Maven: org.mockito:mockito-core:2.23.4" level="project" /> - <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.3" level="project" /> - <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.3" level="project" /> - <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" /> + <orderEntry type="library" name="Maven: org.mockito:mockito-core:3.5.7" level="project" /> + <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.13" level="project" /> + <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.13" level="project" /> + <orderEntry type="library" name="Maven: org.objenesis:objenesis:3.1" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: log4j:log4j:1.2.17" level="project" /> </component> </module>
\ No newline at end of file diff --git a/org.eclipse.scout.rt.security.test/src/test/java/org/eclipse/scout/rt/security/PermissionsTest.java b/org.eclipse.scout.rt.security.test/src/test/java/org/eclipse/scout/rt/security/PermissionsTest.java index 03a1d4d4d8..9466c19b45 100644 --- a/org.eclipse.scout.rt.security.test/src/test/java/org/eclipse/scout/rt/security/PermissionsTest.java +++ b/org.eclipse.scout.rt.security.test/src/test/java/org/eclipse/scout/rt/security/PermissionsTest.java @@ -1,5 +1,5 @@ -/******************************************************************************* - * Copyright (c) 2010-2019 BSI Business Systems Integration AG. +/* + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,10 +7,9 @@ * * Contributors: * BSI Business Systems Integration AG - initial API and implementation - ******************************************************************************/ + */ package org.eclipse.scout.rt.security; -import static org.eclipse.scout.rt.testing.platform.util.ScoutAssert.assertThrows; import static org.junit.Assert.*; import static org.mockito.Mockito.*; @@ -41,6 +40,7 @@ import org.eclipse.scout.rt.security.fixture.UJFixturePermission; import org.eclipse.scout.rt.testing.platform.BeanTestingHelper; import org.eclipse.scout.rt.testing.platform.runner.PlatformTestRunner; import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -288,10 +288,10 @@ public class PermissionsTest { m_support.checkAndThrow(new AFixturePermission()); m_support.checkAndThrow(new JFixturePermission()); - assertThrows(AccessForbiddenException.class, () -> m_support.checkAndThrow(null)); - assertThrows(AccessForbiddenException.class, () -> m_support.checkAndThrow(new NFixturePermission())); - assertThrows(AccessForbiddenException.class, () -> m_support.checkAndThrow(new DFixturePermission())); - assertThrows(AccessForbiddenException.class, () -> m_support.checkAndThrow(new UJFixturePermission())); + Assert.assertThrows(AccessForbiddenException.class, () -> m_support.checkAndThrow(null)); + Assert.assertThrows(AccessForbiddenException.class, () -> m_support.checkAndThrow(new NFixturePermission())); + Assert.assertThrows(AccessForbiddenException.class, () -> m_support.checkAndThrow(new DFixturePermission())); + Assert.assertThrows(AccessForbiddenException.class, () -> m_support.checkAndThrow(new UJFixturePermission())); } @Test @@ -380,9 +380,9 @@ public class PermissionsTest { @Test public void testSealing() { IPermissionCollection permissions = createDefaultPermissionCollection(); - assertThrows(AssertionException.class, () -> permissions.add(new UJFixturePermission())); + Assert.assertThrows(AssertionException.class, () -> permissions.add(new UJFixturePermission())); List<Permission> permissionList = Collections.list(((PermissionCollection) permissions).elements()); - assertThrows(AssertionException.class, () -> ((IPermission) permissionList.get(0)).setLevelInternal(PermissionLevel.ALL)); + Assert.assertThrows(AssertionException.class, () -> ((IPermission) permissionList.get(0)).setLevelInternal(PermissionLevel.ALL)); } } diff --git a/org.eclipse.scout.rt.security/org.eclipse.scout.rt.security.iml b/org.eclipse.scout.rt.security/org.eclipse.scout.rt.security.iml index 6a049c9704..e5d2ff248a 100644 --- a/org.eclipse.scout.rt.security/org.eclipse.scout.rt.security.iml +++ b/org.eclipse.scout.rt.security/org.eclipse.scout.rt.security.iml @@ -11,8 +11,8 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> <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.dataobject" /> 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 76cf3fb3aa..9beec0aeb8 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,10 +14,10 @@ <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:1.34.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> + <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.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:28.2-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" 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" /> @@ -26,23 +26,24 @@ <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: commons-codec:commons-codec:1.11" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" level="project" /> - <orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.3" 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" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform.test" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> <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="library" name="Maven: junit:junit:4.12" level="project" /> + <orderEntry type="library" name="Maven: junit:junit:4.13" level="project" /> <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> - <orderEntry type="library" name="Maven: org.mockito:mockito-core:2.23.4" level="project" /> - <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.3" level="project" /> - <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.3" level="project" /> - <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" /> + <orderEntry type="library" name="Maven: org.mockito:mockito-core:3.5.7" level="project" /> + <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.13" level="project" /> + <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.13" level="project" /> + <orderEntry type="library" name="Maven: org.objenesis:objenesis:3.1" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> </component> </module>
\ No newline at end of file diff --git a/org.eclipse.scout.rt.server.commons.test/src/test/java/org/eclipse/scout/rt/server/commons/authentication/ServletFilterHelperTest.java b/org.eclipse.scout.rt.server.commons.test/src/test/java/org/eclipse/scout/rt/server/commons/authentication/ServletFilterHelperTest.java index 74105fad4c..e64b4ba96b 100644 --- a/org.eclipse.scout.rt.server.commons.test/src/test/java/org/eclipse/scout/rt/server/commons/authentication/ServletFilterHelperTest.java +++ b/org.eclipse.scout.rt.server.commons.test/src/test/java/org/eclipse/scout/rt/server/commons/authentication/ServletFilterHelperTest.java @@ -20,7 +20,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.eclipse.scout.rt.platform.BEANS; -import org.eclipse.scout.rt.testing.platform.util.ScoutAssert; +import org.junit.Assert; import org.junit.Test; import org.mockito.ArgumentCaptor; @@ -29,7 +29,7 @@ public class ServletFilterHelperTest { @Test public void testIsIdempotent() { final ServletFilterHelper helper = BEANS.get(ServletFilterHelper.class); - ScoutAssert.assertThrows(NullPointerException.class, () -> helper.isIdempotent(null)); + Assert.assertThrows(NullPointerException.class, () -> helper.isIdempotent(null)); assertTrue(helper.isIdempotent(mockRequest("GET"))); assertTrue(helper.isIdempotent(mockRequest("PUT"))); assertTrue(helper.isIdempotent(mockRequest("HEAD"))); @@ -88,8 +88,8 @@ public class ServletFilterHelperTest { public void testCreateBasicAuthRequest() { final ServletFilterHelper helper = BEANS.get(ServletFilterHelper.class); - ScoutAssert.assertThrows(NullPointerException.class, () -> helper.createBasicAuthRequest(null, null)); - ScoutAssert.assertThrows(NullPointerException.class, () -> helper.createBasicAuthRequest("scott", null)); + Assert.assertThrows(NullPointerException.class, () -> helper.createBasicAuthRequest(null, null)); + Assert.assertThrows(NullPointerException.class, () -> helper.createBasicAuthRequest("scott", null)); assertEquals("Basic bnVsbDo=", helper.createBasicAuthRequest(null, "".toCharArray())); assertEquals("Basic c2NvdHQ6", helper.createBasicAuthRequest("scott", "".toCharArray())); diff --git a/org.eclipse.scout.rt.server.commons.test/src/test/java/org/eclipse/scout/rt/server/commons/servlet/HttpServletControlTest.java b/org.eclipse.scout.rt.server.commons.test/src/test/java/org/eclipse/scout/rt/server/commons/servlet/HttpServletControlTest.java index 4927535226..0d3aafee21 100644 --- a/org.eclipse.scout.rt.server.commons.test/src/test/java/org/eclipse/scout/rt/server/commons/servlet/HttpServletControlTest.java +++ b/org.eclipse.scout.rt.server.commons.test/src/test/java/org/eclipse/scout/rt/server/commons/servlet/HttpServletControlTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2017 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -71,7 +71,7 @@ public class HttpServletControlTest { httpServletControl.setResponseHeaders(servlet, req, resp); - Mockito.verifyZeroInteractions(servlet); + Mockito.verifyNoInteractions(servlet); if (expectXHeaders) { Mockito.verify(resp).setHeader(HttpServletControl.HTTP_HEADER_X_FRAME_OPTIONS, HttpServletControl.SAMEORIGIN); Mockito.verify(resp).setHeader(HttpServletControl.HTTP_HEADER_X_XSS_PROTECTION, HttpServletControl.XSS_MODE_BLOCK); 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 e01711f71f..8cde7a7bc2 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 @@ -12,16 +12,16 @@ <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.shared" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> <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="module" module-name="org.eclipse.scout.rt.dataobject" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.34.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> + <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.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:28.2-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" 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" /> @@ -30,9 +30,10 @@ <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: commons-codec:commons-codec:1.11" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" level="project" /> - <orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.3" 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" /> </component> </module>
\ No newline at end of file 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 6b656ad772..7e01d74e93 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 @@ -18,13 +18,13 @@ <orderEntry type="module" module-name="org.eclipse.scout.rt.server" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.shared" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> + <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:1.34.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> + <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.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:28.2-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" 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" /> @@ -33,50 +33,46 @@ <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: commons-codec:commons-codec:1.11" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" 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" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.mom.api" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.dataobject" /> <orderEntry type="library" name="Maven: jakarta.xml.ws:jakarta.xml.ws-api:2.3.3" level="project" /> - <orderEntry type="library" name="Maven: jakarta.jws:jakarta.jws-api:1.1.1" level="project" /> + <orderEntry type="library" name="Maven: jakarta.jws:jakarta.jws-api:2.1.0" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.server.test" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.shared.test" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform.test" /> - <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" /> + <orderEntry type="library" name="Maven: junit:junit:4.13" level="project" /> <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> - <orderEntry type="library" name="Maven: org.mockito:mockito-core:2.23.4" level="project" /> - <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.3" level="project" /> - <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.3" level="project" /> - <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" /> - <orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.3" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: com.sun.xml.ws:jaxws-rt:2.3.2" level="project" /> + <orderEntry type="library" name="Maven: org.mockito:mockito-core:3.5.7" level="project" /> + <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.13" level="project" /> + <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.13" level="project" /> + <orderEntry type="library" name="Maven: org.objenesis:objenesis:3.1" level="project" /> + <orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.4" level="project" /> + <orderEntry type="library" name="Maven: com.sun.xml.ws:jaxws-rt:2.3.3" level="project" /> + <orderEntry type="library" name="Maven: com.sun.xml.ws:policy:2.7.10" level="project" /> + <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.3" level="project" /> + <orderEntry type="library" name="Maven: org.glassfish.ha:ha-api:3.1.12" level="project" /> + <orderEntry type="library" name="Maven: org.glassfish.external:management-api:3.2.2" level="project" /> + <orderEntry type="library" name="Maven: org.glassfish.gmbal:gmbal:4.0.1" level="project" /> + <orderEntry type="library" name="Maven: org.glassfish.pfl:pfl-tf:4.1.0" level="project" /> + <orderEntry type="library" name="Maven: org.glassfish.pfl:pfl-basic:4.1.0" level="project" /> + <orderEntry type="library" name="Maven: org.jvnet.staxex:stax-ex:1.8.3" level="project" /> + <orderEntry type="library" name="Maven: com.sun.xml.stream.buffer:streambuffer:1.5.9" level="project" /> + <orderEntry type="library" name="Maven: org.jvnet.mimepull:mimepull:1.9.13" level="project" /> + <orderEntry type="library" name="Maven: com.sun.xml.fastinfoset:FastInfoset:1.2.18" level="project" /> + <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.activation:jakarta.activation:1.2.2" level="project" /> + <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.xml.messaging.saaj:saaj-impl:1.5.2" level="project" /> + <orderEntry type="library" scope="RUNTIME" name="Maven: com.fasterxml.woodstox:woodstox-core:5.1.0" level="project" /> + <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.woodstox:stax2-api:4.1" level="project" /> <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" /> <orderEntry type="library" name="Maven: jakarta.xml.soap:jakarta.xml.soap-api:1.4.2" level="project" /> <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.glassfish.jaxb:jaxb-runtime:2.3.2" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.glassfish.jaxb:txw2:2.3.2" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: com.sun.istack:istack-commons-runtime:3.0.8" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: com.sun.xml.ws:policy:2.7.6" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.glassfish.gmbal:gmbal:4.0.0" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.glassfish.external:management-api:3.2.1" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.glassfish.pfl:pfl-basic:4.0.1" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.glassfish.pfl:pfl-tf:4.0.1" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.glassfish.pfl:pfl-asm:4.0.1" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.glassfish.pfl:pfl-dynamic:4.0.1" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.glassfish.pfl:pfl-basic-tools:4.0.1" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.glassfish.pfl:pfl-tf-tools:4.0.1" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.jvnet.staxex:stax-ex:1.8.1" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: com.sun.xml.stream.buffer:streambuffer:1.5.7" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.jvnet.mimepull:mimepull:1.9.10" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: com.sun.xml.fastinfoset:FastInfoset:1.2.16" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.glassfish.ha:ha-api:3.1.12" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: com.sun.xml.messaging.saaj:saaj-impl:1.5.1" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.woodstox:woodstox-core:5.1.0" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.codehaus.woodstox:stax2-api:4.1" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" /> + <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> </component> </module>
\ No newline at end of file diff --git a/org.eclipse.scout.rt.server.jaxws.test/pom.xml b/org.eclipse.scout.rt.server.jaxws.test/pom.xml index 34e91cbb42..4353e8f81d 100644 --- a/org.eclipse.scout.rt.server.jaxws.test/pom.xml +++ b/org.eclipse.scout.rt.server.jaxws.test/pom.xml @@ -1,16 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - - Copyright (c) 2010-2018 BSI Business Systems Integration AG. - All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 - which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html - - Contributors: - BSI Business Systems Integration AG - initial API and implementation - ---> + ~ Copyright (c) 2010-2020 BSI Business Systems Integration AG. + ~ All rights reserved. This program and the accompanying materials + ~ are made available under the terms of the Eclipse Public License v1.0 + ~ which accompanies this distribution, and is available at + ~ http://www.eclipse.org/legal/epl-v10.html + ~ + ~ Contributors: + ~ BSI Business Systems Integration AG - initial API and implementation + --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -28,7 +26,7 @@ <build> <plugins> <plugin> - <groupId>com.helger.maven</groupId> + <groupId>com.sun.xml.ws</groupId> <artifactId>jaxws-maven-plugin</artifactId> <executions> <execution> @@ -75,12 +73,10 @@ <dependency> <groupId>com.sun.xml.ws</groupId> <artifactId>jaxws-rt</artifactId> - <scope>test</scope> </dependency> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> - <scope>test</scope> </dependency> </dependencies> </project> 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 52a0c20d89..2a3f64d70f 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 @@ -13,15 +13,15 @@ <orderEntry type="module" module-name="org.eclipse.scout.rt.server" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.shared" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> <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:1.34.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> + <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.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:28.2-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" 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" /> @@ -30,16 +30,17 @@ <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: commons-codec:commons-codec:1.11" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" 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" /> - <orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.3" level="project" /> + <orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.4" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.mom.api" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.dataobject" /> <orderEntry type="library" name="Maven: jakarta.xml.ws:jakarta.xml.ws-api:2.3.3" level="project" /> <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" /> <orderEntry type="library" name="Maven: jakarta.xml.soap:jakarta.xml.soap-api:1.4.2" level="project" /> - <orderEntry type="library" name="Maven: jakarta.jws:jakarta.jws-api:1.1.1" level="project" /> + <orderEntry type="library" name="Maven: jakarta.jws:jakarta.jws-api:2.1.0" level="project" /> </component> </module>
\ No newline at end of file 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 761032d303..67f80b1738 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 @@ -14,14 +14,14 @@ <orderEntry type="module" module-name="org.eclipse.scout.rt.server" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.shared" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> <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:1.34.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> + <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.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:28.2-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" 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" /> @@ -30,24 +30,25 @@ <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: commons-codec:commons-codec:1.11" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" 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" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.mom.api" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.dataobject" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.server.test" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.shared.test" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform.test" /> - <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" /> + <orderEntry type="library" name="Maven: junit:junit:4.13" level="project" /> <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> - <orderEntry type="library" name="Maven: org.mockito:mockito-core:2.23.4" level="project" /> - <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.3" level="project" /> - <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.3" level="project" /> - <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" /> - <orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.3" level="project" /> + <orderEntry type="library" name="Maven: org.mockito:mockito-core:3.5.7" level="project" /> + <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.13" level="project" /> + <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.13" level="project" /> + <orderEntry type="library" name="Maven: org.objenesis:objenesis:3.1" level="project" /> + <orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.4" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> </component> </module>
\ No newline at end of file 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 de3f2f8aaa..6798a0c7ac 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 @@ -13,15 +13,15 @@ <orderEntry type="module" module-name="org.eclipse.scout.rt.server" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.shared" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> <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:1.34.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> + <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.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:28.2-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" 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" /> @@ -30,11 +30,12 @@ <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: commons-codec:commons-codec:1.11" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" 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" /> - <orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.3" level="project" /> + <orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.4" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.mom.api" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.dataobject" /> </component> 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 00d18d8bb0..734455bec1 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 @@ -23,14 +23,14 @@ <orderEntry type="module" module-name="org.eclipse.scout.rt.server" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.shared" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> <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:1.34.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> + <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.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:28.2-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" 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" /> @@ -39,31 +39,32 @@ <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: commons-codec:commons-codec:1.11" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" 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" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.mom.api" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.dataobject" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.shared.test" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform.test" /> - <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" /> + <orderEntry type="library" name="Maven: junit:junit:4.13" level="project" /> <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> - <orderEntry type="library" name="Maven: org.mockito:mockito-core:2.23.4" level="project" /> - <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.3" level="project" /> - <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.3" level="project" /> - <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" /> + <orderEntry type="library" name="Maven: org.mockito:mockito-core:3.5.7" level="project" /> + <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.13" level="project" /> + <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.13" level="project" /> + <orderEntry type="library" name="Maven: org.objenesis:objenesis:3.1" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-webapp:9.4.30.v20200611" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-xml:9.4.30.v20200611" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-util:9.4.30.v20200611" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-servlet:9.4.30.v20200611" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-security:9.4.30.v20200611" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-server:9.4.30.v20200611" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-http:9.4.30.v20200611" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-io:9.4.30.v20200611" level="project" /> - <orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.3" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-webapp:9.4.31.v20200723" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-xml:9.4.31.v20200723" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-util:9.4.31.v20200723" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-servlet:9.4.31.v20200723" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-security:9.4.31.v20200723" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-server:9.4.31.v20200723" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-http:9.4.31.v20200723" level="project" /> + <orderEntry type="library" scope="TEST" 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" /> </component> </module>
\ No newline at end of file diff --git a/org.eclipse.scout.rt.server.test/src/test/java/org/eclipse/scout/rt/server/ServiceOperationInvokerTest.java b/org.eclipse.scout.rt.server.test/src/test/java/org/eclipse/scout/rt/server/ServiceOperationInvokerTest.java index 4ecd783261..e474b65097 100644 --- a/org.eclipse.scout.rt.server.test/src/test/java/org/eclipse/scout/rt/server/ServiceOperationInvokerTest.java +++ b/org.eclipse.scout.rt.server.test/src/test/java/org/eclipse/scout/rt/server/ServiceOperationInvokerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2017 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,10 +13,7 @@ package org.eclipse.scout.rt.server; import static org.hamcrest.core.IsInstanceOf.instanceOf; import static org.hamcrest.core.IsNot.not; import static org.hamcrest.core.StringContains.containsString; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; @@ -30,6 +27,7 @@ import org.eclipse.scout.rt.shared.servicetunnel.ServiceTunnelRequest; import org.eclipse.scout.rt.shared.servicetunnel.ServiceTunnelResponse; import org.eclipse.scout.rt.testing.platform.mock.BeanMock; import org.eclipse.scout.rt.testing.platform.runner.PlatformTestRunner; +import org.hamcrest.MatcherAssert; import org.junit.Test; import org.junit.runner.RunWith; @@ -94,8 +92,8 @@ public class ServiceOperationInvokerTest { */ private void assertProcessingException(ServiceTunnelResponse res, String customMessage) { Throwable exception = res.getException(); - assertThat(exception, instanceOf(ProcessingException.class)); - assertThat("Exception message should not reveil anything (security)", exception.getMessage(), not(containsString(customMessage))); + MatcherAssert.assertThat(exception, instanceOf(ProcessingException.class)); + MatcherAssert.assertThat("Exception message should not reveil anything (security)", exception.getMessage(), not(containsString(customMessage))); assertEquals("Stacktrace must be empty (security)", 0, exception.getStackTrace().length); assertNotNull(res.getProcessingDuration()); } diff --git a/org.eclipse.scout.rt.server.test/src/test/java/org/eclipse/scout/rt/server/clientnotification/ClientNotificationRegistryTest.java b/org.eclipse.scout.rt.server.test/src/test/java/org/eclipse/scout/rt/server/clientnotification/ClientNotificationRegistryTest.java index e6cdcc07d7..796c0d38ed 100644 --- a/org.eclipse.scout.rt.server.test/src/test/java/org/eclipse/scout/rt/server/clientnotification/ClientNotificationRegistryTest.java +++ b/org.eclipse.scout.rt.server.test/src/test/java/org/eclipse/scout/rt/server/clientnotification/ClientNotificationRegistryTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2017 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -161,9 +161,9 @@ public class ClientNotificationRegistryTest { try { ClientNotificationRegistry reg = new ClientNotificationRegistry(TEST_QUEUE_EXPIRE_TIMEOUT); reg.registerSession("testNodeId", "testSessionId", TEST_USER); - reg.publish(Collections.<ClientNotificationMessage> emptySet()); + reg.publish(Collections.emptySet()); assertEquals(Collections.emptyList(), consumeNoWait(reg, "testNodeId")); - Mockito.verifyZeroInteractions(mockClusterSyncService); + Mockito.verifyNoInteractions(mockClusterSyncService); } finally { BeanTestingHelper.get().unregisterBean(bean); @@ -188,7 +188,7 @@ public class ClientNotificationRegistryTest { List<ClientNotificationMessage> notificationsNode2 = consumeNoWait(reg, "testNodeId2"); assertSingleTestNotification(notificationsNode1); assertSingleTestNotification(notificationsNode2); - Mockito.verifyZeroInteractions(mockClusterSyncService); + Mockito.verifyNoInteractions(mockClusterSyncService); } finally { BeanTestingHelper.get().unregisterBean(bean); diff --git a/org.eclipse.scout.rt.server.test/src/test/java/org/eclipse/scout/rt/server/job/filter/future/ServerRunContextFutureFilterTest.java b/org.eclipse.scout.rt.server.test/src/test/java/org/eclipse/scout/rt/server/job/filter/future/ServerRunContextFutureFilterTest.java index d84e26fb62..c110c034dc 100644 --- a/org.eclipse.scout.rt.server.test/src/test/java/org/eclipse/scout/rt/server/job/filter/future/ServerRunContextFutureFilterTest.java +++ b/org.eclipse.scout.rt.server.test/src/test/java/org/eclipse/scout/rt/server/job/filter/future/ServerRunContextFutureFilterTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2017 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -42,8 +42,8 @@ public class ServerRunContextFutureFilterTest { private IServerSession m_serverSession2; @Before - public void before() { - MockitoAnnotations.initMocks(this); + public void before() throws Exception { + MockitoAnnotations.openMocks(this).close(); when(m_serverJobFuture.getJobInput()).thenReturn(Jobs.newInput().withRunContext(ServerRunContexts.empty().withSession(m_serverSession1))); when(m_jobFuture.getJobInput()).thenReturn(Jobs.newInput().withRunContext(RunContexts.empty())); 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 bc517a6cfc..db9ce4c3b2 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 @@ -12,15 +12,15 @@ <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.shared" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> <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:1.34.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> + <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.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:28.2-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" 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" /> @@ -29,11 +29,12 @@ <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: commons-codec:commons-codec:1.11" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" 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" /> - <orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.3" level="project" /> + <orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.4" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.mom.api" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.dataobject" /> </component> 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 8dda324109..4fe520956d 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 @@ -12,16 +12,16 @@ <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.client" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> <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.shared" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.security" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.34.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> + <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.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:28.2-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" 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" /> @@ -30,12 +30,13 @@ <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: commons-codec:commons-codec:1.11" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" 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" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.server.commons" /> - <orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.3" level="project" /> + <orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.4" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.mom.api" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.dataobject" /> </component> 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 d4c3d68814..ac5190dfa5 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 @@ -14,15 +14,15 @@ <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.shared" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> <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="module" module-name="org.eclipse.scout.rt.dataobject" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.34.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> + <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.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:28.2-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" 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" /> @@ -31,18 +31,19 @@ <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: commons-codec:commons-codec:1.11" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" 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" /> - <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" /> + <orderEntry type="library" name="Maven: junit:junit:4.13" level="project" /> <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> - <orderEntry type="library" name="Maven: org.mockito:mockito-core:2.23.4" level="project" /> - <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.3" level="project" /> - <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.3" level="project" /> - <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" /> + <orderEntry type="library" name="Maven: org.mockito:mockito-core:3.5.7" level="project" /> + <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.13" level="project" /> + <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.13" level="project" /> + <orderEntry type="library" name="Maven: org.objenesis:objenesis:3.1" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> </component> </module>
\ No newline at end of file diff --git a/org.eclipse.scout.rt.shared.test/src/test/java/org/eclipse/scout/rt/shared/services/common/code/CodeServiceTest.java b/org.eclipse.scout.rt.shared.test/src/test/java/org/eclipse/scout/rt/shared/services/common/code/CodeServiceTest.java index 286b7b2391..652edec13d 100644 --- a/org.eclipse.scout.rt.shared.test/src/test/java/org/eclipse/scout/rt/shared/services/common/code/CodeServiceTest.java +++ b/org.eclipse.scout.rt.shared.test/src/test/java/org/eclipse/scout/rt/shared/services/common/code/CodeServiceTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2017 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -26,6 +26,7 @@ import org.eclipse.scout.rt.platform.util.CollectionUtility; import org.eclipse.scout.rt.shared.services.common.code.fixture.TestCodeType3; import org.eclipse.scout.rt.shared.services.common.code.fixture.TestCodeType4; import org.eclipse.scout.rt.testing.platform.runner.PlatformTestRunner; +import org.hamcrest.MatcherAssert; import org.junit.Test; import org.junit.runner.RunWith; @@ -41,25 +42,25 @@ public class CodeServiceTest { /** * Test method for - * {@link org.eclipse.scout.rt.shared.services.common.code.CodeService#getAllCodeTypeClasses(java.lang.String)} . + * {@link CodeService#getAllCodeTypeClasses()} . */ @Test public void testGetAllCodeTypeClasses() { ICodeService service = newCodeServiceInstance(); Collection<Class<? extends ICodeType<?, ?>>> codeTypeClasses1 = service.getAllCodeTypeClasses(); assertEquals("codeTypeClasses1 size", 2, codeTypeClasses1.size()); - assertEquals("codeTypeClasses1 contains AbcCodeType", true, codeTypeClasses1.contains(AbcCodeType.class)); - assertEquals("codeTypeClasses1 contains ZyxCodeType", true, codeTypeClasses1.contains(ZyxCodeType.class)); + assertTrue("codeTypeClasses1 contains AbcCodeType", codeTypeClasses1.contains(AbcCodeType.class)); + assertTrue("codeTypeClasses1 contains ZyxCodeType", codeTypeClasses1.contains(ZyxCodeType.class)); Collection<Class<? extends ICodeType<?, ?>>> codeTypeClasses2 = service.getAllCodeTypeClasses(); assertEquals("codeTypeClasses2 size", 1, codeTypeClasses2.size()); - assertEquals("codeTypeClasses2 contains AbcCodeType", true, codeTypeClasses2.contains(AbcCodeType.class)); - assertEquals("codeTypeClasses2 contains ZyxCodeType", false, codeTypeClasses2.contains(ZyxCodeType.class)); + assertTrue("codeTypeClasses2 contains AbcCodeType", codeTypeClasses2.contains(AbcCodeType.class)); + assertFalse("codeTypeClasses2 contains ZyxCodeType", codeTypeClasses2.contains(ZyxCodeType.class)); } /** * Test method for - * {@link org.eclipse.scout.rt.shared.services.common.code.CodeService#getAllCodeTypes(java.lang.String)} . + * {@link CodeService#getAllCodeTypes()} . */ @Test public void testGetAllCodeTypesString() { @@ -211,28 +212,28 @@ public class CodeServiceTest { public void testReplaceLookupUsingCodeService() { ICodeService service = newCodeServiceInstance(); - assertThat(service.getCodeType(TestCodeType3.class), instanceOf(TestCodeType4.class)); - assertThat(service.getCodeType(TestCodeType4.class), instanceOf(TestCodeType4.class)); + MatcherAssert.assertThat(service.getCodeType(TestCodeType3.class), instanceOf(TestCodeType4.class)); + MatcherAssert.assertThat(service.getCodeType(TestCodeType4.class), instanceOf(TestCodeType4.class)); } @Test public void testReplaceCodeServiceGetCodeTypes() { ICodeService service = newCodeServiceInstance(); - List<ICodeType<?, ?>> codeTypes = service.getCodeTypes(Arrays.<Class<? extends ICodeType<?, ?>>> asList(TestCodeType3.class, TestCodeType4.class)); + List<ICodeType<?, ?>> codeTypes = service.getCodeTypes(Arrays.asList(TestCodeType3.class, TestCodeType4.class)); assertEquals(2, codeTypes.size()); - assertThat(codeTypes.get(0), instanceOf(TestCodeType4.class)); - assertThat(codeTypes.get(1), instanceOf(TestCodeType4.class)); + MatcherAssert.assertThat(codeTypes.get(0), instanceOf(TestCodeType4.class)); + MatcherAssert.assertThat(codeTypes.get(1), instanceOf(TestCodeType4.class)); } @Test public void testReplaceCodeServiceGetCodeTypeMap() { ICodeService service = newCodeServiceInstance(); - Map<Class<? extends ICodeType<?, ?>>, ICodeType<?, ?>> codeTypes = service.getCodeTypeMap(Arrays.<Class<? extends ICodeType<?, ?>>> asList(TestCodeType3.class, TestCodeType4.class)); + Map<Class<? extends ICodeType<?, ?>>, ICodeType<?, ?>> codeTypes = service.getCodeTypeMap(Arrays.asList(TestCodeType3.class, TestCodeType4.class)); assertEquals(2, codeTypes.size()); - assertThat(codeTypes.get(TestCodeType3.class), instanceOf(TestCodeType4.class)); - assertThat(codeTypes.get(TestCodeType4.class), instanceOf(TestCodeType4.class)); + MatcherAssert.assertThat(codeTypes.get(TestCodeType3.class), instanceOf(TestCodeType4.class)); + MatcherAssert.assertThat(codeTypes.get(TestCodeType4.class), instanceOf(TestCodeType4.class)); } protected ICodeService newCodeServiceInstance() { diff --git a/org.eclipse.scout.rt.shared.test/src/test/java/org/eclipse/scout/rt/shared/services/common/code/CodeTypeRegistrationTest.java b/org.eclipse.scout.rt.shared.test/src/test/java/org/eclipse/scout/rt/shared/services/common/code/CodeTypeRegistrationTest.java index 58d70059b0..7888fa33a3 100644 --- a/org.eclipse.scout.rt.shared.test/src/test/java/org/eclipse/scout/rt/shared/services/common/code/CodeTypeRegistrationTest.java +++ b/org.eclipse.scout.rt.shared.test/src/test/java/org/eclipse/scout/rt/shared/services/common/code/CodeTypeRegistrationTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2017 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,15 +11,14 @@ package org.eclipse.scout.rt.shared.services.common.code; import static org.hamcrest.core.IsInstanceOf.instanceOf; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.*; import org.eclipse.scout.rt.platform.BEANS; import org.eclipse.scout.rt.shared.services.common.code.fixture.IgnoredCodeType; import org.eclipse.scout.rt.shared.services.common.code.fixture.TestCodeType1; import org.eclipse.scout.rt.shared.services.common.code.fixture.TestCodeType3; import org.eclipse.scout.rt.shared.services.common.code.fixture.TestCodeType4; +import org.hamcrest.MatcherAssert; import org.junit.Test; /** @@ -35,8 +34,8 @@ public class CodeTypeRegistrationTest { @Test public void testReplace() { - assertThat(BEANS.get(TestCodeType3.class), instanceOf(TestCodeType4.class)); - assertThat(BEANS.get(TestCodeType4.class), instanceOf(TestCodeType4.class)); + MatcherAssert.assertThat(BEANS.get(TestCodeType3.class), instanceOf(TestCodeType4.class)); + MatcherAssert.assertThat(BEANS.get(TestCodeType4.class), instanceOf(TestCodeType4.class)); } } 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 9a9af816ef..6fbb8ae16f 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 @@ -11,16 +11,16 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> <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="module" module-name="org.eclipse.scout.rt.dataobject" /> - <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.34.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> + <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.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:28.2-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" 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" /> @@ -29,8 +29,9 @@ <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: commons-codec:commons-codec:1.11" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" 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> </module>
\ No newline at end of file diff --git a/org.eclipse.scout.rt.shared/pom.xml b/org.eclipse.scout.rt.shared/pom.xml index 7400522151..f672b1bd5b 100644 --- a/org.eclipse.scout.rt.shared/pom.xml +++ b/org.eclipse.scout.rt.shared/pom.xml @@ -1,16 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - - Copyright (c) 2010-2018 BSI Business Systems Integration AG. - All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 - which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html - - Contributors: - BSI Business Systems Integration AG - initial API and implementation - ---> + ~ Copyright (c) 2010-2020 BSI Business Systems Integration AG. + ~ All rights reserved. This program and the accompanying materials + ~ are made available under the terms of the Eclipse Public License v1.0 + ~ which accompanies this distribution, and is available at + ~ http://www.eclipse.org/legal/epl-v10.html + ~ + ~ Contributors: + ~ BSI Business Systems Integration AG - initial API and implementation + --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -37,7 +35,7 @@ </dependency> <dependency> <groupId>com.google.http-client</groupId> - <artifactId>google-http-client</artifactId> + <artifactId>google-http-client-apache-v2</artifactId> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> diff --git a/org.eclipse.scout.rt.shared/src/main/java/org/eclipse/scout/rt/shared/http/ApacheHttpTransportFactory.java b/org.eclipse.scout.rt.shared/src/main/java/org/eclipse/scout/rt/shared/http/ApacheHttpTransportFactory.java index 3746308872..5ca2baf95b 100644 --- a/org.eclipse.scout.rt.shared/src/main/java/org/eclipse/scout/rt/shared/http/ApacheHttpTransportFactory.java +++ b/org.eclipse.scout.rt.shared/src/main/java/org/eclipse/scout/rt/shared/http/ApacheHttpTransportFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2019 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -41,10 +41,10 @@ import org.eclipse.scout.rt.shared.http.HttpConfigurationProperties.ApacheHttpTr import org.eclipse.scout.rt.shared.http.HttpConfigurationProperties.ApacheHttpTransportRetryOnSocketExceptionByConnectionResetProperty; import org.eclipse.scout.rt.shared.http.proxy.ConfigurableProxySelector; import org.eclipse.scout.rt.shared.http.retry.CustomHttpRequestRetryHandler; -import org.eclipse.scout.rt.shared.http.transport.ApacheHttpTransport; import org.eclipse.scout.rt.shared.servicetunnel.http.MultiSessionCookieStore; import com.google.api.client.http.HttpTransport; +import com.google.api.client.http.apache.v2.ApacheHttpTransport; /** * Factory to create the {@link ApacheHttpTransport} instances. @@ -71,18 +71,12 @@ public class ApacheHttpTransportFactory implements IHttpTransportFactory { return new ApacheHttpTransport(builder.build()); } - /** - * @param builder - */ protected void setConnectionKeepAliveAndRetrySettings(HttpClientBuilder builder) { addConnectionKeepAliveSettings(builder); addRetrySettings(builder); addRedirectSettings(builder); } - /** - * @param builder - */ protected void addConnectionKeepAliveSettings(HttpClientBuilder builder) { final boolean keepAliveProp = CONFIG.getPropertyValue(ApacheHttpTransportKeepAliveProperty.class); if (keepAliveProp) { @@ -93,9 +87,6 @@ public class ApacheHttpTransportFactory implements IHttpTransportFactory { } } - /** - * @param builder - */ protected void addRetrySettings(HttpClientBuilder builder) { final boolean retryOnNoHttpResponseException = CONFIG.getPropertyValue(ApacheHttpTransportRetryOnNoHttpResponseExceptionProperty.class); final boolean retryOnSocketExceptionByConnectionReset = CONFIG.getPropertyValue(ApacheHttpTransportRetryOnSocketExceptionByConnectionResetProperty.class); @@ -107,9 +98,6 @@ public class ApacheHttpTransportFactory implements IHttpTransportFactory { } } - /** - * @param builder - */ protected void addRedirectSettings(HttpClientBuilder builder) { final boolean redirectPost = CONFIG.getPropertyValue(ApacheHttpTransportRedirectPostProperty.class); if (redirectPost) { diff --git a/org.eclipse.scout.rt.shared/src/main/java/org/eclipse/scout/rt/shared/http/transport/ApacheHttpRequest.java b/org.eclipse.scout.rt.shared/src/main/java/org/eclipse/scout/rt/shared/http/transport/ApacheHttpRequest.java deleted file mode 100644 index ad5469ce87..0000000000 --- a/org.eclipse.scout.rt.shared/src/main/java/org/eclipse/scout/rt/shared/http/transport/ApacheHttpRequest.java +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright (c) 2010-2017 BSI Business Systems Integration AG. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * BSI Business Systems Integration AG - initial API and implementation - */ -package org.eclipse.scout.rt.shared.http.transport; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - -import org.apache.http.HttpEntityEnclosingRequest; -import org.apache.http.client.HttpClient; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.client.config.RequestConfig.Builder; -import org.apache.http.client.methods.HttpRequestBase; -import org.apache.http.entity.AbstractHttpEntity; -import org.eclipse.scout.rt.platform.exception.ProcessingException; - -import com.google.api.client.http.HttpContent; -import com.google.api.client.http.LowLevelHttpRequest; -import com.google.api.client.http.LowLevelHttpResponse; -import com.google.api.client.util.StreamingContent; - -/** - * <p> - * Internal {@link LowLevelHttpRequest} for {@link ApacheHttpTransport}. - * </p> - * - * @see ApacheHttpTransport - */ -public class ApacheHttpRequest extends LowLevelHttpRequest { - - private final HttpClient m_httpClient; - - private final HttpRequestBase m_request; - - public ApacheHttpRequest(HttpClient httpClient, HttpRequestBase request) { - m_httpClient = httpClient; - m_request = request; - } - - @Override - public void addHeader(String name, String value) throws IOException { - m_request.addHeader(name, value); - } - - @Override - public void setTimeout(int connectTimeout, int readTimeout) throws IOException { - super.setTimeout(connectTimeout, readTimeout); - RequestConfig config = m_request.getConfig(); - Builder configBuilder = config != null ? RequestConfig.copy(config) : RequestConfig.custom(); - configBuilder.setConnectTimeout(connectTimeout); - configBuilder.setSocketTimeout(readTimeout); - m_request.setConfig(configBuilder.build()); - - } - - @Override - public LowLevelHttpResponse execute() throws IOException { - final StreamingContent streamingContent = getStreamingContent(); - if (streamingContent != null) { - if (!(m_request instanceof HttpEntityEnclosingRequest)) { - throw new ProcessingException("This request {} does not support content.", m_request); - } - - AbstractHttpEntity entity = new AbstractHttpEntity() { - - @Override - public void writeTo(OutputStream outstream) throws IOException { - streamingContent.writeTo(outstream); - } - - @Override - public boolean isStreaming() { - return true; - } - - @Override - public boolean isRepeatable() { - if (streamingContent instanceof HttpContent) { - return ((HttpContent) streamingContent).retrySupported(); - } - return false; - } - - @Override - public long getContentLength() { - return ApacheHttpRequest.this.getContentLength(); - } - - @Override - public InputStream getContent() { - throw new UnsupportedOperationException("Streaming entity cannot be represented as an input stream."); - } - }; - ((HttpEntityEnclosingRequest) m_request).setEntity(entity); - entity.setContentEncoding(getContentEncoding()); - entity.setContentType(getContentType()); - } - return createResponseInternal(); - } - - protected ApacheHttpResponse createResponseInternal() throws IOException { - return new ApacheHttpResponse(m_request, m_httpClient.execute(m_request)); - } - -} diff --git a/org.eclipse.scout.rt.shared/src/main/java/org/eclipse/scout/rt/shared/http/transport/ApacheHttpResponse.java b/org.eclipse.scout.rt.shared/src/main/java/org/eclipse/scout/rt/shared/http/transport/ApacheHttpResponse.java deleted file mode 100644 index 0ce228a914..0000000000 --- a/org.eclipse.scout.rt.shared/src/main/java/org/eclipse/scout/rt/shared/http/transport/ApacheHttpResponse.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright (c) 2010-2017 BSI Business Systems Integration AG. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * BSI Business Systems Integration AG - initial API and implementation - */ -package org.eclipse.scout.rt.shared.http.transport; - -import java.io.IOException; -import java.io.InputStream; - -import org.apache.http.Header; -import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; -import org.apache.http.client.methods.HttpRequestBase; - -import com.google.api.client.http.LowLevelHttpResponse; - -/** - * <p> - * Internal {@link LowLevelHttpResponse} for {@link ApacheHttpTransport}. - * </p> - * - * @see ApacheHttpTransport - */ -public class ApacheHttpResponse extends LowLevelHttpResponse { - - private final HttpRequestBase m_request; - private final HttpResponse m_response; - - public ApacheHttpResponse(HttpRequestBase request, HttpResponse response) { - m_request = request; - m_response = response; - } - - @Override - public InputStream getContent() throws IOException { - HttpEntity entity = m_response.getEntity(); - return entity != null ? entity.getContent() : null; - } - - @Override - public String getContentEncoding() throws IOException { - HttpEntity entity = m_response.getEntity(); - Header contentEncoding = entity != null ? entity.getContentEncoding() : null; - return contentEncoding != null ? contentEncoding.getValue() : null; - } - - @Override - public long getContentLength() throws IOException { - HttpEntity entity = m_response.getEntity(); - return entity != null ? entity.getContentLength() : 0; - } - - @Override - public String getContentType() throws IOException { - HttpEntity entity = m_response.getEntity(); - Header contentType = entity != null ? entity.getContentType() : null; - return contentType != null ? contentType.getValue() : null; - } - - @Override - public String getStatusLine() throws IOException { - return m_response.getStatusLine().toString(); - } - - @Override - public int getStatusCode() throws IOException { - return m_response.getStatusLine().getStatusCode(); - } - - @Override - public String getReasonPhrase() throws IOException { - return m_response.getStatusLine().getReasonPhrase(); - } - - @Override - public int getHeaderCount() throws IOException { - return m_response.getAllHeaders().length; - } - - @Override - public String getHeaderName(int index) throws IOException { - return m_response.getAllHeaders()[index].getName(); - } - - @Override - public String getHeaderValue(int index) throws IOException { - return m_response.getAllHeaders()[index].getValue(); - } - - @Override - public void disconnect() throws IOException { - m_request.abort(); - } - -} diff --git a/org.eclipse.scout.rt.shared/src/main/java/org/eclipse/scout/rt/shared/http/transport/ApacheHttpTransport.java b/org.eclipse.scout.rt.shared/src/main/java/org/eclipse/scout/rt/shared/http/transport/ApacheHttpTransport.java deleted file mode 100644 index 8c847f89c7..0000000000 --- a/org.eclipse.scout.rt.shared/src/main/java/org/eclipse/scout/rt/shared/http/transport/ApacheHttpTransport.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright (c) 2010-2017 BSI Business Systems Integration AG. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * BSI Business Systems Integration AG - initial API and implementation - */ -package org.eclipse.scout.rt.shared.http.transport; - -import java.io.Closeable; -import java.io.IOException; - -import org.apache.http.client.HttpClient; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpHead; -import org.apache.http.client.methods.HttpOptions; -import org.apache.http.client.methods.HttpPatch; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpPut; -import org.apache.http.client.methods.HttpRequestBase; - -import com.google.api.client.http.HttpMethods; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.LowLevelHttpRequest; - -/** - * <p> - * Unfortunately {@link com.google.api.client.http.apache.ApacheHttpTransport} does not support the Apache HTTP client - * library for versions greater than 4.3 (actually version Google HTTP Client 1.22 is built with version Apache HTTP - * Client 4.0.1 dating back to 2009). - * </p> - * <p> - * This implementation of a {@link HttpTransport} should work with newer versions of the Apache HTTP client. - * </p> - * - * @see "<a href="https://github.com/google/google-http-java-client/issues/250">Support for Apache http client v4.3 #250</a>" - */ -public class ApacheHttpTransport extends HttpTransport { - - private final HttpClient m_httpClient; - - public ApacheHttpTransport(HttpClient httpClient) { - m_httpClient = httpClient; - } - - public HttpClient getHttpClient() { - return m_httpClient; - } - - @Override - protected LowLevelHttpRequest buildRequest(String method, String url) throws IOException { - if (method == null) { - return null; - } - HttpRequestBase req; - if (HttpMethods.GET.equalsIgnoreCase(method)) { - req = new HttpGet(url); - } - else if (HttpMethods.POST.equalsIgnoreCase(method)) { - req = new HttpPost(url); - } - else if (HttpMethods.PUT.equalsIgnoreCase(method)) { - req = new HttpPut(url); - } - else if (HttpMethods.DELETE.equalsIgnoreCase(method)) { - req = new HttpDelete(url); - } - else if (HttpMethods.OPTIONS.equalsIgnoreCase(method)) { - req = new HttpOptions(url); - } - else if (HttpMethods.HEAD.equalsIgnoreCase(method)) { - req = new HttpHead(url); - } - else if (HttpMethods.PATCH.equalsIgnoreCase(method)) { - req = new HttpPatch(url); - } - else { - throw new UnsupportedOperationException("Unknown request method: " + method); - } - return createRequestInternal(req); - } - - protected ApacheHttpRequest createRequestInternal(HttpRequestBase req) { - return new ApacheHttpRequest(m_httpClient, req); - } - - @Override - public void shutdown() throws IOException { - HttpClient httpClient = getHttpClient(); - if (httpClient instanceof Closeable) { - ((Closeable) httpClient).close(); - } - } - -} 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 280424f752..4740e17346 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,10 +15,10 @@ <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:1.34.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> + <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.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:28.2-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" 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" /> @@ -27,43 +27,45 @@ <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: commons-codec:commons-codec:1.11" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-swing:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-anim:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-parser:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svg-dom:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-awt-util:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:xmlgraphics-commons:2.2" 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" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-anim:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-parser:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svg-dom:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-awt-util:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:xmlgraphics-commons:2.4" level="project" /> <orderEntry type="library" name="Maven: commons-io:commons-io:1.3.1" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-bridge:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-xml:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-css:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-dom:1.10" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-bridge:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-xml:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-css:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-dom:1.13" level="project" /> <orderEntry type="library" name="Maven: xalan:xalan:2.7.2" level="project" /> <orderEntry type="library" name="Maven: xalan:serializer:2.7.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-ext:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-gui-util:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-gvt:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-script:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-util:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-constants:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-i18n:1.10" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-ext:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-gui-util:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-gvt:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-script:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-shared-resources:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-util:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-constants:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-i18n:1.13" level="project" /> <orderEntry type="library" name="Maven: xml-apis:xml-apis-ext:1.3.04" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform.test" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> <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="library" name="Maven: org.mockito:mockito-core:2.23.4" level="project" /> - <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.3" level="project" /> - <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.3" level="project" /> - <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" /> - <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" /> + <orderEntry type="library" name="Maven: org.mockito:mockito-core:3.5.7" level="project" /> + <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.13" level="project" /> + <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.13" level="project" /> + <orderEntry type="library" name="Maven: org.objenesis:objenesis:3.1" level="project" /> + <orderEntry type="library" name="Maven: junit:junit:4.13" level="project" /> <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> </component> </module>
\ No newline at end of file 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 494b8dbaf7..878dc93607 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 @@ -12,17 +12,17 @@ <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.client" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> <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.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:1.34.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> + <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.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:28.2-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" 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" /> @@ -31,29 +31,31 @@ <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: commons-codec:commons-codec:1.11" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-swing:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-anim:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-parser:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svg-dom:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-awt-util:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:xmlgraphics-commons:2.2" 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" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-anim:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-parser:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svg-dom:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-awt-util:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:xmlgraphics-commons:2.4" level="project" /> <orderEntry type="library" name="Maven: commons-io:commons-io:1.3.1" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-bridge:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-xml:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-css:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-dom:1.10" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-bridge:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-xml:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-css:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-dom:1.13" level="project" /> <orderEntry type="library" name="Maven: xalan:xalan:2.7.2" level="project" /> <orderEntry type="library" name="Maven: xalan:serializer:2.7.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-ext:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-gui-util:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-gvt:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-script:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-util:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-constants:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-i18n:1.10" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-ext:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-gui-util:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-gvt:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-script:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-shared-resources:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-util:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-constants:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-i18n:1.13" level="project" /> <orderEntry type="library" name="Maven: xml-apis:xml-apis-ext:1.3.04" level="project" /> </component> </module>
\ No newline at end of file diff --git a/org.eclipse.scout.rt.svg.client/src/main/java/org/eclipse/scout/rt/svg/client/SVGUtility.java b/org.eclipse.scout.rt.svg.client/src/main/java/org/eclipse/scout/rt/svg/client/SVGUtility.java index fe94c4be79..5199665f60 100644 --- a/org.eclipse.scout.rt.svg.client/src/main/java/org/eclipse/scout/rt/svg/client/SVGUtility.java +++ b/org.eclipse.scout.rt.svg.client/src/main/java/org/eclipse/scout/rt/svg/client/SVGUtility.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2017 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -29,9 +29,9 @@ import org.apache.batik.bridge.BridgeContext; import org.apache.batik.bridge.DynamicGVTBuilder; import org.apache.batik.bridge.GVTBuilder; import org.apache.batik.bridge.UserAgentAdapter; +import org.apache.batik.constants.XMLConstants; import org.apache.batik.dom.svg.SVGOMRect; import org.apache.batik.util.SVGConstants; -import org.apache.batik.util.XMLConstants; import org.eclipse.scout.rt.platform.exception.ProcessingException; import org.eclipse.scout.rt.platform.util.StringUtility; import org.eclipse.scout.rt.platform.util.XmlUtility; @@ -221,8 +221,6 @@ public final class SVGUtility { * Set the text content of a text element, in case it contains newlines then add tspan elements. Requires the GVT tree * to be attached to the svg document. * - * @param textElement - * @param value * @param rowGap * in px */ @@ -279,7 +277,7 @@ public final class SVGUtility { } /** - * @param set + * @param textContent * the text content on a node by using the child text node. Use this instead of e.setTextContent to be * compatible with batik 1.6 (jdk 1.4) */ @@ -300,7 +298,7 @@ public final class SVGUtility { * is the {@link SVGTextContentElement} containing optional style and font information context for the * wrapping algorithm * @param text - * @param wordWrapWidth + * @param wordWrap * in px * @return the wrapped text with additional newline characters where it was wrapped. */ 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 bb660fbfbe..04750d7434 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 @@ -13,17 +13,17 @@ <orderEntry type="module" module-name="org.eclipse.scout.rt.svg.client" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.client" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> <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.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:1.34.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> + <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.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:28.2-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" 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" /> @@ -32,34 +32,36 @@ <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: commons-codec:commons-codec:1.11" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-swing:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-anim:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-parser:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svg-dom:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-awt-util:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:xmlgraphics-commons:2.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-bridge:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-xml:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-css:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-dom:1.10" 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" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-anim:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-parser:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svg-dom:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-awt-util:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:xmlgraphics-commons:2.4" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-bridge:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-xml:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-css:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-dom:1.13" level="project" /> <orderEntry type="library" name="Maven: xalan:xalan:2.7.2" level="project" /> <orderEntry type="library" name="Maven: xalan:serializer:2.7.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-ext:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-gui-util:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-gvt:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-script:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-util:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-constants:1.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-i18n:1.10" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-ext:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-gui-util:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-gvt:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-script:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-shared-resources:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-util:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-constants:1.13" level="project" /> + <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-i18n:1.13" level="project" /> <orderEntry type="library" name="Maven: xml-apis:xml-apis-ext:1.3.04" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.ui.html" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.server.commons" /> - <orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.3" level="project" /> + <orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.4" level="project" /> <orderEntry type="module" module-name="org.eclipse.scout.json" /> - <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" /> + <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" /> <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" /> <orderEntry type="module" module-name="eclipse-scout-core" /> </component> 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 e36a773134..7dfc83ccca 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,20 +15,21 @@ <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:1.34.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> + <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: 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: commons-codec:commons-codec:1.11" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" 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" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> <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="library" name="Maven: junit:junit:4.12" level="project" /> + <orderEntry type="library" name="Maven: junit:junit:4.13" level="project" /> <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-java:3.141.59" level="project" /> <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-api:3.141.59" level="project" /> 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 b84f19cca2..5c94c494b8 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,10 +15,10 @@ <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:1.34.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> + <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.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:28.2-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" 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" /> @@ -27,31 +27,32 @@ <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: commons-codec:commons-codec:1.11" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" level="project" /> - <orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.3" 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" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.client" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> <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.json" /> - <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" /> + <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" /> <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" /> <orderEntry type="module" module-name="eclipse-scout-core" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.client.test" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.shared.test" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform.test" /> - <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" /> + <orderEntry type="library" name="Maven: junit:junit:4.13" level="project" /> <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> - <orderEntry type="library" name="Maven: org.mockito:mockito-core:2.23.4" level="project" /> - <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.3" level="project" /> - <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.3" level="project" /> - <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" /> + <orderEntry type="library" name="Maven: org.mockito:mockito-core:3.5.7" level="project" /> + <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.13" level="project" /> + <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.13" level="project" /> + <orderEntry type="library" name="Maven: org.objenesis:objenesis:3.1" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> </component> </module>
\ No newline at end of file diff --git a/org.eclipse.scout.rt.ui.html.test/src/test/java/org/eclipse/scout/rt/ui/html/UiSessionTest.java b/org.eclipse.scout.rt.ui.html.test/src/test/java/org/eclipse/scout/rt/ui/html/UiSessionTest.java index 4d39468d72..4b49d0d95a 100644 --- a/org.eclipse.scout.rt.ui.html.test/src/test/java/org/eclipse/scout/rt/ui/html/UiSessionTest.java +++ b/org.eclipse.scout.rt.ui.html.test/src/test/java/org/eclipse/scout/rt/ui/html/UiSessionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2017 BSI Business Systems Integration AG. + * Copyright (c) 2010-2020 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -40,6 +40,7 @@ import org.eclipse.scout.rt.ui.html.UiHtmlConfigProperties.SessionStoreHousekeep import org.eclipse.scout.rt.ui.html.fixtures.SessionStoreTestForm; import org.eclipse.scout.rt.ui.html.fixtures.SessionStoreTestForm.CloseAction; import org.eclipse.scout.rt.ui.html.json.testing.JsonTestUtility; +import org.hamcrest.MatcherAssert; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -171,7 +172,7 @@ public class UiSessionTest { // register ui session in session store final ISessionStore sessionStore = BEANS.get(HttpSessionHelper.class).getSessionStore(httpSession); sessionStore.registerUiSession(uiSession); - assertThat(sessionStore, is(instanceOf(HttpSessionBindingListener.class))); + MatcherAssert.assertThat(sessionStore, is(instanceOf(HttpSessionBindingListener.class))); // create and start test form in a model job final SessionStoreTestForm form = ModelJobs.schedule(() -> { @@ -185,7 +186,7 @@ public class UiSessionTest { .awaitDoneAndGet(5, TimeUnit.SECONDS); // schedule a job that emulates servlet container that performs session invalidation on session timeout - IFuture<Void> appServerSessionTimeoutFuture = Jobs.schedule(() -> httpSession.invalidate(), Jobs.newInput() + IFuture<Void> appServerSessionTimeoutFuture = Jobs.schedule(httpSession::invalidate, Jobs.newInput() .withName("simulate session timeout") .withExecutionTrigger(Jobs .newExecutionTrigger() @@ -252,7 +253,7 @@ public class UiSessionTest { // register ui session in session store final ISessionStore sessionStore = BEANS.get(HttpSessionHelper.class).getSessionStore(httpSession); sessionStore.registerUiSession(uiSession); - assertThat(sessionStore, is(instanceOf(HttpSessionBindingListener.class))); + MatcherAssert.assertThat(sessionStore, is(instanceOf(HttpSessionBindingListener.class))); // create and start test form in a model job SessionStoreTestForm form = ModelJobs.schedule(() -> { 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 a8f62f38c0..0642ae14d3 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,10 +14,10 @@ <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:1.34.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> + <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.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:28.2-android" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" 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" /> @@ -26,18 +26,19 @@ <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: commons-codec:commons-codec:1.11" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" level="project" /> - <orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.3" 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" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.client" /> <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" /> - <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> <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.json" /> - <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" /> + <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" /> <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" /> <orderEntry type="module" module-name="eclipse-scout-core" /> </component> diff --git a/org.eclipse.scout.rt/pom.xml b/org.eclipse.scout.rt/pom.xml index 50b8953ca9..1ec052e859 100644 --- a/org.eclipse.scout.rt/pom.xml +++ b/org.eclipse.scout.rt/pom.xml @@ -15,7 +15,7 @@ <parent> <groupId>org.eclipse.scout</groupId> <artifactId>maven_rt_plugin_config-master</artifactId> - <version>3.12.7</version> + <version>3.12.8-SNAPSHOT</version> <relativePath/> </parent> @@ -97,14 +97,14 @@ <scout.base.version>11.0.0</scout.base.version> <base.version>${scout.base.version}</base.version> <org.eclipse.scout.rt.version>${project.version}</org.eclipse.scout.rt.version> - <jetty.version>9.4.30.v20200611</jetty.version> - <slf4j.version>1.7.25</slf4j.version> - <jackson.version>2.9.10</jackson.version> - <jackson-databind.version>2.9.10.3</jackson-databind.version> - <batik.version>1.10</batik.version> - <activemq.version>5.15.12</activemq.version> - <artemis.version>2.6.3</artemis.version> - <com.google.http-client.version>1.34.2</com.google.http-client.version> + <jetty.version>9.4.31.v20200723</jetty.version> + <slf4j.version>1.7.30</slf4j.version> + <jackson.version>2.11.2</jackson.version> + <jackson-databind.version>2.11.2</jackson-databind.version> + <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> <master_coverage_jacoco_destFile>${basedir}/../org.eclipse.scout.rt/target/jacoco-all.exec</master_coverage_jacoco_destFile> @@ -200,7 +200,7 @@ <dependency> <groupId>org.jboss</groupId> <artifactId>jandex</artifactId> - <version>2.0.5.Final</version> + <version>2.2.1.Final</version> </dependency> <dependency> @@ -547,13 +547,13 @@ <dependency> <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> - <version>1.3.3</version> + <version>1.4</version> </dependency> <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>1.11</version> + <version>1.14</version> </dependency> <dependency> @@ -588,14 +588,13 @@ <dependency> <groupId>jakarta.servlet</groupId> <artifactId>jakarta.servlet-api</artifactId> - <version>4.0.3</version> + <version>4.0.4</version> </dependency> <dependency> <groupId>jakarta.ws.rs</groupId> <artifactId>jakarta.ws.rs-api</artifactId> <version>2.1.6</version> - <!-- <type>bundle</type> FIXME imo needed? --> <exclusions> <exclusion> <groupId>jakarta.activation</groupId> @@ -618,19 +617,31 @@ <!-- Jersey (REST) --> <dependency> - <!-- must be compatible with the javax.ws.rs-api version (rs-api 2.0.x is implemented in Jersey 2.25.x, rs-api 2.1.x in Jersey 2.26+) --> + <!-- must be compatible with the jakarta.ws.rs-api version (rs-api 2.0.x is implemented in Jersey 2.25.x, rs-api 2.1.x in Jersey 2.26+) --> <groupId>org.glassfish.jersey</groupId> <artifactId>jersey-bom</artifactId> - <version>2.30.1</version> + <version>2.31</version> <type>pom</type> <scope>import</scope> </dependency> + <!-- Re-Specify dependency here to add exclusions even the version is already specified in the jersey-bom. --> + <dependency> + <groupId>org.glassfish.jersey.media</groupId> + <artifactId>jersey-media-json-jackson</artifactId> + <version>2.31</version> + <exclusions> + <exclusion> + <groupId>jakarta.activation</groupId> + <artifactId>jakarta.activation-api</artifactId> + </exclusion> + </exclusions> + </dependency> <!-- This is included in above org.glassfish.jersey:jersey-bom --> <dependency> <groupId>org.glassfish.jersey.connectors</groupId> <artifactId>jersey-apache-connector</artifactId> - <version>2.30.1</version> + <version>2.31</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -643,7 +654,7 @@ <!-- exclude javax.inject from hk2 because it contains these classes two times: once from javax.inject:javax.inject and once from org.glassfish.hk2.external:javax.inject --> <groupId>org.glassfish.jersey.inject</groupId> <artifactId>jersey-hk2</artifactId> - <version>2.30.1</version> + <version>2.31</version> </dependency> <!-- JAX-WS with METRO (not bundled with JRE) --> @@ -658,16 +669,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.glassfish.jaxb</groupId> - <artifactId>txw2</artifactId> - <version>${master_dependency_jaxws_version}</version> - </dependency> - <dependency> - <groupId>org.jvnet.mimepull</groupId> - <artifactId>mimepull</artifactId> - <version>1.9.10</version> - </dependency> <!-- Build Dependencies (Provided) --> <dependency> @@ -680,13 +681,13 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.12</version> + <version>4.13</version> </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>2.23.4</version> + <version>3.5.7</version> </dependency> <dependency> @@ -747,7 +748,7 @@ <dependency> <groupId>jakarta.jws</groupId> <artifactId>jakarta.jws-api</artifactId> - <version>1.1.1</version> + <version>2.1.0</version> </dependency> <dependency> <groupId>jakarta.xml.bind</groupId> @@ -867,6 +868,11 @@ <dependency> <groupId>com.google.http-client</groupId> + <artifactId>google-http-client-apache-v2</artifactId> + <version>${com.google.http-client.version}</version> + </dependency> + <dependency> + <groupId>com.google.http-client</groupId> <artifactId>google-http-client</artifactId> <version>${com.google.http-client.version}</version> </dependency> @@ -895,22 +901,11 @@ </exclusions> </dependency> - <!-- CXF contains mixed asm dependency versions: 5.2, 6.1 & 6.2 --> - <!-- Specify the desired version explicitly here so that always the same version is used --> - <dependency> - <groupId>org.ow2.asm</groupId> - <artifactId>asm-commons</artifactId> - <version>7.1</version> - </dependency> - <dependency> - <groupId>org.ow2.asm</groupId> - <artifactId>asm-tree</artifactId> - <version>7.1</version> - </dependency> + <!-- CXF does not specify the version of org.ow2.asm:asm. Therefore specify the desired version explicitly here --> <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm</artifactId> - <version>7.1</version> + <version>7.3.1</version> </dependency> </dependencies> </dependencyManagement> |
