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

Commit 4e4c867

Browse files
authored
Updating JUnit (#401)
*Updating JUnit *Some more copyright corrections
1 parent a392f37 commit 4e4c867

27 files changed

Lines changed: 114 additions & 354 deletions

mq/main/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -967,7 +967,7 @@
967967
<dependency>
968968
<groupId>junit</groupId>
969969
<artifactId>junit</artifactId>
970-
<version>4.3.1</version>
970+
<version>${junit.version}</version>
971971
<scope>test</scope>
972972
</dependency>
973973
</dependencies>

mq/src/share/install/install/model/InstallDirectory.xcs

Lines changed: 4 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!--
3-
4-
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
5-
6-
Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
7-
8-
The contents of this file are subject to the terms of either the GNU
9-
General Public License Version 2 only ("GPL") or the Common Development
10-
and Distribution License("CDDL") (collectively, the "License"). You
11-
may not use this file except in compliance with the License. You can
12-
obtain a copy of the License at
13-
https://oss.oracle.com/licenses/CDDL+GPL-1.1
14-
or LICENSE.txt. See the License for the specific
15-
language governing permissions and limitations under the License.
16-
17-
When distributing the software, include this License Header Notice in each
18-
file and include the License file at LICENSE.txt.
19-
20-
GPL Classpath Exception:
21-
Oracle designates this particular file as subject to the "Classpath"
22-
exception as provided by Oracle in the GPL Version 2 section of the License
23-
file that accompanied this code.
24-
25-
Modifications:
26-
If applicable, add the following below the License Header, with the fields
27-
enclosed by brackets [] replaced by your own identifying information:
28-
"Portions Copyright [year] [name of copyright owner]"
29-
30-
Contributor(s):
31-
If you wish your version of this file to be governed by only the CDDL or
32-
only the GPL Version 2, indicate your decision by adding "[Contributor]
33-
elects to include this software in this distribution under the [CDDL or GPL
34-
Version 2] license." If you don't indicate a single choice of license, a
35-
recipient has the option to distribute your version of this file under
36-
either the CDDL, the GPL Version 2 or to extend the choice of license to
37-
its licensees as provided above. However, if you add GPL Version 2 code
38-
and therefore, elected the GPL Version 2 license, then the option applies
39-
only if the new code is made subject to such option by the copyright
40-
holder.
41-
42-
-->
43-
442
<oor:component-schema oor:version="1.1" oor:name="InstallDirectory" oor:package="org.openinstaller.InstallDirectory"
453
xsi:schemaLocation="http://openoffice.org/2001/registry"
464
xmlns:xs="http://www.w3.org/2001/XMLSchema"
@@ -51,19 +9,19 @@
519
5210
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
5311
54-
Copyright (c) 2006-2010 Oracle and/or its affiliates. All rights reserved.
12+
Copyright (c) 2006-2017 Oracle and/or its affiliates. All rights reserved.
5513
5614
The contents of this file are subject to the terms of either the GNU
5715
General Public License Version 2 only ("GPL") or the Common Development
5816
and Distribution License("CDDL") (collectively, the "License"). You
5917
may not use this file except in compliance with the License. You can
6018
obtain a copy of the License at
61-
https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
62-
or packager/legal/LICENSE.txt. See the License for the specific
19+
https://oss.oracle.com/licenses/CDDL+GPL-1.1
20+
or LICENSE.txt. See the License for the specific
6321
language governing permissions and limitations under the License.
6422
6523
When distributing the software, include this License Header Notice in each
66-
file and include the License file at packager/legal/LICENSE.txt.
24+
file and include the License file at LICENSE.txt.
6725
6826
GPL Classpath Exception:
6927
Oracle designates this particular file as subject to the "Classpath"

mq/src/share/install/install/model/RegistrationOptions.xcs

Lines changed: 4 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!--
3-
4-
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
5-
6-
Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
7-
8-
The contents of this file are subject to the terms of either the GNU
9-
General Public License Version 2 only ("GPL") or the Common Development
10-
and Distribution License("CDDL") (collectively, the "License"). You
11-
may not use this file except in compliance with the License. You can
12-
obtain a copy of the License at
13-
https://oss.oracle.com/licenses/CDDL+GPL-1.1
14-
or LICENSE.txt. See the License for the specific
15-
language governing permissions and limitations under the License.
16-
17-
When distributing the software, include this License Header Notice in each
18-
file and include the License file at LICENSE.txt.
19-
20-
GPL Classpath Exception:
21-
Oracle designates this particular file as subject to the "Classpath"
22-
exception as provided by Oracle in the GPL Version 2 section of the License
23-
file that accompanied this code.
24-
25-
Modifications:
26-
If applicable, add the following below the License Header, with the fields
27-
enclosed by brackets [] replaced by your own identifying information:
28-
"Portions Copyright [year] [name of copyright owner]"
29-
30-
Contributor(s):
31-
If you wish your version of this file to be governed by only the CDDL or
32-
only the GPL Version 2, indicate your decision by adding "[Contributor]
33-
elects to include this software in this distribution under the [CDDL or GPL
34-
Version 2] license." If you don't indicate a single choice of license, a
35-
recipient has the option to distribute your version of this file under
36-
either the CDDL, the GPL Version 2 or to extend the choice of license to
37-
its licensees as provided above. However, if you add GPL Version 2 code
38-
and therefore, elected the GPL Version 2 license, then the option applies
39-
only if the new code is made subject to such option by the copyright
40-
holder.
41-
42-
-->
43-
442
<oor:component-schema oor:version="1.1" oor:name="RegistrationOptions" oor:package="com.sun.install.L10nSelection"
453
xsi:schemaLocation="http://openoffice.org/2001/registry"
464
xmlns:xs="http://www.w3.org/2001/XMLSchema"
@@ -51,19 +9,19 @@
519
5210
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
5311
54-
Copyright (c) 2006-2010 Oracle and/or its affiliates. All rights reserved.
12+
Copyright (c) 2006-2017 Oracle and/or its affiliates. All rights reserved.
5513
5614
The contents of this file are subject to the terms of either the GNU
5715
General Public License Version 2 only ("GPL") or the Common Development
5816
and Distribution License("CDDL") (collectively, the "License"). You
5917
may not use this file except in compliance with the License. You can
6018
obtain a copy of the License at
61-
https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
62-
or packager/legal/LICENSE.txt. See the License for the specific
19+
https://oss.oracle.com/licenses/CDDL+GPL-1.1
20+
or LICENSE.txt. See the License for the specific
6321
language governing permissions and limitations under the License.
6422
6523
When distributing the software, include this License Header Notice in each
66-
file and include the License file at packager/legal/LICENSE.txt.
24+
file and include the License file at LICENSE.txt.
6725
6826
GPL Classpath Exception:
6927
Oracle designates this particular file as subject to the "Classpath"

mq/src/share/install/install/model/RegistrationPrefs.xcs

Lines changed: 4 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!--
3-
4-
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
5-
6-
Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
7-
8-
The contents of this file are subject to the terms of either the GNU
9-
General Public License Version 2 only ("GPL") or the Common Development
10-
and Distribution License("CDDL") (collectively, the "License"). You
11-
may not use this file except in compliance with the License. You can
12-
obtain a copy of the License at
13-
https://oss.oracle.com/licenses/CDDL+GPL-1.1
14-
or LICENSE.txt. See the License for the specific
15-
language governing permissions and limitations under the License.
16-
17-
When distributing the software, include this License Header Notice in each
18-
file and include the License file at LICENSE.txt.
19-
20-
GPL Classpath Exception:
21-
Oracle designates this particular file as subject to the "Classpath"
22-
exception as provided by Oracle in the GPL Version 2 section of the License
23-
file that accompanied this code.
24-
25-
Modifications:
26-
If applicable, add the following below the License Header, with the fields
27-
enclosed by brackets [] replaced by your own identifying information:
28-
"Portions Copyright [year] [name of copyright owner]"
29-
30-
Contributor(s):
31-
If you wish your version of this file to be governed by only the CDDL or
32-
only the GPL Version 2, indicate your decision by adding "[Contributor]
33-
elects to include this software in this distribution under the [CDDL or GPL
34-
Version 2] license." If you don't indicate a single choice of license, a
35-
recipient has the option to distribute your version of this file under
36-
either the CDDL, the GPL Version 2 or to extend the choice of license to
37-
its licensees as provided above. However, if you add GPL Version 2 code
38-
and therefore, elected the GPL Version 2 license, then the option applies
39-
only if the new code is made subject to such option by the copyright
40-
holder.
41-
42-
-->
43-
442
<oor:component-schema oor:version="1.1" oor:name="RegistrationPrefs" oor:package="com.sun.install.L10nSelection"
453
xsi:schemaLocation="http://openoffice.org/2001/registry"
464
xmlns:xs="http://www.w3.org/2001/XMLSchema"
@@ -51,19 +9,19 @@
519
5210
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
5311
54-
Copyright (c) 2006-2010 Oracle and/or its affiliates. All rights reserved.
12+
Copyright (c) 2006-2017 Oracle and/or its affiliates. All rights reserved.
5513
5614
The contents of this file are subject to the terms of either the GNU
5715
General Public License Version 2 only ("GPL") or the Common Development
5816
and Distribution License("CDDL") (collectively, the "License"). You
5917
may not use this file except in compliance with the License. You can
6018
obtain a copy of the License at
61-
https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
62-
or packager/legal/LICENSE.txt. See the License for the specific
19+
https://oss.oracle.com/licenses/CDDL+GPL-1.1
20+
or LICENSE.txt. See the License for the specific
6321
language governing permissions and limitations under the License.
6422
6523
When distributing the software, include this License Header Notice in each
66-
file and include the License file at packager/legal/LICENSE.txt.
24+
file and include the License file at LICENSE.txt.
6725
6826
GPL Classpath Exception:
6927
Oracle designates this particular file as subject to the "Classpath"

mq/src/share/install/install/model/RegistrationProgress.xcs

Lines changed: 4 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!--
3-
4-
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
5-
6-
Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
7-
8-
The contents of this file are subject to the terms of either the GNU
9-
General Public License Version 2 only ("GPL") or the Common Development
10-
and Distribution License("CDDL") (collectively, the "License"). You
11-
may not use this file except in compliance with the License. You can
12-
obtain a copy of the License at
13-
https://oss.oracle.com/licenses/CDDL+GPL-1.1
14-
or LICENSE.txt. See the License for the specific
15-
language governing permissions and limitations under the License.
16-
17-
When distributing the software, include this License Header Notice in each
18-
file and include the License file at LICENSE.txt.
19-
20-
GPL Classpath Exception:
21-
Oracle designates this particular file as subject to the "Classpath"
22-
exception as provided by Oracle in the GPL Version 2 section of the License
23-
file that accompanied this code.
24-
25-
Modifications:
26-
If applicable, add the following below the License Header, with the fields
27-
enclosed by brackets [] replaced by your own identifying information:
28-
"Portions Copyright [year] [name of copyright owner]"
29-
30-
Contributor(s):
31-
If you wish your version of this file to be governed by only the CDDL or
32-
only the GPL Version 2, indicate your decision by adding "[Contributor]
33-
elects to include this software in this distribution under the [CDDL or GPL
34-
Version 2] license." If you don't indicate a single choice of license, a
35-
recipient has the option to distribute your version of this file under
36-
either the CDDL, the GPL Version 2 or to extend the choice of license to
37-
its licensees as provided above. However, if you add GPL Version 2 code
38-
and therefore, elected the GPL Version 2 license, then the option applies
39-
only if the new code is made subject to such option by the copyright
40-
holder.
41-
42-
-->
43-
442
<oor:component-schema oor:version="1.1" oor:name="RegistrationProgress" oor:package="org.openinstaller.progress"
453
xsi:schemaLocation="http://openoffice.org/2001/registry"
464
xmlns:xs="http://www.w3.org/2001/XMLSchema"
@@ -51,19 +9,19 @@
519
5210
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
5311
54-
Copyright (c) 2006-2010 Oracle and/or its affiliates. All rights reserved.
12+
Copyright (c) 2006-2017 Oracle and/or its affiliates. All rights reserved.
5513
5614
The contents of this file are subject to the terms of either the GNU
5715
General Public License Version 2 only ("GPL") or the Common Development
5816
and Distribution License("CDDL") (collectively, the "License"). You
5917
may not use this file except in compliance with the License. You can
6018
obtain a copy of the License at
61-
https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
62-
or packager/legal/LICENSE.txt. See the License for the specific
19+
https://oss.oracle.com/licenses/CDDL+GPL-1.1
20+
or LICENSE.txt. See the License for the specific
6321
language governing permissions and limitations under the License.
6422
6523
When distributing the software, include this License Header Notice in each
66-
file and include the License file at packager/legal/LICENSE.txt.
24+
file and include the License file at LICENSE.txt.
6725
6826
GPL Classpath Exception:
6927
Oracle designates this particular file as subject to the "Classpath"

mq/src/share/install/install/model/RegistrationWelcome.xcs

Lines changed: 4 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!--
3-
4-
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
5-
6-
Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
7-
8-
The contents of this file are subject to the terms of either the GNU
9-
General Public License Version 2 only ("GPL") or the Common Development
10-
and Distribution License("CDDL") (collectively, the "License"). You
11-
may not use this file except in compliance with the License. You can
12-
obtain a copy of the License at
13-
https://oss.oracle.com/licenses/CDDL+GPL-1.1
14-
or LICENSE.txt. See the License for the specific
15-
language governing permissions and limitations under the License.
16-
17-
When distributing the software, include this License Header Notice in each
18-
file and include the License file at LICENSE.txt.
19-
20-
GPL Classpath Exception:
21-
Oracle designates this particular file as subject to the "Classpath"
22-
exception as provided by Oracle in the GPL Version 2 section of the License
23-
file that accompanied this code.
24-
25-
Modifications:
26-
If applicable, add the following below the License Header, with the fields
27-
enclosed by brackets [] replaced by your own identifying information:
28-
"Portions Copyright [year] [name of copyright owner]"
29-
30-
Contributor(s):
31-
If you wish your version of this file to be governed by only the CDDL or
32-
only the GPL Version 2, indicate your decision by adding "[Contributor]
33-
elects to include this software in this distribution under the [CDDL or GPL
34-
Version 2] license." If you don't indicate a single choice of license, a
35-
recipient has the option to distribute your version of this file under
36-
either the CDDL, the GPL Version 2 or to extend the choice of license to
37-
its licensees as provided above. However, if you add GPL Version 2 code
38-
and therefore, elected the GPL Version 2 license, then the option applies
39-
only if the new code is made subject to such option by the copyright
40-
holder.
41-
42-
-->
43-
442
<oor:component-schema oor:version="1.1" oor:name="RegistrationWelcome" oor:package="org.openinstaller.welcome"
453
xsi:schemaLocation="http://openoffice.org/2001/registry"
464
xmlns:xs="http://www.w3.org/2001/XMLSchema"
@@ -51,19 +9,19 @@
519
5210
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
5311
54-
Copyright (c) 2006-2010 Oracle and/or its affiliates. All rights reserved.
12+
Copyright (c) 2006-2017 Oracle and/or its affiliates. All rights reserved.
5513
5614
The contents of this file are subject to the terms of either the GNU
5715
General Public License Version 2 only ("GPL") or the Common Development
5816
and Distribution License("CDDL") (collectively, the "License"). You
5917
may not use this file except in compliance with the License. You can
6018
obtain a copy of the License at
61-
https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
62-
or packager/legal/LICENSE.txt. See the License for the specific
19+
https://oss.oracle.com/licenses/CDDL+GPL-1.1
20+
or LICENSE.txt. See the License for the specific
6321
language governing permissions and limitations under the License.
6422
6523
When distributing the software, include this License Header Notice in each
66-
file and include the License file at packager/legal/LICENSE.txt.
24+
file and include the License file at LICENSE.txt.
6725
6826
GPL Classpath Exception:
6927
Oracle designates this particular file as subject to the "Classpath"

0 commit comments

Comments
 (0)