File tree Expand file tree Collapse file tree
examples/org.eclipse.glsp.example.workflow
plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/di Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -2,7 +2,7 @@ pipeline {
22 agent any
33 tools {
44 maven ' apache-maven-latest'
5- jdk ' openjdk-jdk11 -latest'
5+ jdk ' openjdk-jdk17 -latest'
66 }
77
88 environment {
@@ -74,6 +74,11 @@ pipeline {
7474 }
7575 }
7676 }
77+ stage(' Trigger Java11 build' ) {
78+ steps {
79+ build wait : false , job : ' glsp-server-java11'
80+ }
81+ }
7782 }
7883 }
7984 }
Original file line number Diff line number Diff line change 140140 <artifactSet >
141141 <excludes >
142142 <exclude >jakarta.websocket:jakarta.websocket-api</exclude >
143+ <exclude >javax.websocket:javax.websocket-api</exclude >
143144 <exclude >log4j:log4j</exclude >
144145 </excludes >
145146 </artifactSet >
151152 <exclude >META-INF/DEPENDENCIES</exclude >
152153 <exclude >META-INF/ECLIPSE_*</exclude >
153154 <exclude >META-INF/LICENSE*</exclude >
155+ <exclude >META-INF/services/javax.servlet.ServletContainerInitializer</exclude >
154156 <exclude >META-INF/services/jakarta.servlet.ServletContainerInitializer*</exclude >
155157 <exclude >META-INF/services/org.eclipse.jetty.webapp.Configuration*</exclude >
156158 <exclude >META-INF/services/org.eclipse.elk.core.data.ILayoutMetaDataProvider*</exclude >
Original file line number Diff line number Diff line change 2323import java .lang .annotation .Retention ;
2424import java .lang .annotation .Target ;
2525
26- import javax . inject .Qualifier ;
26+ import com . google . inject .BindingAnnotation ;
2727
2828/**
2929 * Helper annotation that is used for injecting the client id string into classes of diagram session (client session)
3737 * private String diagramType;
3838 * </pre>
3939 */
40- @ Qualifier
4140@ Target ({ FIELD , PARAMETER , METHOD })
4241@ Retention (RUNTIME )
42+ @ BindingAnnotation
4343public @interface ClientId {}
Original file line number Diff line number Diff line change 11/********************************************************************************
2- * Copyright (c) 2021-2022 EclipseSource and others.
2+ * Copyright (c) 2021-2023 EclipseSource and others.
33 *
44 * This program and the accompanying materials are made available under the
55 * terms of the Eclipse Public License v. 2.0 which is available at
2323import java .lang .annotation .Retention ;
2424import java .lang .annotation .Target ;
2525
26- import javax . inject .Qualifier ;
26+ import com . google . inject .BindingAnnotation ;
2727
2828/**
2929 * Helper annotation that is used for injecting the diagram type string into classes of diagram session (client session)
3838 * </pre>
3939 *
4040 */
41- @ Qualifier
4241@ Target ({ FIELD , PARAMETER , METHOD })
4342@ Retention (RUNTIME )
43+ @ BindingAnnotation
4444public @interface DiagramType {}
Original file line number Diff line number Diff line change 297297 <groupId >org.apache.maven.plugins</groupId >
298298 <artifactId >maven-source-plugin</artifactId >
299299 <version >${maven.source.version} </version >
300- <configuration >
301- <argLine >
302- --illegal-access=permit
303- </argLine >
304- </configuration >
305300 <executions >
306301 <execution >
307302 <id >attach-sources</id >
316311 <groupId >org.apache.maven.plugins</groupId >
317312 <artifactId >maven-surefire-plugin</artifactId >
318313 <version >${maven.surefire.version} </version >
319- <configuration >
320- <argLine >
321- --illegal-access=permit
322- </argLine >
323- </configuration >
324314 </plugin >
325315 <plugin >
326316 <groupId >org.apache.maven.plugins</groupId >
327317 <artifactId >maven-failsafe-plugin</artifactId >
328318 <version >${maven.failsafe.version} </version >
329- <configuration >
330- <argLine >
331- --illegal-access=permit
332- </argLine >
333- </configuration >
334319 </plugin >
335320 <!-- to disable use -Dcheckstyle.skip -->
336321 <plugin >
You can’t perform that action at this time.
0 commit comments