Skip to content

Commit 2ddc393

Browse files
jbescosjbescos
committed
Merge branch 'master' into issue4780
Signed-off-by: Jorge Bescos Gascon <[email protected]>
2 parents 3974a96 + 4459ebb commit 2ddc393

File tree

1,775 files changed

+37891
-12593
lines changed

Some content is hidden

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

1,775 files changed

+37891
-12593
lines changed

‎.github/workflows/maven.yml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
#
2+
# Copyright (c) 2022 Contributors to the Eclipse Foundation
3+
#
4+
# This program and the accompanying materials are made available under the
5+
# terms of the Eclipse Public License v. 2.0 which is available at
6+
# http://www.eclipse.org/legal/epl-2.0,
7+
# or the Eclipse Distribution License v. 1.0 which is available at
8+
# http://www.eclipse.org/org/documents/edl-v10.php.
9+
#
10+
# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
11+
#
12+
13+
name: Jersey
14+
15+
on: [push, pull_request]
16+
17+
jobs:
18+
build:
19+
name: Build on JDK ${{ matrix.java_version }} with ${{matrix.test_profiles}} profile
20+
runs-on: ubuntu-latest
21+
env:
22+
script-directory: $GITHUB_WORKSPACE/etc/jenkins
23+
24+
strategy:
25+
matrix:
26+
java_version: [ 11 ]
27+
verify_profiles: [ '-Plicense_check' ]
28+
continue-on-error: false
29+
30+
steps:
31+
- name: Checkout for build
32+
uses: actions/[email protected]
33+
with:
34+
fetch-depth: 0
35+
- name: Set up JDK
36+
uses: actions/setup-java@v2
37+
with:
38+
distribution: 'zulu'
39+
java-version: ${{ matrix.java_version }}
40+
- name: configure JDK
41+
run: |
42+
secLoc=`find $JAVA_HOME -name java.security`
43+
sed -i 's/jdk.tls.disabledAlgorithms/# jdk.tls.disabledAlgorithms/g' -i $secLoc
44+
- name: Build
45+
run: mvn -V -U -B ${{matrix.verify_profiles}} org.eclipse.dash:license-tool-plugin:license-check -DexcludeArtifactIds=bsh,jmh-core,jmh-generator-annprocess,swing-layout

‎NOTICE.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ Javassist Version 3.25.0-GA
7070
* Project: http://www.javassist.org/
7171
* Copyright (C) 1999- Shigeru Chiba. All Rights Reserved.
7272

73-
Jackson JAX-RS Providers Version 2.10.1
73+
Jackson JAX-RS Providers Version 2.13.3
7474
* License: Apache License, 2.0
7575
* Project: https://github.com/FasterXML/jackson-jaxrs-providers
76-
* Copyright: (c) 2009-2011 FasterXML, LLC. All rights reserved unless otherwise indicated.
76+
* Copyright: (c) 2009-2022 FasterXML, LLC. All rights reserved unless otherwise indicated.
7777

7878
jQuery v1.12.4
7979
* License: jquery.org/license
@@ -95,8 +95,8 @@ KineticJS, v4.7.1
9595
* Project: http://www.kineticjs.com, https://github.com/ericdrowell/KineticJS
9696
* Copyright: Eric Rowell
9797

