diff --git a/docker-compose.yml b/docker-compose.yml index f7fd401..a39b537 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,10 +17,10 @@ version: '3.5' services: - deploy: - image: svenruppert/maven-3.6.1-adopt:1.8.212-04 - container_name: deploy - hostname: deploy + deploy-fluent-api-for-flow: + image: svenruppert/maven-3.6.2-adopt:1.8.212-04 + container_name: deploy-fluent-api-for-flow + hostname: deploy-fluent-api-for-flow volumes: - /var/run/docker.sock:/tmp/docker.sock:ro - $PWD/:/usr/src/mymaven @@ -30,4 +30,5 @@ services: # command: 'mvn help:active-profiles command: 'mvn license:format clean deploy -P_release + -Pvaadin-install-nodejs -Dmaven.test.skip=true ' \ No newline at end of file diff --git a/docker_compile_locale.sh b/docker_compile_locale.sh index 882ed79..e00174b 100755 --- a/docker_compile_locale.sh +++ b/docker_compile_locale.sh @@ -21,5 +21,5 @@ docker run \ --name compile \ -v "$(pwd)":/usr/src/mymaven \ -w /usr/src/mymaven \ - svenruppert/maven-3.6.1-adopt:1.8.212-04 \ + svenruppert/maven-3.6.2-adopt:1.8.212-04 \ mvn clean install diff --git a/fluent-api-impl/pom.xml b/fluent-api-impl/pom.xml index e4a598e..8133eed 100644 --- a/fluent-api-impl/pom.xml +++ b/fluent-api-impl/pom.xml @@ -21,58 +21,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.rapidpm.vaadin - fluent-api-for-flow - 00.08.02-RPM-SNAPSHOT + fluent-api-for-flow-parent + 00.08.02-RPM 4.0.0 - fluent-api-for-flow-impl + fluent-api-for-flow - - - - 1 - ${project.build.finalName}.${project.packaging} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/fluent-api-test/pom.xml b/fluent-api-test/pom.xml index 7ee0d90..92acd25 100644 --- a/fluent-api-test/pom.xml +++ b/fluent-api-test/pom.xml @@ -21,8 +21,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.rapidpm.vaadin - fluent-api-for-flow - 00.08.02-RPM-SNAPSHOT + fluent-api-for-flow-parent + 00.08.02-RPM 4.0.0 @@ -53,13 +53,13 @@ org.rapidpm.vaadin - fluent-api-for-flow-impl - 00.08.02-RPM-SNAPSHOT + fluent-api-for-flow + 00.08.02-RPM org.rapidpm.vaadin id-generator-for-flow - 00.09.02-RPM + 00.09.03-RPM diff --git a/pom.xml b/pom.xml index 81fbf78..1d19970 100644 --- a/pom.xml +++ b/pom.xml @@ -24,14 +24,14 @@ org.rapidpm - rapidpm-vaadin-dependencies-v14 - 04.01.05-RPM + rapidpm-vaadin-dependencies-vXX + 04.01.15-RPM org.rapidpm.vaadin - fluent-api-for-flow + fluent-api-for-flow-parent Fluent API for Flow - 00.08.02-RPM-SNAPSHOT + 00.08.02-RPM pom @@ -90,13 +90,7 @@ - - com.vaadin - vaadin-bom - ${vaadin-v14.version} - pom - import - + @@ -129,36 +123,65 @@ 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 - * - - + vaadin-lumo-theme + + + com.vaadin + vaadin-ordered-layout-flow + + + com.vaadin + vaadin-form-layout-flow + + + com.vaadin + vaadin-radio-button-flow + + + com.vaadin + vaadin-combo-box-flow + + + com.vaadin + vaadin-button-flow + + + com.vaadin + vaadin-select-flow + + + com.vaadin + vaadin-date-picker-flow + + com.vaadin + vaadin-icons-flow + + + com.vaadin + vaadin-tabs-flow + + + com.vaadin + vaadin-context-menu-flow + + + com.vaadin + vaadin-notification-flow + + + com.vaadin + vaadin-grid-flow + + + com.vaadin + vaadin-checkbox-flow + + + com.vaadin + vaadin-text-field-flow + + \ No newline at end of file