Skip to content
This repository was archived by the owner on Sep 24, 2018. It is now read-only.

Commit b9cfe03

Browse files
lukasjlukasj
committed
fix licenses
Signed-off-by: Lukas Jungmann <[email protected]>
1 parent d0ad8a0 commit b9cfe03

Some content is hidden

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

74 files changed

+306
-216
lines changed

‎api/copyright-exclude

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
/exclude.xml
2+
/LICENSE.txt
3+
/offline-javadoc/package-list
4+
/test/README.txt
5+
/test/runtests.sh
6+
/test/src/jaxws/factory/Invalid.java
7+
/test/src/jaxws/factory/Valid.java
8+
/test/src/jaxws/factory/Valid2.java
9+
/test/src/jaxws/factory/Valid3.java
10+
/test/src/jaxws/test/Test.java

‎api/copyright.txt

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
/*
2+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3+
*
4+
* Copyright (c) YYYY Oracle and/or its affiliates. All rights reserved.
5+
*
6+
* The contents of this file are subject to the terms of either the GNU
7+
* General Public License Version 2 only ("GPL") or the Common Development
8+
* and Distribution License("CDDL") (collectively, the "License"). You
9+
* may not use this file except in compliance with the License. You can
10+
* obtain a copy of the License at
11+
* https://oss.oracle.com/licenses/CDDL+GPL-1.1
12+
* or LICENSE.txt. See the License for the specific
13+
* language governing permissions and limitations under the License.
14+
*
15+
* When distributing the software, include this License Header Notice in each
16+
* file and include the License file at LICENSE.txt.
17+
*
18+
* GPL Classpath Exception:
19+
* Oracle designates this particular file as subject to the "Classpath"
20+
* exception as provided by Oracle in the GPL Version 2 section of the License
21+
* file that accompanied this code.
22+
*
23+
* Modifications:
24+
* If applicable, add the following below the License Header, with the fields
25+
* enclosed by brackets [] replaced by your own identifying information:
26+
* "Portions Copyright [year] [name of copyright owner]"
27+
*
28+
* Contributor(s):
29+
* If you wish your version of this file to be governed by only the CDDL or
30+
* only the GPL Version 2, indicate your decision by adding "[Contributor]
31+
* elects to include this software in this distribution under the [CDDL or GPL
32+
* Version 2] license." If you don't indicate a single choice of license, a
33+
* recipient has the option to distribute your version of this file under
34+
* either the CDDL, the GPL Version 2 or to extend the choice of license to
35+
* its licensees as provided above. However, if you add GPL Version 2 code
36+
* and therefore, elected the GPL Version 2 license, then the option applies
37+
* only if the new code is made subject to such option by the copyright
38+
* holder.
39+
*/

‎api/exclude.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
33
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
44
5-
Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
5+
Copyright (c) 2013-2017 Oracle and/or its affiliates. All rights reserved.
66
77
The contents of this file are subject to the terms of either the GNU
88
General Public License Version 2 only ("GPL") or the Common Development
99
and Distribution License("CDDL") (collectively, the "License"). You
1010
may not use this file except in compliance with the License. You can
1111
obtain a copy of the License at
12-
http://glassfish.java.net/public/CDDL+GPL_1_1.html
13-
or packager/legal/LICENSE.txt. See the License for the specific
12+
https://oss.oracle.com/licenses/CDDL+GPL-1.1
13+
or LICENSE.txt. See the License for the specific
1414
language governing permissions and limitations under the License.
1515
1616
When distributing the software, include this License Header Notice in each
17-
file and include the License file at packager/legal/LICENSE.txt.
17+
file and include the License file at LICENSE.txt.
1818
1919
GPL Classpath Exception:
2020
Oracle designates this particular file as subject to the "Classpath"

