Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
69a5703
Refactor main modules pom file
ebrahimmfadae Nov 14, 2021
e3acb1b
Fix wallet maven structure
ebrahimmfadae Nov 15, 2021
4e2e98a
Optimize wallet imports
ebrahimmfadae Nov 15, 2021
0f2a078
Fix utility module pom
ebrahimmfadae Nov 15, 2021
0d8485d
Reformat whole project
ebrahimmfadae Nov 15, 2021
79a7291
Fix user management pom
ebrahimmfadae Nov 15, 2021
eaa7855
Fix matching gateway pom
ebrahimmfadae Nov 15, 2021
39dd9fa
Fix matching engine pom
ebrahimmfadae Nov 15, 2021
54e26bc
Fix matching engine sub modules
ebrahimmfadae Nov 15, 2021
13e4ce6
Fix matching engine namespaces
ebrahimmfadae Nov 15, 2021
ab7ed52
Fix cache cleaning issues
ebrahimmfadae Nov 15, 2021
f259053
Fix bc gateway pom
ebrahimmfadae Nov 15, 2021
580eeae
Fix api pom
ebrahimmfadae Nov 16, 2021
f764a07
Fix accountant-app pom
ebrahimmfadae Nov 16, 2021
b5a4060
Fix accountant-core pom
ebrahimmfadae Nov 16, 2021
6bc375f
Fix accountant postgres pom
ebrahimmfadae Nov 16, 2021
023d462
Fix accountant kafka listener pom
ebrahimmfadae Nov 16, 2021
6057410
Fix accountant kafka submitter pom
ebrahimmfadae Nov 16, 2021
0ea650d
Fix accountant wallet proxy pom
ebrahimmfadae Nov 16, 2021
d480364
Fix dependency issues
ebrahimmfadae Nov 16, 2021
ebcbd1b
Fix typo in wallet
ebrahimmfadae Nov 16, 2021
7b49aba
Level up dependencies
ebrahimmfadae Nov 17, 2021
d0a1f7b
Fix kotlin core dependencies
ebrahimmfadae Nov 20, 2021
72f6c2d
Remove duplicate dependencies
ebrahimmfadae Nov 20, 2021
0f267f3
Fix wallet app dependencies
ebrahimmfadae Nov 20, 2021
937dbb5
Organize internal versioning
ebrahimmfadae Nov 21, 2021
2fb9f78
Clean up utility
ebrahimmfadae Nov 21, 2021
0338e49
Kebab case module names
ebrahimmfadae Nov 21, 2021
761368d
Fix docker compose
ebrahimmfadae Nov 21, 2021
77a159a
Update CI/CD configs
ebrahimmfadae Nov 21, 2021
1d7e02c
Update docker compose
ebrahimmfadae Nov 21, 2021
91b2e65
Fix matching modules issues
ebrahimmfadae Nov 21, 2021
c9791a0
Fix bc-gateway module structure
ebrahimmfadae Nov 21, 2021
c7c0f12
Remove redundant .gitignores
ebrahimmfadae Nov 21, 2021
6ffd48c
Fix accountant kafka package name
ebrahimmfadae Nov 21, 2021
95fca3f
Fix bc-gateway module dependencies
ebrahimmfadae Nov 22, 2021
50c66b4
Merge branch 'issues/93/fix-dependency-structure' into fix-utility-maven
ebrahimmfadae Nov 22, 2021
a12a13f
Cleanup utility poms
ebrahimmfadae Nov 22, 2021
e61b02d
Extract parent in utility modules
ebrahimmfadae Nov 22, 2021
d514a23
Cleanup plugins
ebrahimmfadae Nov 22, 2021
b2913d9
Update surefire version
ebrahimmfadae Nov 24, 2021
b274688
Remove redundant plugins
ebrahimmfadae Nov 24, 2021
08f76a5
Fix docker compose
ebrahimmfadae Nov 24, 2021
9d6c403
Fix executable jar issue
ebrahimmfadae Nov 24, 2021
176a66b
Cleanup pom.xml files
ebrahimmfadae Nov 24, 2021
f020776
Fix spring component namespace
ebrahimmfadae Nov 24, 2021
da455a1
Merge branch 'issues/93/fix-dependency-structure' into merge-maven-ch…
ebrahimmfadae Nov 24, 2021
35e7785
Update websocket maven config
ebrahimmfadae Nov 24, 2021
69adcb4
Fix some imports
ebrahimmfadae Nov 24, 2021
e8dcf46
Rename websocket module
ebrahimmfadae Nov 24, 2021
d73a2c4
Update docker compose
ebrahimmfadae Nov 24, 2021
d937f13
Revert component scan changes
ebrahimmfadae Nov 24, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
22 changes: 12 additions & 10 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
name: build opex
name: Deploy OPEX

on:
push:
branches:
- main
branches:
- main

jobs:
jenkinsJob:
name: build opex new version
runs-on: ubuntu-latest
steps:
- name: trigger opex build job
uses: appleboy/jenkins-action@master
with:
url: ${{ secrets.JENKINS_URL }}
user: ${{ secrets.JENKINS_USER }}
token: ${{ secrets.JENKINS_TOKEN }}
job: "opex-build-job"
- name: Trigger opex-build-job on jenkins
uses: appleboy/jenkins-action@master
with:
url: ${{ secrets.JENKINS_URL }}
user: ${{ secrets.JENKINS_USER }}
token: ${{ secrets.JENKINS_TOKEN }}
job: "opex-build-job"
33 changes: 3 additions & 30 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build Opex pull request
name: Build on pull request

on:
pull_request:
Expand All @@ -21,33 +21,6 @@ jobs:
java-package: jdk
java-version: ${{ matrix.java }}
cache: maven
- name: Build Utility
working-directory: ./Utility
run: mvn -B clean install
- name: Build Engine
working-directory: ./MatchingEngine
run: mvn -B clean install
- name: Build Gateway
working-directory: ./MatchingGateway
run: mvn -B clean install
- name: Build EventLog
working-directory: ./EventLog
run: mvn -B clean install
- name: Build Accountant
working-directory: ./Accountant
run: mvn -B clean install
- name: Build Accountant
working-directory: ./Accountant
run: mvn -B clean install
- name: Build Wallet
working-directory: ./Wallet
run: mvn -B clean install
- name: Build UserManagement
working-directory: ./UserManagement
run: mvn -B clean install
- name: Build Api
working-directory: ./Api
run: mvn -B clean install
- name: Build BlockchainGateway
working-directory: ./BlockchainGateway
- name: Build OPEX-Core
working-directory: .
run: mvn -B clean install
50 changes: 30 additions & 20 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,26 +1,36 @@
# Compiled class file
*.class
HELP.md
target/
!.mvn/wrapper/maven-wrapper.jar
!**/src/main/**/target/
!**/src/test/**/target/

# Log file
*.log
### STS ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache

# BlueJ files
*.ctxt

# Idea folders
### IntelliJ IDEA ###
.idea
*.iws
*.iml
*.ipr

# Mobile Tools for Java (J2ME)
.mtj.tmp/
### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/
build/
!**/src/main/**/build/
!**/src/test/**/build/

# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar
### VS Code ###
.vscode/
!/.mvn/

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
.DS_Store
1 change: 0 additions & 1 deletion Accountant/.gitignore

This file was deleted.

80 changes: 0 additions & 80 deletions Accountant/accountant-app/.gitignore

This file was deleted.

Loading