Fixed versioning and POM parenting.

This commit is contained in:
neviyn 2018-10-09 09:20:53 +01:00
parent 02ed4b8b08
commit c4bf14f383
3 changed files with 155 additions and 123 deletions

View File

@ -4,19 +4,16 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>uk.co.neviyn</groupId>
<artifactId>observationdatabase</artifactId>
<version>PRE-ALPHA</version>
<artifactId>backend</artifactId>
<packaging>jar</packaging>
<name>observationdatabase</name>
<name>backend</name>
<description>Training observation database</description>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.5.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
<groupId>uk.co.neviyn</groupId>
<artifactId>Observations</artifactId>
<version>${revision}</version>
</parent>
<properties>
@ -24,8 +21,23 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<kotlin.version>1.2.71</kotlin.version>
<kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
<spring.version>2.0.5.RELEASE</spring.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<!-- Import dependency management from Spring Boot -->
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
@ -84,16 +96,33 @@
</dependencies>
<build>
<sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
<sourceDirectory>src/main/kotlin</sourceDirectory>
<testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring.version}</version>
</plugin>
<plugin>
<artifactId>kotlin-maven-plugin</artifactId>
<executions>
<execution>
<id>compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>test-compile</id>
<goals>
<goal>test-compile</goal>
</goals>
</execution>
</executions>
<groupId>org.jetbrains.kotlin</groupId>
<version>${kotlin.version}</version>
<configuration>
<args>
<arg>-Xjsr305=strict</arg>

View File

@ -5,11 +5,13 @@
<parent>
<groupId>uk.co.neviyn</groupId>
<artifactId>Observations</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>frontend</artifactId>
<name>frontend</name>
<packaging>pom</packaging>
<build>
<plugins>

View File

@ -5,7 +5,7 @@
<groupId>uk.co.neviyn</groupId>
<artifactId>Observations</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>${revision}</version>
<packaging>pom</packaging>
<name>Observations</name>
@ -13,6 +13,7 @@
<properties>
<main.basedir>${project.basedir}</main.basedir>
<revision>ALPHA-1</revision>
</properties>
<modules>