Skip to content

Commit 9d8babd

Browse files
jbescosjbescos
committed
Merge and fixes
Signed-off-by: Jorge Bescos Gascon <[email protected]>
2 parents 25654bb + ab9953f commit 9d8babd

File tree

2,345 files changed

+66946
-19855
lines changed

Some content is hidden

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

2,345 files changed

+66946
-19855
lines changed

‎.github/workflows/maven.yml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
#
2+
# Copyright (c) 2022, 2023 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: [ 21 ]
27+
verify_profiles: [ '-Plicense_check,staging' ]
28+
continue-on-error: false
29+
30+
steps:
31+
- name: Checkout for build
32+
uses: actions/checkout@v3
33+
with:
34+
fetch-depth: 0
35+
- name: Set up JDK
36+
uses: actions/setup-java@v3
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 -pl '!:version-agnostic'
46+
- name: Upload license-check info
47+
uses: actions/upload-artifact@v3
48+
with:
49+
name: license-summary.txt
50+
path: target/dash/summary

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ nb-configuration.xml
2727
.settings/*
2828
.project
2929
.classpath
30+
.factorypath
3031

3132
# Maven plugins noise
3233
dependency-reduced-pom.xml

‎NOTICE.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ aopalliance Version 1
4141
* Project: http://aopalliance.sourceforge.net
4242
* Copyright: Material in the public domain is not protected by copyright
4343

44-
Bean Validation API 3.0.0
44+
Bean Validation API 3.0.2
4545
* License: Apache License, 2.0
4646
* Project: https://projects.eclipse.org/projects/ee4j.bean-validation
4747
* Copyright: 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
4848
* by the @authors tag.
4949

50-
Hibernate Validator CDI, 7.0.0.Final
50+
Hibernate Validator CDI, 8.0.1.Final
5151
* License: Apache License, 2.0
5252
* Project: https://beanvalidation.org/
5353
* Repackaged in org.glassfish.jersey.server.validation.internal.hibernate
@@ -65,15 +65,15 @@ jakarta.inject Version: 1
6565
* License: Apache License, 2.0
6666
* Copyright (C) 2009 The JSR-330 Expert Group
6767

68-
Javassist Version 3.25.0-GA
68+
Javassist Version 3.29.2-GA
6969
* License: Apache License, 2.0
7070
* Project: http://www.javassist.org/
7171
* Copyright (C) 1999- Shigeru Chiba. All Rights Reserved.
7272

73-
Jackson JAX-RS Providers Version 2.13.0
73+
Jackson JAX-RS Providers Version 2.15.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-2023 FasterXML, LLC. All rights reserved unless otherwise indicated.
7777

7878
jQuery v1.12.4
7979
* License: jquery.org/license
@@ -95,7 +95,7 @@ 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 9.2
98+
org.objectweb.asm Version 9.6
9999
* License: Modified BSD (https://asm.ow2.io/license.html)
100100
* Copyright (c) 2000-2011 INRIA, France Telecom. All rights reserved.
101101

‎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, 2022 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2015, 2023 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>3.1.0-SNAPSHOT</version>
25+
<version>3.1.99-SNAPSHOT</version>
2626
</parent>
2727

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

‎archetypes/jersey-example-java8-webapp/src/main/resources/archetype-resources/pom.xml‎

Lines changed: 8 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, 2022 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2015, 2023 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
@@ -98,6 +98,11 @@
9898
<war>${project.build.directory}/${project.build.finalName}.war</war>
9999
</configuration>
100100
</plugin>
101+
<plugin>
102+
<groupId>org.apache.maven.plugins</groupId>
103+
<artifactId>maven-war-plugin</artifactId>
104+
<version>${war.mvn.plugin.version}</version>
105+
</plugin>
101106
</plugins>
102107
</build>
103108

@@ -120,7 +125,8 @@
120125
</profiles>
121126

122127
<properties>
123-
<java.version>1.8</java.version>
128+
<java.version>11</java.version>
124129
<jersey.config.test.container.port>8080</jersey.config.test.container.port>
130+
<war.mvn.plugin.version>3.4.0</war.mvn.plugin.version>
125131
</properties>
126132
</project>

‎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, 2022 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2013, 2023 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>3.1.0-SNAPSHOT</version>
25+
<version>3.1.99-SNAPSHOT</version>
2626
</parent>
2727
<packaging>maven-archetype</packaging>
2828

‎archetypes/jersey-heroku-webapp/src/main/resources/archetype-resources/pom.xml‎

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@
3838
</dependency> -->
3939

4040
<dependency>
41-
<groupId>org.eclipse.jetty</groupId>
42-
<artifactId>jetty-servlet</artifactId>
41+
<groupId>org.eclipse.jetty.ee10</groupId>
42+
<artifactId>jetty-ee10-servlet</artifactId>
4343
<version>\${jetty.version}</version>
4444
<scope>provided</scope>
4545
</dependency>
4646
<dependency>
47-
<groupId>org.eclipse.jetty</groupId>
48-
<artifactId>jetty-webapp</artifactId>
47+
<groupId>org.eclipse.jetty.ee10</groupId>
48+
<artifactId>jetty-ee10-webapp</artifactId>
4949
<version>\${jetty.version}</version>
5050
<scope>provided</scope>
5151
</dependency>
@@ -89,8 +89,8 @@
8989
</executions>
9090
</plugin>
9191
<plugin>
92-
<groupId>org.eclipse.jetty</groupId>
93-
<artifactId>jetty-maven-plugin</artifactId>
92+
<groupId>org.eclipse.jetty.ee10</groupId>
93+
<artifactId>jetty-ee10-maven-plugin</artifactId>
9494
<version>\${jetty.version}</version>
9595
<configuration>
9696
<contextPath>/</contextPath>
@@ -101,12 +101,25 @@
101101
<war>\${project.build.directory}/\${project.build.finalName}.war</war>
102102
</configuration>
103103
</plugin>
104+
<plugin>
105+
<!-- Surefire support for JUnit-5 -->
106+
<groupId>org.apache.maven.plugins</groupId>
107+
<artifactId>maven-surefire-plugin</artifactId>
108+
<version>${surefire.mvn.plugin.version}</version>
109+
</plugin>
110+
<plugin>
111+
<groupId>org.apache.maven.plugins</groupId>
112+
<artifactId>maven-war-plugin</artifactId>
113+
<version>${war.mvn.plugin.version}</version>
114+
</plugin>
104115
</plugins>
105116
</build>
106117

107118
<properties>
108119
<jersey.version>${project.version}</jersey.version>
120+
<jetty.version>12.0.5</jetty.version>
109121
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
110-
<jetty.version>11.0.0.beta3</jetty.version>
122+
<surefire.mvn.plugin.version>3.2.1</surefire.mvn.plugin.version>
123+
<war.mvn.plugin.version>3.4.0</war.mvn.plugin.version>
111124
</properties>
112-
</project>
125+
</project>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package ${package}.heroku;
22

33
import org.eclipse.jetty.server.Server;
4-
import org.eclipse.jetty.webapp.WebAppContext;
4+
import org.eclipse.jetty.ee10.webapp.WebAppContext;
55

66
/**
77
* This class launches the web application in an embedded Jetty container. This is the entry point to your application. The Java
@@ -30,7 +30,7 @@ public static void main(String[] args) throws Exception{
3030

3131
final String webappDirLocation = "src/main/webapp/";
3232
root.setDescriptor(webappDirLocation + "/WEB-INF/web.xml");
33-
root.setResourceBase(webappDirLocation);
33+
root.setBaseResourceAsString(webappDirLocation);
3434

3535
server.setHandler(root);
3636

‎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, 2022 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2010, 2023 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>3.1.0-SNAPSHOT</version>
24+
<version>3.1.99-SNAPSHOT</version>
2525
</parent>
2626
<artifactId>jersey-quickstart-grizzly2</artifactId>
2727
<packaging>maven-archetype</packaging>

0 commit comments

Comments
 (0)