From: Artur Signell Date: Fri, 9 Sep 2016 10:11:17 +0000 (+0300) Subject: Format project pom files using correct settings (4 spaces) X-Git-Tag: 8.0.0.alpha2~40 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=61aff6078ce7fda5aba4c423ae6f78c4e3fd8cab;p=vaadin-framework.git Format project pom files using correct settings (4 spaces) Change-Id: I4b4760949897d2755da26a06f9048a596abdf0b6 --- diff --git a/all/pom.xml b/all/pom.xml index 384b27d77f..be6511ff8f 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -1,368 +1,376 @@ - 4.0.0 - - com.vaadin - vaadin-root - 8.0-SNAPSHOT - - vaadin-all - vaadin-all - jar - - - ${project.build.directory}/generated-resources/releasenotes/release-notes-tickets.html - ${project.build.outputDirectory}/WebContent/ - yyyy-MM-dd - - - https://vaadin.com/ - Vaadin All package - - - - ${project.groupId} - vaadin-shared - ${project.version} - - - - ${project.groupId} - vaadin-push - ${project.version} - - - - ${project.groupId} - vaadin-server - ${project.version} - - - - ${project.groupId} - vaadin-themes - ${project.version} - - - - ${project.groupId} - vaadin-client - ${project.version} - - - - ${project.groupId} - vaadin-client-compiler - ${project.version} - - - - ${project.groupId} - vaadin-client-compiled - ${project.version} - - - - ${project.groupId} - vaadin-compatibility-shared - ${project.version} - - - - ${project.groupId} - vaadin-compatibility-server - ${project.version} - - - - ${project.groupId} - vaadin-compatibility-client - ${project.version} - - - - ${project.groupId} - vaadin-compatibility-client-compiled - ${project.version} - - - - ${project.groupId} - vaadin-widgets - ${project.version} - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - initialize - parse-version - - parse-version - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - - checkstyle - - process-sources - - - - - - maven-antrun-plugin - - - filter-release-notes - prepare-package - - run - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - maven-assembly-plugin - - - package - - single - - - - - - false - - false - - all-assembly-descriptor.xml - - - - - - - - - - maven-deploy-plugin - - true - - - - org.sonatype.plugins - nexus-staging-maven-plugin - - true - - - - - maven-install-plugin - - true - - - - - maven-jar-plugin - - - default-jar - never - - - - - - maven-source-plugin - - true - - - - - - maven-javadoc-plugin - - true - - - - - - - - - - release - - false - - - - - org.codehaus.mojo - exec-maven-plugin - - - fetch-release-notes-tickets - process-classes - - exec - - - compile - ${java.home}/bin/java - - -Dvaadin.version=${project.version} - -classpath - - - com.vaadin.buildhelpers.FetchReleaseNotesTickets - - - ${relnotes.tickets.file} - - - - - - - - maven-dependency-plugin - - - extract-sources - prepare-package - - unpack - - - - - ${project.groupId} - vaadin-shared - sources - - - - ${project.groupId} - vaadin-server - sources - - - - ${project.groupId} - vaadin-client - sources - - - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-source-path - prepare-package - - add-source - - - - ${dependency.unpack.directory} - - - - - - - - - maven-javadoc-plugin - - - generate-combined-javadoc - package - - jar - - - false - com.vaadin.buildhelpers - false - - http://docs.oracle.com/javase/6/docs/api/ - http://docs.oracle.com/j2ee/1.4/docs/api/ - - - - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - true - - - - - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + com.vaadin + vaadin-root + 8.0-SNAPSHOT + + vaadin-all + vaadin-all + jar + + + ${project.build.directory}/generated-resources/releasenotes/release-notes-tickets.html + ${project.build.outputDirectory}/WebContent/ + yyyy-MM-dd + + + https://vaadin.com/ + Vaadin All package + + + + ${project.groupId} + vaadin-shared + ${project.version} + + + + ${project.groupId} + vaadin-push + ${project.version} + + + + ${project.groupId} + vaadin-server + ${project.version} + + + + ${project.groupId} + vaadin-themes + ${project.version} + + + + ${project.groupId} + vaadin-client + ${project.version} + + + + ${project.groupId} + vaadin-client-compiler + ${project.version} + + + + ${project.groupId} + vaadin-client-compiled + ${project.version} + + + + ${project.groupId} + vaadin-compatibility-shared + ${project.version} + + + + ${project.groupId} + vaadin-compatibility-server + ${project.version} + + + + ${project.groupId} + vaadin-compatibility-client + ${project.version} + + + + ${project.groupId} + vaadin-compatibility-client-compiled + ${project.version} + + + + ${project.groupId} + vaadin-widgets + ${project.version} + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + initialize + parse-version + + parse-version + + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + + checkstyle + + process-sources + + + + + + maven-antrun-plugin + + + filter-release-notes + prepare-package + + run + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + maven-assembly-plugin + + + package + + single + + + + + + false + + false + + all-assembly-descriptor.xml + + + + + + + + + + maven-deploy-plugin + + true + + + + org.sonatype.plugins + nexus-staging-maven-plugin + + true + + + + + maven-install-plugin + + true + + + + + maven-jar-plugin + + + default-jar + never + + + + + + maven-source-plugin + + true + + + + + + maven-javadoc-plugin + + true + + + + + + + + + + release + + false + + + + + org.codehaus.mojo + exec-maven-plugin + + + fetch-release-notes-tickets + process-classes + + exec + + + compile + ${java.home}/bin/java + + -Dvaadin.version=${project.version} + -classpath + + + com.vaadin.buildhelpers.FetchReleaseNotesTickets + + + ${relnotes.tickets.file} + + + + + + + + maven-dependency-plugin + + + extract-sources + prepare-package + + unpack + + + + + ${project.groupId} + vaadin-shared + sources + + + + ${project.groupId} + vaadin-server + sources + + + + ${project.groupId} + vaadin-client + sources + + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-source-path + prepare-package + + add-source + + + + ${dependency.unpack.directory} + + + + + + + + + maven-javadoc-plugin + + + generate-combined-javadoc + package + + jar + + + false + com.vaadin.buildhelpers + false + + http://docs.oracle.com/javase/6/docs/api/ + http://docs.oracle.com/j2ee/1.4/docs/api/ + + + + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + + true + + + + + + + diff --git a/buildhelpers/pom.xml b/buildhelpers/pom.xml index 5ea219297a..4b238df73e 100644 --- a/buildhelpers/pom.xml +++ b/buildhelpers/pom.xml @@ -1,91 +1,91 @@ - 4.0.0 - - com.vaadin - vaadin-root - 8.0-SNAPSHOT - - com.vaadin - vaadin-buildhelpers - vaadin-buildhelpers - jar + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + com.vaadin + vaadin-root + 8.0-SNAPSHOT + + com.vaadin + vaadin-buildhelpers + vaadin-buildhelpers + jar - https://vaadin.com/ - Vaadin build helpers + https://vaadin.com/ + Vaadin build helpers - - - commons-io - commons-io - - - commons-cli - commons-cli - - - com.vaadin - vaadin-sass-compiler - + + + commons-io + commons-io + + + commons-cli + commons-cli + + + com.vaadin + vaadin-sass-compiler + - - com.carrotsearch - smartsprites - - + + com.carrotsearch + smartsprites + + - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - - checkstyle - - process-sources - - - - - org.apache.maven.plugins - maven-jar-plugin - - - false - - true - - - - - - maven-deploy-plugin - - true - - - + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + + checkstyle + + process-sources + + + + + org.apache.maven.plugins + maven-jar-plugin + + + false + + true + + + + + + maven-deploy-plugin + + true + + + - - - - - maven-source-plugin - - true - - - - org.sonatype.plugins - nexus-staging-maven-plugin - - true - - - - - + + + + + maven-source-plugin + + true + + + + org.sonatype.plugins + nexus-staging-maven-plugin + + true + + + + + diff --git a/client-compiler/pom.xml b/client-compiler/pom.xml index 35b5ce423a..1ccfccc666 100644 --- a/client-compiler/pom.xml +++ b/client-compiler/pom.xml @@ -1,126 +1,126 @@ - 4.0.0 - - com.vaadin - vaadin-root - 8.0-SNAPSHOT - - vaadin-client-compiler - vaadin-client-compiler - jar + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + com.vaadin + vaadin-root + 8.0-SNAPSHOT + + vaadin-client-compiler + vaadin-client-compiler + jar - https://vaadin.com/ - Vaadin client compiler + https://vaadin.com/ + Vaadin client compiler - - - ${project.groupId} - vaadin-client - ${project.version} - - - com.google.gwt - gwt-dev - - - com.vaadin - vaadin-sass-compiler - - + + + ${project.groupId} + vaadin-client + ${project.version} + + + com.google.gwt + gwt-dev + + + com.vaadin + vaadin-sass-compiler + + - - - - src/main/resources - true - - + + + + src/main/resources + true + + - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - - checkstyle - - process-sources - - - - - maven-resources-plugin - - - - copy-sources - - prepare-package - - copy-resources - - - ${project.build.outputDirectory} - - - src/main/java - false - - - - - - - - org.apache.felix - maven-bundle-plugin - true - - - ${osgi.bundle.version} - ${osgi.execution.environment} - com.vaadin.*;version="${osgi.bundle.version}" - - - - - - - bundle-manifest - prepare-package - - manifest - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - true - - - - - - org.codehaus.mojo - animal-sniffer-maven-plugin - - true - - - - org.apache.maven.plugins - maven-surefire-plugin - - - + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + + checkstyle + + process-sources + + + + + maven-resources-plugin + + + + copy-sources + + prepare-package + + copy-resources + + + ${project.build.outputDirectory} + + + src/main/java + false + + + + + + + + org.apache.felix + maven-bundle-plugin + true + + + ${osgi.bundle.version} + ${osgi.execution.environment} + com.vaadin.*;version="${osgi.bundle.version}" + + + + + + + bundle-manifest + prepare-package + + manifest + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + true + + + + + + org.codehaus.mojo + animal-sniffer-maven-plugin + + true + + + + org.apache.maven.plugins + maven-surefire-plugin + + + diff --git a/client/pom.xml b/client/pom.xml index cf540bd47f..ca6009a007 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -1,144 +1,144 @@ - 4.0.0 - - com.vaadin - vaadin-root - 8.0-SNAPSHOT - - com.vaadin - vaadin-client - vaadin-client - jar + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + com.vaadin + vaadin-root + 8.0-SNAPSHOT + + com.vaadin + vaadin-client + vaadin-client + jar - https://vaadin.com/ - Vaadin client + https://vaadin.com/ + Vaadin client - - - - - ${project.groupId} - vaadin-shared - ${project.version} - + + + + + ${project.groupId} + vaadin-shared + ${project.version} + - - ${project.groupId} - vaadin-server - ${project.version} - - - ${project.groupId} - vaadin-sass-compiler - - - + + ${project.groupId} + vaadin-server + ${project.version} + + + ${project.groupId} + vaadin-sass-compiler + + + - - - com.google.gwt - gwt-elemental - - + + + com.google.gwt + gwt-elemental + + - - - - maven-resources-plugin - - - - copy-sources - - prepare-package - - copy-resources - - - ${project.build.outputDirectory} - - - src/main/resources - false - - - src/main/java - false - - - - - - + + + + maven-resources-plugin + + + + copy-sources + + prepare-package + + copy-resources + + + ${project.build.outputDirectory} + + + src/main/resources + false + + + src/main/java + false + + + + + + - - org.apache.felix - maven-bundle-plugin - true - - - ${osgi.execution.environment} - com.vaadin.*;version="${osgi.bundle.version}" - - - - - - bundle-manifest - prepare-package - - manifest - - - - + + org.apache.felix + maven-bundle-plugin + true + + + ${osgi.execution.environment} + com.vaadin.*;version="${osgi.bundle.version}" + + + + + + bundle-manifest + prepare-package + + manifest + + + + - - org.apache.maven.plugins - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - false - - true - - - 1 - com.vaadin.DefaultWidgetSet - - - - + + org.apache.maven.plugins + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + false + + true + + + 1 + com.vaadin.DefaultWidgetSet + + + + - - org.apache.maven.plugins - maven-checkstyle-plugin - - - - checkstyle - - process-sources - - - + + org.apache.maven.plugins + maven-checkstyle-plugin + + + + checkstyle + + process-sources + + + - - org.codehaus.mojo - animal-sniffer-maven-plugin - - true - - + + org.codehaus.mojo + animal-sniffer-maven-plugin + + true + + - - org.apache.maven.plugins - maven-surefire-plugin - - - + + org.apache.maven.plugins + maven-surefire-plugin + + + diff --git a/compatibility-client-compiled/pom.xml b/compatibility-client-compiled/pom.xml index da8e7c6866..298f402bf6 100644 --- a/compatibility-client-compiled/pom.xml +++ b/compatibility-client-compiled/pom.xml @@ -1,183 +1,184 @@ - 4.0.0 - - com.vaadin - vaadin-root - 8.0-SNAPSHOT - - vaadin-compatibility-client-compiled - vaadin-compatibility-client-compiled - jar + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + com.vaadin + vaadin-root + 8.0-SNAPSHOT + + vaadin-compatibility-client-compiled + vaadin-compatibility-client-compiled + jar - - com.vaadin.v7.Vaadin7WidgetSet - OBF - 6 - + + com.vaadin.v7.Vaadin7WidgetSet + OBF + 6 + - https://vaadin.com/ - Vaadin 7 compatibility client compiled + https://vaadin.com/ + Vaadin 7 compatibility client compiled - - - ${project.groupId} - vaadin-compatibility-server - ${project.version} - provided - + + + ${project.groupId} + vaadin-compatibility-server + ${project.version} + provided + - - ${project.groupId} - vaadin-compatibility-client - ${project.version} - provided - + + ${project.groupId} + vaadin-compatibility-client + ${project.version} + provided + - - com.vaadin - vaadin-client-compiler - ${project.version} - provided - + + com.vaadin + vaadin-client-compiler + ${project.version} + provided + - - com.vaadin - vaadin-buildhelpers - ${project.version} - provided - - + + com.vaadin + vaadin-buildhelpers + ${project.version} + provided + + - - - - org.codehaus.mojo - exec-maven-plugin - - - generate-export-package - package - - exec - - - compile - ${java.home}/bin/java - - -Dvaadin.version=${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion} - -DincludeNumberPackages=1 + + + + org.codehaus.mojo + exec-maven-plugin + + + generate-export-package + package + + exec + + + compile + ${java.home}/bin/java + + -Dvaadin.version=${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion} + -DincludeNumberPackages=1 - -classpath - + -classpath + - com.vaadin.buildhelpers.GeneratePackageExports + com.vaadin.buildhelpers.GeneratePackageExports - ${project.build.directory}/${project.build.finalName}.${project.packaging} - VAADIN/widgetsets - - - - - + ${project.build.directory}/${project.build.finalName}.${project.packaging} + VAADIN/widgetsets + + + + + - - com.vaadin - vaadin-maven-plugin - - - ${widgetset.name} - - ${project.build.outputDirectory}/VAADIN/widgetsets - ${project.build.directory}/gwt-unitCache - - -Xmx1G - - - - - compile - - - - + + com.vaadin + vaadin-maven-plugin + + + ${widgetset.name} + + ${project.build.outputDirectory}/VAADIN/widgetsets + ${project.build.directory}/gwt-unitCache + + -Xmx1G + + + + + compile + + + + - - org.apache.felix - maven-bundle-plugin - true - - - ${osgi.bundle.version} - ${osgi.execution.environment} - - - - - - - - bundle-manifest - prepare-package - - manifest - - - - + + org.apache.felix + maven-bundle-plugin + true + + + ${osgi.bundle.version} + ${osgi.execution.environment} + + + + + + + + bundle-manifest + prepare-package + + manifest + + + + - - org.apache.maven.plugins - maven-jar-plugin - 2.6 - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - false - - true - - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.codehaus.mojo - - - exec-maven-plugin - - - [1.4.0,) - - - exec - - - - - - - - - - - - - + + org.apache.maven.plugins + maven-jar-plugin + 2.6 + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + false + + true + + + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.codehaus.mojo + + + exec-maven-plugin + + + [1.4.0,) + + + exec + + + + + + + + + + + + + diff --git a/compatibility-client/pom.xml b/compatibility-client/pom.xml index 316b64fa1a..b5bdf183a9 100644 --- a/compatibility-client/pom.xml +++ b/compatibility-client/pom.xml @@ -1,102 +1,102 @@ - 4.0.0 - - com.vaadin - vaadin-root - 8.0-SNAPSHOT - - vaadin-compatibility-client - vaadin-compatibility-client - jar + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + com.vaadin + vaadin-root + 8.0-SNAPSHOT + + vaadin-compatibility-client + vaadin-compatibility-client + jar - https://vaadin.com/ - Vaadin 7 compatibility package for Vaadin 8 + https://vaadin.com/ + Vaadin 7 compatibility package for Vaadin 8 - - - - com.vaadin - vaadin-client - ${project.version} - - - ${project.groupId} - vaadin-compatibility-server - ${project.version} - - - ${project.groupId} - vaadin-compatibility-shared - ${project.version} - - + + + + com.vaadin + vaadin-client + ${project.version} + + + ${project.groupId} + vaadin-compatibility-server + ${project.version} + + + ${project.groupId} + vaadin-compatibility-shared + ${project.version} + + - - - - org.apache.maven.plugins - maven-jar-plugin - - - false - - true - - - 1 - com.vaadin.v7.Vaadin7WidgetSet - - - - + + + + org.apache.maven.plugins + maven-jar-plugin + + + false + + true + + + 1 + com.vaadin.v7.Vaadin7WidgetSet + + + + - - org.apache.maven.plugins - maven-checkstyle-plugin - - - - checkstyle - - process-sources - - - + + org.apache.maven.plugins + maven-checkstyle-plugin + + + + checkstyle + + process-sources + + + - - maven-resources-plugin - - - - copy-sources - - prepare-package - - copy-resources - - - ${project.build.outputDirectory} - - - src/main/resources - false - - - src/main/java - false - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - + + maven-resources-plugin + + + + copy-sources + + prepare-package + + copy-resources + + + ${project.build.outputDirectory} + + + src/main/resources + false + + + src/main/java + false + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + diff --git a/compatibility-server/pom.xml b/compatibility-server/pom.xml index 024cefc001..642ab89930 100644 --- a/compatibility-server/pom.xml +++ b/compatibility-server/pom.xml @@ -1,123 +1,123 @@ - 4.0.0 - - com.vaadin - vaadin-root - 8.0-SNAPSHOT - - vaadin-compatibility-server - vaadin-compatibility-server - jar + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + com.vaadin + vaadin-root + 8.0-SNAPSHOT + + vaadin-compatibility-server + vaadin-compatibility-server + jar - https://vaadin.com/ - Vaadin 7 compatibility package for Vaadin 8 + https://vaadin.com/ + Vaadin 7 compatibility package for Vaadin 8 - - - - ${project.groupId} - vaadin-server - ${project.version} - - - ${project.groupId} - vaadin-server - ${project.version} - tests - test - - - ${project.groupId} - vaadin-compatibility-shared - ${project.version} - - - javax.servlet - javax.servlet-api - provided - - - commons-lang - commons-lang - test - - - org.hsqldb - hsqldb - test - - - - javax.validation - validation-api - provided - true - - + + + + ${project.groupId} + vaadin-server + ${project.version} + + + ${project.groupId} + vaadin-server + ${project.version} + tests + test + + + ${project.groupId} + vaadin-compatibility-shared + ${project.version} + + + javax.servlet + javax.servlet-api + provided + + + commons-lang + commons-lang + test + + + org.hsqldb + hsqldb + test + + + + javax.validation + validation-api + provided + true + + - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - - checkstyle - - process-sources - - - + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + + checkstyle + + process-sources + + + - - org.apache.felix - maven-bundle-plugin - true - - - ${osgi.execution.environment} - ${osgi.bundle.version} - com.vaadin.v7.*;version="${osgi.bundle.version}" + + org.apache.felix + maven-bundle-plugin + true + + + ${osgi.execution.environment} + ${osgi.bundle.version} + com.vaadin.v7.*;version="${osgi.bundle.version}" - - com.vaadin.server;bundle-version="${osgi.bundle.version}", - com.vaadin.shared;bundle-version="${osgi.bundle.version}" - - - - - - bundle-manifest - prepare-package - - manifest - - - - + + com.vaadin.server;bundle-version="${osgi.bundle.version}", + com.vaadin.shared;bundle-version="${osgi.bundle.version}" + + + + + + bundle-manifest + prepare-package + + manifest + + + + - - org.apache.maven.plugins - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - false - - true - - - - + + org.apache.maven.plugins + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + false + + true + + + + - - org.apache.maven.plugins - maven-surefire-plugin - - - + + org.apache.maven.plugins + maven-surefire-plugin + + + diff --git a/compatibility-shared/pom.xml b/compatibility-shared/pom.xml index aa5a27ab8c..30886a1ac1 100644 --- a/compatibility-shared/pom.xml +++ b/compatibility-shared/pom.xml @@ -1,67 +1,67 @@ - 4.0.0 - - com.vaadin - vaadin-root - 8.0-SNAPSHOT - - vaadin-compatibility-shared - vaadin-compatibility-shared - jar + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + com.vaadin + vaadin-root + 8.0-SNAPSHOT + + vaadin-compatibility-shared + vaadin-compatibility-shared + jar - https://vaadin.com/ - Vaadin 7 compatibility package for Vaadin 8 + https://vaadin.com/ + Vaadin 7 compatibility package for Vaadin 8 - - - - com.vaadin - vaadin-shared - ${project.version} - - + + + + com.vaadin + vaadin-shared + ${project.version} + + - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - - checkstyle - - process-sources - - - + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + + checkstyle + + process-sources + + + - - org.apache.felix - maven-bundle-plugin - true - - - ${osgi.execution.environment} - ${osgi.bundle.version} - com.vaadin.*;version="${osgi.bundle.version}" - - com.vaadin.shared;bundle-version="${osgi.bundle.version}" - - - - - - bundle-manifest - prepare-package - - manifest - - - - + + org.apache.felix + maven-bundle-plugin + true + + + ${osgi.execution.environment} + ${osgi.bundle.version} + com.vaadin.*;version="${osgi.bundle.version}" + + com.vaadin.shared;bundle-version="${osgi.bundle.version}" + + + + + + bundle-manifest + prepare-package + + manifest + + + + maven-resources-plugin @@ -91,25 +91,25 @@ - - org.apache.maven.plugins - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - false - - true - - - - + + org.apache.maven.plugins + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + false + + true + + + + - - org.apache.maven.plugins - maven-surefire-plugin - - - + + org.apache.maven.plugins + maven-surefire-plugin + + + diff --git a/liferay/pom.xml b/liferay/pom.xml index 086f3a435c..5491260197 100644 --- a/liferay/pom.xml +++ b/liferay/pom.xml @@ -1,139 +1,140 @@ - 4.0.0 - - com.vaadin - vaadin-root - 8.0-SNAPSHOT - - vaadin-liferay - vaadin-liferay - pom + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + com.vaadin + vaadin-root + 8.0-SNAPSHOT + + vaadin-liferay + vaadin-liferay + pom - https://vaadin.com/ - Vaadin Liferay package + https://vaadin.com/ + Vaadin Liferay package - - - ${project.groupId} - vaadin-client-compiled - ${project.version} - provided - + + + ${project.groupId} + vaadin-client-compiled + ${project.version} + provided + - - ${project.groupId} - vaadin-push - ${project.version} - provided - + + ${project.groupId} + vaadin-push + ${project.version} + provided + - - ${project.groupId} - vaadin-themes - ${project.version} - provided - + + ${project.groupId} + vaadin-themes + ${project.version} + provided + - - ${project.groupId} - vaadin-server - ${project.version} - provided - - + + ${project.groupId} + vaadin-server + ${project.version} + provided + + - - - - maven-dependency-plugin - - - unpack - generate-resources - - unpack - - - - - com.vaadin - vaadin-push - VAADIN/vaadinPush.js, VAADIN/vaadinPush.debug.js - + + + + maven-dependency-plugin + + + unpack + generate-resources + + unpack + + + + + com.vaadin + vaadin-push + VAADIN/vaadinPush.js, + VAADIN/vaadinPush.debug.js + - - com.vaadin - vaadin-client-compiled - VAADIN/widgetsets/**/* - + + com.vaadin + vaadin-client-compiled + VAADIN/widgetsets/**/* + - - com.vaadin - vaadin-themes - - VAADIN/themes/base/**, - VAADIN/themes/chameleon/**, - VAADIN/themes/runo/**, - VAADIN/themes/reindeer/** - - - - com.vaadin - vaadin-server - VAADIN/vaadinBootstrap.js - - - - - - - - maven-assembly-plugin - - - package - - single - - - - - - false - - false - - liferay-assembly-descriptor.xml - - - - - maven-deploy-plugin - - true - - - - maven-install-plugin - - true - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - - true - - - - - + + com.vaadin + vaadin-themes + + VAADIN/themes/base/**, + VAADIN/themes/chameleon/**, + VAADIN/themes/runo/**, + VAADIN/themes/reindeer/** + + + + com.vaadin + vaadin-server + VAADIN/vaadinBootstrap.js + + + + + + + + maven-assembly-plugin + + + package + + single + + + + + + false + + false + + liferay-assembly-descriptor.xml + + + + + maven-deploy-plugin + + true + + + + maven-install-plugin + + true + + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + + true + + + + + diff --git a/pom.xml b/pom.xml index 18f4d20efc..38d7d32d15 100644 --- a/pom.xml +++ b/pom.xml @@ -1,558 +1,559 @@ - 4.0.0 - - com.vaadin - vaadin-parent - 1.0.0 - - vaadin-root - vaadin-root - pom - 8.0-SNAPSHOT + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + com.vaadin + vaadin-parent + 1.0.0 + + vaadin-root + vaadin-root + pom + 8.0-SNAPSHOT - - 3.0.5 - + + 3.0.5 + - - 1.8 - 1.8 - UTF-8 + + 1.8 + 1.8 + UTF-8 - - 6.0.2 - 9.3.9.v20160517 + + 6.0.2 + 9.3.9.v20160517 - 2.8.0-rc2 - 8.0-SNAPSHOT + 2.8.0-rc2 + 8.0-SNAPSHOT - - 1.0.0.GA - 1.8.3 - 2.0 - 0.9.13 - - 2.4.5.vaadin1 + + 1.0.0.GA + 1.8.3 + 2.0 + 0.9.13 + + 2.4.5.vaadin1 - - 3.0.0 - JavaSE-1.8 - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion} + + 3.0.0 + JavaSE-1.8 + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion} - - ${project.build.directory}/dependency-unpack - + + ${project.build.directory}/dependency-unpack + - - - - vaadin-prereleases - http://maven.vaadin.com/vaadin-prereleases - - - vaadin-snapshots - https://oss.sonatype.org/content/repositories/vaadin-snapshots/ - - false - - - true - - - + + + + vaadin-prereleases + http://maven.vaadin.com/vaadin-prereleases + + + vaadin-snapshots + https://oss.sonatype.org/content/repositories/vaadin-snapshots/ + + false + + + true + + + - - Vaadin Ltd - - https://vaadin.com/ - Vaadin Framework Root Pom - - - Apache License Version 2.0 - repo - http://www.apache.org/licenses/LICENSE-2.0 - - - - scm:https:https://github.com/vaadin/vaadin.git - scm:https:https://github.com/vaadin/vaadin.git - https://github.com/vaadin/vaadin - + + Vaadin Ltd + + https://vaadin.com/ + Vaadin Framework Root Pom + + + Apache License Version 2.0 + repo + http://www.apache.org/licenses/LICENSE-2.0 + + + + scm:https:https://github.com/vaadin/vaadin.git + scm:https:https://github.com/vaadin/vaadin.git + https://github.com/vaadin/vaadin + - - buildhelpers - shared - push - server - client - client-compiler - client-compiled - themes - widgets - uitest-common - uitest - liferay - all - compatibility-server - compatibility-client - compatibility-client-compiled - compatibility-shared - - bom - + + buildhelpers + shared + push + server + client + client-compiler + client-compiled + themes + widgets + uitest-common + uitest + liferay + all + compatibility-server + compatibility-client + compatibility-client-compiled + compatibility-shared + + bom + - - - - commons-io - commons-io - 2.4 - - - commons-cli - commons-cli - 1.2 - - - commons-lang - commons-lang - 2.6 - - - commons-codec - commons-codec - 1.5 - - - org.slf4j - slf4j-log4j12 - 1.6.1 - - - com.vaadin - vaadin-sass-compiler - ${vaadin.sass.version} - - - com.carrotsearch - smartsprites - 0.2.10 - - - com.google.gwt - gwt-dev - ${vaadin.gwt.version} - - - com.google.gwt - gwt-elemental - ${vaadin.gwt.version} - - - com.google.gwt - gwt-servlet - ${vaadin.gwt.version} - - - com.vaadin.external.atmosphere - atmosphere-runtime - ${atmosphere.runtime.version} - - - com.vaadin.external.atmosphere.client - javascript - war - 2.3.2.vaadin1 - - - junit - junit - 4.11 - - - org.easymock - easymock - 3.0 - - - javax.servlet - javax.servlet-api - 3.0.1 - - - javax.portlet - portlet-api - ${javax.portlet.version} - - - com.google.appengine - appengine-api-1.0-sdk - 1.7.7 - - - javax.validation - validation-api - ${javax.validation.version} - - - org.hibernate - hibernate-validator - 4.2.0.Final - - - org.jsoup - jsoup - ${jsoup.version} - - - org.mockito - mockito-all - 1.9.5 - - - org.hamcrest - hamcrest-all - 1.3 - - - org.hsqldb - hsqldb - 2.2.6 - - - com.vaadin - vaadin-testbench - 4.0.3 - - - org.eclipse.jetty - jetty-server - ${jetty.version} - - - org.eclipse.jetty - jetty-servlets - ${jetty.version} - - - org.eclipse.jetty.websocket - websocket-server - ${jetty.version} - - - org.eclipse.jetty - jetty-webapp - ${jetty.version} - - - org.eclipse.jetty - jetty-util - ${jetty.version} - - - org.eclipse.jetty - jetty-proxy - ${jetty.version} - - - com.jcraft - jsch - 0.1.52 - - - org.eclipse.jgit - org.eclipse.jgit - 3.5.1.201410131835-r - - - + + + + commons-io + commons-io + 2.4 + + + commons-cli + commons-cli + 1.2 + + + commons-lang + commons-lang + 2.6 + + + commons-codec + commons-codec + 1.5 + + + org.slf4j + slf4j-log4j12 + 1.6.1 + + + com.vaadin + vaadin-sass-compiler + ${vaadin.sass.version} + + + com.carrotsearch + smartsprites + 0.2.10 + + + com.google.gwt + gwt-dev + ${vaadin.gwt.version} + + + com.google.gwt + gwt-elemental + ${vaadin.gwt.version} + + + com.google.gwt + gwt-servlet + ${vaadin.gwt.version} + + + com.vaadin.external.atmosphere + atmosphere-runtime + ${atmosphere.runtime.version} + + + com.vaadin.external.atmosphere.client + javascript + war + 2.3.2.vaadin1 + + + junit + junit + 4.11 + + + org.easymock + easymock + 3.0 + + + javax.servlet + javax.servlet-api + 3.0.1 + + + javax.portlet + portlet-api + ${javax.portlet.version} + + + com.google.appengine + appengine-api-1.0-sdk + 1.7.7 + + + javax.validation + validation-api + ${javax.validation.version} + + + org.hibernate + hibernate-validator + 4.2.0.Final + + + org.jsoup + jsoup + ${jsoup.version} + + + org.mockito + mockito-all + 1.9.5 + + + org.hamcrest + hamcrest-all + 1.3 + + + org.hsqldb + hsqldb + 2.2.6 + + + com.vaadin + vaadin-testbench + 4.0.3 + + + org.eclipse.jetty + jetty-server + ${jetty.version} + + + org.eclipse.jetty + jetty-servlets + ${jetty.version} + + + org.eclipse.jetty.websocket + websocket-server + ${jetty.version} + + + org.eclipse.jetty + jetty-webapp + ${jetty.version} + + + org.eclipse.jetty + jetty-util + ${jetty.version} + + + org.eclipse.jetty + jetty-proxy + ${jetty.version} + + + com.jcraft + jsch + 0.1.52 + + + org.eclipse.jgit + org.eclipse.jgit + 3.5.1.201410131835-r + + + - - - - junit - junit - test - - - org.mockito - mockito-all - test - - - org.hamcrest - hamcrest-all - test - - - org.easymock - easymock - test - - - org.hibernate - hibernate-validator - test - - + + + + junit + junit + test + + + org.mockito + mockito-all + test + + + org.hamcrest + hamcrest-all + test + + + org.easymock + easymock + test + + + org.hibernate + hibernate-validator + test + + - - - - - maven-clean-plugin - 3.0.0 - - - maven-compiler-plugin - 3.5.1 - - - maven-deploy-plugin - 2.8.2 - - - maven-install-plugin - 2.5.2 - - - maven-resources-plugin - - 2.6 - - - maven-site-plugin - 3.5 - - - maven-jar-plugin - 2.6 - - - maven-assembly-plugin - 2.6 - - - maven-surefire-plugin - 2.19.1 - - - maven-antrun-plugin - 1.8 - - - org.apache.felix - maven-bundle-plugin - 3.0.1 - - - org.apache.maven.plugins - maven-dependency-plugin - 2.10 - - ${dependency.unpack.directory} - false - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.4.0 - - - org.codehaus.mojo - versions-maven-plugin - 2.3 - - - org.codehaus.mojo - build-helper-maven-plugin - 1.10 - - - maven-source-plugin - 3.0.0 - - - com.vaadin - vaadin-maven-plugin - ${vaadin.plugin.version} - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.17 - - - - com.puppycrawl.tools - checkstyle - 6.17 - - - - ../checkstyle/vaadin-checkstyle.xml - ../checkstyle/header - ../checkstyle/suppressions.xml - UTF-8 - false - false - false - - - - org.codehaus.mojo - animal-sniffer-maven-plugin - 1.15 - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.apache.maven.plugins - - - maven-antrun-plugin - - - [1.8,) - - - run - - - - - - - - - - - - + + + + + maven-clean-plugin + 3.0.0 + + + maven-compiler-plugin + 3.5.1 + + + maven-deploy-plugin + 2.8.2 + + + maven-install-plugin + 2.5.2 + + + maven-resources-plugin + + 2.6 + + + maven-site-plugin + 3.5 + + + maven-jar-plugin + 2.6 + + + maven-assembly-plugin + 2.6 + + + maven-surefire-plugin + 2.19.1 + + + maven-antrun-plugin + 1.8 + + + org.apache.felix + maven-bundle-plugin + 3.0.1 + + + org.apache.maven.plugins + maven-dependency-plugin + 2.10 + + ${dependency.unpack.directory} + false + true + + + + org.codehaus.mojo + exec-maven-plugin + 1.4.0 + + + org.codehaus.mojo + versions-maven-plugin + 2.3 + + + org.codehaus.mojo + build-helper-maven-plugin + 1.10 + + + maven-source-plugin + 3.0.0 + + + com.vaadin + vaadin-maven-plugin + ${vaadin.plugin.version} + + + org.apache.maven.plugins + maven-checkstyle-plugin + 2.17 + + + + com.puppycrawl.tools + checkstyle + 6.17 + + + + ../checkstyle/vaadin-checkstyle.xml + ../checkstyle/header + ../checkstyle/suppressions.xml + UTF-8 + false + false + false + + + + org.codehaus.mojo + animal-sniffer-maven-plugin + 1.15 + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.apache.maven.plugins + + + maven-antrun-plugin + + + [1.8,) + + + run + + + + + + + + + + + + - - - org.codehaus.mojo - animal-sniffer-maven-plugin - - - java8compatibility - test - - check - - - - org.codehaus.mojo.signature - java18 - 1.0 - - - com.google.gwt.* - - - - - + + + org.codehaus.mojo + animal-sniffer-maven-plugin + + + java8compatibility + test + + check + + + + org.codehaus.mojo.signature + java18 + 1.0 + + + com.google.gwt.* + + + + + - - - org.codehaus.mojo - build-helper-maven-plugin + + + org.codehaus.mojo + build-helper-maven-plugin - - - - add-dependency-resources - generate-resources - - add-resource - - - - - ${dependency.unpack.directory} - false - - - - - - parse-version - - parse-version - - - - - - + + + + add-dependency-resources + generate-resources + + add-resource + + + + + ${dependency.unpack.directory} + false + + + + + + parse-version + + parse-version + + + + + + - - - release - - false - - - ${project.version} - - - - - maven-source-plugin - - - sources-jar - package - - jar - - - - - **/*.java - - - - - - - maven-javadoc-plugin - 2.10.3 - - - generate-javadoc - - jar - - - false - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - - - - + + + release + + false + + + ${project.version} + + + + + maven-source-plugin + + + sources-jar + package + + jar + + + + + **/*.java + + + + + + + maven-javadoc-plugin + 2.10.3 + + + generate-javadoc + + jar + + + false + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + + + + diff --git a/push/pom.xml b/push/pom.xml index 71ecbad0cd..f0ad9d7e39 100644 --- a/push/pom.xml +++ b/push/pom.xml @@ -1,168 +1,176 @@ - 4.0.0 - - com.vaadin - vaadin-root - 8.0-SNAPSHOT - - vaadin-push - vaadin-push - jar - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + com.vaadin + vaadin-root + 8.0-SNAPSHOT + + vaadin-push + vaadin-push + jar + - + - https://vaadin.com/ - Vaadin server push support + https://vaadin.com/ + Vaadin server push support - - - - com.vaadin.external.atmosphere - atmosphere-runtime - - - com.vaadin.external.atmosphere.client - javascript - war - provided - + + + + com.vaadin.external.atmosphere + atmosphere-runtime + + + com.vaadin.external.atmosphere.client + javascript + war + provided + - + - - - - maven-antrun-plugin - - - default-cli - generate-resources - - run - - - - - - - + + + + maven-antrun-plugin + + + default-cli + generate-resources + + run + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - ${vaadinPush.js.contents} + + + + + + + + + ${vaadinPush.js.contents} - - - + + + - - compresspush - compile - - run - - - - - - + + compresspush + compile + + run + + + + + + - + - - - - - - - - + + + + + + + + - - net.alchim31.maven - yuicompressor-maven-plugin - 1.5.1 - - - minifyjs - process-resources - - compress - - - - - ${project.build.outputDirectory}/VAADIN - - vaadinPush.debug.js - - ${project.build.outputDirectory}/VAADIN - - + + net.alchim31.maven + yuicompressor-maven-plugin + 1.5.1 + + + minifyjs + process-resources + + compress + + + + + ${project.build.outputDirectory}/VAADIN + + vaadinPush.debug.js + + ${project.build.outputDirectory}/VAADIN + + - - org.apache.felix - maven-bundle-plugin - true - - - ${osgi.bundle.version} - ${osgi.execution.environment} - VAADIN - com.vaadin.external.atmosphere.runtime;bundle-version="${atmosphere.runtime.version}";visibility:=reexport - - - - - bundle-manifest - process-classes - - manifest - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - false - - true - - - - - - + + org.apache.felix + maven-bundle-plugin + true + + + ${osgi.bundle.version} + ${osgi.execution.environment} + VAADIN + com.vaadin.external.atmosphere.runtime;bundle-version="${atmosphere.runtime.version}";visibility:=reexport + + + + + bundle-manifest + process-classes + + manifest + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + false + + true + + + + + + diff --git a/server/pom.xml b/server/pom.xml index 27edf34288..616558cdea 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -1,244 +1,245 @@ - 4.0.0 - - com.vaadin - vaadin-root - 8.0-SNAPSHOT - - vaadin-server - vaadin-server - jar - - https://vaadin.com/ - Vaadin server - - - - - - - com.liferay.portal - portal-service - ${liferay.portal.version} - provided - - - - - javax.servlet - javax.servlet-api - provided - - - - - javax.portlet - portlet-api - provided - - - - - com.google.appengine - appengine-api-1.0-sdk - provided - - - - - javax.validation - validation-api - provided - true - - - - - ${project.groupId} - vaadin-sass-compiler - - - - - - ${project.groupId} - vaadin-shared - ${project.version} - - - ${project.groupId} - vaadin-push - ${project.version} - provided - - - - - org.jsoup - jsoup - - - - - - - commons-io - commons-io - test - - - commons-lang - commons-lang - test - - - org.hsqldb - hsqldb - test - - - org.slf4j - slf4j-log4j12 - test - - - - - - - - - - maven-resources-plugin - - - - copy-sources - - prepare-package - - copy-resources - - - ${project.build.outputDirectory} - - - src/main/resources - false - - - src/main/java - false - - - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - - checkstyle - - process-sources - - - - - - maven-antrun-plugin - - - compressbootstrap - prepare-package - - run - - - - - - - - - - - - - - - org.apache.felix - maven-bundle-plugin - true - - - ${osgi.execution.environment} - ${osgi.bundle.version} - com.vaadin.*;version="${osgi.bundle.version}" - javax.servlet;version="${osgi.javax.servlet.version}", - javax.servlet.http;version="${osgi.javax.servlet.version}", - javax.validation;version="${javax.validation.version}";resolution:=optional, - org.jsoup;version="${jsoup.version}", - org.jsoup.parser;version="${jsoup.version}", - org.jsoup.nodes;version="${jsoup.version}", - org.jsoup.helper;version="${jsoup.version}", - org.jsoup.safety;version="${jsoup.version}", - org.jsoup.select;version="${jsoup.version}", - javax.portlet;version="[${javax.portlet.version},3)";resolution:=optional, - javax.portlet.filter;version="[${javax.portlet.version},3)";resolution:=optional, - com.liferay.portal.kernel.util;resolution:=optional - - com.vaadin.shared;bundle-version="${osgi.bundle.version}", - com.vaadin.push;bundle-version="${osgi.bundle.version}";resolution:=optional, - com.vaadin.sass-compiler;bundle-version="${vaadin.sass.version}";resolution:=optional - - - - - bundle-manifest - prepare-package - - manifest - - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - false - - true - - - - - - - - test-jar - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + com.vaadin + vaadin-root + 8.0-SNAPSHOT + + vaadin-server + vaadin-server + jar + + https://vaadin.com/ + Vaadin server + + + + + + + com.liferay.portal + portal-service + ${liferay.portal.version} + provided + + + + + javax.servlet + javax.servlet-api + provided + + + + + javax.portlet + portlet-api + provided + + + + + com.google.appengine + appengine-api-1.0-sdk + provided + + + + + javax.validation + validation-api + provided + true + + + + + ${project.groupId} + vaadin-sass-compiler + + + + + + ${project.groupId} + vaadin-shared + ${project.version} + + + ${project.groupId} + vaadin-push + ${project.version} + provided + + + + + org.jsoup + jsoup + + + + + + + commons-io + commons-io + test + + + commons-lang + commons-lang + test + + + org.hsqldb + hsqldb + test + + + org.slf4j + slf4j-log4j12 + test + + + + + + + + + + maven-resources-plugin + + + + copy-sources + + prepare-package + + copy-resources + + + ${project.build.outputDirectory} + + + src/main/resources + false + + + src/main/java + false + + + + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + + checkstyle + + process-sources + + + + + + maven-antrun-plugin + + + compressbootstrap + prepare-package + + run + + + + + + + + + + + + + + + org.apache.felix + maven-bundle-plugin + true + + + ${osgi.execution.environment} + ${osgi.bundle.version} + com.vaadin.*;version="${osgi.bundle.version}" + javax.servlet;version="${osgi.javax.servlet.version}", + javax.servlet.http;version="${osgi.javax.servlet.version}", + javax.validation;version="${javax.validation.version}";resolution:=optional, + org.jsoup;version="${jsoup.version}", + org.jsoup.parser;version="${jsoup.version}", + org.jsoup.nodes;version="${jsoup.version}", + org.jsoup.helper;version="${jsoup.version}", + org.jsoup.safety;version="${jsoup.version}", + org.jsoup.select;version="${jsoup.version}", + javax.portlet;version="[${javax.portlet.version},3)";resolution:=optional, + javax.portlet.filter;version="[${javax.portlet.version},3)";resolution:=optional, + com.liferay.portal.kernel.util;resolution:=optional + + com.vaadin.shared;bundle-version="${osgi.bundle.version}", + com.vaadin.push;bundle-version="${osgi.bundle.version}";resolution:=optional, + com.vaadin.sass-compiler;bundle-version="${vaadin.sass.version}";resolution:=optional + + + + + bundle-manifest + prepare-package + + manifest + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + false + + true + + + + + + + + test-jar + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + diff --git a/shared/pom.xml b/shared/pom.xml index 4d558ca20e..c896f6f744 100644 --- a/shared/pom.xml +++ b/shared/pom.xml @@ -1,161 +1,161 @@ - 4.0.0 - - com.vaadin - vaadin-root - 8.0-SNAPSHOT - - vaadin-shared - vaadin-shared - jar + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + com.vaadin + vaadin-root + 8.0-SNAPSHOT + + vaadin-shared + vaadin-shared + jar - - + + - https://vaadin.com/ - Vaadin shared + https://vaadin.com/ + Vaadin shared - - - - com.google.gwt - gwt-elemental - provided - - + + + + com.google.gwt + gwt-elemental + provided + + - - - - - org.codehaus.mojo - templating-maven-plugin - 1.0.0 - - - - filter-sources - - - - + + + + + org.codehaus.mojo + templating-maven-plugin + 1.0.0 + + + + filter-sources + + + + - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-dependencies - generate-resources - - unpack - - - - - com.google.gwt - gwt-elemental - - elemental/json/**, - elemental/util/Array*, - elemental/util/Can*, - elemental/util/Map* - - - - - - - - + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-dependencies + generate-resources + + unpack + + + + + com.google.gwt + gwt-elemental + + elemental/json/**, + elemental/util/Array*, + elemental/util/Can*, + elemental/util/Map* + + + + + + + - - maven-resources-plugin - - - - copy-sources - - prepare-package - - copy-resources - - - ${project.build.outputDirectory} - - - src/main/java - false - - - ${project.build.directory}/generated-sources/java-templates - false - - - - - - - - org.apache.felix - maven-bundle-plugin - true - - - ${osgi.execution.environment} - ${osgi.bundle.version} - com.vaadin.*;version="${osgi.bundle.version}",elemental.*;version="${osgi.bundle.version}" - - - - - - - bundle-manifest - prepare-package - - manifest - - - - + + maven-resources-plugin + + + + copy-sources + + prepare-package + + copy-resources + + + ${project.build.outputDirectory} + + + src/main/java + false + + + ${project.build.directory}/generated-sources/java-templates + false + + + + + + - - org.apache.maven.plugins - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - false - - true - - - - + + org.apache.felix + maven-bundle-plugin + true + + + ${osgi.execution.environment} + ${osgi.bundle.version} + com.vaadin.*;version="${osgi.bundle.version}",elemental.*;version="${osgi.bundle.version}" + + + + + + + bundle-manifest + prepare-package + + manifest + + + + - - org.apache.maven.plugins - maven-checkstyle-plugin - - - - checkstyle - - process-sources - - - + + org.apache.maven.plugins + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + false + + true + + + + - - org.apache.maven.plugins - maven-surefire-plugin - - - + + org.apache.maven.plugins + maven-checkstyle-plugin + + + + checkstyle + + process-sources + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + diff --git a/themes/pom.xml b/themes/pom.xml index 15ef3c09ed..b0d3d87360 100644 --- a/themes/pom.xml +++ b/themes/pom.xml @@ -1,352 +1,364 @@ - 4.0.0 - - com.vaadin - vaadin-root - 8.0-SNAPSHOT - - vaadin-themes - vaadin-themes - jar + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + com.vaadin + vaadin-root + 8.0-SNAPSHOT + + vaadin-themes + vaadin-themes + jar - https://vaadin.com/ - Vaadin themes + https://vaadin.com/ + Vaadin themes - - - - ${project.groupId} - vaadin-server - ${project.version} - provided - - - ${project.groupId} - vaadin-buildhelpers - ${project.version} - provided - + + + + ${project.groupId} + vaadin-server + ${project.version} + provided + + + ${project.groupId} + vaadin-buildhelpers + ${project.version} + provided + - - com.vaadin - vaadin-sass-compiler - provided - + + com.vaadin + vaadin-sass-compiler + provided + - - com.carrotsearch - smartsprites - provided - - - - commons-io - commons-io - provided - - + + com.carrotsearch + smartsprites + provided + + + + commons-io + commons-io + provided + + - - - - maven-resources-plugin - - - copy-theme-sources - generate-resources - - copy-resources - - - ${project.build.outputDirectory} - - - src/main/themes - false - - **/base.scss - **/valo/shared/_global.scss - - - - src/main/themes - true - - **/base.scss - **/valo/shared/_global.scss - - - - - - - + + + + maven-resources-plugin + + + copy-theme-sources + generate-resources + + copy-resources + + + ${project.build.outputDirectory} + + + src/main/themes + false + + **/base.scss + **/valo/shared/_global.scss + + + + src/main/themes + true + + **/base.scss + **/valo/shared/_global.scss + + + + + + + - - com.vaadin - vaadin-maven-plugin - - true - ${project.build.outputDirectory} - - - - process-resources - - compile-theme - - - - + + com.vaadin + vaadin-maven-plugin + + true + ${project.build.outputDirectory} + + + + process-resources + + compile-theme + + + + - - org.codehaus.mojo - exec-maven-plugin - - - compile-legacy-base - process-resources - - exec - - - compile - ${java.home}/bin/java - - -classpath - + + org.codehaus.mojo + exec-maven-plugin + + + compile-legacy-base + process-resources + + exec + + + compile + ${java.home}/bin/java + + -classpath + - com.vaadin.sass.SassCompiler - ${project.build.outputDirectory}/VAADIN/themes/base/legacy-styles.scss - ${project.build.outputDirectory}/VAADIN/themes/base/legacy-styles.css - - - + com.vaadin.sass.SassCompiler + + ${project.build.outputDirectory}/VAADIN/themes/base/legacy-styles.scss + + ${project.build.outputDirectory}/VAADIN/themes/base/legacy-styles.css + + + - - compile-legacy-chameleon - process-resources - - exec - - - compile - ${java.home}/bin/java - - -classpath - + + compile-legacy-chameleon + process-resources + + exec + + + compile + ${java.home}/bin/java + + -classpath + - com.vaadin.sass.SassCompiler - ${project.build.outputDirectory}/VAADIN/themes/chameleon/legacy-styles.scss - ${project.build.outputDirectory}/VAADIN/themes/chameleon/legacy-styles.css - - - - - compile-legacy-reindeer - process-resources - - exec - - - compile - ${java.home}/bin/java - - -classpath - + com.vaadin.sass.SassCompiler + + ${project.build.outputDirectory}/VAADIN/themes/chameleon/legacy-styles.scss + + ${project.build.outputDirectory}/VAADIN/themes/chameleon/legacy-styles.css + + + + + compile-legacy-reindeer + process-resources + + exec + + + compile + ${java.home}/bin/java + + -classpath + - com.vaadin.sass.SassCompiler - ${project.build.outputDirectory}/VAADIN/themes/reindeer/legacy-styles.scss - ${project.build.outputDirectory}/VAADIN/themes/reindeer/legacy-styles.css - - - - - compile-legacy-runo - process-resources - - exec - - - compile - ${java.home}/bin/java - - -classpath - + com.vaadin.sass.SassCompiler + + ${project.build.outputDirectory}/VAADIN/themes/reindeer/legacy-styles.scss + + ${project.build.outputDirectory}/VAADIN/themes/reindeer/legacy-styles.css + + + + + compile-legacy-runo + process-resources + + exec + + + compile + ${java.home}/bin/java + + -classpath + - com.vaadin.sass.SassCompiler - ${project.build.outputDirectory}/VAADIN/themes/runo/legacy-styles.scss - ${project.build.outputDirectory}/VAADIN/themes/runo/legacy-styles.css - - - - - smart-sprite-reindeer - process-resources - - exec - - - compile - ${java.home}/bin/java - - -classpath - + com.vaadin.sass.SassCompiler + + ${project.build.outputDirectory}/VAADIN/themes/runo/legacy-styles.scss + + ${project.build.outputDirectory}/VAADIN/themes/runo/legacy-styles.css + + + + + smart-sprite-reindeer + process-resources + + exec + + + compile + ${java.home}/bin/java + + -classpath + - org.carrot2.labs.smartsprites.SmartSprites + org.carrot2.labs.smartsprites.SmartSprites - --sprite-png-depth - AUTO + --sprite-png-depth + AUTO - --css-file-encoding - UTF-8 + --css-file-encoding + UTF-8 - --root-dir-path - ${project.build.outputDirectory}/VAADIN/themes/reindeer + --root-dir-path + ${project.build.outputDirectory}/VAADIN/themes/reindeer - --log-level - WARN - - - - - generate-export-package - package - - exec - - - compile - ${java.home}/bin/java - - -Dvaadin.version=${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion} - -DincludeNumberPackages=0 + --log-level + WARN + + + + + generate-export-package + package + + exec + + + compile + ${java.home}/bin/java + + -Dvaadin.version=${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion} + -DincludeNumberPackages=0 - -classpath - + -classpath + - com.vaadin.buildhelpers.GeneratePackageExports + com.vaadin.buildhelpers.GeneratePackageExports - ${project.build.directory}/${project.build.finalName}.${project.packaging} - VAADIN/themes - - - - - + ${project.build.directory}/${project.build.finalName}.${project.packaging} + VAADIN/themes + + + + + - - maven-antrun-plugin - - - repackage-reindeer - process-classes - - run - - - - + + maven-antrun-plugin + + + repackage-reindeer + process-classes + + run + + + + - + - + - - - - - - + + + + + + - - org.apache.felix - maven-bundle-plugin - true - - - ${osgi.bundle.version} - ${osgi.execution.environment} - - - - - - - - bundle-manifest - prepare-package - - manifest - - - - + + org.apache.felix + maven-bundle-plugin + true + + + ${osgi.bundle.version} + ${osgi.execution.environment} + + + + + + + + bundle-manifest + prepare-package + + manifest + + + + - - org.apache.maven.plugins - maven-jar-plugin - 2.6 - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - false - - true - - - - - + + org.apache.maven.plugins + maven-jar-plugin + 2.6 + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + false + + true + + + + + - - - - maven-source-plugin - - true - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.codehaus.mojo - - - exec-maven-plugin - - - [1.4.0,) - - - exec - - - - - - - - - - - - - + + + + maven-source-plugin + + true + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.codehaus.mojo + + + exec-maven-plugin + + + [1.4.0,) + + + exec + + + + + + + + + + + + + diff --git a/uitest-common/pom.xml b/uitest-common/pom.xml index 07c9ae203e..2375f8a072 100644 --- a/uitest-common/pom.xml +++ b/uitest-common/pom.xml @@ -1,110 +1,110 @@ - 4.0.0 - - com.vaadin - vaadin-root - 8.0-SNAPSHOT - - vaadin-uitest-common - vaadin-uitest-common - jar - - true - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + com.vaadin + vaadin-root + 8.0-SNAPSHOT + + vaadin-uitest-common + vaadin-uitest-common + jar + + true + - https://vaadin.com/ - Vaadin UI test common classes and dependencies + https://vaadin.com/ + Vaadin UI test common classes and dependencies - - - vaadin-addons - http://maven.vaadin.com/vaadin-addons - - + + + vaadin-addons + http://maven.vaadin.com/vaadin-addons + + - - - - ${project.groupId} - vaadin-server - ${project.version} - - - javax.servlet - javax.servlet-api - - - + + + + ${project.groupId} + vaadin-server + ${project.version} + + + javax.servlet + javax.servlet-api + + + - - junit - junit - compile - - - commons-io - commons-io - - - com.vaadin - vaadin-testbench - - + + junit + junit + compile + + + commons-io + commons-io + + + com.vaadin + vaadin-testbench + + - - - - maven-deploy-plugin - - ${skip.uitest.deployment} - - - - maven-surefire-plugin - - true - - - - org.codehaus.mojo - animal-sniffer-maven-plugin - - true - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - - true - - - - maven-javadoc-plugin - - true - - - - - + + + + maven-deploy-plugin + + ${skip.uitest.deployment} + + + + maven-surefire-plugin + + true + + + + org.codehaus.mojo + animal-sniffer-maven-plugin + + true + + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + + true + + + + maven-javadoc-plugin + + true + + + + + - - - - dev-build - - false - - - false - - - + + + + dev-build + + false + + + false + + + diff --git a/uitest/pom.xml b/uitest/pom.xml index f7a571c324..afef955576 100644 --- a/uitest/pom.xml +++ b/uitest/pom.xml @@ -1,330 +1,330 @@ - 4.0.0 - - com.vaadin - vaadin-root - 8.0-SNAPSHOT - - vaadin-uitest - vaadin-uitest - war - - true - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + com.vaadin + vaadin-root + 8.0-SNAPSHOT + + vaadin-uitest + vaadin-uitest + war + + true + - https://vaadin.com/ - Vaadin UI tests + https://vaadin.com/ + Vaadin UI tests - - - vaadin-addons - http://maven.vaadin.com/vaadin-addons - - + + + vaadin-addons + http://maven.vaadin.com/vaadin-addons + + - + - - - javax.portlet - portlet-api - provided - + + + javax.portlet + portlet-api + provided + - - javax.validation - validation-api - + + javax.validation + validation-api + - - org.hibernate - hibernate-validator - - - - com.google.appengine - appengine-api-1.0-sdk - provided - + + org.hibernate + hibernate-validator + + + + com.google.appengine + appengine-api-1.0-sdk + provided + - - - - org.eclipse.jetty - jetty-server - provided - - - org.eclipse.jetty - jetty-servlets - provided - - - org.eclipse.jetty.websocket - websocket-server - provided - - - org.eclipse.jetty - jetty-webapp - ${jetty.version} - provided - - - org.eclipse.jetty - jetty-util - ${jetty.version} - provided - - - org.eclipse.jetty - jetty-proxy - ${jetty.version} - provided - + + + + org.eclipse.jetty + jetty-server + provided + + + org.eclipse.jetty + jetty-servlets + provided + + + org.eclipse.jetty.websocket + websocket-server + provided + + + org.eclipse.jetty + jetty-webapp + ${jetty.version} + provided + + + org.eclipse.jetty + jetty-util + ${jetty.version} + provided + + + org.eclipse.jetty + jetty-proxy + ${jetty.version} + provided + - - - - ${project.groupId} - vaadin-server - ${project.version} - - - javax.servlet - javax.servlet-api - - - + + + + ${project.groupId} + vaadin-server + ${project.version} + + + javax.servlet + javax.servlet-api + + + - - ${project.groupId} - vaadin-client - ${project.version} - - - javax.validation - javax.servlet-api - - - + + ${project.groupId} + vaadin-client + ${project.version} + + + javax.validation + javax.servlet-api + + + - - com.google.gwt - gwt-elemental - provided - - - com.google.gwt - gwt-servlet - + + com.google.gwt + gwt-elemental + provided + + + com.google.gwt + gwt-servlet + - - ${project.groupId} - vaadin-client-compiled - ${project.version} - - - ${project.groupId} - vaadin-themes - ${project.version} - - - ${project.groupId} - vaadin-push - ${project.version} - - - javax.validation - javax.servlet-api - - - + + ${project.groupId} + vaadin-client-compiled + ${project.version} + + + ${project.groupId} + vaadin-themes + ${project.version} + + + ${project.groupId} + vaadin-push + ${project.version} + + + javax.validation + javax.servlet-api + + + - - - ${project.groupId} - vaadin-compatibility-client-compiled - ${project.version} - - - ${project.groupId} - vaadin-compatibility-server - ${project.version} - - - ${project.groupId} - vaadin-compatibility-client - ${project.version} - - - - ${project.groupId} - vaadin-client-compiler - ${project.version} - provided - + + + ${project.groupId} + vaadin-compatibility-client-compiled + ${project.version} + + + ${project.groupId} + vaadin-compatibility-server + ${project.version} + + + ${project.groupId} + vaadin-compatibility-client + ${project.version} + + + + ${project.groupId} + vaadin-client-compiler + ${project.version} + provided + - - - - javax.servlet - javax.servlet-api - 3.1.0 - provided - + + + + javax.servlet + javax.servlet-api + 3.1.0 + provided + - - ${project.groupId} - vaadin-uitest-common - ${project.version} - test - + + ${project.groupId} + vaadin-uitest-common + ${project.version} + test + - - com.jcraft - jsch - - - commons-codec - commons-codec - - - commons-io - commons-io - - - - org.hsqldb - hsqldb - - - - commons-lang - commons-lang - + + com.jcraft + jsch + + + commons-codec + commons-codec + + + commons-io + commons-io + + + + org.hsqldb + hsqldb + + + + commons-lang + commons-lang + - - com.vaadin - vaadin-sass-compiler - - - org.eclipse.jgit - org.eclipse.jgit - - - org.apache.httpcomponents - httpclient - - - - + + com.vaadin + vaadin-sass-compiler + + + org.eclipse.jgit + org.eclipse.jgit + + + org.apache.httpcomponents + httpclient + + + + - - - - src/main/themes - - **/*.scss - - - - src/main/resources - - + + + + src/main/themes + + **/*.scss + + + + src/main/resources + + - - - com.vaadin - vaadin-maven-plugin - - src/main/themes - ${project.build.outputDirectory}/VAADIN/widgetsets - ${project.build.directory}/gwt-unitCache - true - -Xmx1G - - - - - compile - compile-theme - - - - + + + com.vaadin + vaadin-maven-plugin + + src/main/themes + ${project.build.outputDirectory}/VAADIN/widgetsets + ${project.build.directory}/gwt-unitCache + true + -Xmx1G + + + + + compile + compile-theme + + + + - - org.eclipse.jetty - jetty-maven-plugin - ${jetty.version} - - - 8888 - - - + + org.eclipse.jetty + jetty-maven-plugin + ${jetty.version} + + + 8888 + + + - - maven-install-plugin - - true - - - - maven-deploy-plugin - - ${skip.uitest.deployment} - - - - maven-surefire-plugin - - true - - - - org.codehaus.mojo - animal-sniffer-maven-plugin - - true - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - - true - - - - maven-javadoc-plugin - - true - - - - - + + maven-install-plugin + + true + + + + maven-deploy-plugin + + ${skip.uitest.deployment} + + + + maven-surefire-plugin + + true + + + + org.codehaus.mojo + animal-sniffer-maven-plugin + + true + + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + + true + + + + maven-javadoc-plugin + + true + + + + + - - - - dev-build - - false - - - false - - - + + + + dev-build + + false + + + false + + + diff --git a/widgets/pom.xml b/widgets/pom.xml index 772a97c6c2..4f8c2a8eca 100644 --- a/widgets/pom.xml +++ b/widgets/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.vaadin @@ -11,7 +11,7 @@ vaadin-widgets jar - https://vaadin.com/ + https://vaadin.com/ Vaadin widgets @@ -63,7 +63,7 @@ true - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion} + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion} ${osgi.execution.environment} @@ -231,7 +231,7 @@ -DincludeNumberPackages=1 -classpath - + com.vaadin.buildhelpers.GeneratePackageExports