Merge pull request #65 from PizzaFactory/prp-update-to-the-upstream

[Scheduled] Update to the upstream

assembly/assembly-che-tomcat/pom.xml

@@ -17,7 +17,7 @@
  <parent>
  <artifactId>che-assembly-parent</artifactId>
  <groupId>org.eclipse.che</groupId>
- <version>7.41.0-SNAPSHOT</version>
+ <version>7.42.0-SNAPSHOT</version>
  </parent>
  <artifactId>assembly-che-tomcat</artifactId>
  <packaging>jar</packaging>

assembly/assembly-main/pom.xml

@@ -17,7 +17,7 @@
  <parent>
  <artifactId>che-assembly-parent</artifactId>
  <groupId>org.eclipse.che</groupId>
- <version>7.41.0-SNAPSHOT</version>
+ <version>7.42.0-SNAPSHOT</version>
  </parent>
  <artifactId>assembly-main</artifactId>
  <packaging>pom</packaging>

assembly/assembly-root-war/pom.xml

@@ -17,7 +17,7 @@
  <parent>
  <artifactId>che-assembly-parent</artifactId>
  <groupId>org.eclipse.che</groupId>
- <version>7.41.0-SNAPSHOT</version>
+ <version>7.42.0-SNAPSHOT</version>
  </parent>
  <artifactId>assembly-root-war</artifactId>
  <packaging>war</packaging>

assembly/assembly-swagger-war/pom.xml

@@ -17,7 +17,7 @@
  <parent>
  <artifactId>che-assembly-parent</artifactId>
  <groupId>org.eclipse.che</groupId>
- <version>7.41.0-SNAPSHOT</version>
+ <version>7.42.0-SNAPSHOT</version>
  </parent>
  <artifactId>assembly-swagger-war</artifactId>
  <packaging>war</packaging>

assembly/assembly-wsmaster-war/.deps/EXCLUDED/prod.md

@@ -8,5 +8,10 @@ This file lists dependencies that do not need CQs or auto-detection does not wor
 | `org.jgroups.kubernetes/[email protected]` | [CQ20984](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=20984) |
 | `org.flywaydb/[email protected]` | [CQ14689](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=14689) |
 | `com.auth0/[email protected]` | [CQ23769](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=23769) |
-| `org.apache.tomcat/[email protected]` | [CQ23765](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=23765) |
-  
+| `io.swagger.core.v3/[email protected]` | Apache-2.0 clearlydefined |
+| `io.swagger.core.v3/[email protected]` | Apache-2.0 clearlydefined |
+| `io.swagger.core.v3/[email protected]` | Apache-2.0 clearlydefined |
+| `io.swagger.core.v3/[email protected]` | Apache-2.0 clearlydefined |
+| `io.swagger.core.v3/[email protected]` | Apache-2.0 clearlydefined |
+| `io.swagger.core.v3/[email protected]` | Apache-2.0 clearlydefined |
+

assembly/assembly-wsmaster-war/.deps/dev.md

@@ -2,14 +2,12 @@
 
 | Packages | License | Resolved CQs |
 | --- | --- | --- |
-| `antlr/[email protected]` | BSD-3-Clause | #148 |
 | `com.beust/[email protected]` | Apache-2.0 | [CQ22738](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=22738) |
 | `com.h2database/[email protected]` | EPL-1.0 | [CQ11693](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=11693) |
 | `net.bytebuddy/[email protected]` | Apache-2.0 | clearlydefined |
 | `net.bytebuddy/[email protected]` | Apache-2.0 | clearlydefined |
-| `org.antlr/[email protected]` | NOASSERTION | [CQ14504](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=14504) |
-| `org.antlr/[email protected]` | BSD-3-Clause | clearlydefined |
-| `org.antlr/[email protected]` | BSD-2-Clause | [CQ6759](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=6759) |
+| `org.antlr/[email protected]` | BSD-3-Clause | #1495 |
+| `org.antlr/[email protected]` | BSD-3-Clause | clearlydefined |
 | `org.eclipse.che.core/[email protected]` | EPL-2.0 | ecd.che |
 | `org.mockito/[email protected]` | MIT | clearlydefined |
 | `org.objenesis/[email protected]` | Apache-2.0 | clearlydefined |

assembly/assembly-wsmaster-war/.deps/problems.md

@@ -1,5 +1,3 @@
 # Dependency analysis
 
 ## UNRESOLVED Production dependencies
-
-1. `org.apache.tomcat/[email protected]`

