Skip to content

Commit cd15e85

Browse files
monakamonaka
authored
Merge pull request #65 from PizzaFactory/prp-update-to-the-upstream
[Scheduled] Update to the upstream
2 parents 563822d + 9d6d530 commit cd15e85

File tree

257 files changed

+411
-1430
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

257 files changed

+411
-1430
lines changed

Diff for: ‎assembly/assembly-che-tomcat/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<artifactId>che-assembly-parent</artifactId>
1919
<groupId>org.eclipse.che</groupId>
20-
<version>7.41.0-SNAPSHOT</version>
20+
<version>7.42.0-SNAPSHOT</version>
2121
</parent>
2222
<artifactId>assembly-che-tomcat</artifactId>
2323
<packaging>jar</packaging>

Diff for: ‎assembly/assembly-main/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<artifactId>che-assembly-parent</artifactId>
1919
<groupId>org.eclipse.che</groupId>
20-
<version>7.41.0-SNAPSHOT</version>
20+
<version>7.42.0-SNAPSHOT</version>
2121
</parent>
2222
<artifactId>assembly-main</artifactId>
2323
<packaging>pom</packaging>

Diff for: ‎assembly/assembly-root-war/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<artifactId>che-assembly-parent</artifactId>
1919
<groupId>org.eclipse.che</groupId>
20-
<version>7.41.0-SNAPSHOT</version>
20+
<version>7.42.0-SNAPSHOT</version>
2121
</parent>
2222
<artifactId>assembly-root-war</artifactId>
2323
<packaging>war</packaging>

Diff for: ‎assembly/assembly-swagger-war/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<artifactId>che-assembly-parent</artifactId>
1919
<groupId>org.eclipse.che</groupId>
20-
<version>7.41.0-SNAPSHOT</version>
20+
<version>7.42.0-SNAPSHOT</version>
2121
</parent>
2222
<artifactId>assembly-swagger-war</artifactId>
2323
<packaging>war</packaging>

Diff for: ‎assembly/assembly-wsmaster-war/.deps/EXCLUDED/prod.md

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

Diff for: ‎assembly/assembly-wsmaster-war/.deps/dev.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@
22

33
| Packages | License | Resolved CQs |
44
| --- | --- | --- |
5-
| `antlr/[email protected]` | BSD-3-Clause | #148 |
65
| `com.beust/[email protected]` | Apache-2.0 | [CQ22738](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=22738) |
76
| `com.h2database/[email protected]` | EPL-1.0 | [CQ11693](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=11693) |
87
| `net.bytebuddy/[email protected]` | Apache-2.0 | clearlydefined |
98
| `net.bytebuddy/[email protected]` | Apache-2.0 | clearlydefined |
10-
| `org.antlr/[email protected]` | NOASSERTION | [CQ14504](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=14504) |
11-
| `org.antlr/[email protected]` | BSD-3-Clause | clearlydefined |
12-
| `org.antlr/[email protected]` | BSD-2-Clause | [CQ6759](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=6759) |
9+
| `org.antlr/[email protected]` | BSD-3-Clause | #1495 |
10+
| `org.antlr/[email protected]` | BSD-3-Clause | clearlydefined |
1311
| `org.eclipse.che.core/[email protected]` | EPL-2.0 | ecd.che |
1412
| `org.mockito/[email protected]` | MIT | clearlydefined |
1513
| `org.objenesis/[email protected]` | Apache-2.0 | clearlydefined |

Diff for: ‎assembly/assembly-wsmaster-war/.deps/problems.md

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
# Dependency analysis
22

33
## UNRESOLVED Production dependencies
4-
5-
1. `org.apache.tomcat/[email protected]`

Diff for: ‎assembly/assembly-wsmaster-war/.deps/prod.md

