Skip to content

Commit

Permalink
Merge pull request #2496 from pshipton/rel9
Browse files Browse the repository at this point in the history
Update the v0.9.0-release branch with the latest tested working content
  • Loading branch information
DanHeidinga authored Jul 27, 2018
2 parents 6323d1d + 64fcf04 commit da3b8c7
Show file tree
Hide file tree
Showing 555 changed files with 19,454 additions and 10,470 deletions.
17 changes: 0 additions & 17 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,6 @@
#
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception

# This .gitattributes file will cause all text files EXCEPT for
# those specifically listed below to be encoded as EBCDIC.
# Selected binary files will not be translated at all.

# The default for text files
* git-encoding=iso8859-1 working-tree-encoding=ibm-1047

# Specific types of files remain as ASCII
*.xml git-encoding=iso8859-1 working-tree-encoding=iso8859-1
*.dtd git-encoding=iso8859-1 working-tree-encoding=iso8859-1
*.xsd git-encoding=iso8859-1 working-tree-encoding=iso8859-1
buildspecs/* git-encoding=iso8859-1 working-tree-encoding=iso8859-1

# git's files (which MUST be ASCII)
.gitattributes git-encoding=iso8859-1 working-tree-encoding=iso8859-1
.gitignore git-encoding=iso8859-1 working-tree-encoding=iso8859-1

# Binary files
*.jpg git-encoding=BINARY working-tree-encoding=BINARY
*.png git-encoding=BINARY working-tree-encoding=BINARY
Expand Down
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ os:
- linux
language: cpp
sudo: false
#cache: ccache # https://docs.travis-ci.com/user/caching/
cache:
directories:
- $HOME/.ccache
dist: trusty
addons:
apt:
Expand Down Expand Up @@ -82,7 +84,6 @@ script:
# Based on https://blog.travis-ci.com/2014-12-17-faster-builds-with-container-based-infrastructure/ travis container
# builds have 2 cores and 4 gigs of memory. Attempt to double provision the number of cores for the make...
# Limit number of jobs to work around g++ internal compiler error.
- export UMA_WINDOWS_PARRALLEL_HACK=-j4
- bash configure --with-freemarker-jar=$TRAVIS_BUILD_DIR/freemarker.jar --with-jobs=4 --with-num-cores=4 --enable-ccache --with-cmake --disable-ddr
- make images EXTRA_CMAKE_ARGS="-DOMR_WARNINGS_AS_ERRORS=FALSE"
# Minimal sniff test - ensure java -version works.
Expand Down
37 changes: 22 additions & 15 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ is available at https://www.apache.org/licenses/LICENSE-2.0.
This Source Code may also be made available under the following
Secondary Licenses when the conditions for such availability set
forth in the Eclipse Public License, v. 2.0 are satisfied: GNU
General Public License, version 2 with the GNU Classpath
General Public License, version 2 with the GNU Classpath
Exception [1] and GNU General Public License, version 2 with the
OpenJDK Assembly Exception [2].
Expand All @@ -27,10 +27,11 @@ Thank you for your interest in Eclipse OpenJ9!
We welcome and encourage all kinds of contributions to the project, not only
code. This includes bug reports, user experience feedback, assistance in
reproducing issues and more. Contributions to the website
(https://github.com/eclipse/openj9-website), to the system verification tests
(https://github.com/eclipse/openj9-systemtest), or Eclipse OMR
(https://github.com/eclipse/omr) which is an integral part of OpenJ9 are all
also welcome.
(https://github.com/eclipse/openj9-website), to the user documentation
(https://github.com/eclipse/openj9-docs), to the system verification tests
(https://github.com/eclipse/openj9-systemtest), or to Eclipse OMR
(https://github.com/eclipse/omr), which is an integral part of OpenJ9 are all
also welcome.


## Submitting a contribution to OpenJ9
Expand All @@ -48,9 +49,15 @@ Following these guidelines will help us merge your pull requests smoothly:
3. We encourage you to open a pull request early, and mark it as "Work In
Progress", by prefixing the PR title with "WIP". This allows feedback to
start early, and helps create a better end product. Committers will wait
until after you've removed the WIP prefix to merge your changes.
until after you've removed the WIP prefix to merge your changes.

4. Please carefully read and adhere to the legal considerations and
4. If your contribution introduces an external change that requires an update
to the [user documentation](https://www.eclipse.org/openj9/docs/), add the
label `doc:externals` and open an [issue](https://github.com/eclipse/openj9-docs/issues/new?template=new-documentation-change.md)
at the user documentation repository. Examples of an external change include
a new command line option, a change in behavior, or a restriction.

5. Please carefully read and adhere to the legal considerations and
copyright/license requirements outlined below.

## Commit Guidelines
Expand All @@ -69,7 +76,7 @@ copying resources into the body of the commit over providing external links.
Structure large commit messages with headers, references etc. Remember, however,
that the commit message is always going to be rendered in plain text.

Please add `[skip ci]` to the commit message when the change doesn't require a
Please add `[skip ci]` to the commit message when the change doesn't require a
compilation, such as documentation only changes, to avoid unnecessarily wasting
the project's build resources.

Expand All @@ -80,7 +87,7 @@ https://help.github.com/articles/closing-issues-using-keywords/
For example:

```
Correct race in frobnicator
Correct race in frobnicator
This patch eliminates the race condition in issue #1234.
Expand Down Expand Up @@ -168,7 +175,7 @@ Here is the checklist for contributions to be _acceptable_:
Your signing of the ECA will be verified by a webservice called 'ip-validation'
that checks the email address that signed-off on your commits has signed the
ECA. **Note**: This service is case-sensitive, so ensure the email that signed
the ECA and that signed-off on your commits is the same, down to the case.
the ECA and that signed-off on your commits is the same, down to the case.

### Copyright Notice and Licensing Requirements

Expand All @@ -189,23 +196,23 @@ The template for the copyright notice and dual-license is as follows:
```
/*******************************************************************************
* Copyright (c) %s, %s IBM Corp. and others
*
*
* This program and the accompanying materials are made available under
* the terms of the Eclipse Public License 2.0 which accompanies this
* distribution and is available at https://www.eclipse.org/legal/epl-2.0/
* or the Apache License, Version 2.0 which accompanies this distribution and
* is available at https://www.apache.org/licenses/LICENSE-2.0.
*
*
* This Source Code may also be made available under the following
* Secondary Licenses when the conditions for such availability set
* forth in the Eclipse Public License, v. 2.0 are satisfied: GNU
* General Public License, version 2 with the GNU Classpath
* General Public License, version 2 with the GNU Classpath
* Exception [1] and GNU General Public License, version 2 with the
* OpenJDK Assembly Exception [2].
*
*
* [1] https://www.gnu.org/software/classpath/license.html
* [2] http://openjdk.java.net/legal/assembly-exception.html
*
*
* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
*******************************************************************************/
```
Loading

0 comments on commit da3b8c7

Please sign in to comment.