Fixed merge conflicts

Sphereon-Opensource · Jul 5, 2024 · eb4d318 · eb4d318
1 parent 6848c34
commit eb4d318
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/admin-server/README.md → modules/admin-server/README.md b/admin-server/README.md → modules/admin-server/README.md
@@ -15,12 +15,12 @@ DATASOURCE_URL=<URL>
 
 To build
 <br>
-```./gradlew admin-server:build```
+```./gradlew :modules:admin-server:build```
 
 To run
 <br>
-```./gradlew admin-server:bootRun```
+```./gradlew :modules:admin-server:bootRun```
 
 To run tests
 <br>
-```./gradlew admin-server:test```
+```./gradlew :modules:admin-server:test```
diff --git a/admin-server/build.gradle.kts → modules/admin-server/build.gradle.kts b/admin-server/build.gradle.kts → modules/admin-server/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     application
 }
 
-group = "com.sphereon.oid.fed"
+group = "com.sphereon.oid.fed.server.admin"
 version = "1.0.0"
 
 java {

diff --git a/...otlin/com/sphereon/oid/fed/Application.kt → ...ereon/oid/fed/server/admin/Application.kt b/...otlin/com/sphereon/oid/fed/Application.kt → ...ereon/oid/fed/server/admin/Application.kt
@@ -1,4 +1,4 @@
-package com.sphereon.oid.fed
+package com.sphereon.oid.fed.server.admin
 
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.runApplication

diff --git a/...src/main/resources/application.properties → ...src/main/resources/application.properties b/...src/main/resources/application.properties → ...src/main/resources/application.properties
diff --git a/.../com/sphereon/oid/fed/ApplicationTests.kt → .../oid/fed/server/admin/ApplicationTests.kt b/.../com/sphereon/oid/fed/ApplicationTests.kt → .../oid/fed/server/admin/ApplicationTests.kt
@@ -1,4 +1,4 @@
-package com.sphereon.oid.fed
+package com.sphereon.oid.fed.server.admin
 
 import org.junit.jupiter.api.Test
 import org.springframework.boot.test.context.SpringBootTest

diff --git a/...om/sphereon/oid/fed/StatusEndpointTest.kt → ...id/fed/server/admin/StatusEndpointTest.kt b/...om/sphereon/oid/fed/StatusEndpointTest.kt → ...id/fed/server/admin/StatusEndpointTest.kt
@@ -1,4 +1,4 @@
-package com.sphereon.oid.fed
+package com.sphereon.oid.fed.server.admin
 
 import org.junit.jupiter.api.Test
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -29,4 +29,4 @@ dependencyResolutionManagement {
 }
 
 include(":modules:openid-federation-common")
-include(":admin-server")
+include(":modules:admin-server")