Skip to content

Fix repo issues #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Laffini merged 19 commits into from
Nov 28, 2021
Merged

Fix repo issues #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
02b763d
Update pom.xml
Laffini Nov 21, 2021
c3e3534
Create settings.xml
Laffini Nov 21, 2021
738f3f1
Update settings.xml
Laffini Nov 21, 2021
aaa8092
Update pom.xml
Laffini Nov 21, 2021
a621f40
Update maven.yml
Laffini Nov 21, 2021
7cb5db3
Update settings.xml
Laffini Nov 21, 2021
b7ad28d
Update settings.xml
Laffini Nov 21, 2021
02e0ed6
Update maven.yml
Laffini Nov 21, 2021
83b9db5
Attempt to fix CI issues
Laffini Nov 21, 2021
f92f78b
Update pom.xml
Laffini Nov 21, 2021
bf11a89
Add -X for debugging
Laffini Nov 21, 2021
97420e8
Update maven.yml
Laffini Nov 21, 2021
857952b
Update pom.xml
Laffini Nov 21, 2021
f0a8265
Update maven.yml
Laffini Nov 21, 2021
259d46a
Classpath check
Laffini Nov 21, 2021
31858cc
Compile scope
Laffini Nov 21, 2021
9fc81ea
Package name check
Laffini Nov 26, 2021
ea626b5
Renaming packages
Laffini Nov 28, 2021
5985cc0
Update maven.yml
Laffini Nov 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions .classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
8 changes: 7 additions & 1 deletion .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
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
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ target/

### STS ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache
.classpath

### IntelliJ IDEA ###
.idea
Expand Down
77 changes: 42 additions & 35 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.0</version>
<relativePath/>
<relativePath />
</parent>
<groupId>net.laffyco.java-matching-engine</groupId>
<artifactId>rest-api</artifactId>
Expand All @@ -16,33 +17,39 @@
<properties>
<java.version>1.8</java.version>
</properties>

<profiles>
<profile>
<id>Repos</id>
<repositories>
<repository>
<id>central</id>
<url>https://repo1.maven.org/maven2</url>
<releases><enabled>true</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
</repository>
<repository>
<id>github</id>
<name>GitHub OWNER Apache Maven Packages</name>
<url>https://maven.pkg.github.com/Laffini/Java-Matching-Engine-Core</url>
</repository>
</repositories>
</profile>
</profiles>


<repositories>
<repository>
<id>central</id>
<url>https://repo1.maven.org/maven2</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>github</id>
<name>GitHub OWNER Apache Maven Packages</name>
<url>https://maven.pkg.github.com/Laffini/Java-Matching-Engine-Core</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>


<dependencies>
<dependency>
<groupId>net.laffyco.java-matching-engine</groupId>
<artifactId>core</artifactId>
<version>0.0.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.laffyco.java-matching-engine</groupId>
<artifactId>core</artifactId>
<version>0.0.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
Expand All @@ -68,13 +75,13 @@
</plugin>
</plugins>
</build>

<distributionManagement>
<repository>
<id>github</id>
<name>GitHub Laffini Apache Maven Packages</name>
<url>https://maven.pkg.github.com/Laffini/Java-Matching-Engine-REST-API</url>
</repository>
</distributionManagement>
<repository>
<id>github</id>
<name>GitHub Laffini Apache Maven Packages</name>
<url>https://maven.pkg.github.com/Laffini/Java-Matching-Engine-REST-API</url>
</repository>
</distributionManagement>

</project>
29 changes: 29 additions & 0 deletions settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8" ?>
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
<activeProfiles>
<activeProfile>github</activeProfile>
</activeProfiles>

<profiles>
<profile>
<id>github</id>
<repositories>
<repository>
<id>github</id>
<name>GitHub OWNER Apache Maven Packages</name>
<url>https://maven.pkg.github.com/Laffini/Java-Matching-Engine-Core</url>
</repository>
</repositories>
</profile>
</profiles>

<servers>
<server>
<id>github</id>
<username>Laffini</username>
<password>${env.GITHUB_TOKEN_REF}</password>
</server>
</servers>
</settings>
2 changes: 1 addition & 1 deletion src/test/java/net/laffyco/javamatchingengine/restapi/controllers/OrderControllerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/net/laffyco/javamatchingengine/restapi/controllers/SpreadControllerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down