neviyn/ObservationDatabase
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Fixed versioning and POM parenting.

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
backend/pom.xml
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"> 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> <modelVersion>4.0.0</modelVersion>
<groupId>uk.co.neviyn</groupId> <artifactId>backend</artifactId>
<artifactId>observationdatabase</artifactId>
<version>PRE-ALPHA</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>observationdatabase</name> <name>backend</name>
<description>Training observation database</description> <description>Training observation database</description>
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>uk.co.neviyn</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>Observations</artifactId>
<version>2.0.5.RELEASE</version> <version>${revision}</version>
<relativePath/> <!-- lookup parent from repository -->
</parent> </parent>
<properties> <properties>
@ -24,8 +21,23 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<kotlin.version>1.2.71</kotlin.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> </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> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@ -84,16 +96,33 @@
</dependencies> </dependencies>
<build> <build>
<sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory> <sourceDirectory>src/main/kotlin</sourceDirectory>
<testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory> <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring.version}</version>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>kotlin-maven-plugin</artifactId> <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> <groupId>org.jetbrains.kotlin</groupId>
<version>${kotlin.version}</version>
<configuration> <configuration>
<args> <args>
<arg>-Xjsr305=strict</arg> <arg>-Xjsr305=strict</arg>
@ -117,42 +146,42 @@
</dependencies> </dependencies>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>3.1.0</version> <version>3.1.0</version>
<executions> <executions>
<execution> <execution>
<id>copy Vue.js frontend content</id> <id>copy Vue.js frontend content</id>
<phase>generate-resources</phase> <phase>generate-resources</phase>
<goals> <goals>
<goal>copy-resources</goal> <goal>copy-resources</goal>
</goals> </goals>
<configuration> <configuration>
<outputDirectory>src/main/resources/static</outputDirectory> <outputDirectory>src/main/resources/static</outputDirectory>
<overwrite>true</overwrite> <overwrite>true</overwrite>
<resources> <resources>
<resource> <resource>
<directory>../frontend/target/dist</directory> <directory>../frontend/target/dist</directory>
<excludes> <excludes>
<exclude>**/*.map</exclude> <exclude>**/*.map</exclude>
</excludes> </excludes>
</resource> </resource>
</resources> </resources>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-clean-plugin</artifactId> <artifactId>maven-clean-plugin</artifactId>
<version>3.1.0</version> <version>3.1.0</version>
<configuration> <configuration>
<filesets> <filesets>
<fileset> <fileset>
<directory>src/main/resources/static</directory> <directory>src/main/resources/static</directory>
<followSymlinks>false</followSymlinks> <followSymlinks>false</followSymlinks>
</fileset> </fileset>
</filesets> </filesets>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

152
frontend/pom.xml
View File

@ -2,85 +2,87 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>uk.co.neviyn</groupId> <groupId>uk.co.neviyn</groupId>
<artifactId>Observations</artifactId> <artifactId>Observations</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>frontend</artifactId> <artifactId>frontend</artifactId>
<name>frontend</name>
<packaging>pom</packaging>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>com.github.eirslett</groupId> <groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId> <artifactId>frontend-maven-plugin</artifactId>
<version>1.2</version> <version>1.2</version>
<executions> <executions>
<!-- Install our node and npm version to run npm/node scripts--> <!-- Install our node and npm version to run npm/node scripts-->
<execution> <execution>
<id>install node and npm</id> <id>install node and npm</id>
<goals> <goals>
<goal>install-node-and-npm</goal> <goal>install-node-and-npm</goal>
</goals> </goals>
<configuration> <configuration>
<nodeVersion>v10.9.0</nodeVersion> <nodeVersion>v10.9.0</nodeVersion>
<npmVersion>6.4.1</npmVersion> <npmVersion>6.4.1</npmVersion>
<nodeDownloadRoot>https://nodejs.org/dist/</nodeDownloadRoot> <nodeDownloadRoot>https://nodejs.org/dist/</nodeDownloadRoot>
<npmDownloadRoot>http://registry.npmjs.org/npm/-/</npmDownloadRoot> <npmDownloadRoot>http://registry.npmjs.org/npm/-/</npmDownloadRoot>
</configuration> </configuration>
</execution> </execution>
<!-- Set NPM Registry --> <!-- Set NPM Registry -->
<execution> <execution>
<id>npm set registry</id> <id>npm set registry</id>
<goals> <goals>
<goal>npm</goal> <goal>npm</goal>
</goals> </goals>
<configuration> <configuration>
<arguments>config set registry https://registry.npmjs.org</arguments> <arguments>config set registry https://registry.npmjs.org</arguments>
</configuration> </configuration>
</execution> </execution>
<!-- Set SSL privilege --> <!-- Set SSL privilege -->
<execution> <execution>
<id>npm set non-strict ssl</id> <id>npm set non-strict ssl</id>
<goals> <goals>
<goal>npm</goal> <goal>npm</goal>
</goals> </goals>
<!-- Optional configuration which provides for running any npm command --> <!-- Optional configuration which provides for running any npm command -->
<configuration> <configuration>
<arguments>config set strict-ssl false</arguments> <arguments>config set strict-ssl false</arguments>
</configuration> </configuration>
</execution> </execution>
<!-- Install all project dependencies --> <!-- Install all project dependencies -->
<execution> <execution>
<id>npm install</id> <id>npm install</id>
<goals> <goals>
<goal>npm</goal> <goal>npm</goal>
</goals> </goals>
<!-- optional: default phase is "generate-resources" --> <!-- optional: default phase is "generate-resources" -->
<phase>generate-resources</phase> <phase>generate-resources</phase>
<!-- Optional configuration which provides for running any npm command --> <!-- Optional configuration which provides for running any npm command -->
<configuration> <configuration>
<arguments>install</arguments> <arguments>install</arguments>
</configuration> </configuration>
</execution> </execution>
<!-- Build and minify static files --> <!-- Build and minify static files -->
<execution> <execution>
<id>npm run build</id> <id>npm run build</id>
<goals> <goals>
<goal>npm</goal> <goal>npm</goal>
</goals> </goals>
<configuration> <configuration>
<arguments>run build</arguments> <arguments>run build</arguments>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

3
pom.xml
View File

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