Skip to content

Commit

Permalink
chore: created composite application
Browse files Browse the repository at this point in the history
  • Loading branch information
@Koufan-De-King
Koufan-De-King committed Oct 22, 2024
1 parent 33809a6 commit d8e360d
Show file tree
Hide file tree
Showing 9 changed files with 94 additions and 68 deletions.
10 changes: 10 additions & 0 deletions obs/obs-rest-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,14 @@
<scope>test</scope>
</dependency>
</dependencies>

<!-- <build>-->
<!-- <plugins>-->
<!-- <plugin>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-maven-plugin</artifactId>-->
<!-- </plugin>-->
<!-- </plugins>-->
<!-- </build>-->

</project>
8 changes: 8 additions & 0 deletions obs/obs-rest-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,13 @@
<!-- Other existing dependencies -->
</dependencies>

<!-- <build>-->
<!-- <plugins>-->
<!-- <plugin>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-maven-plugin</artifactId>-->
<!-- </plugin>-->
<!-- </plugins>-->
<!-- </build>-->

</project>
56 changes: 28 additions & 28 deletions obs/obs-service-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,33 +38,33 @@

</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>${maven-enforcer-plugin.version}</version>
<executions>
<execution>
<id>enforce-banned-dependencies</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<bannedDependencies>
<excludes>
<exclude>com.adorsys.webank:obs-service-impl</exclude>
<exclude>com.adorsys.webank:obs-repository</exclude>
</excludes>
</bannedDependencies>
</rules>
<fail>true</fail>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<!-- <build>-->
<!-- <plugins>-->
<!-- <plugin>-->
<!-- <groupId>org.apache.maven.plugins</groupId>-->
<!-- <artifactId>maven-enforcer-plugin</artifactId>-->
<!-- <version>${maven-enforcer-plugin.version}</version>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <id>enforce-banned-dependencies</id>-->
<!-- <goals>-->
<!-- <goal>enforce</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <rules>-->
<!-- <bannedDependencies>-->
<!-- <excludes>-->
<!-- <exclude>com.adorsys.webank:obs-service-impl</exclude>-->
<!-- <exclude>com.adorsys.webank:obs-repository</exclude>-->
<!-- </excludes>-->
<!-- </bannedDependencies>-->
<!-- </rules>-->
<!-- <fail>true</fail>-->
<!-- </configuration>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- </plugin>-->
<!-- </plugins>-->
<!-- </build>-->

</project>
9 changes: 9 additions & 0 deletions obs/obs-service-impl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,13 @@
</dependency>
</dependencies>

<!-- <build>-->
<!-- <plugins>-->
<!-- <plugin>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-maven-plugin</artifactId>-->
<!-- </plugin>-->
<!-- </plugins>-->
<!-- </build>-->

</project>
1 change: 0 additions & 1 deletion obs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
<module>obs-rest-server</module>
<module>obs-service-api</module>
<module>obs-service-impl</module>

</modules>


Expand Down
42 changes: 21 additions & 21 deletions online-banking-app/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</parent>
<groupId>com.adorsys.webank</groupId>
<artifactId>online-banking-app</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>0.1-SNAPSHOT</version>
<name>online-banking-app</name>
<description>online banking service</description>
<url/>
Expand All @@ -32,29 +32,29 @@
</properties>
<dependencies>

<!-- <dependency>-->
<!-- <groupId>com.adorsys.webank</groupId>-->
<!-- <artifactId>obs-rest-api</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- </dependency>-->
<dependency>
<groupId>com.adorsys.webank</groupId>
<artifactId>obs-rest-api</artifactId>
<version>${project.version}</version>
</dependency>

<!-- <dependency>-->
<!-- <groupId>com.adorsys.webank</groupId>-->
<!-- <artifactId>obs-rest-server</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- </dependency>-->
<dependency>
<groupId>com.adorsys.webank</groupId>
<artifactId>obs-rest-server</artifactId>
<version>${project.version}</version>
</dependency>

<!-- <dependency>-->
<!-- <groupId>com.adorsys.webank</groupId>-->
<!-- <artifactId>obs-service-api</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- </dependency>-->
<dependency>
<groupId>com.adorsys.webank</groupId>
<artifactId>obs-service-api</artifactId>
<version>${project.version}</version>
</dependency>

<!-- <dependency>-->
<!-- <groupId>com.adorsys.webank</groupId>-->
<!-- <artifactId>obs-service-impl</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- </dependency>-->
<dependency>
<groupId>com.adorsys.webank</groupId>
<artifactId>obs-service-impl</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
6 changes: 3 additions & 3 deletions online-banking-app/src/main/java/com/adorsys/webank/OnlineBankingApplication.java
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.adorsys.webank.obs;
package com.adorsys.webank;

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;

@SpringBootApplication
@SpringBootApplication(exclude = {org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration.class,
org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration.class})
public class OnlineBankingApplication {

public static void main(String[] args) {
Expand Down
1 change: 0 additions & 1 deletion online-banking-app/src/main/resources/application.properties
View file

This file was deleted.

29 changes: 15 additions & 14 deletions online-banking-app/src/test/java/com/adorsys/webank/OnlineBankingApplicationTests.java
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
package com.adorsys.webank.obs;

import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;

@SpringBootTest(classes = OnlineBankingApplication.class) // Specify main class
public class OnlineBankingApplicationTests {

@Test
public void contextLoads() {
// This test intentionally does nothing.
// The @SpringBootTest annotation simulates application startup.
}
}
//package com.adorsys.webank;
//
//import com.adorsys.webank.obs.OnlineBankingApplication;
//import org.junit.jupiter.api.Test;
//import org.springframework.boot.test.context.SpringBootTest;
//
//@SpringBootTest(classes = OnlineBankingApplication.class) // Specify main class
//public class OnlineBankingApplicationTests {
//
// @Test
// public void contextLoads() {
// // This test intentionally does nothing.
// // The @SpringBootTest annotation simulates application startup.
// }
//}

0 comments on commit d8e360d

Please sign in to comment.