diff --git a/.gitignore b/.gitignore index d4f0376..bac0a6c 100644 --- a/.gitignore +++ b/.gitignore @@ -39,6 +39,4 @@ webpack.config.js webpack.generated.js ### Maven ### -**/target -**/.polyglot.pom.groovy -.polyglot.pom.groovy \ No newline at end of file +**/target \ No newline at end of file diff --git a/acrarium/pom.groovy b/acrarium/pom.groovy deleted file mode 100644 index c588ad9..0000000 --- a/acrarium/pom.groovy +++ /dev/null @@ -1,294 +0,0 @@ -/* - * (C) Copyright 2019 Lukas Morawietz (https://github.com/F43nd1r) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -project { - modelVersion '4.0.0' - groupId 'com.faendir' - artifactId 'acrarium' - version '0.9.0-SNAPSHOT' - name 'Acrarium' - packaging 'war' - - properties { - 'maven.compiler.source' '1.8' - 'maven.compiler.target' '1.8' - 'project.build.sourceEncoding' 'UTF-8' - 'project.reporting.outputEncoding' 'UTF-8' - 'drivers.dir' '${project.basedir}/drivers' - 'drivers.downloader.phase' 'pre-integration-test' - 'vaadin.version' '14.0.4' - 'querydsl.version' '4.2.1' - } - - parent { - groupId 'org.springframework.boot' - artifactId 'spring-boot-starter-parent' - version '2.1.8.RELEASE' - } - - pluginRepositories { - pluginRepository { - id 'central' - url 'https://repo1.maven.org/maven2/' - snapshots { - enabled false - } - } - } - - repositories { - repository { - id 'central' - url 'https://repo1.maven.org/maven2/' - snapshots { - enabled false - } - } - repository { - id 'Vaadin Directory' - url 'https://maven.vaadin.com/vaadin-addons' - snapshots { - enabled false - } - } - repository { - id 'Google' - url 'https://maven.google.com' - snapshots { - enabled false - } - } - repository { - id 'jcenter' - url 'https://jcenter.bintray.com' - snapshots { - enabled false - } - } - /*repository { - id 'maven.oracle.com' - url 'https://maven.oracle.com' - layout 'default' - snapshots { - enabled false - } - }*/ - } - - dependencyManagement { - dependencies { - dependency { - groupId 'com.vaadin' - artifactId 'vaadin-bom' - version '${vaadin.version}' - type 'pom' - scope 'import' - } - } - } - - dependencies { - dependency { - groupId 'com.vaadin' - artifactId 'vaadin' - exclusions { - exclusion { - artifactId '*' - groupId 'com.vaadin.webjar' - } - exclusion { - artifactId '*' - groupId 'org.webjars.bowergithub.insites' - } - exclusion { - artifactId '*' - groupId 'org.webjars.bowergithub.polymer' - } - exclusion { - artifactId '*' - groupId 'org.webjars.bowergithub.polymerelements' - } - exclusion { - artifactId '*' - groupId 'org.webjars.bowergithub.vaadin' - } - exclusion { - artifactId '*' - groupId 'org.webjars.bowergithub.webcomponents' - } - } - } - dependency { - groupId 'com.vaadin' - artifactId 'vaadin-spring-boot-starter' - exclusions { - exclusion { - artifactId 'vaadin-core' - groupId 'com.vaadin' - } - } - } - dependency 'org.springframework.boot:spring-boot-starter-data-jpa' - dependency 'mysql:mysql-connector-java' - dependency 'org.springframework.boot:spring-boot-starter-security' - dependency 'org.springframework.boot:spring-boot-starter-mail' - dependency 'org.liquibase:liquibase-core' - dependency 'org.yaml:snakeyaml' - dependency 'com.querydsl:querydsl-jpa:${querydsl.version}' - dependency 'com.querydsl:querydsl-sql:${querydsl.version}' - dependency 'com.querydsl:querydsl-apt:${querydsl.version}:provided' - dependency 'org.jfree:jfreechart:1.5.0' - dependency 'org.apache.xmlgraphics:batik-svggen:1.10' - dependency 'ch.acra:acra-javacore:5.3.0' - dependency 'com.faendir.vaadin:jfreechart-flow:1.1.6' - dependency 'org.codeartisans:org.json:20161124' - dependency 'org.apache.commons:commons-text:1.6' - dependency 'commons-io:commons-io:2.5' - dependency 'org.xbib:time:1.0.0' - dependency 'com.faendir.proguard:retrace:1.3' - dependency 'javax.xml.bind:jaxb-api:2.3.1' - dependency 'com.github.ziplet:ziplet:2.3.0' - dependency 'me.xdrop:fuzzywuzzy:1.2.0' - dependency 'com.talanlabs:avatar-generator:1.1.0' - dependency 'org.ektorp:org.ektorp.spring:1.5.0' - dependency 'com.github.appreciated:apexcharts:2.0.0.beta4' - dependency 'javax.servlet:javax.servlet-api:4.0.1' - dependency { - groupId 'org.springframework.boot' - artifactId 'spring-boot-starter-test' - scope 'test' - } - dependency { - groupId 'org.springframework.security' - artifactId 'spring-security-test' - scope 'test' - } - dependency { - groupId 'com.h2database' - artifactId 'h2' - scope 'test' - } - /*dependency { - groupId 'com.oracle.weblogic' - artifactId 'ojdbc7' - version '12.1.3-0-0' - scope 'test' - }*/ - } - - build { - defaultGoal 'spring-boot:run' - plugins { - plugin { - groupId 'org.springframework.boot' - artifactId 'spring-boot-maven-plugin' - } - plugin { - groupId 'com.vaadin' - artifactId 'vaadin-maven-plugin' - version '${vaadin.version}' - executions { - execution { - goals { - goal 'prepare-frontend' - } - } - } - } - plugin { - groupId 'com.mysema.maven' - artifactId 'apt-maven-plugin' - version '1.1.3' - executions { - execution { - goals 'process' - configuration { - outputDirectory '${project.build.directory}/generated-sources/java' - processor 'com.querydsl.apt.jpa.JPAAnnotationProcessor' - } - } - } - } - plugin { - groupId 'org.codehaus.mojo' - artifactId 'build-helper-maven-plugin' - executions { - execution { - id 'add-source' - phase 'generate-sources' - goals 'add-source' - configuration { - sources { - source '${project.build.directory}/generated-sources/java' - } - } - } - } - } - plugin { - groupId 'com.faendir' - artifactId 'message-generator-maven-plugin' - version '1.0-SNAPSHOT' - executions { - execution { - goals 'generate' - } - } - configuration { - inputDirectory 'src/main/resources/i18n' - packageName 'com.faendir.acra.i18n' - } - } - } - } - - profiles { - profile { - id 'production' - build { - plugins { - plugin { - groupId 'org.springframework.boot' - artifactId 'spring-boot-maven-plugin' - configuration { - jvmArguments '-Dvaadin.productionMode' - } - } - plugin { - groupId 'com.vaadin' - artifactId 'vaadin-maven-plugin' - executions { - execution { - phase 'compile' - goals { - goal 'build-frontend' - } - } - } - } - } - } - properties { - 'vaadin.productionMode' 'true' - } - dependencies { - dependency { - groupId 'com.vaadin' - artifactId 'flow-server-production-mode' - } - } - } - } -} \ No newline at end of file diff --git a/acrarium/pom.xml b/acrarium/pom.xml new file mode 100644 index 0000000..cbf5474 --- /dev/null +++ b/acrarium/pom.xml @@ -0,0 +1,360 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.1.8.RELEASE + + com.faendir + acrarium + 0.9.0-SNAPSHOT + war + Acrarium + + UTF-8 + 14.0.4 + ${project.basedir}/drivers + UTF-8 + 1.8 + 4.2.1 + 1.8 + pre-integration-test + + + + + com.vaadin + vaadin-bom + ${vaadin.version} + pom + import + + + + + + com.vaadin + vaadin + + + * + com.vaadin.webjar + + + * + org.webjars.bowergithub.insites + + + * + org.webjars.bowergithub.polymer + + + * + org.webjars.bowergithub.polymerelements + + + * + org.webjars.bowergithub.vaadin + + + * + org.webjars.bowergithub.webcomponents + + + + + com.vaadin + vaadin-spring-boot-starter + + + vaadin-core + com.vaadin + + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + mysql + mysql-connector-java + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.boot + spring-boot-starter-mail + + + org.liquibase + liquibase-core + + + org.yaml + snakeyaml + + + com.querydsl + querydsl-jpa + ${querydsl.version} + + + com.querydsl + querydsl-sql + ${querydsl.version} + + + com.querydsl + querydsl-apt + ${querydsl.version} + provided + + + org.jfree + jfreechart + 1.5.0 + + + org.apache.xmlgraphics + batik-svggen + 1.10 + + + ch.acra + acra-javacore + 5.3.0 + + + com.faendir.vaadin + jfreechart-flow + 1.1.6 + + + org.codeartisans + org.json + 20161124 + + + org.apache.commons + commons-text + 1.6 + + + commons-io + commons-io + 2.5 + + + org.xbib + time + 1.0.0 + + + com.faendir.proguard + retrace + 1.3 + + + javax.xml.bind + jaxb-api + 2.3.1 + + + com.github.ziplet + ziplet + 2.3.0 + + + me.xdrop + fuzzywuzzy + 1.2.0 + + + com.talanlabs + avatar-generator + 1.1.0 + + + org.ektorp + org.ektorp.spring + 1.5.0 + + + com.github.appreciated + apexcharts + 2.0.0.beta4 + + + javax.servlet + javax.servlet-api + 4.0.1 + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.security + spring-security-test + test + + + com.h2database + h2 + test + + + + + + false + + central + https://repo1.maven.org/maven2/ + + + + false + + Vaadin Directory + https://maven.vaadin.com/vaadin-addons + + + + false + + Google + https://maven.google.com + + + + false + + jcenter + https://jcenter.bintray.com + + + + + + false + + central + https://repo1.maven.org/maven2/ + + + + spring-boot:run + + + org.springframework.boot + spring-boot-maven-plugin + + + com.vaadin + vaadin-maven-plugin + ${vaadin.version} + + + + prepare-frontend + + + + + + com.mysema.maven + apt-maven-plugin + 1.1.3 + + + + process + + + ${project.build.directory}/generated-sources/java + com.querydsl.apt.jpa.JPAAnnotationProcessor + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-source + generate-sources + + add-source + + + + ${project.build.directory}/generated-sources/java + + + + + + + com.faendir + message-generator-maven-plugin + 1.0-SNAPSHOT + + + + generate + + + + + src/main/resources/i18n + com.faendir.acra.i18n + + + + + + + production + + + + org.springframework.boot + spring-boot-maven-plugin + + -Dvaadin.productionMode + + + + com.vaadin + vaadin-maven-plugin + + + compile + + build-frontend + + + + + + + + true + + + + com.vaadin + flow-server-production-mode + + + + + diff --git a/message-generator-maven-plugin/pom.groovy b/message-generator-maven-plugin/pom.groovy deleted file mode 100644 index 3a3514f..0000000 --- a/message-generator-maven-plugin/pom.groovy +++ /dev/null @@ -1,52 +0,0 @@ -project { - modelVersion '4.0.0' - groupId 'com.faendir' - artifactId 'message-generator-maven-plugin' - version '1.0-SNAPSHOT' - packaging 'maven-plugin' - name 'message-generator-maven-plugin' - - dependencies { - dependency 'org.apache.maven:maven-plugin-api:3.0' - dependency 'org.apache.maven.plugin-tools:maven-plugin-annotations:3.4:provided' - dependency 'com.squareup:javapoet:1.11.1' - dependency 'com.google.guava:guava:26.0-jre' - } - - properties { - 'maven.compiler.source' '1.8' - 'maven.compiler.target' '1.8' - 'project.build.sourceEncoding' 'UTF-8' - 'project.reporting.outputEncoding' 'UTF-8' - } - - build { - plugins { - plugin { - groupId 'org.apache.maven.plugins' - artifactId 'maven-plugin-plugin' - version '3.6.0' - executions { - execution { - id 'mojo-descriptor' - goals 'descriptor' - } - } - } - plugin { - groupId 'org.apache.maven.plugins' - artifactId 'maven-javadoc-plugin' - version '3.1.1' - executions { - execution { - id 'attach-javadocs' - goals 'jar' - configuration { - doclint 'none' - } - } - } - } - } - } -} diff --git a/message-generator-maven-plugin/pom.xml b/message-generator-maven-plugin/pom.xml new file mode 100644 index 0000000..7e98bfc --- /dev/null +++ b/message-generator-maven-plugin/pom.xml @@ -0,0 +1,70 @@ + + + 4.0.0 + com.faendir + message-generator-maven-plugin + 1.0-SNAPSHOT + maven-plugin + message-generator-maven-plugin + + UTF-8 + UTF-8 + 1.8 + 1.8 + + + + org.apache.maven + maven-plugin-api + 3.0 + + + org.apache.maven.plugin-tools + maven-plugin-annotations + 3.4 + provided + + + com.squareup + javapoet + 1.11.1 + + + com.google.guava + guava + 26.0-jre + + + + + + maven-plugin-plugin + 3.6.0 + + + mojo-descriptor + + descriptor + + + + + + maven-javadoc-plugin + 3.1.1 + + + attach-javadocs + + jar + + + none + + + + + + + diff --git a/pom.groovy b/pom.groovy deleted file mode 100644 index af0b805..0000000 --- a/pom.groovy +++ /dev/null @@ -1,61 +0,0 @@ -/* - * (C) Copyright 2019 Lukas Morawietz (https://github.com/F43nd1r) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -project { - modelVersion '4.0.0' - packaging 'pom' - groupId 'com.faendir' - artifactId 'parent' - version '0.9.0-SNAPSHOT' - - scm { - url 'https://github.com/F43nd1r/Acrarium' - connection 'scm:git:git://github.com:F43nd1r/Acrarium.git' - developerConnection 'scm:git:git@github.com:F43nd1r/Acrarium.git' - } - - modules { - module 'message-generator-maven-plugin' - module 'acrarium' - } - - build { - plugins { - plugin { - artifactId 'maven-release-plugin' - version '2.5.3' - configuration { - autoVersionSubModules true - tagNameFormat 'v@{project.version}' - releaseProfile 'release' - } - } - plugin { - groupId 'org.apache.maven.plugins' - artifactId 'maven-javadoc-plugin' - version '3.1.1' - executions { - execution { - id 'attach-javadocs' - goals 'jar' - configuration { - doclint 'none' - } - } - } - } - } - } -} \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..af2c0e4 --- /dev/null +++ b/pom.xml @@ -0,0 +1,44 @@ + + + 4.0.0 + com.faendir + parent + 0.9.0-SNAPSHOT + pom + + message-generator-maven-plugin + acrarium + + + scm:git:git://github.com:F43nd1r/Acrarium.git + scm:git:git@github.com:F43nd1r/Acrarium.git + https://github.com/F43nd1r/Acrarium + + + + + maven-release-plugin + 2.5.3 + + v@{project.version} + + + + maven-javadoc-plugin + 3.1.1 + + + attach-javadocs + + jar + + + none + + + + + + +