diff options
| -rw-r--r-- | bom/build.xml | 46 | ||||
| -rw-r--r-- | bom/ivy.xml | 18 | ||||
| -rw-r--r-- | bom/pom.xml (renamed from bom/vaadin-bom.pom) | 21 | ||||
| -rw-r--r-- | ivysettings.xml | 2 | ||||
| -rw-r--r-- | pom.xml | 1 |
5 files changed, 12 insertions, 76 deletions
diff --git a/bom/build.xml b/bom/build.xml deleted file mode 100644 index 42d7303b7b..0000000000 --- a/bom/build.xml +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0"?> - -<project name="vaadin-bom" basedir="." default="publish-local" - xmlns:artifact="antlib:org.apache.maven.artifact.ant" xmlns:antcontrib="antlib:net.sf.antcontrib"> - <description> - Compiles a BOM (Bill of Materials) Maven artifact - </description> - <include file="../common.xml" as="common" /> - <include file="../build.xml" as="vaadin" /> - - <!-- global properties --> - <property name="module.name" value="vaadin-bom" /> - <property name="result.dir" value="result" /> - - <target name="bom" description="Generates a BOM (Bill of Materials) pom.xml. Either for a snapshot or a release version"> - <fail unless="result.dir" message="No result.dir parameter given" /> - <condition property="vaadin.maven.version" value="${vaadin.version}"> - <isset property="build.release" /> - </condition> - <!-- if this wasn't already set by the condition, this is a snapshot --> - <property name="vaadin.maven.version" value="${vaadin.version.major}.${vaadin.version.minor}-SNAPSHOT" /> - - <property name="bom.xml" location="${result.dir}/lib/vaadin-bom-${vaadin.version}.pom" /> - - <copy file="vaadin-bom.pom" tofile="${bom.xml}" overwrite="true"> - <filterchain> - <replacestring from="@vaadin.version@" to="${vaadin.maven.version}" /> - </filterchain> - </copy> - </target> - - <target name="publish-local" depends="bom"> - <antcall target="common.publish-local" /> - </target> - - <target name="clean"> - <antcall target="common.clean" /> - </target> - <target name="checkstyle"> - <!-- No code in this module --> - </target> - <target name="test" depends="checkstyle"> - <!-- No tests for this BOM.. --> - </target> - -</project> diff --git a/bom/ivy.xml b/bom/ivy.xml deleted file mode 100644 index 39abb30d80..0000000000 --- a/bom/ivy.xml +++ /dev/null @@ -1,18 +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-bom" revision="${vaadin.version}" /> - - <configurations> - <conf name="build" /> - </configurations> - <publications> - <artifact type="pom" ext="pom" /> - </publications> - <dependencies defaultconf="build"> - </dependencies> - -</ivy-module> diff --git a/bom/vaadin-bom.pom b/bom/pom.xml index f2b482ad9b..7762121889 100644 --- a/bom/vaadin-bom.pom +++ b/bom/pom.xml @@ -3,12 +3,11 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>com.vaadin</groupId> - <artifactId>vaadin-parent</artifactId> - <version>1.0.0</version> + <artifactId>vaadin-root</artifactId> + <version>7.7.0-SNAPSHOT</version> </parent> <groupId>com.vaadin</groupId> <artifactId>vaadin-bom</artifactId> - <version>@vaadin.version@</version> <packaging>pom</packaging> <name>Vaadin Framework (Bill of Materials)</name> <description>Vaadin Framework (Bill of Materials)</description> @@ -61,42 +60,42 @@ <dependency> <groupId>com.vaadin</groupId> <artifactId>vaadin-shared</artifactId> - <version>@vaadin.version@</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>com.vaadin</groupId> <artifactId>vaadin-server</artifactId> - <version>@vaadin.version@</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>com.vaadin</groupId> <artifactId>vaadin-push</artifactId> - <version>@vaadin.version@</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>com.vaadin</groupId> <artifactId>vaadin-widgets</artifactId> - <version>@vaadin.version@</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>com.vaadin</groupId> <artifactId>vaadin-client</artifactId> - <version>@vaadin.version@</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>com.vaadin</groupId> <artifactId>vaadin-client-compiler</artifactId> - <version>@vaadin.version@</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>com.vaadin</groupId> <artifactId>vaadin-client-compiled</artifactId> - <version>@vaadin.version@</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>com.vaadin</groupId> <artifactId>vaadin-themes</artifactId> - <version>@vaadin.version@</version> + <version>${project.version}</version> </dependency> </dependencies> </dependencyManagement> diff --git a/ivysettings.xml b/ivysettings.xml index 368d4d7fd8..ba1c26a02c 100644 --- a/ivysettings.xml +++ b/ivysettings.xml @@ -56,7 +56,7 @@ <module organisation="com.vaadin" name="vaadin-widgets" resolver="build-temp" /> <module organisation="com.vaadin" name="vaadin-bom" - resolver="build-temp" /> + resolver="local-maven" /> <module organisation="com.vaadin" name="vaadin-liferay" resolver="build-temp" /> </modules> @@ -47,6 +47,7 @@ <description>Vaadin Framework Root Pom</description> <modules> + <module>bom</module> <module>shared</module> <module>push</module> <module>server</module> |