‎api/maven-release.txt

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,40 @@
1+
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2+
#
3+
# Copyright (c) 2013-2017 Oracle and/or its affiliates. All rights reserved.
4+
#
5+
# The contents of this file are subject to the terms of either the GNU
6+
# General Public License Version 2 only ("GPL") or the Common Development
7+
# and Distribution License("CDDL") (collectively, the "License"). You
8+
# may not use this file except in compliance with the License. You can
9+
# obtain a copy of the License at
10+
# https://oss.oracle.com/licenses/CDDL+GPL-1.1
11+
# or LICENSE.txt. See the License for the specific
12+
# language governing permissions and limitations under the License.
13+
#
14+
# When distributing the software, include this License Header Notice in each
15+
# file and include the License file at LICENSE.txt.
16+
#
17+
# GPL Classpath Exception:
18+
# Oracle designates this particular file as subject to the "Classpath"
19+
# exception as provided by Oracle in the GPL Version 2 section of the License
20+
# file that accompanied this code.
21+
#
22+
# Modifications:
23+
# If applicable, add the following below the License Header, with the fields
24+
# enclosed by brackets [] replaced by your own identifying information:
25+
# "Portions Copyright [year] [name of copyright owner]"
26+
#
27+
# Contributor(s):
28+
# If you wish your version of this file to be governed by only the CDDL or
29+
# only the GPL Version 2, indicate your decision by adding "[Contributor]
30+
# elects to include this software in this distribution under the [CDDL or GPL
31+
# Version 2] license." If you don't indicate a single choice of license, a
32+
# recipient has the option to distribute your version of this file under
33+
# either the CDDL, the GPL Version 2 or to extend the choice of license to
34+
# its licensees as provided above. However, if you add GPL Version 2 code
35+
# and therefore, elected the GPL Version 2 license, then the option applies
36+
# only if the new code is made subject to such option by the copyright
37+
# holder.
38+
#
39+
140
mvn clean package javadoc:javadoc javadoc:jar source:jar gpg:sign deploy

‎api/pom.xml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
and Distribution License("CDDL") (collectively, the "License"). You
1010
may not use this file except in compliance with the License. You can
1111
obtain a copy of the License at
12-
http://glassfish.java.net/public/CDDL+GPL_1_1.html
13-
or packager/legal/LICENSE.txt. See the License for the specific
12+
https://oss.oracle.com/licenses/CDDL+GPL-1.1
13+
or LICENSE.txt. See the License for the specific
1414
language governing permissions and limitations under the License.
1515
1616
When distributing the software, include this License Header Notice in each
17-
file and include the License file at packager/legal/LICENSE.txt.
17+
file and include the License file at LICENSE.txt.
1818
1919
GPL Classpath Exception:
2020
Oracle designates this particular file as subject to the "Classpath"
@@ -39,6 +39,7 @@
3939
holder.
4040
4141
-->
42+
4243
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4344
<parent>
4445
<groupId>net.java</groupId>
@@ -148,7 +149,7 @@
148149
<plugin>
149150
<groupId>org.glassfish.copyright</groupId>
150151
<artifactId>glassfish-copyright-maven-plugin</artifactId>
151-
<version>1.29</version>
152+
<version>1.42</version>
152153
</plugin>
153154
<plugin>
154155
<artifactId>maven-compiler-plugin</artifactId>
@@ -228,6 +229,7 @@
228229
<configuration>
229230
<templateFile>${project.basedir}/copyright.txt</templateFile>
230231
<excludeFile>${project.basedir}/copyright-exclude</excludeFile>
232+
<scm>git</scm>
231233
<!-- skip files not under SCM-->
232234
<scmOnly>true</scmOnly>
233235
<!-- turn off warnings -->