assembly/assembly-wsmaster-war/.deps/prod.md

@@ -3,8 +3,8 @@
 | Packages | License | Resolved CQs |
 | --- | --- | --- |
 | `aopalliance/[email protected]` | LicenseRef-Public-Domain | [CQ2918](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=2918) |
-| `ch.qos.logback/[email protected].8` | EPL-1.0 | [CQ13636](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13636) |
-| `ch.qos.logback/[email protected].8` | EPL-1.0 | [CQ13635](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13635) |
+| `ch.qos.logback/[email protected].9` | EPL-1.0 | [CQ13636](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13636) |
+| `ch.qos.logback/[email protected].9` | EPL-1.0 | [CQ13635](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13635) |
 | `com.auth0/[email protected]` | NOASSERTION | [CQ23769](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=23769) |
 | `com.fasterxml.jackson.core/[email protected]` | Apache-2.0 | [CQ23491](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=23491) |
 | `com.fasterxml.jackson.core/[email protected]` | Apache-2.0 | [CQ23092](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=23092) |
@@ -25,7 +25,7 @@
 | `com.google.j2objc/[email protected]` | Apache-2.0 | [CQ21195](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=21195) |
 | `com.google.oauth-client/[email protected]` | Apache-2.0 | clearlydefined |
 | `com.ibm.icu/[email protected]` | NOASSERTION | [CQ23669](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=23654) |
-| `com.jcraft/[email protected].54` | BSD-2-Clause | [CQ12480](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12480) |
+| `com.jcraft/[email protected].55` | BSD-3-Clause | [CQ19435](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19435) |
 | `com.squareup.okhttp3/[email protected]` | Apache-2.0 | clearlydefined |
 | `com.squareup.okhttp3/[email protected]` | Apache-2.0 | [CQ19549](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19549) |
 | `com.squareup.okio/[email protected]` | Apache-2.0 | [CQ20187](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=20187) |
@@ -95,21 +95,20 @@
 | `io.prometheus/[email protected]` | Apache-2.0 | clearlydefined |
 | `io.prometheus/[email protected]` | Apache-2.0 | clearlydefined |
 | `io.prometheus/[email protected]` | Apache-2.0 | clearlydefined |
-| `io.swagger.core.v3/[email protected].10` | Apache-2.0 | clearlydefined |
-| `io.swagger.core.v3/[email protected].10` | Apache-2.0 | clearlydefined |
-| `io.swagger.core.v3/[email protected].10` | Apache-2.0 | clearlydefined |
-| `io.swagger.core.v3/[email protected].10` | Apache-2.0 | clearlydefined |
-| `io.swagger.core.v3/[email protected].10` | Apache-2.0 | clearlydefined |
+| `io.swagger.core.v3/[email protected].11` | - | Apache-2.0 clearlydefined |
+| `io.swagger.core.v3/[email protected].11` | - | Apache-2.0 clearlydefined |
+| `io.swagger.core.v3/[email protected].11` | - | Apache-2.0 clearlydefined |
+| `io.swagger.core.v3/[email protected].11` | - | Apache-2.0 clearlydefined |
+| `io.swagger.core.v3/[email protected].11` | - | Apache-2.0 clearlydefined |
 | `jakarta.activation/[email protected]` | EPL-2.0 OR BSD-3-Clause OR GPL-2.0-with-classpath-exception | ee4j.jaf |
 | `jakarta.annotation/[email protected]` | EPL-2.0 OR GPL-2.0-with-classpath-exception | ee4j.ca |
-| `jakarta.inject/[email protected].3` | - | eclipse |
+| `jakarta.inject/[email protected].5` | - | eclipse |
 | `jakarta.servlet/[email protected]` | EPL-2.0 OR GPL-2.0-with-classpath-exception | ee4j.servlet |
 | `jakarta.validation/[email protected]` | EPL-1.0 | modeling.emf.validation |
 | `jakarta.websocket/[email protected]` | EPL-2.0 OR GPL-2.0-with-classpath-exception | ee4j.websocket |
 | `jakarta.ws.rs/[email protected]` | EPL-2.0 OR GPL-2.0-with-classpath-exception | ee4j.jaxrs |
 | `jakarta.xml.bind/[email protected]` | BSD-3-Clause | ee4j.jaxb |
