Skip to content
This repository was archived by the owner on Jul 2, 2020. It is now read-only.

Commit fe3654c

Browse files
author
dvtdev
committed
Update
1 parent ba46114 commit fe3654c

File tree

2 files changed

+50
-14
lines changed

2 files changed

+50
-14
lines changed

CONTRIBUTING.md

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# Contributing to generator-oraclejet
2+
3+
*Copyright (c) 2014,2016 Oracle and/or its affiliates
4+
The Universal Permissive License (UPL), Version 1.0*
5+
6+
Pull requests can be made under [The Oracle Contributor Agreement](https://www.oracle.com/technetwork/community/oca-486395.html)
7+
(OCA).
8+
9+
If you have ideas, comments, or issues related to Oracle JET and Yeoman generators, swing on by the [Oracle JET Generators discussion forum.](https://community.oracle.com/community/development_tools/oracle-jet/generators)
10+
11+
For pull requests to be accepted into generator-oraclejet, the bottom of
12+
your commit message must have the following line using your name and
13+
e-mail address as it appears in the OCA Signatories list.
14+
15+
```
16+
Signed-off-by: Your Name <you@example.org>
17+
```
18+
19+
This can be automatically added to pull requests by committing with:
20+
21+
```
22+
git commit --signoff
23+
````
24+
25+
Only pull requests from committers that can be verified as having
26+
signed the OCA can be accepted.

LICENSE.md

+24-14
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,36 @@
1+
# generator-oraclejet
12

3+
You may not use the identified files except in compliance with the
4+
Universal Permissive License (UPL), Version 1.0 (the "License.")
5+
6+
You may obtain a copy of the License at
7+
https://opensource.org/licenses/UPL. A copy of the license is
8+
also reproduced below.
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
13+
implied.
14+
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
18+
19+
```
220
Copyright (c) 2014, 2016 Oracle and/or its affiliates
321
The Universal Permissive License (UPL), Version 1.0
422
5-
Subject to the condition set forth below, permission is hereby granted to any person obtaining a copy of this software, associated documentation and/or data
6-
(collectively the "Software"), free of charge and under any and all copyright rights in the Software, and any and all patent rights owned or freely licensable by each
7-
licensor hereunder covering either (i) the unmodified Software as contributed to or provided by such licensor, or (ii) the Larger Works (as defined below), to deal in
8-
both
23+
Subject to the condition set forth below, permission is hereby granted to any person obtaining a copy of this software, associated documentation and/or data (collectively the "Software"), free of charge and under any and all copyright rights in the Software, and any and all patent rights owned or freely licensable by each licensor hereunder covering either (i) the unmodified Software as contributed to or provided by such licensor, or (ii) the Larger Works (as defined below), to deal in both
924
1025
(a) the Software, and
1126
12-
(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if one is included with the Software (each a “Larger Work” to which the Software is
13-
contributed by such licensors),
27+
(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if one is included with the Software (each a “Larger Work” to which the Software is contributed by such licensors),
1428
15-
without restriction, including without limitation the rights to copy, create derivative works of, display, perform, and distribute the Software and make, use, sell, offer
16-
for sale, import, export, have made, and have sold the Software and the Larger Work(s), and to sublicense the foregoing rights on either these or other terms.
29+
without restriction, including without limitation the rights to copy, create derivative works of, display, perform, and distribute the Software and make, use, sell, offer for sale, import, export, have made, and have sold the Software and the Larger Work(s), and to sublicense the foregoing rights on either these or other terms.
1730
1831
This license is subject to the following condition:
1932
20-
The above copyright notice and either this complete permission notice or at a minimum a reference to the UPL must be included in all copies or substantial portions
21-
of the Software.
33+
The above copyright notice and either this complete permission notice or at a minimum a reference to the UPL must be included in all copies or substantial portions of the Software.
2234
23-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
24-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
25-
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
26-
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
35+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
36+
```

0 commit comments

Comments
 (0)