‎api/src/main/java/javax/xml/ws/Action.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
* and Distribution License("CDDL") (collectively, the "License"). You
99
* may not use this file except in compliance with the License. You can
1010
* obtain a copy of the License at
11-
* http://glassfish.java.net/public/CDDL+GPL_1_1.html
12-
* or packager/legal/LICENSE.txt. See the License for the specific
11+
* https://oss.oracle.com/licenses/CDDL+GPL-1.1
12+
* or LICENSE.txt. See the License for the specific
1313
* language governing permissions and limitations under the License.
1414
*
1515
* When distributing the software, include this License Header Notice in each
16-
* file and include the License file at packager/legal/LICENSE.txt.
16+
* file and include the License file at LICENSE.txt.
1717
*
1818
* GPL Classpath Exception:
1919
* Oracle designates this particular file as subject to the "Classpath"

‎api/src/main/java/javax/xml/ws/AsyncHandler.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
* and Distribution License("CDDL") (collectively, the "License"). You
99
* may not use this file except in compliance with the License. You can
1010
* obtain a copy of the License at
11-
* http://glassfish.java.net/public/CDDL+GPL_1_1.html
12-
* or packager/legal/LICENSE.txt. See the License for the specific
11+
* https://oss.oracle.com/licenses/CDDL+GPL-1.1
12+
* or LICENSE.txt. See the License for the specific
1313
* language governing permissions and limitations under the License.
1414
*
1515
* When distributing the software, include this License Header Notice in each
16-
* file and include the License file at packager/legal/LICENSE.txt.
16+
* file and include the License file at LICENSE.txt.
1717
*
1818
* GPL Classpath Exception:
1919
* Oracle designates this particular file as subject to the "Classpath"

‎api/src/main/java/javax/xml/ws/Binding.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
* and Distribution License("CDDL") (collectively, the "License"). You
99
* may not use this file except in compliance with the License. You can
1010
* obtain a copy of the License at
11-
* http://glassfish.java.net/public/CDDL+GPL_1_1.html
12-
* or packager/legal/LICENSE.txt. See the License for the specific
11+
* https://oss.oracle.com/licenses/CDDL+GPL-1.1
12+
* or LICENSE.txt. See the License for the specific
1313
* language governing permissions and limitations under the License.
1414
*
1515
* When distributing the software, include this License Header Notice in each
16-
* file and include the License file at packager/legal/LICENSE.txt.
16+
* file and include the License file at LICENSE.txt.
1717
*
1818
* GPL Classpath Exception:
1919
* Oracle designates this particular file as subject to the "Classpath"

‎api/src/main/java/javax/xml/ws/BindingProvider.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
* and Distribution License("CDDL") (collectively, the "License"). You
99
* may not use this file except in compliance with the License. You can
1010
* obtain a copy of the License at
11-
* http://glassfish.java.net/public/CDDL+GPL_1_1.html
12-
* or packager/legal/LICENSE.txt. See the License for the specific
11+
* https://oss.oracle.com/licenses/CDDL+GPL-1.1
12+
* or LICENSE.txt. See the License for the specific
1313
* language governing permissions and limitations under the License.
1414
*
1515
* When distributing the software, include this License Header Notice in each
16-
* file and include the License file at packager/legal/LICENSE.txt.
16+
* file and include the License file at LICENSE.txt.
1717
*
1818
* GPL Classpath Exception:
1919
* Oracle designates this particular file as subject to the "Classpath"

‎api/src/main/java/javax/xml/ws/BindingType.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
* and Distribution License("CDDL") (collectively, the "License"). You
99
* may not use this file except in compliance with the License. You can
1010
* obtain a copy of the License at
11-
* http://glassfish.java.net/public/CDDL+GPL_1_1.html
12-
* or packager/legal/LICENSE.txt. See the License for the specific
11+
* https://oss.oracle.com/licenses/CDDL+GPL-1.1
12+
* or LICENSE.txt. See the License for the specific
1313
* language governing permissions and limitations under the License.
1414
*
1515
* When distributing the software, include this License Header Notice in each
16-
* file and include the License file at packager/legal/LICENSE.txt.
16+
* file and include the License file at LICENSE.txt.
1717
*
1818
* GPL Classpath Exception:
1919
* Oracle designates this particular file as subject to the "Classpath"

0 commit comments

Comments
 (0)