-| `net.java.dev.jna/[email protected]` | Apache-2.0 | [CQ9291](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=9291) |
-| `net.logstash.logback/[email protected]` | Apache-2.0 | clearlydefined |
+| `net.logstash.logback/[email protected]` | Apache-2.0 | clearlydefined |
 | `org.apache.commons/[email protected]` | Apache-2.0 | clearlydefined |
 | `org.apache.httpcomponents/[email protected]` | Apache-2.0 | [CQ23528](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=23528) |
 | `org.apache.thrift/[email protected]` | Apache-2.0 | clearlydefined |
@@ -120,7 +119,7 @@
 | `org.apache.tomcat/[email protected]` | Apache-2.0 | clearlydefined |
 | `org.apache.tomcat/[email protected]` | Apache-2.0 | clearlydefined |
 | `org.apache.tomcat/[email protected]` | Apache-2.0 | clearlydefined |
-| `org.apache.tomcat/[email protected]` | - |  [CQ23765](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=23765) |
+| `org.apache.tomcat/[email protected]` | Apache-2.0 | clearlydefined |
 | `org.apache.tomcat/[email protected]` | Apache-2.0 | clearlydefined |
 | `org.apache.tomcat/[email protected]` | Apache-2.0 | clearlydefined |
 | `org.apache.tomcat/[email protected]` | Apache-2.0 AND (EPL-2.0 OR GPL-2.0-with-classpath-exception) | #921 |

assembly/assembly-wsmaster-war/pom.xml

@@ -17,7 +17,7 @@
  <parent>
  <artifactId>che-assembly-parent</artifactId>
  <groupId>org.eclipse.che</groupId>
- <version>7.41.0-SNAPSHOT</version>
+ <version>7.42.0-SNAPSHOT</version>
  </parent>
  <artifactId>assembly-wsmaster-war</artifactId>
  <packaging>war</packaging>

assembly/assembly-wsmaster-war/src/test/java/org/eclipse/che/integration/IntegrityConfigurationTest.java

@@ -134,41 +134,31 @@ public void shouldNotDeclareUnused() {
  new MethodAnnotationsScanner());
  Set<String> parameters = new HashSet<>();
  parameters.addAll(
- reflections
- .getConstructorsWithAnyParamAnnotated(Named.class)
- .stream()
+ reflections.getConstructorsWithAnyParamAnnotated(Named.class).stream()
  .flatMap(c -> Stream.of(c.getParameters()))
  .filter(p -> p.isAnnotationPresent(Named.class))
  .map(p -> p.getAnnotation(Named.class).value())
  .collect(Collectors.toSet()));
 
  parameters.addAll(
- reflections
- .getFieldsAnnotatedWith(Named.class)
- .stream()
+ reflections.getFieldsAnnotatedWith(Named.class).stream()
  .filter(f -> f.isAnnotationPresent(Named.class))
  .map(f -> f.getAnnotation(Named.class).value())
  .collect(Collectors.toSet()));
 
  parameters.addAll(
- reflections
- .getMethodsAnnotatedWith(ScheduleDelay.class)
- .stream()
+ reflections.getMethodsAnnotatedWith(ScheduleDelay.class).stream()
  .filter(m -> m.isAnnotationPresent(ScheduleDelay.class))
  .map(m -> m.getAnnotation(ScheduleDelay.class).delayParameterName())
  .collect(Collectors.toSet()));
  parameters.addAll(
- reflections
- .getMethodsAnnotatedWith(ScheduleDelay.class)
- .stream()
+ reflections.getMethodsAnnotatedWith(ScheduleDelay.class).stream()
  .filter(m -> m.isAnnotationPresent(ScheduleDelay.class))
  .map(m -> m.getAnnotation(ScheduleDelay.class).initialDelayParameterName())
  .collect(Collectors.toSet()));
 
  Set<String> unusedDeclaredConfigurationParameters =
