Skip to content

Commit

Permalink
Rename Shamrock to Quarkus, change file contents
Browse files Browse the repository at this point in the history
  • Loading branch information
@stuartwdouglas
stuartwdouglas committed Feb 22, 2019
1 parent f04c92d commit ff555ef
Show file tree
Hide file tree
Showing 1,418 changed files with 5,811 additions and 5,811 deletions.
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,21 +52,21 @@ If you have not done so on this machine, you need to:
* `xcode-select --install`
* Set `GRAALVM_HOME` to your GraalVM Home directory e.g. `/opt/graalvm` on Linux or `$location/JDK/GraalVM/Contents/Home` on macOS

Docker is not strictly necessary: it is used to run the MariaDB and PostgreSQL tests which are not enabled by default. However it is a recommended install if you plan to work on Shamrock JPA support:
Docker is not strictly necessary: it is used to run the MariaDB and PostgreSQL tests which are not enabled by default. However it is a recommended install if you plan to work on Quarkus JPA support:

* Check [the installation guide](https://docs.docker.com/install/), and [the MacOS installation guide](https://docs.docker.com/docker-for-mac/install/)
* If you just install docker, be sure that your current user can run a container (no root required).
On Linux, check [the post-installation guide](https://docs.docker.com/install/linux/linux-postinstall/)

## Build

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

```bash
git clone https://github.com/jbossas/protean-shamrock.git
cd protean-shamrock
git clone https://github.com/jbossas/quarkus.git
cd quarkus
mvn clean install
# Wait... success!
```
Expand Down
18 changes: 9 additions & 9 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Shamrock
# Quarkus

[![Build Status](https://dev.azure.com/protean-ci/Shamrock/_apis/build/status/jbossas.protean-shamrock)](https://dev.azure.com/protean-ci/Shamrock/_build/latest?definitionId=4)
[![Build Status](https://dev.azure.com/quarkus-ci/Quarkus/_apis/build/status/jbossas.quarkus)](https://dev.azure.com/quarkus-ci/Quarkus/_build/latest?definitionId=4)

> Protean is a Cloud Native, Container First framework for writing Java applications.
> Quarkus is a Cloud Native, Container First framework for writing Java applications.

* **Container First**:
Expand All @@ -22,14 +22,14 @@ _All under ONE framework._

## Getting Started

* [Documentation](http://10.0.144.40/nfs/protean/)
* [Getting Started](http://10.0.144.40/nfs/protean/getting-started-guide.html)
* [Documentation](http://10.0.144.40/nfs/quarkus/)
* [Getting Started](http://10.0.144.40/nfs/quarkus/getting-started-guide.html)

---

## Shamrock
## Quarkus

Shamrock, aka the core of Protean, is a framework that allows you to process Java EE and Eclipse MicroProfile metadata at build time,
Quarkus, aka the core of Quarkus, is a framework that allows you to process Java EE and Eclipse MicroProfile metadata at build time,
and use it to create low overhead jar files, as well as native images using Graal/Substrate VM.

At the moment it has the following features:
Expand Down Expand Up @@ -59,13 +59,13 @@ At the moment it has the following features:
- A JUnit runner that can run tests, and supports IDE usage
- A JUnit runner that can test a native image produced by the Maven plugin

### How to build Shamrock
### How to build Quarkus

The build instructions are available in the [contribution guide](CONTRIBUTING.md).

### Architecture Overview

Shamrock runs in two distinct phases. The first phase is build time processing phase called augmentation. In this phase
Quarkus runs in two distinct phases. The first phase is build time processing phase called augmentation. In this phase
we process all metadata such as annotations and descriptors and use this information to determine which services we
need to start at runtime. The output of this phase is generated bytecode that will configure and start all the
services required at runtime.
Expand Down
14 changes: 7 additions & 7 deletions azure-mvn-settings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<mirrors>
<mirror>
<id>jboss-public-repository-group</id>
<mirrorOf>*,!protean-nexus-release,!protean-nexus-snapshot</mirrorOf>
<mirrorOf>*,!quarkus-nexus-release,!quarkus-nexus-snapshot</mirrorOf>
<name>jboss</name>
<url>http://repository.jboss.org/nexus/content/groups/developer/</url>
</mirror>
Expand All @@ -25,10 +25,10 @@
<updatePolicy>never</updatePolicy>
</snapshots>
</repository>
<!-- Forgot the password? see https://github.com/protean-project/hibernate-protean/wiki/Protean-Nexus-credentials -->
<!-- Forgot the password? see https://github.com/quarkus-project/hibernate-quarkus/wiki/Quarkus-Nexus-credentials -->
<repository>
<id>protean-nexus-release</id>
<name>Protean AWS Nexus - Releases</name>
<id>quarkus-nexus-release</id>
<name>Quarkus AWS Nexus - Releases</name>
<url>http://ec2-18-234-117-118.compute-1.amazonaws.com:8081/nexus/content/repositories/releases/</url>
<layout>default</layout>
<releases>
Expand All @@ -39,10 +39,10 @@
<enabled>false</enabled>
</snapshots>
</repository>
<!-- Forgot the password? see https://github.com/protean-project/hibernate-protean/wiki/Protean-Nexus-credentials -->
<!-- Forgot the password? see https://github.com/quarkus-project/hibernate-quarkus/wiki/Quarkus-Nexus-credentials -->
<repository>
<id>protean-nexus-snapshot</id>
<name>Protean AWS Nexus - Snapshots</name>
<id>quarkus-nexus-snapshot</id>
<name>Quarkus AWS Nexus - Snapshots</name>
<url>http://ec2-18-234-117-118.compute-1.amazonaws.com:8081/nexus/content/repositories/snapshots/</url>
<layout>default</layout>
<releases>
Expand Down
18 changes: 9 additions & 9 deletions azure-pipelines.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
vmImage: 'Ubuntu 16.04'

variables:
imageName: 'shamrock:$(build.buildId)'
imageName: 'quarkus:$(build.buildId)'

steps:

Expand All @@ -30,9 +30,9 @@ jobs:
options: '-B --settings azure-mvn-settings.xml -Dnative-image.docker-build -Dtest-postgresql -Dnative-image.xmx=4g -Dnative'

- script: |
docker build -f docker/integration-test-main/Dockerfile -t jtgdocker1/shamrock-integration-test-main integration-tests/main
docker build -f docker/integration-test-main/Dockerfile -t jtgdocker1/quarkus-integration-test-main integration-tests/main
docker login -u jtgdocker1 -p uEo-NTv-5YT-kk6
docker push jtgdocker1/shamrock-integration-test-main
docker push jtgdocker1/quarkus-integration-test-main
docker logout
displayName: Publishing Integration Test Main Container Image
Expand Down Expand Up @@ -68,17 +68,17 @@ jobs:
}
cd openshift-origin-client*
docker login -u jtgdocker1 -p uEo-NTv-5YT-kk6
docker pull jtgdocker1/shamrock-integration-test-main
docker pull jtgdocker1/quarkus-integration-test-main
docker pull centos/postgresql-10-centos7
docker logout
./oc create secret docker-registry jtgdocker1 --docker-username=jtgdocker1 --docker-password=uEo-NTv-5YT-kk6 --docker-email='[email protected]'
./oc secrets link default jtgdocker1 --for=pull
./oc new-app -e "POSTGRESQL_USER=hibernate_orm_test" -e "POSTGRESQL_PASSWORD=hibernate_orm_test" -e "POSTGRESQL_DATABASE=hibernate_orm_test" centos/postgresql-10-centos7
wait_for_pod postgres
./oc new-app -e "DATASOURCE_URL=jdbc:postgresql://postgresql-10-centos7/hibernate_orm_test" jtgdocker1/shamrock-integration-test-main
wait_for_pod shamrock
./oc new-app -e "DATASOURCE_URL=jdbc:postgresql://postgresql-10-centos7/hibernate_orm_test" jtgdocker1/quarkus-integration-test-main
wait_for_pod quarkus
./oc status
VAL=`./oc get service shamrock-integration-test-main -o "custom-columns=IP:.spec.clusterIP" --no-headers=true`
VAL=`./oc get service quarkus-integration-test-main -o "custom-columns=IP:.spec.clusterIP" --no-headers=true`
VAL2=`curl -v http://$VAL:8080/jpa/testjpaeminjection`
test "$VAL2" = "OK"
displayName: 'Deploy and Test On Openshift'
Expand All @@ -90,7 +90,7 @@ jobs:
vmImage: 'vs2017-win2016'

variables:
imageName: 'shamrock-windows:$(build.buildId)'
imageName: 'quarkus-windows:$(build.buildId)'

steps:

Expand All @@ -106,7 +106,7 @@ jobs:
vmImage: 'Ubuntu 16.04'

variables:
imageName: 'shamrock-jdk11:$(build.buildId)'
imageName: 'quarkus-jdk11:$(build.buildId)'

steps:
- task: Maven@3
Expand Down
Loading

0 comments on commit ff555ef

Please sign in to comment.