+11-12
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
| Packages | License | Resolved CQs |
44
| --- | --- | --- |
55
| `aopalliance/[email protected]` | LicenseRef-Public-Domain | [CQ2918](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=2918) |
6-
| `ch.qos.logback/[email protected].8` | EPL-1.0 | [CQ13636](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13636) |
7-
| `ch.qos.logback/[email protected].8` | EPL-1.0 | [CQ13635](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13635) |
6+
| `ch.qos.logback/[email protected].9` | EPL-1.0 | [CQ13636](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13636) |
7+
| `ch.qos.logback/[email protected].9` | EPL-1.0 | [CQ13635](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13635) |
88
| `com.auth0/[email protected]` | NOASSERTION | [CQ23769](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=23769) |
99
| `com.fasterxml.jackson.core/[email protected]` | Apache-2.0 | [CQ23491](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=23491) |
1010
| `com.fasterxml.jackson.core/[email protected]` | Apache-2.0 | [CQ23092](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=23092) |
@@ -25,7 +25,7 @@
2525
| `com.google.j2objc/[email protected]` | Apache-2.0 | [CQ21195](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=21195) |
2626
| `com.google.oauth-client/[email protected]` | Apache-2.0 | clearlydefined |
2727
| `com.ibm.icu/[email protected]` | NOASSERTION | [CQ23669](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=23654) |
28-
| `com.jcraft/[email protected].54` | BSD-2-Clause | [CQ12480](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12480) |
28+
| `com.jcraft/[email protected].55` | BSD-3-Clause | [CQ19435](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19435) |
2929
| `com.squareup.okhttp3/[email protected]` | Apache-2.0 | clearlydefined |
3030
| `com.squareup.okhttp3/[email protected]` | Apache-2.0 | [CQ19549](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19549) |
3131
| `com.squareup.okio/[email protected]` | Apache-2.0 | [CQ20187](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=20187) |
@@ -95,21 +95,20 @@
9595
| `io.prometheus/[email protected]` | Apache-2.0 | clearlydefined |
9696
| `io.prometheus/[email protected]` | Apache-2.0 | clearlydefined |
9797
| `io.prometheus/[email protected]` | Apache-2.0 | clearlydefined |
98-
| `io.swagger.core.v3/[email protected].10` | Apache-2.0 | clearlydefined |
99-
| `io.swagger.core.v3/[email protected].10` | Apache-2.0 | clearlydefined |
100-
| `io.swagger.core.v3/[email protected].10` | Apache-2.0 | clearlydefined |
101-
| `io.swagger.core.v3/[email protected].10` | Apache-2.0 | clearlydefined |
102-
| `io.swagger.core.v3/[email protected].10` | Apache-2.0 | clearlydefined |
98+
| `io.swagger.core.v3/[email protected].11` | - | Apache-2.0 clearlydefined |
99+
| `io.swagger.core.v3/[email protected].11` | - | Apache-2.0 clearlydefined |
100+
| `io.swagger.core.v3/[email protected].11` | - | Apache-2.0 clearlydefined |
101+
| `io.swagger.core.v3/[email protected].11` | - | Apache-2.0 clearlydefined |
102+
| `io.swagger.core.v3/[email protected].11` | - | Apache-2.0 clearlydefined |
103103
| `jakarta.activation/[email protected]` | EPL-2.0 OR BSD-3-Clause OR GPL-2.0-with-classpath-exception | ee4j.jaf |
104104
| `jakarta.annotation/[email protected]` | EPL-2.0 OR GPL-2.0-with-classpath-exception | ee4j.ca |
105-
| `jakarta.inject/[email protected].3` | - | eclipse |
105+
| `jakarta.inject/[email protected].5` | - | eclipse |
106106
| `jakarta.servlet/[email protected]` | EPL-2.0 OR GPL-2.0-with-classpath-exception | ee4j.servlet |
107107
| `jakarta.validation/[email protected]` | EPL-1.0 | modeling.emf.validation |
108108
| `jakarta.websocket/[email protected]` | EPL-2.0 OR GPL-2.0-with-classpath-exception | ee4j.websocket |
109109
| `jakarta.ws.rs/[email protected]` | EPL-2.0 OR GPL-2.0-with-classpath-exception | ee4j.jaxrs |
110110
| `jakarta.xml.bind/[email protected]` | BSD-3-Clause | ee4j.jaxb |
111-
| `net.java.dev.jna/[email protected]` | Apache-2.0 | [CQ9291](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=9291) |
112-
| `net.logstash.logback/[email protected]` | Apache-2.0 | clearlydefined |
111+
| `net.logstash.logback/[email protected]` | Apache-2.0 | clearlydefined |
113112
| `org.apache.commons/[email protected]` | Apache-2.0 | clearlydefined |
114113
| `org.apache.httpcomponents/[email protected]` | Apache-2.0 | [CQ23528](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=23528) |
115114
| `org.apache.thrift/[email protected]` | Apache-2.0 | clearlydefined |
@@ -120,7 +119,7 @@
120119
| `org.apache.tomcat/[email protected]` | Apache-2.0 | clearlydefined |
121120
| `org.apache.tomcat/[email protected]` | Apache-2.0 | clearlydefined |
122121
| `org.apache.tomcat/[email protected]` | Apache-2.0 | clearlydefined |
123-
| `org.apache.tomcat/[email protected]` | - | [CQ23765](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=23765) |
122+
| `org.apache.tomcat/[email protected]` | Apache-2.0 | clearlydefined |
124123
| `org.apache.tomcat/[email protected]` | Apache-2.0 | clearlydefined |
125124
| `org.apache.tomcat/[email protected]` | Apache-2.0 | clearlydefined |
126125
| `org.apache.tomcat/[email protected]` | Apache-2.0 AND (EPL-2.0 OR GPL-2.0-with-classpath-exception) | #921 |