- getProperties(new File(Resources.getResource("che").getPath()))
- .keySet()
- .stream()
+ getProperties(new File(Resources.getResource("che").getPath())).keySet().stream()
  .filter(k -> !parameters.contains(k))
  .collect(Collectors.toSet());
  Assert.assertTrue(

assembly/pom.xml

@@ -17,7 +17,7 @@
  <parent>
  <artifactId>che-server</artifactId>
  <groupId>org.eclipse.che</groupId>
- <version>7.41.0-SNAPSHOT</version>
+ <version>7.42.0-SNAPSHOT</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
  <artifactId>che-assembly-parent</artifactId>

core/che-core-api-core/pom.xml

@@ -17,7 +17,7 @@
  <parent>
  <artifactId>che-core-parent</artifactId>
  <groupId>org.eclipse.che.core</groupId>
- <version>7.41.0-SNAPSHOT</version>
+ <version>7.42.0-SNAPSHOT</version>
  </parent>
  <artifactId>che-core-api-core</artifactId>
  <packaging>jar</packaging>
@@ -63,10 +63,6 @@
  <groupId>jakarta.ws.rs</groupId>
  <artifactId>jakarta.ws.rs-api</artifactId>
  </dependency>
- <dependency>
- <groupId>net.java.dev.jna</groupId>
- <artifactId>jna</artifactId>
- </dependency>
  <dependency>
  <groupId>org.eclipse.che.core</groupId>
  <artifactId>che-core-api-dto</artifactId>

core/che-core-api-core/src/main/java/org/eclipse/che/api/core/jsonrpc/impl/ServerSideRequestProcessorConfigurator.java

@@ -29,8 +29,7 @@ public class ServerSideRequestProcessorConfigurator
  public ServerSideRequestProcessorConfigurator(
  Set<RequestProcessorConfigurationProvider.Configuration> configurations) {
  this.configurations =
- configurations
- .stream()
+ configurations.stream()
  .collect(Collectors.toMap(Configuration::getEndpointId, Function.identity()));
  }
 

core/che-core-api-core/src/main/java/org/eclipse/che/api/core/notification/RemoteSubscriptionManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2018 Red Hat, Inc.
+ * Copyright (c) 2012-2021 Red Hat, Inc.
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
  * which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -60,9 +60,7 @@ public <T> void register(
  String method, Class<T> eventType, BiPredicate<T, Map<String, String>> biPredicate) {
  eventService.subscribe(
  event ->
- remoteSubscriptionStorage
- .getByMethod(method)
- .stream()
+ remoteSubscriptionStorage.getByMethod(method).stream()
  .filter(context -> biPredicate.test(event, context.getScope()))
  .forEach(context -> transmit(context.getEndpointId(), method, event)),
  eventType);

core/che-core-api-core/src/main/java/org/eclipse/che/api/core/rest/ApiInfoService.java

@@ -46,9 +46,7 @@ public ApiInfo info() {
  public RootResourcesList listJSON(@Context ServletContext context) {
  ResourceBinder binder = (ResourceBinder) context.getAttribute(ResourceBinder.class.getName());
  return new RootResourcesList(
- binder
- .getResources()
- .stream()
+ binder.getResources().stream()
  .map(
  new Function<ObjectFactory<ResourceDescriptor>, RootResource>() {
  @Nullable

core/che-core-api-core/src/main/java/org/eclipse/che/api/core/rest/DefaultHttpJsonResponse.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2018 Red Hat, Inc.
+ * Copyright (c) 2012-2021 Red Hat, Inc.
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
  * which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -51,9 +51,7 @@ protected DefaultHttpJsonResponse(
  this.responseCode = responseCode;
  this.headers =
  unmodifiableMap(
- headers
- .entrySet()
- .stream()
+ headers.entrySet().stream()
  .collect(Collectors.toMap(Map.Entry::getKey, e -> unmodifiableList(e.getValue()))));
  }
 

core/che-core-api-core/src/main/java/org/eclipse/che/api/core/util/JsonRpcEndpointIdsHolder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2018 Red Hat, Inc.
+ * Copyright (c) 2012-2021 Red Hat, Inc.
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
  * which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -55,9 +55,7 @@ private void configureUnSubscribeHandler(RequestHandlerConfigurator configurator
  }
 
  public Set<String> getEndpointIdsByWorkspaceId(String workspaceId) {
- return endpointIds
- .entrySet()
- .stream()
+ return endpointIds.entrySet().stream()
  .filter(it -> it.getValue().contains(workspaceId))
  .map(Map.Entry::getKey)
  .collect(toSet());

core/che-core-api-core/src/main/java/org/eclipse/che/api/core/util/JsonRpcEndpointToMachineNameHolder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2018 Red Hat, Inc.
+ * Copyright (c) 2012-2021 Red Hat, Inc.
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
  * which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -55,9 +55,7 @@ private void configureUnSubscribeHandler(RequestHandlerConfigurator configurator
  }
 
  public Set<String> getEndpointIdsByWorkspaceIdPlusMachineName(String workspaceIdPlusMachineName) {
- return endpointIds
- .entrySet()
- .stream()
+ return endpointIds.entrySet().stream()
  .filter(it -> it.getValue().contains(workspaceIdPlusMachineName))
  .map(Map.Entry::getKey)
  .collect(toSet());