From ac53f295a4c2187f9b02969f4b407b3496719932 Mon Sep 17 00:00:00 2001 From: Peter Anning <22272449+peteanning@users.noreply.github.com> Date: Tue, 10 May 2022 10:18:09 +0100 Subject: [PATCH 1/2] added mvn multi-module build --- README.md | 2 +- as/pom.xml | 8 ++++---- pom.xml | 38 ++++++++++++++++++++++++++++++++++++++ rc/pom.xml | 8 ++++---- rs/pom.xml | 8 ++++---- 5 files changed, 51 insertions(+), 13 deletions(-) create mode 100644 pom.xml diff --git a/README.md b/README.md index dbffe5a..26192cd 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ The authorization server is in the directory `/as/` and can be started using Spr The AS is accessible at -The client instance is in the director `/c/` and can be started using Spring Boot from that directory: +The client instance is in the directory `/rc/` and can be started using Spring Boot from that directory: `mvn spring-boot:run` diff --git a/as/pom.xml b/as/pom.xml index 7a7ff33..cb27db8 100644 --- a/as/pom.xml +++ b/as/pom.xml @@ -4,10 +4,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.boot - spring-boot-starter-parent - 2.3.4.RELEASE - + io.bspk + parent-project + 1.0-SNAPSHOT + ../pom.xml io.bspk oauth.xyz.as diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..384bfd1 --- /dev/null +++ b/pom.xml @@ -0,0 +1,38 @@ + + + 4.0.0 + + + + org.springframework.boot + spring-boot-starter-parent + 2.3.4.RELEASE + + + + io.bspk + parent-project + 1.0-SNAPSHOT + pom + + parent-project + + + lib + as + rs + rc + + + + + + + + + + + + + + diff --git a/rc/pom.xml b/rc/pom.xml index 375d993..669a037 100644 --- a/rc/pom.xml +++ b/rc/pom.xml @@ -4,10 +4,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.boot - spring-boot-starter-parent - 2.3.4.RELEASE - + io.bspk + parent-project + 1.0-SNAPSHOT + ../pom.xml io.bspk oauth.xyz.rc diff --git a/rs/pom.xml b/rs/pom.xml index 27ac205..8969b2f 100644 --- a/rs/pom.xml +++ b/rs/pom.xml @@ -4,10 +4,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.boot - spring-boot-starter-parent - 2.3.4.RELEASE - + io.bspk + parent-project + 1.0-SNAPSHOT + ../pom.xml io.bspk oauth.xyz.rs From 1721bb067673ef1c5a3ba16b291318604d0f90fc Mon Sep 17 00:00:00 2001 From: Peter Anning <22272449+peteanning@users.noreply.github.com> Date: Tue, 10 May 2022 10:23:14 +0100 Subject: [PATCH 2/2] added build instructions --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 26192cd..d46661e 100644 --- a/README.md +++ b/README.md @@ -6,11 +6,9 @@ To run, first start a mongo DB instance for the items to connect to. One is prov All components connect to each other over local HTTP connections. To facilitate testing under containerization, everything has been configured to use the hostname `host.docker.internal`. To access the web interfaces from localhost, it is helpful to alias `host.docker.internal` to the loopback address of `127.0.0.1` to run this. +To build use: -To build locally, you'll need to install the library package from the `lib` directory by running this command from that directory: - -`mvn install` - +`mvn clean install` The authorization server is in the directory `/as/` and can be started using Spring Boot from that directory: