From 1b73770105899b9015ff6685e7d6674934336ca4 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Mon, 15 Aug 2016 15:23:27 +0300 Subject: [PATCH] Add Vaadin 7 compatibility modules Change-Id: Ife8387c94c85a8167902e69fce5c3a6f761c5d8b --- compatibility-client-compiled/pom.xml | 183 ++++++++++++++++++ compatibility-client/pom.xml | 54 ++++++ .../com/vaadin/v7/Vaadin7WidgetSet.gwt.xml | 7 + compatibility-server/pom.xml | 94 +++++++++ compatibility-shared/pom.xml | 88 +++++++++ pom.xml | 4 + uitest/pom.xml | 16 ++ 7 files changed, 446 insertions(+) create mode 100644 compatibility-client-compiled/pom.xml create mode 100644 compatibility-client/pom.xml create mode 100755 compatibility-client/src/main/resources/com/vaadin/v7/Vaadin7WidgetSet.gwt.xml create mode 100644 compatibility-server/pom.xml create mode 100644 compatibility-shared/pom.xml diff --git a/compatibility-client-compiled/pom.xml b/compatibility-client-compiled/pom.xml new file mode 100644 index 0000000000..38ed7fed5b --- /dev/null +++ b/compatibility-client-compiled/pom.xml @@ -0,0 +1,183 @@ + + + 4.0.0 + + com.vaadin + vaadin-root + 8.0-SNAPSHOT + + com.vaadin.v7 + vaadin-compatibility-client-compiled + vaadin-compatibility-client-compiled + jar + + + com.vaadin.v7.Vaadin7WidgetSet + OBF + 6 + + + https://vaadin.com/ + Vaadin 7 compatibility client compiled + + + + ${project.groupId} + vaadin-compatibility-server + ${project.version} + provided + + + + ${project.groupId} + vaadin-compatibility-client + ${project.version} + provided + + + + com.vaadin + vaadin-client-compiler + ${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 + + -classpath + + + com.vaadin.buildhelpers.GeneratePackageExports + + ${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 + + + + + + compile + + + + + + + + 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 + + + + + + + + + + + + + + + diff --git a/compatibility-client/pom.xml b/compatibility-client/pom.xml new file mode 100644 index 0000000000..c9503ecd9f --- /dev/null +++ b/compatibility-client/pom.xml @@ -0,0 +1,54 @@ + + + 4.0.0 + + com.vaadin + vaadin-root + 8.0-SNAPSHOT + + com.vaadin.v7 + vaadin-compatibility-client + vaadin-compatibility-client + jar + + https://vaadin.com/ + Vaadin 7 compatibility package for Vaadin 8 + + + + + com.vaadin + vaadin-client + ${project.version} + + + com.vaadin.v7 + vaadin-compatibility-server + ${project.version} + + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + + checkstyle + + process-sources + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + + diff --git a/compatibility-client/src/main/resources/com/vaadin/v7/Vaadin7WidgetSet.gwt.xml b/compatibility-client/src/main/resources/com/vaadin/v7/Vaadin7WidgetSet.gwt.xml new file mode 100755 index 0000000000..e124491d3a --- /dev/null +++ b/compatibility-client/src/main/resources/com/vaadin/v7/Vaadin7WidgetSet.gwt.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/compatibility-server/pom.xml b/compatibility-server/pom.xml new file mode 100644 index 0000000000..1ff2a05961 --- /dev/null +++ b/compatibility-server/pom.xml @@ -0,0 +1,94 @@ + + + 4.0.0 + + com.vaadin + vaadin-root + 8.0-SNAPSHOT + + com.vaadin.v7 + vaadin-compatibility-server + vaadin-compatibility-server + jar + + https://vaadin.com/ + Vaadin 7 compatibility package for Vaadin 8 + + + + + com.vaadin + vaadin-server + ${project.version} + + + com.vaadin.v7 + vaadin-compatibility-shared + ${project.version} + + + + + + + + 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}" + + com.vaadin.server;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-surefire-plugin + + + + + diff --git a/compatibility-shared/pom.xml b/compatibility-shared/pom.xml new file mode 100644 index 0000000000..709b3ee8d4 --- /dev/null +++ b/compatibility-shared/pom.xml @@ -0,0 +1,88 @@ + + + 4.0.0 + + com.vaadin + vaadin-root + 8.0-SNAPSHOT + + com.vaadin.v7 + vaadin-compatibility-shared + vaadin-compatibility-shared + jar + + https://vaadin.com/ + Vaadin 7 compatibility package for Vaadin 8 + + + + + com.vaadin + vaadin-shared + ${project.version} + + + + + + + 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.maven.plugins + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + false + + true + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + + diff --git a/pom.xml b/pom.xml index e2317026f8..5c608dff1d 100644 --- a/pom.xml +++ b/pom.xml @@ -88,6 +88,10 @@ uitest liferay all + compatibility-server + compatibility-client + compatibility-client-compiled + compatibility-shared bom diff --git a/uitest/pom.xml b/uitest/pom.xml index 989b58dc9d..a36a257121 100644 --- a/uitest/pom.xml +++ b/uitest/pom.xml @@ -143,6 +143,22 @@ + + + com.vaadin.v7 + vaadin-compatibility-client-compiled + ${project.version} + + + com.vaadin.v7 + vaadin-compatibility-server + ${project.version} + + + com.vaadin.v7 + vaadin-compatibility-client + ${project.version} + ${project.groupId} -- 2.39.5