Skip to content

Commit b5a8542

Browse files
LaffiniLaffini
authored
Merge pull request #2 from Laffini/repo
Fix repo issues
2 parents 7abe094 + 5985cc0 commit b5a8542

File tree

7 files changed

+113
-39
lines changed

7 files changed

+113
-39
lines changed

‎.classpath‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" output="target/classes" path="src/main/java">
4+
<attributes>
5+
<attribute name="optional" value="true"/>
6+
<attribute name="maven.pomderived" value="true"/>
7+
</attributes>
8+
</classpathentry>
9+
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
10+
<attributes>
11+
<attribute name="maven.pomderived" value="true"/>
12+
</attributes>
13+
</classpathentry>
14+
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
15+
<attributes>
16+
<attribute name="test" value="true"/>
17+
<attribute name="optional" value="true"/>
18+
<attribute name="maven.pomderived" value="true"/>
19+
</attributes>
20+
</classpathentry>
21+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
22+
<attributes>
23+
<attribute name="maven.pomderived" value="true"/>
24+
</attributes>
25+
</classpathentry>
26+
<classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
27+
<attributes>
28+
<attribute name="maven.pomderived" value="true"/>
29+
</attributes>
30+
</classpathentry>
31+
<classpathentry kind="output" path="target/classes"/>
32+
</classpath>

‎.github/workflows/maven.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,11 @@ jobs:
2020
uses: actions/setup-java@v1
2121
with:
2222
java-version: 1.8
23+
server-id: github
24+
server-username: GITHUB_USER_REF
25+
server-password: GITHUB_TOKEN_REF
2326
- name: Build with Maven
24-
run: mvn -B package --file pom.xml
27+
env:
28+
GITHUB_USER_REF: ${{ secrets.GH_PACKAGE_REPO_USERNAME }}
29+
GITHUB_TOKEN_REF: ${{ secrets.GH_PACKAGE_REPO_PASSWORD }}
30+
run: mvn clean install -s settings.xml -B package --file pom.xml -X

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ target/
66

77
### STS ###
88
.apt_generated
9-
.classpath
109
.factorypath
1110
.project
1211
.settings
1312
.springBeans
1413
.sts4-cache
14+
.classpath
1515

1616
### IntelliJ IDEA ###
1717
.idea

‎pom.xml‎

Lines changed: 42 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
34
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
45
<modelVersion>4.0.0</modelVersion>
56
<parent>
67
<groupId>org.springframework.boot</groupId>
78
<artifactId>spring-boot-starter-parent</artifactId>
89
<version>2.6.0</version>
9-
<relativePath/>
10+
<relativePath />
1011
</parent>
1112
<groupId>net.laffyco.java-matching-engine</groupId>
1213
<artifactId>rest-api</artifactId>
@@ -16,33 +17,39 @@
1617
<properties>
1718
<java.version>1.8</java.version>
1819
</properties>
19-
20-
<profiles>
21-
<profile>
22-
<id>Repos</id>
23-
<repositories>
24-
<repository>
25-
<id>central</id>
26-
<url>https://repo1.maven.org/maven2</url>
27-
<releases><enabled>true</enabled></releases>
28-
<snapshots><enabled>true</enabled></snapshots>
29-
</repository>
30-
<repository>
31-
<id>github</id>
32-
<name>GitHub OWNER Apache Maven Packages</name>
33-
<url>https://maven.pkg.github.com/Laffini/Java-Matching-Engine-Core</url>
34-
</repository>
35-
</repositories>
36-
</profile>
37-
</profiles>
38-
20+
21+
<repositories>
22+
<repository>
23+
<id>central</id>
24+
<url>https://repo1.maven.org/maven2</url>
25+
<releases>
26+
<enabled>true</enabled>
27+
</releases>
28+
<snapshots>
29+
<enabled>true</enabled>
30+
</snapshots>
31+
</repository>
32+
<repository>
33+
<id>github</id>
34+
<name>GitHub OWNER Apache Maven Packages</name>
35+
<url>https://maven.pkg.github.com/Laffini/Java-Matching-Engine-Core</url>
36+
<releases>
37+
<enabled>true</enabled>
38+
</releases>
39+
<snapshots>
40+
<enabled>true</enabled>
41+
</snapshots>
42+
</repository>
43+
</repositories>
44+
45+
3946
<dependencies>
40-
<dependency>
41-
<groupId>net.laffyco.java-matching-engine</groupId>
42-
<artifactId>core</artifactId>
43-
<version>0.0.1</version>
44-
<scope>compile</scope>
45-
</dependency>
47+
<dependency>
48+
<groupId>net.laffyco.java-matching-engine</groupId>
49+
<artifactId>core</artifactId>
50+
<version>0.0.1-SNAPSHOT</version>
51+
<scope>compile</scope>
52+
</dependency>
4653
<dependency>
4754
<groupId>org.springframework.boot</groupId>
4855
<artifactId>spring-boot-starter-web</artifactId>
@@ -68,13 +75,13 @@
6875
</plugin>
6976
</plugins>
7077
</build>
71-
78+
7279
<distributionManagement>
73-
<repository>
74-
<id>github</id>
75-
<name>GitHub Laffini Apache Maven Packages</name>
76-
<url>https://maven.pkg.github.com/Laffini/Java-Matching-Engine-REST-API</url>
77-
</repository>
78-
</distributionManagement>
80+
<repository>
81+
<id>github</id>
82+
<name>GitHub Laffini Apache Maven Packages</name>
83+
<url>https://maven.pkg.github.com/Laffini/Java-Matching-Engine-REST-API</url>
84+
</repository>
85+
</distributionManagement>
7986

8087
</project>

‎settings.xml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
5+
<activeProfiles>
6+
<activeProfile>github</activeProfile>
7+
</activeProfiles>
8+
9+
<profiles>
10+
<profile>
11+
<id>github</id>
12+
<repositories>
13+
<repository>
14+
<id>github</id>
15+
<name>GitHub OWNER Apache Maven Packages</name>
16+
<url>https://maven.pkg.github.com/Laffini/Java-Matching-Engine-Core</url>
17+
</repository>
18+
</repositories>
19+
</profile>
20+
</profiles>
21+
22+
<servers>
23+
<server>
24+
<id>github</id>
25+
<username>Laffini</username>
26+
<password>${env.GITHUB_TOKEN_REF}</password>
27+
</server>
28+
</servers>
29+
</settings>

‎src/test/java/net/laffyco/javamatchingengine/restapi/controllers/OrderControllerTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
//import org.mockito.InjectMocks;
66
//import org.mockito.Mock;
77
//
8-
//import net.laffyco.javamatchingengine.core.api.OrderInterface;
8+
//import net.laffyco.java-matching-engine.core.api.OrderInterface;
99
//
1010
///**
1111
// * Tests the OrderController.

‎src/test/java/net/laffyco/javamatchingengine/restapi/controllers/SpreadControllerTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
//import org.mockito.InjectMocks;
66
//import org.mockito.Mock;
77
//
8-
//import net.laffyco.javamatchingengine.core.api.SpreadInterface;
8+
//import net.laffyco.java-matching-engine.core.api.SpreadInterface;
99
//
1010
///**
1111
// * Tests the SpreadController.

0 commit comments

Comments
 (0)