Skip to content

Commit d55f78e

Browse files
authored
Merge pull request #3931 from jansupol/eclipse_legal_changes
Fix license information
2 parents 9de733a + 7e446b4 commit d55f78e

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

NOTICE.md

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

73-
Java(TM) EE Interceptors 1.1 API Version 1.0.0.Beta1
74-
* License: LGPL 2.1
75-
* Copyright 2005, JBoss Inc., and individual contributors as indicated by the @authors tag.
76-
7773
Jackson JAX-RS Providers Version 2.8.10
7874
* License: Apache License, 2.0
7975
* Project: https://github.com/FasterXML/jackson-jaxrs-providers

core-client/src/test/java/org/glassfish/jersey/client/ClientConfigTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public boolean configure(final FeatureContext context) {
158158
}
159159

160160
/**
161-
* Copied from DefaultConfigTest.
161+
* Copied from CommonConfigTest.
162162
*/
163163
@Test
164164
public void testGetFeatures() {

examples/entity-filtering/src/main/java/org/glassfish/jersey/examples/entityfiltering/domain/EntityStore.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ public final class EntityStore {
2929

3030
static {
3131
// Projects.
32-
final Project project = createProject("Jersey", "Jersey is the open source (under dual EPL+GPL license) JAX-RS 2.1 "
33-
+ "(JSR 370) production quality Reference Implementation for building RESTful Web services.");
32+
final Project project = createProject("Jersey", "Jersey is the open source (see NOTICE.md for license "
33+
+ "information) JAX-RS 2.1 (JSR 370) production quality Reference Implementation for building RESTful Web "
34+
+ "services.");
3435

3536
// Users.
3637
final User robot = createUser("Jersey Robot", "[email protected]");

0 commit comments

Comments
 (0)