Skip to content

Commit c3434ba

Browse files
ddsharpeddsharpe
authored
update copyright to comply with new Oracle requirement (#89)
* update copyright to comply with new Oracle requirement * updated with reformatted license text * fix typo in License.txt to match https://oss.oracle.com/licenses/upl/
1 parent c157e55 commit c3434ba

File tree

77 files changed

+195
-187
lines changed

Some content is hidden

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

77 files changed

+195
-187
lines changed

‎LICENSE.txt

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,35 @@
1-
Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
1+
Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
22

33
The Universal Permissive License (UPL), Version 1.0
44

5-
Subject to the condition set forth below, permission is hereby granted to any person obtaining a copy of this
6-
software, associated documentation and/or data (collectively the "Software"), free of charge and under any and
7-
all copyright rights in the Software, and any and all patent rights owned or freely licensable by each licensor
8-
hereunder covering either (i) the unmodified Software as contributed to or provided by such licensor, or
9-
(ii) the Larger Works (as defined below), to deal in both
5+
Subject to the condition set forth below, permission is hereby granted to any
6+
person obtaining a copy of this software, associated documentation and/or data
7+
(collectively the "Software"), free of charge and under any and all copyright
8+
rights in the Software, and any and all patent rights owned or freely
9+
licensable by each licensor hereunder covering either (i) the unmodified
10+
Software as contributed to or provided by such licensor, or (ii) the Larger
11+
Works (as defined below), to deal in both
1012

1113
(a) the Software, and
12-
(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if one is included with the Software
13-
(each a “Larger Work” to which the Software is contributed by such licensors),
14+
(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
15+
one is included with the Software (each a "Larger Work" to which the Software
16+
is contributed by such licensors),
1417

15-
without restriction, including without limitation the rights to copy, create derivative works of, display,
16-
perform, and distribute the Software and make, use, sell, offer for sale, import, export, have made, and have
17-
sold the Software and the Larger Work(s), and to sublicense the foregoing rights on either these or other terms.
18+
without restriction, including without limitation the rights to copy, create
19+
derivative works of, display, perform, and distribute the Software and make,
20+
use, sell, offer for sale, import, export, have made, and have sold the
21+
Software and the Larger Work(s), and to sublicense the foregoing rights on
22+
either these or other terms.
1823

1924
This license is subject to the following condition:
20-
The above copyright notice and either this complete permission notice or at a minimum a reference to the UPL must
21-
be included in all copies or substantial portions of the Software.
25+
The above copyright notice and either this complete permission notice or at
26+
a minimum a reference to the UPL must be included in all copies or
27+
substantial portions of the Software.
2228

23-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
24-
THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
25-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
26-
CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
27-
IN THE SOFTWARE.
29+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
30+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
31+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
32+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
33+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
34+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
35+
SOFTWARE.

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ The Image Tool provides three functions within the main script:
3939
[Image Tool Quick Start Guide](site/quickstart.md)
4040

4141
## Copyright
42-
Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
42+
Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.

‎build-tools/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<!-- Copyright 2019, Oracle Corporation and/or its affiliates. All rights reserved.
1+
<!-- Copyright (c) 2019, Oracle Corporation and/or its affiliates. All rights reserved.
22
Licensed under the Universal Permissive License v 1.0 as shown at
3-
http://oss.oracle.com/licenses/upl. -->
3+
https://oss.oracle.com/licenses/upl. -->
44
<project>
55
<modelVersion>4.0.0</modelVersion>
66

‎build-tools/src/main/resources/weblogic-image-tool/checkstyle/java.header

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
^// Copyright (\d\d\d\d, )+Oracle Corporation and\/or its affiliates\. All rights reserved\.$
2-
^// Licensed under the Universal Permissive License v 1\.0 as shown at http://oss\.oracle\.com/licenses/upl\.$
1+
^// Copyright \(c\) (\d\d\d\d, )+Oracle Corporation and\/or its affiliates\. All rights reserved\.$
2+
^// Licensed under the Universal Permissive License v 1\.0 as shown at https://oss\.oracle\.com/licenses/upl\.$

‎build-tools/src/main/resources/weblogic-image-tool/spotbugs/exclude-common.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
44
5-
Copyright (c) 2011-2013 Oracle and/or its affiliates. All rights reserved.
5+
Copyright (c) 2011-2013 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

‎imagetool/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<!-- Copyright 2019, Oracle Corporation and/or its affiliates. All rights reserved.
1+
<!-- Copyright (c) 2019, Oracle Corporation and/or its affiliates. All rights reserved.
22
Licensed under the Universal Permissive License v 1.0 as shown at
3-
http://oss.oracle.com/licenses/upl. -->
3+
https://oss.oracle.com/licenses/upl. -->
44
<project xmlns="http://maven.apache.org/POM/4.0.0"
55
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
66
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

‎imagetool/src/assembly/zip.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
33
The Universal Permissive License (UPL), Version 1.0
44
-->
55
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"

‎imagetool/src/main/bin/imagetool.cmd

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
@echo off
2-
@rem **************************************************************************
3-
@rem imagetool.cmd
4-
@rem
5-
@rem Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
6-
@rem Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
7-
8-
IF "%JAVA_HOME%" == "" (
9-
ECHO JAVA_HOME not set. Please set JAVA_HOME to jdk home. OpenJDK is not supported.
10-
EXIT /B 2
11-
)
12-
FOR %%i IN ("%JAVA_HOME%") DO SET JAVA_HOME=%%~fsi
13-
IF %JAVA_HOME:~-1%==\ SET JAVA_HOME=%JAVA_HOME:~0,-1%
14-
IF EXIST %JAVA_HOME%\bin\java.exe (
15-
FOR %%i IN ("%JAVA_HOME%\bin\java.exe") DO SET JAVA_EXE=%%~fsi
16-
) ELSE (
17-
ECHO Java executable does not exist at %JAVA_HOME%\bin\java.exe does not exist >&2
18-
EXIT /B 2
19-
)
20-
FOR /F %%i IN ('%JAVA_EXE% -version 2^>^&1') DO (
21-
IF "%%i" == "OpenJDK" (
22-
ECHO JAVA_HOME %JAVA_HOME% contains OpenJDK^, which is not supported >&2
23-
EXIT /B 2
24-
)
25-
)
26-
SET IMAGETOOL_HOME=%~dp0%/..
1+
@echo off
2+
@rem **************************************************************************
3+
@rem imagetool.cmd
4+
@rem
5+
@rem Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
6+
@rem Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
7+
8+
IF "%JAVA_HOME%" == "" (
9+
ECHO JAVA_HOME not set. Please set JAVA_HOME to jdk home. OpenJDK is not supported.
10+
EXIT /B 2
11+
)
12+
FOR %%i IN ("%JAVA_HOME%") DO SET JAVA_HOME=%%~fsi
13+
IF %JAVA_HOME:~-1%==\ SET JAVA_HOME=%JAVA_HOME:~0,-1%
14+
IF EXIST %JAVA_HOME%\bin\java.exe (
15+
FOR %%i IN ("%JAVA_HOME%\bin\java.exe") DO SET JAVA_EXE=%%~fsi
16+
) ELSE (
17+
ECHO Java executable does not exist at %JAVA_HOME%\bin\java.exe does not exist >&2
18+
EXIT /B 2
19+
)
20+
FOR /F %%i IN ('%JAVA_EXE% -version 2^>^&1') DO (
21+
IF "%%i" == "OpenJDK" (
22+
ECHO JAVA_HOME %JAVA_HOME% contains OpenJDK^, which is not supported >&2
23+
EXIT /B 2
24+
)
25+
)
26+
SET IMAGETOOL_HOME=%~dp0%/..
2727
%JAVA_HOME%\bin\java -cp %IMAGETOOL_HOME%\lib\* -Djava.util.logging.config.file=%IMAGETOOL_HOME%\bin\logging.properties com.oracle.weblogic.imagetool.cli.CLIDriver %*

‎imagetool/src/main/bin/imagetool.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
2-
#Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
2+
#Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
33
#
4-
#Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
4+
#Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
55
#
66
# imagetool.sh
77

‎imagetool/src/main/bin/setup.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
2-
#Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
2+
#Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
33
#
4-
#Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
4+
#Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
55
#
66
# source setup.sh
77
umask 27

0 commit comments

Comments
 (0)