Skip to content

Commit

Permalink
Merge pull request #1 from quarkusio/master
Browse files Browse the repository at this point in the history
Bringing up to date.
  • Loading branch information
nmcl authored May 10, 2019
2 parents 6940105 + 2dda518 commit 572a3b3
Show file tree
Hide file tree
Showing 1,601 changed files with 50,129 additions and 15,161 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,5 @@ ObjectStore
build
docker/distroless/bazel-*
/.apt_generated_tests/
quarkus.log
replay_*.log
22 changes: 11 additions & 11 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ The DCO text is also included verbatim in the [dco.txt](dco.txt) file in the roo
This project uses GitHub issues to manage the issues. Open an issue directly in GitHub.

If you believe you found a bug, and it's likely possible, please indicate a way to reproduce it, what you are seeing and what you would expect to see.
Don't forget to indicate your Java, Maven and GraalVM version.
Don't forget to indicate your Quarkus, Java, Maven/Gradle and GraalVM version.

## Before you contribute

Expand Down Expand Up @@ -51,7 +51,6 @@ If you have not done so on this machine, you need to:

* Install Git and configure your GitHub access
* Install Java SDK (OpenJDK recommended)
* Download and Apache Maven (3.5+)
* Install [GraalVM](http://www.graalvm.org/downloads/) (community edition is enough)
* Install platform C developer tools:
* Linux
Expand All @@ -71,14 +70,14 @@ On Linux, check [the post-installation guide](https://docs.docker.com/install/li
### IDE Config and Code Style

Quarkus has a strictly enforced code style. Code formatting is done by the Eclipse code formatter, using the config files
found in the `ide-config` directory. By default when you run `mvn install` the code will be formatted automatically.
found in the `ide-config` directory. By default when you run `./mvnw install` the code will be formatted automatically.
When submitting a pull request the CI build will fail if running the formatter results in any code changes, so it is
recommended that you always run a full maven build before submitting a pull request.
recommended that you always run a full Maven build before submitting a pull request.

#### Eclipse Setup

Open the *Preferences* window, and then navigate to _Java_ -> _Code Style_ -> _Formatter_. Click _Import_ and then
select the `eclipse-formatter.xml` file in the `ide-config` directory.
select the `eclipse-format.xml` file in the `ide-config` directory.

Next navigate to _Java_ -> _Code Style_ -> _Organize Imports_. Click _Import_ and select the `eclipse.importorder` file.

Expand All @@ -89,29 +88,30 @@ Open the _Preferences_ window, navigate to _Plugins_ and install the [Eclipse Co
Restart you IDE, open the *Preferences* window again and navigate to _Other Settings_ -> _Eclipse Code Formatter_.

Select _Use the Eclipse Code Formatter_, then change the _Eclipse Java Formatter Config File_ to point to the
`eclipse-formatter.xml` file in the `ide-config` directory. Make sure the _Optimize Imports_ box is ticked, and
`eclipse-format.xml` file in the `ide-config` directory. Make sure the _Optimize Imports_ box is ticked, and
select the `eclipse.importorder` file as the import order config file.


## Build

* Clone the repository: `git clone https://github.com/quarkusio/quarkus.git`
* Navigate to the directory: `cd quarkus`
* Invoke `mvn clean install` from the root directory
* Invoke `./mvnw clean install` from the root directory

```bash
git clone https://github.com/quarkusio/quarkus.git
cd quarkus
mvn clean install
./mvnw clean install
# Wait... success!
```

The default build will create two different native images, which is quite time consuming. You can skip this
by disabling the `native-image` profile: `mvn install -Dno-native`.
The default build does not create native images, which is quite time consuming.

You can build and test native images in the integration tests supporting it by using `./mvnw install -Dnative`.

By default the build will use the native image server. This speeds up the build, but can cause problems due to the cache
not being invalidated correctly in some cases. To run a build with a new instance of the server you can use
`mvn install -Dnative-image.new-server=true`.
`./mvnw install -Dnative-image.new-server=true`.

## The small print

Expand Down
69 changes: 69 additions & 0 deletions DECISIONS.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
= Decision-Making Framework

== Proposal

Design and process decision proposals should be made to the `quarkus-dev`
Google group (https://groups.google.com/forum/#!forum/quarkus-dev[on the web]
or mailto:[email protected][over e-mail]).

== Bake time

Any significant design or process decision should "bake"
for a minimum of 2 regular working days before becoming policy.
If this time elapses with no discussion, this should be considered
to be assent - with a few caveats. This allows things to move along
without new ideas being stuck in an idle "limbo" for weeks and weeks waiting for
an OK.

== Notification

When proposing a design decision, it is important to ensure that the
maintainer(s) and contributor(s) of any impacted areas are aware of
the decision. If a design proposal impacts a system and the
maintainer has not responded (even just to say "OK"), then it is the
responsibility of the proposer to ensure that they are not on PTO
(vacation) or anything of that nature. The proposer should make a
reasonable effort to contact the maintainer(s) and significant contributor(s)
of the given area and ensure that they've at least _seen_ the proposal.
To streamline this, it's a good idea for such maintainers to give their
quick OK to a proposal on a timely basis.

In cases where it is unclear to the proposer who is responsible for a
given area, this should be stated in the proposal so that the responsible
person or people can be found.

For a process decision, the same rules apply, except that the
"maintainers" of this "system" should be considered to be the project
lead(s). Again silence means assent - but only if they've _seen_ the
proposal.

It is the responsibility of all maintainers to stay on top of design
proposals, even if just to respond and say "I need time to think about
it" before the 48 hours expire.

Notification may take place over the Google group or e-mail list, or
over https://quarkusio.zulipchat.com/#[the online Zulip chat].

== Issues and pull requests on GitHub

If a https://github.com/quarkusio/quarkus/issues[GitHub issue] or
https://github.com/quarkusio/quarkus/pulls[pull request] is created which
proposes a design change, then it should be labelled `Needs Decision`, and the
corresponding discussion should then be held on the Google group as explained
above. A link to the discussion should be placed in a comment of the issue.
Such pull requests should not be merged, nor issues resolved, until the design
decision is resolved according to this process.

== Disputes

Because good ideas can come from anywhere, anyone may propose a design
change; likewise, anyone may dispute a proposal. It is the responsibility
of all parties to participate fairly and respectfully.

In the case of unresolvable disputes, the final decision rests with
the project lead(s); it is their responsibility to
ensure that they are informed on the details of the decision before
ruling. The project leads are encouraged to facilitate resolution
among the disputing parties before resorting to an executive ruling,
but at the end of the day the project needs to move forward and so
this should be kept in mind.
44 changes: 22 additions & 22 deletions azure-mvn-settings.xml
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
<settings>
<mirrors>
<mirror>
<id>jboss-public-repository-group</id>
<mirrorOf>*,!quarkus-nexus-release,!quarkus-nexus-snapshot</mirrorOf>
<name>jboss</name>
<url>http://repository.jboss.org/nexus/content/groups/developer/</url>
</mirror>
</mirrors>
<profiles>
<profile>
<id>jboss-nexus</id>
<id>google-mirror-jboss-proxy</id>
<repositories>
<repository>
<id>jboss-public-repository-group</id>
<name>JBoss Public Repository Group</name>
<url>http://repository.jboss.org/nexus/content/groups/public/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
</snapshots>
<id>google-maven-central</id>
<name>GCS Maven Central mirror EU</name>
<url>https://maven-central-eu.storage-download.googleapis.com/repos/central/data/</url>
</repository>
<repository>
<id>jboss-maven-central-proxy</id>
<name>JBoss Maven Central proxy</name>
<url>https://repository.jboss.org/nexus/content/repositories/central/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>google-maven-central</id>
<name>GCS Maven Central mirror EU</name>
<url>https://maven-central-eu.storage-download.googleapis.com/repos/central/data/</url>
</pluginRepository>
<pluginRepository>
<id>jboss-maven-central-proxy</id>
<name>JBoss Maven Central proxy</name>
<url>https://repository.jboss.org/nexus/content/repositories/central/</url>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
<activeProfiles>
<activeProfile>jboss-nexus</activeProfile>
<activeProfile>google-mirror-jboss-proxy</activeProfile>
</activeProfiles>
</settings>
4 changes: 2 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ pr:

jobs:
- job: Build_Native_Linux
timeoutInMinutes: 120
timeoutInMinutes: 150
pool:
vmImage: 'Ubuntu 16.04'

Expand All @@ -40,7 +40,7 @@ jobs:
displayName: 'Maven Build'
inputs:
goals: 'install'
options: '-B --settings azure-mvn-settings.xml -Dnative-image.docker-build -Dtest-postgresql -Dnative-image.xmx=5g -Dnative -Dno-format'
options: '-B --settings azure-mvn-settings.xml -Dnative-image.docker-build -Dtest-postgresql -Dtest-elasticsearch -Dnative-image.xmx=6g -Dnative -Dno-format'

- job: Windows_Build
timeoutInMinutes: 60
Expand Down
Loading

0 comments on commit 572a3b3

Please sign in to comment.