Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix broken license url for asm objectweb for core-server #4975

Merged
merged 10 commits into from
Feb 3, 2022
Merged

Fix broken license url for asm objectweb for core-server #4975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2ecd855
Update pom.xml
gemu Feb 1, 2022
a2c34a6
update copyright
gemu Feb 1, 2022
5542de1
fix broken license url for asm objectweb
gemu Feb 2, 2022
cc9c6ac
Merge branch 'eclipse-ee4j:master' into master
gemu Feb 2, 2022
4b1ea7a
Update copyright year
gemu Feb 2, 2022
ddd3ec1
Fix broken license url for asm objectweb
gemu Feb 2, 2022
ca7a304
Update NOTICE.md
gemu Feb 2, 2022
22f5c57
Fix broken license url for asm objectweb
gemu Feb 2, 2022
15b1619
migrate apidoc references for JAXRS-API to rest
senivam Feb 3, 2022
131e27a
Merge pull request #1 from senivam/apidoc_migration
gemu Feb 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NOTICE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ KineticJS, v4.7.1
* Copyright: Eric Rowell

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

org.osgi.core version 6.0.0
Expand Down
4 changes: 2 additions & 2 deletions core-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2010, 2021 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2010, 2022 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -56,7 +56,7 @@
</license>
<license>
<name>Modified BSD</name>
<url>http://asm.objectweb.org/license.html</url>
<url>https://asm.ow2.io/license.html</url>
<distribution>repo</distribution>
<comments>ASM @ jersey.repackaged.org.objectweb.asm</comments>
</license>
Expand Down
2 changes: 1 addition & 1 deletion core-server/src/main/resources/META-INF/NOTICE.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ org.glassfish.jersey.server.internal.monitoring.core
* Copyright 2010-2013 Coda Hale and Yammer, Inc.

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

W3.org documents
Expand Down
6 changes: 3 additions & 3 deletions docs/src/main/docbook/jersey.ent
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1" ?>
<!--

Copyright (c) 2010, 2021 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2010, 2022 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -56,8 +56,8 @@
<!ENTITY jaxb.release.uri "https://eclipse-ee4j.github.io/jaxb-ri">
<!ENTITY jaxb.javadoc.uri "&jaxb.release.uri;/docs/api/javax/xml/bind">
<!ENTITY jaxrs.release.uri "https://github.com/eclipse-ee4j/jaxrs-api">
<!ENTITY jaxrs.javadoc.uri "https://eclipse-ee4j.github.io/jaxrs-api/apidocs/2.1.6/javax/ws/rs">
<!ENTITY jaxrs21.javadoc.uri "https://eclipse-ee4j.github.io/jaxrs-api/apidocs/2.1.6/javax/ws/rs">
<!ENTITY jaxrs.javadoc.uri "https://jakartaee.github.io/rest/apidocs/2.1.6/javax/ws/rs">
<!ENTITY jaxrs21.javadoc.uri "https://jakartaee.github.io/rest/apidocs/2.1.6/javax/ws/rs">
<!ENTITY jsonb.javadoc.uri "https://javaee.github.io/javaee-spec/javadocs/javax/json/bind">
<!ENTITY jersey.documentation.uri "https://eclipse-ee4j.github.io/jersey.github.io">

Expand Down
2 changes: 1 addition & 1 deletion examples/NOTICE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ KineticJS, v4.7.1
* Copyright: Eric Rowell

org.objectweb.asm Version 7.2
* License: Modified BSD (http://asm.objectweb.org/license.html)
* License: Modified BSD (https://asm.ow2.io/license.html)
* Copyright (c) 2000-2011 INRIA, France Telecom. All rights reserved.

org.osgi.core version 6.0.0
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@
All Rights Reserved. Use is subject to license terms.]]>
</bottom>
<links>
<link>https://eclipse-ee4j.github.io/jaxrs-api/apidocs/2.1.6/</link>
<link>https://jakartaee.github.io/rest/apidocs/2.1.6/</link>
<link>https://javaee.github.io/hk2/apidocs/</link>
</links>
<excludePackageNames>
Expand Down