diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..d575057 --- /dev/null +++ b/.classpath @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 942f861..0e3dc4b 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -20,5 +20,11 @@ jobs: uses: actions/setup-java@v1 with: java-version: 1.8 + server-id: github + server-username: GITHUB_USER_REF + server-password: GITHUB_TOKEN_REF - name: Build with Maven - run: mvn -B package --file pom.xml \ No newline at end of file + env: + GITHUB_USER_REF: ${{ secrets.GH_PACKAGE_REPO_USERNAME }} + GITHUB_TOKEN_REF: ${{ secrets.GH_PACKAGE_REPO_PASSWORD }} + run: mvn clean install -s settings.xml -B package --file pom.xml -X \ No newline at end of file diff --git a/.gitignore b/.gitignore index 549e00a..c132b52 100644 --- a/.gitignore +++ b/.gitignore @@ -6,12 +6,12 @@ target/ ### STS ### .apt_generated -.classpath .factorypath .project .settings .springBeans .sts4-cache +.classpath ### IntelliJ IDEA ### .idea diff --git a/pom.xml b/pom.xml index bf6a895..b4259b1 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,13 @@ - 4.0.0 org.springframework.boot spring-boot-starter-parent 2.6.0 - + net.laffyco.java-matching-engine rest-api @@ -16,33 +17,39 @@ 1.8 - - - - Repos - - - central - https://repo1.maven.org/maven2 - true - true - - - github - GitHub OWNER Apache Maven Packages - https://maven.pkg.github.com/Laffini/Java-Matching-Engine-Core - - - - - + + + + central + https://repo1.maven.org/maven2 + + true + + + true + + + + github + GitHub OWNER Apache Maven Packages + https://maven.pkg.github.com/Laffini/Java-Matching-Engine-Core + + true + + + true + + + + + - - net.laffyco.java-matching-engine - core - 0.0.1 - compile - + + net.laffyco.java-matching-engine + core + 0.0.1-SNAPSHOT + compile + org.springframework.boot spring-boot-starter-web @@ -68,13 +75,13 @@ - + - - github - GitHub Laffini Apache Maven Packages - https://maven.pkg.github.com/Laffini/Java-Matching-Engine-REST-API - - + + github + GitHub Laffini Apache Maven Packages + https://maven.pkg.github.com/Laffini/Java-Matching-Engine-REST-API + + diff --git a/settings.xml b/settings.xml new file mode 100644 index 0000000..f782444 --- /dev/null +++ b/settings.xml @@ -0,0 +1,29 @@ + + + + github + + + + + github + + + github + GitHub OWNER Apache Maven Packages + https://maven.pkg.github.com/Laffini/Java-Matching-Engine-Core + + + + + + + + github + Laffini + ${env.GITHUB_TOKEN_REF} + + + \ No newline at end of file diff --git a/src/test/java/net/laffyco/javamatchingengine/restapi/controllers/OrderControllerTests.java b/src/test/java/net/laffyco/javamatchingengine/restapi/controllers/OrderControllerTests.java index 99ea1b4..702989c 100644 --- a/src/test/java/net/laffyco/javamatchingengine/restapi/controllers/OrderControllerTests.java +++ b/src/test/java/net/laffyco/javamatchingengine/restapi/controllers/OrderControllerTests.java @@ -5,7 +5,7 @@ //import org.mockito.InjectMocks; //import org.mockito.Mock; // -//import net.laffyco.javamatchingengine.core.api.OrderInterface; +//import net.laffyco.java-matching-engine.core.api.OrderInterface; // ///** // * Tests the OrderController. diff --git a/src/test/java/net/laffyco/javamatchingengine/restapi/controllers/SpreadControllerTests.java b/src/test/java/net/laffyco/javamatchingengine/restapi/controllers/SpreadControllerTests.java index d4cc690..13af6a3 100644 --- a/src/test/java/net/laffyco/javamatchingengine/restapi/controllers/SpreadControllerTests.java +++ b/src/test/java/net/laffyco/javamatchingengine/restapi/controllers/SpreadControllerTests.java @@ -5,7 +5,7 @@ //import org.mockito.InjectMocks; //import org.mockito.Mock; // -//import net.laffyco.javamatchingengine.core.api.SpreadInterface; +//import net.laffyco.java-matching-engine.core.api.SpreadInterface; // ///** // * Tests the SpreadController.