diff --git a/backend/pom.xml b/backend/pom.xml index 949f29d..4611c36 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -4,19 +4,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - uk.co.neviyn - observationdatabase - PRE-ALPHA + backend jar - observationdatabase + backend Training observation database - org.springframework.boot - spring-boot-starter-parent - 2.0.5.RELEASE - + uk.co.neviyn + Observations + ${revision} @@ -24,8 +21,23 @@ UTF-8 1.8 1.2.71 + 1.8 + 2.0.5.RELEASE + + + + + org.springframework.boot + spring-boot-dependencies + ${spring.version} + pom + import + + + + org.springframework.boot @@ -84,16 +96,33 @@ - ${project.basedir}/src/main/kotlin + src/main/kotlin ${project.basedir}/src/test/kotlin org.springframework.boot spring-boot-maven-plugin + ${spring.version} kotlin-maven-plugin + + + compile + compile + + compile + + + + test-compile + + test-compile + + + org.jetbrains.kotlin + ${kotlin.version} -Xjsr305=strict @@ -117,42 +146,42 @@ - maven-resources-plugin - 3.1.0 - - - copy Vue.js frontend content - generate-resources - - copy-resources - - - src/main/resources/static - true - - - ../frontend/target/dist - - **/*.map - - - - - - - - - maven-clean-plugin - 3.1.0 - - - - src/main/resources/static - false - - - - + maven-resources-plugin + 3.1.0 + + + copy Vue.js frontend content + generate-resources + + copy-resources + + + src/main/resources/static + true + + + ../frontend/target/dist + + **/*.map + + + + + + + + + maven-clean-plugin + 3.1.0 + + + + src/main/resources/static + false + + + + diff --git a/frontend/pom.xml b/frontend/pom.xml index ac8f9f4..c56981d 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -2,85 +2,87 @@ - - uk.co.neviyn - Observations - 0.0.1-SNAPSHOT - + + uk.co.neviyn + Observations + ${revision} + - 4.0.0 - frontend + 4.0.0 + frontend + frontend + pom - - - - com.github.eirslett - frontend-maven-plugin - 1.2 - - - - install node and npm - - install-node-and-npm - - - v10.9.0 - 6.4.1 - https://nodejs.org/dist/ - http://registry.npmjs.org/npm/-/ - - + + + + com.github.eirslett + frontend-maven-plugin + 1.2 + + + + install node and npm + + install-node-and-npm + + + v10.9.0 + 6.4.1 + https://nodejs.org/dist/ + http://registry.npmjs.org/npm/-/ + + - - - npm set registry - - npm - - - config set registry https://registry.npmjs.org - - + + + npm set registry + + npm + + + config set registry https://registry.npmjs.org + + - - - npm set non-strict ssl - - npm - - - - config set strict-ssl false - - + + + npm set non-strict ssl + + npm + + + + config set strict-ssl false + + - - - npm install - - npm - - - generate-resources - - - install - - + + + npm install + + npm + + + generate-resources + + + install + + - - - npm run build - - npm - - - run build - - - - - - - \ No newline at end of file + + + npm run build + + npm + + + run build + + + + + + + diff --git a/pom.xml b/pom.xml index 635774c..d165e1e 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ uk.co.neviyn Observations - 0.0.1-SNAPSHOT + ${revision} pom Observations @@ -13,10 +13,11 @@ ${project.basedir} + ALPHA-1 frontend backend - \ No newline at end of file +