Skip to content

Commit

Permalink
Refactor and rename some components and its Maven modules; integrate …
Browse files Browse the repository at this point in the history 
…test stage to build
  • Loading branch information
[email protected] committed Feb 12, 2021
1 parent 05b3ee8 commit 9ad3f9c
Show file tree
Hide file tree
Showing 27 changed files with 247 additions and 568 deletions.
43 changes: 5 additions & 38 deletions korewar-admin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,54 +11,21 @@

<artifactId>korewar-admin</artifactId>

<properties>
<maven.compiler.source>15</maven.compiler.source>
<maven.compiler.target>15</maven.compiler.target>
<kotlin.version>1.4.30</kotlin.version>
</properties>

<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
<version>${kotlin.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test</artifactId>
<version>${kotlin.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<sourceDirectory>src/main/kotlin</sourceDirectory>
<plugins>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<version>${kotlin.version}</version>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>

<executions>
<execution>
<id>compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>test-compile</id>
<phase>test-compile</phase>
<goals>
<goal>test-compile</goal>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
<configuration>
<jvmTarget>15</jvmTarget>
</configuration>
</plugin>
</plugins>
</build>

</project>
43 changes: 5 additions & 38 deletions korewar-arena/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,54 +11,21 @@

<artifactId>korewar-arena</artifactId>

<properties>
<maven.compiler.source>15</maven.compiler.source>
<maven.compiler.target>15</maven.compiler.target>
<kotlin.version>1.4.30</kotlin.version>
</properties>

<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
<version>${kotlin.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test</artifactId>
<version>${kotlin.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<sourceDirectory>src/main/kotlin</sourceDirectory>
<plugins>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<version>${kotlin.version}</version>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>

<executions>
<execution>
<id>compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>test-compile</id>
<phase>test-compile</phase>
<goals>
<goal>test-compile</goal>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
<configuration>
<jvmTarget>15</jvmTarget>
</configuration>
</plugin>
</plugins>
</build>

</project>
31 changes: 31 additions & 0 deletions korewar-common/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?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"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>korewar</artifactId>
<groupId>korewar</groupId>
<version>0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>korewar-core</artifactId>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>

<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
2 changes: 1 addition & 1 deletion korewar-core/src/main/kotlin/Core.kt → korewar-common/src/main/kotlin/Core.kt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
class Core {
class Core {
}
0 korewar-core/src/main/resources/deleteme.txt → ...ar-common/src/main/resources/deleteme.txt
View file
File renamed without changes.
28 changes: 14 additions & 14 deletions korewar-core/src/test/kotlin/CoreTest.kt → korewar-common/src/test/kotlin/CoreTest.kt
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.Test

internal class CoreTest {

@Test
fun `test the core`() {
//arrange
//act
val sut = Core()

//assert
assertThat(sut).isNull() //TODO why is this not called during Maven test stage?
}
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.Test

internal class CoreTest {

@Test
fun `test the core`() {
//arrange
//act
val sut = Core()

//assert
assertThat(sut).isNotNull
}
}
64 changes: 0 additions & 64 deletions korewar-core/pom.xml
View file

This file was deleted.

43 changes: 5 additions & 38 deletions korewar-dashboard/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,54 +11,21 @@

<artifactId>korewar-dashboard</artifactId>

<properties>
<maven.compiler.source>15</maven.compiler.source>
<maven.compiler.target>15</maven.compiler.target>
<kotlin.version>1.4.30</kotlin.version>
</properties>

<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
<version>${kotlin.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test</artifactId>
<version>${kotlin.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<sourceDirectory>src/main/kotlin</sourceDirectory>
<plugins>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<version>${kotlin.version}</version>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>

<executions>
<execution>
<id>compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>test-compile</id>
<phase>test-compile</phase>
<goals>
<goal>test-compile</goal>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
<configuration>
<jvmTarget>15</jvmTarget>
</configuration>
</plugin>
</plugins>
</build>

</project>
64 changes: 0 additions & 64 deletions korewar-editor/pom.xml
View file

This file was deleted.

Loading

0 comments on commit 9ad3f9c

Please sign in to comment.