aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2016-08-15 15:23:27 +0300
committerArtur Signell <artur@vaadin.com>2016-08-19 09:24:26 +0300
commit1b73770105899b9015ff6685e7d6674934336ca4 (patch)
tree243873d5e3079e16065babbc9136cdff340aa295
parentb565956a51e870287fb01ea9365ce947e33641f5 (diff)
downloadvaadin-framework-1b73770105899b9015ff6685e7d6674934336ca4.tar.gz
vaadin-framework-1b73770105899b9015ff6685e7d6674934336ca4.zip
Add Vaadin 7 compatibility modules
Change-Id: Ife8387c94c85a8167902e69fce5c3a6f761c5d8b
-rw-r--r--compatibility-client-compiled/pom.xml183
-rw-r--r--compatibility-client/pom.xml54
-rwxr-xr-xcompatibility-client/src/main/resources/com/vaadin/v7/Vaadin7WidgetSet.gwt.xml7
-rw-r--r--compatibility-server/pom.xml94
-rw-r--r--compatibility-shared/pom.xml88
-rw-r--r--pom.xml4
-rw-r--r--uitest/pom.xml16
7 files changed, 446 insertions, 0 deletions
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>com.vaadin</groupId>
+ <artifactId>vaadin-root</artifactId>
+ <version>8.0-SNAPSHOT</version>
+ </parent>
+ <groupId>com.vaadin.v7</groupId>
+ <artifactId>vaadin-compatibility-client-compiled</artifactId>
+ <name>vaadin-compatibility-client-compiled</name>
+ <packaging>jar</packaging>
+
+ <properties>
+ <widgetset.name>com.vaadin.v7.Vaadin7WidgetSet</widgetset.name>
+ <widgetset.style>OBF</widgetset.style>
+ <widgetset.local.workers>6</widgetset.local.workers>
+ </properties>
+
+ <url>https://vaadin.com/</url>
+ <description>Vaadin 7 compatibility client compiled</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>vaadin-compatibility-server</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>vaadin-compatibility-client</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.vaadin</groupId>
+ <artifactId>vaadin-client-compiler</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.vaadin</groupId>
+ <artifactId>vaadin-buildhelpers</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-export-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <classpathScope>compile</classpathScope>
+ <executable>${java.home}/bin/java</executable>
+ <arguments>
+ <argument>-Dvaadin.version=${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</argument>
+ <argument>-DincludeNumberPackages=1</argument>
+
+ <argument>-classpath</argument>
+ <classpath />
+
+ <argument>com.vaadin.buildhelpers.GeneratePackageExports</argument>
+
+ <argument>${project.build.directory}/${project.build.finalName}.${project.packaging}</argument>
+ <argument>VAADIN/widgetsets</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>com.vaadin</groupId>
+ <artifactId>vaadin-maven-plugin</artifactId>
+ <configuration>
+ <modules>
+ <module>${widgetset.name}</module>
+ </modules>
+ <webappDirectory>${project.build.outputDirectory}/VAADIN/widgetsets</webappDirectory>
+ <persistentunitcachedir>${project.build.directory}/gwt-unitCache</persistentunitcachedir>
+ <style>${widgetset.style}</style>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-Version>${osgi.bundle.version}</Bundle-Version>
+ <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment>
+ <!-- Export package is handled in exec plugin -->
+ <Export-Package></Export-Package>
+ <Import-Package></Import-Package>
+ </instructions>
+ </configuration>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.6</version>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ <index>false</index>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.codehaus.mojo
+ </groupId>
+ <artifactId>
+ exec-maven-plugin
+ </artifactId>
+ <versionRange>
+ [1.4.0,)
+ </versionRange>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+</project>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>com.vaadin</groupId>
+ <artifactId>vaadin-root</artifactId>
+ <version>8.0-SNAPSHOT</version>
+ </parent>
+ <groupId>com.vaadin.v7</groupId>
+ <artifactId>vaadin-compatibility-client</artifactId>
+ <name>vaadin-compatibility-client</name>
+ <packaging>jar</packaging>
+
+ <url>https://vaadin.com/</url>
+ <description>Vaadin 7 compatibility package for Vaadin 8</description>
+
+ <dependencies>
+ <!-- Project modules -->
+ <dependency>
+ <groupId>com.vaadin</groupId>
+ <artifactId>vaadin-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.vaadin.v7</groupId>
+ <artifactId>vaadin-compatibility-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>checkstyle</goal>
+ </goals>
+ <phase>process-sources</phase>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
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 @@
+<module>
+ <!-- Hint for WidgetSetBuilder not to automatically update the file -->
+ <!-- WS Compiler: manually edited -->
+
+ <inherits name="com.vaadin.DefaultWidgetSet" />
+
+</module>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>com.vaadin</groupId>
+ <artifactId>vaadin-root</artifactId>
+ <version>8.0-SNAPSHOT</version>
+ </parent>
+ <groupId>com.vaadin.v7</groupId>
+ <artifactId>vaadin-compatibility-server</artifactId>
+ <name>vaadin-compatibility-server</name>
+ <packaging>jar</packaging>
+
+ <url>https://vaadin.com/</url>
+ <description>Vaadin 7 compatibility package for Vaadin 8</description>
+
+ <dependencies>
+ <!-- Project modules -->
+ <dependency>
+ <groupId>com.vaadin</groupId>
+ <artifactId>vaadin-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.vaadin.v7</groupId>
+ <artifactId>vaadin-compatibility-shared</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>checkstyle</goal>
+ </goals>
+ <phase>process-sources</phase>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment>
+ <Bundle-Version>${osgi.bundle.version}</Bundle-Version>
+ <Export-Package>com.vaadin.v7.*;version="${osgi.bundle.version}"</Export-Package>
+ <Require-Bundle>
+ com.vaadin.server;bundle-version="${osgi.bundle.version}"
+ </Require-Bundle>
+ </instructions>
+ </configuration>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ <index>false</index>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>com.vaadin</groupId>
+ <artifactId>vaadin-root</artifactId>
+ <version>8.0-SNAPSHOT</version>
+ </parent>
+ <groupId>com.vaadin.v7</groupId>
+ <artifactId>vaadin-compatibility-shared</artifactId>
+ <name>vaadin-compatibility-shared</name>
+ <packaging>jar</packaging>
+
+ <url>https://vaadin.com/</url>
+ <description>Vaadin 7 compatibility package for Vaadin 8</description>
+
+ <dependencies>
+ <!-- Project modules -->
+ <dependency>
+ <groupId>com.vaadin</groupId>
+ <artifactId>vaadin-shared</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>checkstyle</goal>
+ </goals>
+ <phase>process-sources</phase>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment>
+ <Bundle-Version>${osgi.bundle.version}</Bundle-Version>
+ <Export-Package>com.vaadin.*;version="${osgi.bundle.version}"</Export-Package>
+ <Require-Bundle>
+ com.vaadin.shared;bundle-version="${osgi.bundle.version}",
+ </Require-Bundle>
+ </instructions>
+ </configuration>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ <index>false</index>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/pom.xml b/pom.xml
index e2317026f8..5c608dff1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,6 +88,10 @@
<module>uitest</module>
<module>liferay</module>
<module>all</module>
+ <module>compatibility-server</module>
+ <module>compatibility-client</module>
+ <module>compatibility-client-compiled</module>
+ <module>compatibility-shared</module>
<!-- Nexus staging bug needs the last module to be deployed. -->
<module>bom</module>
</modules>
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 @@
</exclusions>
</dependency>
+ <!-- Vaadin 7 components -->
+ <dependency>
+ <groupId>com.vaadin.v7</groupId>
+ <artifactId>vaadin-compatibility-client-compiled</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.vaadin.v7</groupId>
+ <artifactId>vaadin-compatibility-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.vaadin.v7</groupId>
+ <artifactId>vaadin-compatibility-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!-- For compiling TestingWidgetSet -->
<dependency>
<groupId>${project.groupId}</groupId>