Skip to content

Commit 8b2a9a7

Browse files
authored
Merge pull request #34 from RADAR-CNS/dev
Bring master upto date with dev
2 parents 58fe66e + 1d14072 commit 8b2a9a7

File tree

217 files changed

+9854
-9172
lines changed

Some content is hidden

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

217 files changed

+9854
-9172
lines changed

.dockerignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.idea
2+
.gradle*
3+
build

.gitignore

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
.idea/
33
*.iml
44
*.iws
5+
classes/
56

67
# Mac
78
.DS_Store
@@ -15,3 +16,11 @@ log/
1516

1617
# Build
1718
/build/
19+
20+
# logs
21+
backend.log
22+
23+
# Configuration
24+
smtp.env
25+
26+
/out/

.gitmodules

Whitespace-only changes.

.idea/.name

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/compiler.xml

Lines changed: 10 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/copyright/profiles_settings.xml

Lines changed: 0 additions & 3 deletions
This file was deleted.

.idea/modules.xml

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.travis.yml

Lines changed: 37 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,40 @@
11
language: java
2-
# Update to the latest version of Java 8
3-
sudo: false
4-
addons:
5-
apt:
6-
packages:
7-
- oracle-java8-installer
82
jdk:
93
- oraclejdk8
4+
sudo: required
5+
services:
6+
- docker
7+
env:
8+
DOCKER_COMPOSE_VERSION: 1.9.0
9+
TERM: dumb
10+
before_cache:
11+
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
12+
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
13+
cache:
14+
directories:
15+
- $HOME/.gradle/caches/
16+
- $HOME/.gradle/wrapper/
17+
18+
before_install:
19+
- mkdir -p "$HOME/bin";
20+
- export PATH="$PATH:$HOME/bin";
21+
- curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > "$HOME/bin/docker-compose";
22+
- chmod +x "$HOME/bin/docker-compose";
23+
script:
24+
- ./gradlew check
25+
- sudo docker-compose up -d zookeeper-1 kafka-1 schema-registry-1 && sleep 30 && sudo docker-compose run --rm integration-test
26+
- sudo docker-compose down
27+
after_script:
28+
- ./gradlew sendCoverageToCodacy
29+
30+
deploy:
31+
provider: releases
32+
api_key: ${GH_TOKEN}
33+
file_glob: true
34+
file: "build/libs/*.jar"
35+
skip_cleanup: true
36+
on:
37+
tags: true
38+
39+
after_deploy:
40+
- ./gradlew bintrayUpload

CODEOWNERS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# These owners will be the default owners for everything in the repo.
2+
# Unless a later match takes precedence, they will be requested for review when someone
3+
# opens a pull request.
4+
* @blootsvoets @nivemaham @fnobilia

Dockerfile

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
FROM confluentinc/cp-base:3.2.1-5
2+
3+
ENV TERM=dumb
4+
5+
RUN mkdir /code
6+
WORKDIR /code
7+
8+
COPY gradle /code/gradle
9+
COPY gradle.properties build.gradle settings.gradle gradlew /code/
10+
RUN ./gradlew downloadDependencies
11+
COPY src /code/src
12+
13+
ENTRYPOINT ["./gradlew"]

0 commit comments

Comments
 (0)