Diff for: ‎assembly/assembly-wsmaster-war/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<artifactId>che-assembly-parent</artifactId>
1919
<groupId>org.eclipse.che</groupId>
20-
<version>7.41.0-SNAPSHOT</version>
20+
<version>7.42.0-SNAPSHOT</version>
2121
</parent>
2222
<artifactId>assembly-wsmaster-war</artifactId>
2323
<packaging>war</packaging>

Diff for: ‎assembly/assembly-wsmaster-war/src/test/java/org/eclipse/che/integration/IntegrityConfigurationTest.java

+5-15
Original file line numberDiff line numberDiff line change
@@ -134,41 +134,31 @@ public void shouldNotDeclareUnused() {
134134
new MethodAnnotationsScanner());
135135
Set<String> parameters = new HashSet<>();
136136
parameters.addAll(
137-
reflections
138-
.getConstructorsWithAnyParamAnnotated(Named.class)
139-
.stream()
137+
reflections.getConstructorsWithAnyParamAnnotated(Named.class).stream()
140138
.flatMap(c -> Stream.of(c.getParameters()))
141139
.filter(p -> p.isAnnotationPresent(Named.class))
142140
.map(p -> p.getAnnotation(Named.class).value())
143141
.collect(Collectors.toSet()));
144142

145143
parameters.addAll(
146-
reflections
147-
.getFieldsAnnotatedWith(Named.class)
148-
.stream()
144+
reflections.getFieldsAnnotatedWith(Named.class).stream()
149145
.filter(f -> f.isAnnotationPresent(Named.class))
150146
.map(f -> f.getAnnotation(Named.class).value())
151147
.collect(Collectors.toSet()));
152148

153149
parameters.addAll(
154-
reflections
155-
.getMethodsAnnotatedWith(ScheduleDelay.class)
156-
.stream()
150+
reflections.getMethodsAnnotatedWith(ScheduleDelay.class).stream()
157151
.filter(m -> m.isAnnotationPresent(ScheduleDelay.class))
158152
.map(m -> m.getAnnotation(ScheduleDelay.class).delayParameterName())
159153
.collect(Collectors.toSet()));
160154
parameters.addAll(
161-
reflections
162-
.getMethodsAnnotatedWith(ScheduleDelay.class)
163-
.stream()
155+
reflections.getMethodsAnnotatedWith(ScheduleDelay.class).stream()
164156
.filter(m -> m.isAnnotationPresent(ScheduleDelay.class))
165157
.map(m -> m.getAnnotation(ScheduleDelay.class).initialDelayParameterName())
166158
.collect(Collectors.toSet()));
167159