98-
org.objectweb.asm Version 8.0
99-
* License: Modified BSD (http://asm.objectweb.org/license.html)
98+
org.objectweb.asm Version 9.3
99+
* License: Modified BSD (https://asm.ow2.io/license.html)
100100
* Copyright (c) 2000-2011 INRIA, France Telecom. All rights reserved.
101101

102102
org.osgi.core version 6.0.0

‎archetypes/jersey-example-java8-webapp/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2015, 2022 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.glassfish.jersey.archetypes</groupId>
2424
<artifactId>project</artifactId>
25-
<version>2.35-SNAPSHOT</version>
25+
<version>2.38-SNAPSHOT</version>
2626
</parent>
2727

2828
<artifactId>jersey-example-java8-webapp</artifactId>

‎archetypes/jersey-heroku-webapp/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2013, 2022 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.glassfish.jersey.archetypes</groupId>
2424
<artifactId>project</artifactId>
25-
<version>2.35-SNAPSHOT</version>
25+
<version>2.38-SNAPSHOT</version>
2626
</parent>
2727
<packaging>maven-archetype</packaging>
2828

‎archetypes/jersey-heroku-webapp/src/main/resources/archetype-resources/src/test/java/MyResourceTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import org.glassfish.jersey.server.ResourceConfig;
66
import org.glassfish.jersey.test.JerseyTest;
77

8-
import org.junit.Test;
9-
import static org.junit.Assert.assertEquals;
8+
import org.junit.jupiter.api.Test;
9+
import static org.junit.jupiter.api.Assertions.assertEquals;
1010

1111
import ${package}.MyResource;
1212

‎archetypes/jersey-quickstart-grizzly2/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2010, 2021 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2010, 2022 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.glassfish.jersey.archetypes</groupId>
2323
<artifactId>project</artifactId>
24-
<version>2.35-SNAPSHOT</version>
24+
<version>2.38-SNAPSHOT</version>
2525
</parent>
2626
<artifactId>jersey-quickstart-grizzly2</artifactId>
2727
<packaging>maven-archetype</packaging>

‎archetypes/jersey-quickstart-grizzly2/src/main/resources/archetype-resources/pom.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
</dependency>
3939
-->
4040
<dependency>
41-
<groupId>junit</groupId>
42-
<artifactId>junit</artifactId>
43-
<version>4.12</version>
41+
<groupId>org.junit.jupiter</groupId>
42+
<artifactId>junit-jupiter</artifactId>
43+
<version>\${junit-jupiter.version}</version>
4444
<scope>test</scope>
4545
</dependency>
4646
</dependencies>
@@ -77,6 +77,7 @@
7777

7878
<properties>
7979
<jersey.version>${project.version}</jersey.version>
80+
<junit-jupiter.version>5.9.1</junit-jupiter.version>
8081
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
8182
</properties>
8283
</project>

‎archetypes/jersey-quickstart-grizzly2/src/main/resources/archetype-resources/src/test/java/MyResourceTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66

77
import org.glassfish.grizzly.http.server.HttpServer;
88

9-
import org.junit.After;
10-
import org.junit.Before;
11-
import org.junit.Test;
12-
import static org.junit.Assert.assertEquals;
9+
import org.junit.jupiter.api.AfterEach;
10+
import org.junit.jupiter.api.BeforeEach;
11+
import org.junit.jupiter.api.Test;
12+
import static org.junit.jupiter.api.Assertions.assertEquals;
1313

1414
public class MyResourceTest {
1515

1616
private HttpServer server;
1717
private WebTarget target;
1818

19-
@Before
19+
@BeforeEach
2020
public void setUp() throws Exception {
2121
// start the server
2222
server = Main.startServer();
@@ -32,7 +32,7 @@ public void setUp() throws Exception {
3232
target = c.target(Main.BASE_URI);
3333
}
3434

35-
@After
35+
@AfterEach
3636
public void tearDown() throws Exception {
3737
server.stop();
3838
}

‎archetypes/jersey-quickstart-webapp/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2010, 2021 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2010, 2022 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.glassfish.jersey.archetypes</groupId>
2323
<artifactId>project</artifactId>
24-
<version>2.35-SNAPSHOT</version>
24+
<version>2.38-SNAPSHOT</version>
2525
</parent>
2626
<modelVersion>4.0.0</modelVersion>
2727
<packaging>maven-archetype</packaging>

‎archetypes/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2010, 2021 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2010, 2022 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.glassfish.jersey</groupId>
2424
<artifactId>project</artifactId>
25-
<version>2.35-SNAPSHOT</version>
25+
<version>2.38-SNAPSHOT</version>
2626
</parent>
2727

2828
<groupId>org.glassfish.jersey.archetypes</groupId>

0 commit comments

Comments
 (0)