mirrors
/
vaadin-framework
mirror of https://github.com/vaadin/framework.git
Watch 1
Star 0
Fork 0
Code Issues 0 Releases 328 Wiki Activity
Browse Source

Build Liferay with maven 

Change-Id: I8f95dc9636c450125cf7401bee1824b2ef186454
tags/7.7.0.alpha1
elmot 8 years ago
parent
664d818e4d
commit
0fd53f4594
7 changed files with 153 additions and 107 deletions
Split View Show Diff Stats
  1. 1
    0
      .gitignore
  2. 1
    1
      ivysettings.xml
  3. 0
    76
      liferay/build.xml
  4. 0
    30
      liferay/ivy.xml
  5. 18
    0
      liferay/liferay-assembly-descriptor.xml
  6. 132
    0
      liferay/pom.xml
  7. 1
    0
      pom.xml

+ 1
- 0
.gitignore View File

@@ -91,6 +91,7 @@ client/target/
client-compiler/target/
buildhelpers/target/
client-compiled/target/
liferay/target/
themes/target/
widgets/target/


+ 1
- 1
ivysettings.xml View File

@@ -58,7 +58,7 @@
<module organisation="com.vaadin" name="vaadin-bom"
resolver="local-maven" />
<module organisation="com.vaadin" name="vaadin-liferay"
resolver="build-temp" />
resolver="local-maven" />
</modules>



+ 0
- 76
liferay/build.xml View File

@@ -1,76 +0,0 @@
<?xml version="1.0"?>

<project name="liferay" basedir="." default="publish-local" xmlns:ivy="antlib:org.apache.ivy.ant">
<description>
Builds the Liferay ZIP archive
</description>

<include file="../common.xml" as="common" />
<include file="../build.xml" as="vaadin" />

<property name="module.name" value="vaadin-liferay" />
<property name="result.dir" value="result" />
<property name="lib.dir" value="${result.dir}/lib" />
<property name="work.dir" value="${result.dir}/work" />
<property name="liferay.zip" location="${result.dir}/lib/${module.name}-${vaadin.version}.zip" />

<target name="publish-local" depends="build-zip" if="build.release">
<antcall target="common.publish-local">
<param name="conf" value="deps" />
</antcall>
</target>

<target name="fetch-jars">
<echo>Retriving prebuilt jars</echo>
<!-- Retrieve pre-build jars -->
<ivy:resolve />
<mkdir dir="${lib.dir}" />
<ivy:retrieve pattern="${lib.dir}/[artifact].[type]" conf="deps" />
</target>

<target name="unpack" depends="fetch-jars">
<echo>Unpacking jars into working directory</echo>
<mkdir dir="${work.dir}" />
<unjar src="${lib.dir}/vaadin-client-compiled.jar" dest="${work.dir}">
<patternset>
<include name="VAADIN/widgetsets/**/*" />
</patternset>
</unjar>
<unjar src="${lib.dir}/vaadin-themes.jar" dest="${work.dir}">
<patternset>
<include name="VAADIN/themes/base/**/*" />
<include name="VAADIN/themes/chameleon/**/*" />
<include name="VAADIN/themes/liferay/**/*" />
<include name="VAADIN/themes/runo/**/*" />
<include name="VAADIN/themes/reindeer/**/*" />
</patternset>
</unjar>
<unjar src="${lib.dir}/vaadin-push.jar" dest="${work.dir}">
<patternset>
<include name="VAADIN/vaadinPush.js" />
<include name="VAADIN/vaadinPush.debug.js" />
</patternset>
</unjar>
<unjar src="${lib.dir}/vaadin-server.jar" dest="${work.dir}">
<patternset>
<include name="VAADIN/vaadinBootstrap.js" />
</patternset>
</unjar>
</target>

<target name="build-zip" depends="unpack">
<echo>Building Liferay zip</echo>
<zip zipfile="${liferay.zip}">
<zipfileset dir="${work.dir}" />
</zip>
</target>

<target name="clean">
<antcall target="common.clean" />
</target>

<target name="checkstyle" />

<target name="test" depends="checkstyle" />

</project>

+ 0
- 30
liferay/ivy.xml View File

@@ -1,30 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ivy-module version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
xmlns:m="http://ant.apache.org/ivy/maven">

<info organisation="com.vaadin" module="vaadin-liferay" revision="${vaadin.version}" />

<configurations>
<conf name="build" />
<conf name="build-provided" />
<conf name="deps" visibility="private" />
</configurations>

<publications>
<artifact type="zip" ext="zip" />
</publications>

<dependencies>
<dependency org="com.vaadin" name="vaadin-client-compiled"
rev="${vaadin.version}" conf="deps -> default" transitive="false"/>
<dependency org="com.vaadin" name="vaadin-themes"
rev="${vaadin.version}" conf="deps -> default" transitive="false"/>
<dependency org="com.vaadin" name="vaadin-push"
rev="${vaadin.version}" conf="deps -> default" transitive="false" />
<dependency org="com.vaadin" name="vaadin-server"
rev="${vaadin.version}" conf="deps -> default" transitive="false" />
</dependencies>

</ivy-module>

+ 18
- 0
liferay/liferay-assembly-descriptor.xml View File

@@ -0,0 +1,18 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
<id>bin</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<outputDirectory/>
<directory>${project.build.directory}/dependency</directory>
<includes>
<include>**</include>
</includes>
</fileSet>
</fileSets>
</assembly>

+ 132
- 0
liferay/pom.xml View File

@@ -0,0 +1,132 @@
<?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>7.7.0-SNAPSHOT</version>
</parent>
<artifactId>vaadin-liferay</artifactId>
<name>vaadin-liferay</name>
<packaging>pom</packaging>

<organization>
<name>Vaadin Ltd</name>
</organization>
<url>https://vaadin.com/</url>
<description>Vaadin Liferay package</description>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>vaadin-client-compiled</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>vaadin-push</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>vaadin-themes</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>


<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>vaadin-server</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
<executions>
<execution>
<id>unpack</id>
<phase>prepare-package</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-push</artifactId>
<includes>VAADIN/vaadinPush.js, VAADIN/vaadinPush.debug.js</includes>
</artifactItem>

<artifactItem>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-client-compiled</artifactId>
<includes>VAADIN/widgetsets/**/*</includes>
</artifactItem>

<artifactItem>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-themes</artifactId>
<includes>
VAADIN/themes/base/**,
VAADIN/themes/chameleon/**,
VAADIN/themes/liferay/**,
VAADIN/themes/runo/**,
VAADIN/themes/reindeer/**
</includes>
</artifactItem>
<artifactItem>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-server</artifactId>
<includes>VAADIN/vaadinBootstrap.js</includes>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.6</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
<configuration>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
</archive>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>liferay-assembly-descriptor.xml</descriptor>
</descriptors>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.7</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>

</project>

+ 1
- 0
pom.xml View File

@@ -70,6 +70,7 @@
<module>client-compiled</module>
<module>themes</module>
<module>widgets</module>
<module>liferay</module>
</modules>

<build>

Write Preview
Loading…
Cancel
Save