168160
Set<String> unusedDeclaredConfigurationParameters =
169-
getProperties(new File(Resources.getResource("che").getPath()))
170-
.keySet()
171-
.stream()
161+
getProperties(new File(Resources.getResource("che").getPath())).keySet().stream()
172162
.filter(k -> !parameters.contains(k))
173163
.collect(Collectors.toSet());
174164
Assert.assertTrue(

Diff for: ‎assembly/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<artifactId>che-server</artifactId>
1919
<groupId>org.eclipse.che</groupId>
20-
<version>7.41.0-SNAPSHOT</version>
20+
<version>7.42.0-SNAPSHOT</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>che-assembly-parent</artifactId>

Diff for: ‎core/che-core-api-core/pom.xml

+1-5
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<artifactId>che-core-parent</artifactId>
1919
<groupId>org.eclipse.che.core</groupId>
20-
<version>7.41.0-SNAPSHOT</version>
20+
<version>7.42.0-SNAPSHOT</version>
2121
</parent>
2222
<artifactId>che-core-api-core</artifactId>
2323
<packaging>jar</packaging>
@@ -63,10 +63,6 @@
6363
<groupId>jakarta.ws.rs</groupId>
6464
<artifactId>jakarta.ws.rs-api</artifactId>
6565
</dependency>
66-
<dependency>
67-
<groupId>net.java.dev.jna</groupId>
68-
<artifactId>jna</artifactId>
69-
</dependency>
7066
<dependency>
7167
<groupId>org.eclipse.che.core</groupId>
7268
<artifactId>che-core-api-dto</artifactId>

Diff for: ‎core/che-core-api-core/src/main/java/org/eclipse/che/api/core/jsonrpc/impl/ServerSideRequestProcessorConfigurator.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ public class ServerSideRequestProcessorConfigurator
2929
public ServerSideRequestProcessorConfigurator(
3030
Set<RequestProcessorConfigurationProvider.Configuration> configurations) {
3131
this.configurations =
32-
configurations
33-
.stream()
32+
configurations.stream()
3433
.collect(Collectors.toMap(Configuration::getEndpointId, Function.identity()));
3534
}
3635

Diff for: ‎core/che-core-api-core/src/main/java/org/eclipse/che/api/core/notification/RemoteSubscriptionManager.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012-2018 Red Hat, Inc.
2+
* Copyright (c) 2012-2021 Red Hat, Inc.
33
* This program and the accompanying materials are made
44
* available under the terms of the Eclipse Public License 2.0
55
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -60,9 +60,7 @@ public <T> void register(
6060
String method, Class<T> eventType, BiPredicate<T, Map<String, String>> biPredicate) {
6161
eventService.subscribe(
6262
event ->
63-
remoteSubscriptionStorage
64-
.getByMethod(method)
65-
.stream()
63+
remoteSubscriptionStorage.getByMethod(method).stream()
6664
.filter(context -> biPredicate.test(event, context.getScope()))
6765
.forEach(context -> transmit(context.getEndpointId(), method, event)),
6866
eventType);

Diff for: ‎core/che-core-api-core/src/main/java/org/eclipse/che/api/core/rest/ApiInfoService.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@ public ApiInfo info() {
4646
public RootResourcesList listJSON(@Context ServletContext context) {
4747
ResourceBinder binder = (ResourceBinder) context.getAttribute(ResourceBinder.class.getName());
4848
return new RootResourcesList(
49-
binder
50-
.getResources()
51-
.stream()
49+
binder.getResources().stream()
5250
.map(
5351
new Function<ObjectFactory<ResourceDescriptor>, RootResource>() {
5452
@Nullable

Diff for: ‎core/che-core-api-core/src/main/java/org/eclipse/che/api/core/rest/DefaultHttpJsonResponse.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012-2018 Red Hat, Inc.
2+
* Copyright (c) 2012-2021 Red Hat, Inc.
33
* This program and the accompanying materials are made
44
* available under the terms of the Eclipse Public License 2.0
55
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -51,9 +51,7 @@ protected DefaultHttpJsonResponse(
5151
this.responseCode = responseCode;
5252
this.headers =
5353
unmodifiableMap(
54-
headers
55-
.entrySet()
56-
.stream()
54+
headers.entrySet().stream()
5755
.collect(Collectors.toMap(Map.Entry::getKey, e -> unmodifiableList(e.getValue()))));
5856
}
5957

Diff for: ‎core/che-core-api-core/src/main/java/org/eclipse/che/api/core/util/CancellableProcessWrapper.java

-39
This file was deleted.

Diff for: ‎core/che-core-api-core/src/main/java/org/eclipse/che/api/core/util/DefaultProcessManager.java

-51
This file was deleted.

Diff for: ‎core/che-core-api-core/src/main/java/org/eclipse/che/api/core/util/JsonRpcEndpointIdsHolder.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012-2018 Red Hat, Inc.
2+
* Copyright (c) 2012-2021 Red Hat, Inc.
33
* This program and the accompanying materials are made
44
* available under the terms of the Eclipse Public License 2.0
55
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -55,9 +55,7 @@ private void configureUnSubscribeHandler(RequestHandlerConfigurator configurator
5555
}
5656

5757
public Set<String> getEndpointIdsByWorkspaceId(String workspaceId) {
58-
return endpointIds
59-
.entrySet()
60-
.stream()
58+
return endpointIds.entrySet().stream()
6159
.filter(it -> it.getValue().contains(workspaceId))
6260
.map(Map.Entry::getKey)
6361
.collect(toSet());

Diff for: ‎core/che-core-api-core/src/main/java/org/eclipse/che/api/core/util/JsonRpcEndpointToMachineNameHolder.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012-2018 Red Hat, Inc.
2+
* Copyright (c) 2012-2021 Red Hat, Inc.
33
* This program and the accompanying materials are made
44
* available under the terms of the Eclipse Public License 2.0
55
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -55,9 +55,7 @@ private void configureUnSubscribeHandler(RequestHandlerConfigurator configurator
5555
}
5656

5757
public Set<String> getEndpointIdsByWorkspaceIdPlusMachineName(String workspaceIdPlusMachineName) {
58-
return endpointIds
59-
.entrySet()
60-
.stream()
58+
return endpointIds.entrySet().stream()
6159
.filter(it -> it.getValue().contains(workspaceIdPlusMachineName))
6260
.map(Map.Entry::getKey)
6361
.collect(toSet());

0 commit comments

Comments
 (0)