diff options
| -rw-r--r-- | buildhelpers/pom.xml | 4 | ||||
| -rw-r--r-- | client-compiler/pom.xml | 5 | ||||
| -rw-r--r-- | client/pom.xml | 9 | ||||
| -rw-r--r-- | pom.xml | 185 | ||||
| -rw-r--r-- | push/pom.xml | 2 | ||||
| -rw-r--r-- | server/pom.xml | 26 | ||||
| -rw-r--r-- | shared/pom.xml | 2 | ||||
| -rw-r--r-- | themes/pom.xml | 10 | ||||
| -rw-r--r-- | uitest-common/pom.xml | 7 | ||||
| -rw-r--r-- | uitest/pom.xml | 36 |
10 files changed, 186 insertions, 100 deletions
diff --git a/buildhelpers/pom.xml b/buildhelpers/pom.xml index 66ef8c4de6..5ea219297a 100644 --- a/buildhelpers/pom.xml +++ b/buildhelpers/pom.xml @@ -19,23 +19,19 @@ <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>${commons-io.version}</version> </dependency> <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> - <version>1.2</version> </dependency> <dependency> <groupId>com.vaadin</groupId> <artifactId>vaadin-sass-compiler</artifactId> - <version>${vaadin.sass.version}</version> </dependency> <dependency> <groupId>com.carrotsearch</groupId> <artifactId>smartsprites</artifactId> - <version>0.2.10</version> </dependency> </dependencies> diff --git a/client-compiler/pom.xml b/client-compiler/pom.xml index 72e794118c..4b346295a2 100644 --- a/client-compiler/pom.xml +++ b/client-compiler/pom.xml @@ -16,24 +16,21 @@ <dependencies> <dependency> - <groupId>com.vaadin</groupId> + <groupId>${project.groupId}</groupId> <artifactId>vaadin-client</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-dev</artifactId> - <version>${vaadin.gwt.version}</version> </dependency> <dependency> <groupId>com.vaadin</groupId> <artifactId>vaadin-sass-compiler</artifactId> - <version>${vaadin.sass.version}</version> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>${junit.version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/client/pom.xml b/client/pom.xml index b47cabd15e..9f5a54451e 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -19,18 +19,18 @@ <!-- LIBRARY DEPENDENCIES (compile time) --> <!-- Project modules --> <dependency> - <groupId>com.vaadin</groupId> + <groupId>${project.groupId}</groupId> <artifactId>vaadin-shared</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>com.vaadin</groupId> + <groupId>${project.groupId}</groupId> <artifactId>vaadin-server</artifactId> <version>${project.version}</version> <exclusions> <exclusion> - <groupId>com.vaadin</groupId> + <groupId>${project.groupId}</groupId> <artifactId>vaadin-sass-compiler</artifactId> </exclusion> </exclusions> @@ -40,14 +40,12 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.11</version> <scope>test</scope> </dependency> <dependency> <groupId>org.easymock</groupId> <artifactId>easymock</artifactId> - <version>3.0</version> <scope>test</scope> </dependency> @@ -55,7 +53,6 @@ <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-elemental</artifactId> - <version>${vaadin.gwt.version}</version> </dependency> </dependencies> @@ -7,7 +7,6 @@ <artifactId>vaadin-parent</artifactId> <version>1.0.0</version> </parent> - <groupId>com.vaadin</groupId> <artifactId>vaadin-root</artifactId> <name>vaadin-root</name> <packaging>pom</packaging> @@ -23,32 +22,17 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <!-- Used version numbers for dependencies --> - <commons-io.version>2.4</commons-io.version> - <google.appengine.version>1.7.7</google.appengine.version> - <jsoup.version>1.8.3</jsoup.version> <liferay.portal.version>6.0.2</liferay.portal.version> + <jetty.version>9.3.9.v20160517</jetty.version> - <vaadin.sass.version>0.9.13</vaadin.sass.version> <vaadin.gwt.version>2.8.0-rc2</vaadin.gwt.version> <vaadin.plugin.version>8.0-SNAPSHOT</vaadin.plugin.version> - <javax.portlet.version>2.0</javax.portlet.version> - <javax.servlet.version>3.0.1</javax.servlet.version> - <javax.validation.version>1.0.0.GA</javax.validation.version> - <!-- OSGi --> <osgi.javax.servlet.version>3.0.0</osgi.javax.servlet.version> <osgi.execution.environment>JavaSE-1.8</osgi.execution.environment> <osgi.bundle.version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</osgi.bundle.version> - <!-- Test dependencies --> - <junit.version>4.11</junit.version> - - <!-- Atmosphere versions --> - <!-- Note that this should be kept in sync with the class Constants --> - <atmosphere.runtime.version>2.4.5.vaadin1</atmosphere.runtime.version> - <atmosphere.js.version>2.3.2.vaadin1</atmosphere.js.version> - <!-- Dependency unpack directory --> <dependency.unpack.directory>${project.build.directory}/dependency-unpack</dependency.unpack.directory> </properties> @@ -108,6 +92,173 @@ <module>bom</module> </modules> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.4</version> + </dependency> + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.6</version> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.5</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.6.1</version> + </dependency> + <dependency> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-sass-compiler</artifactId> + <version>0.9.13</version> + </dependency> + <dependency> + <groupId>com.carrotsearch</groupId> + <artifactId>smartsprites</artifactId> + <version>0.2.10</version> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-dev</artifactId> + <version>${vaadin.gwt.version}</version> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-elemental</artifactId> + <version>${vaadin.gwt.version}</version> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-servlet</artifactId> + <version>${vaadin.gwt.version}</version> + </dependency> + <dependency> + <groupId>com.vaadin.external.atmosphere</groupId> + <artifactId>atmosphere-runtime</artifactId> + <!-- Note that this should be kept in sync with the class Constants --> + <version>2.4.5.vaadin1</version> + </dependency> + <dependency> + <groupId>com.vaadin.external.atmosphere.client</groupId> + <artifactId>javascript</artifactId> + <type>war</type> + <version>2.3.2.vaadin1</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.11</version> + </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <version>3.0</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>3.0.1</version> + </dependency> + <dependency> + <groupId>javax.portlet</groupId> + <artifactId>portlet-api</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <groupId>com.google.appengine</groupId> + <artifactId>appengine-api-1.0-sdk</artifactId> + <version>1.7.7</version> + </dependency> + <dependency> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + <version>1.0.0.GA</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <version>4.2.0.Final</version> + </dependency> + <dependency> + <groupId>org.jsoup</groupId> + <artifactId>jsoup</artifactId> + <version>1.8.3</version> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <version>1.9.5</version> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-all</artifactId> + <version>1.3</version> + </dependency> + <dependency> + <groupId>org.hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>2.2.6</version> + </dependency> + <dependency> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-testbench</artifactId> + <version>4.0.3</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlets</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.websocket</groupId> + <artifactId>websocket-server</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-webapp</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-proxy</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>com.jcraft</groupId> + <artifactId>jsch</artifactId> + <version>0.1.52</version> + </dependency> + <dependency> + <groupId>org.eclipse.jgit</groupId> + <artifactId>org.eclipse.jgit</artifactId> + <version>3.5.1.201410131835-r</version> + </dependency> + </dependencies> + + </dependencyManagement> <build> <pluginManagement> <plugins> diff --git a/push/pom.xml b/push/pom.xml index 98c4e2a654..71ecbad0cd 100644 --- a/push/pom.xml +++ b/push/pom.xml @@ -22,12 +22,10 @@ <dependency> <groupId>com.vaadin.external.atmosphere</groupId> <artifactId>atmosphere-runtime</artifactId> - <version>${atmosphere.runtime.version}</version> </dependency> <dependency> <groupId>com.vaadin.external.atmosphere.client</groupId> <artifactId>javascript</artifactId> - <version>${atmosphere.js.version}</version> <type>war</type> <scope>provided</scope> </dependency> diff --git a/server/pom.xml b/server/pom.xml index 111c7fa996..68db722ef8 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -26,19 +26,17 @@ <scope>provided</scope> </dependency> - <!--Servlet API version 3.0 --> + <!--Servlet API --> <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>${javax.servlet.version}</version> <scope>provided</scope> </dependency> - <!--Portlet API version 2.0 (JSR-286) --> + <!--Portlet API --> <dependency> <groupId>javax.portlet</groupId> <artifactId>portlet-api</artifactId> - <version>${javax.portlet.version}</version> <scope>provided</scope> </dependency> @@ -46,7 +44,6 @@ <dependency> <groupId>com.google.appengine</groupId> <artifactId>appengine-api-1.0-sdk</artifactId> - <version>${google.appengine.version}</version> <scope>provided</scope> </dependency> @@ -54,26 +51,24 @@ <dependency> <groupId>javax.validation</groupId> <artifactId>validation-api</artifactId> - <version>${javax.validation.version}</version> <scope>provided</scope> </dependency> <!-- Sass compiler --> <dependency> - <groupId>com.vaadin</groupId> + <groupId>${project.groupId}</groupId> <artifactId>vaadin-sass-compiler</artifactId> - <version>${vaadin.sass.version}</version> </dependency> <!-- LIBRARY DEPENDENCIES (compile time) --> <!-- Project modules --> <dependency> - <groupId>com.vaadin</groupId> + <groupId>${project.groupId}</groupId> <artifactId>vaadin-shared</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>com.vaadin</groupId> + <groupId>${project.groupId}</groupId> <artifactId>vaadin-push</artifactId> <version>${project.version}</version> <scope>provided</scope> @@ -83,7 +78,6 @@ <dependency> <groupId>org.jsoup</groupId> <artifactId>jsoup</artifactId> - <version>${jsoup.version}</version> </dependency> <!-- TESTING DEPENDENCIES --> @@ -92,56 +86,46 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>${junit.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> - <version>1.9.5</version> <scope>test</scope> </dependency> <dependency> <groupId>org.hamcrest</groupId> <artifactId>hamcrest-all</artifactId> - <version>1.3</version> <scope>test</scope> </dependency> <dependency> <groupId>org.easymock</groupId> <artifactId>easymock</artifactId> - <version>3.0</version> <scope>test</scope> </dependency> <dependency> <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId> - <version>2.2.6</version> <scope>test</scope> </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>${commons-io.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.6</version> <scope>test</scope> </dependency> - <!-- Bean Validation implementation --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.6.1</version> <scope>test</scope> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-validator</artifactId> - <version>4.2.0.Final</version> <scope>test</scope> </dependency> diff --git a/shared/pom.xml b/shared/pom.xml index 1fb2144611..1c75c23f1d 100644 --- a/shared/pom.xml +++ b/shared/pom.xml @@ -22,14 +22,12 @@ <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-elemental</artifactId> - <version>${vaadin.gwt.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>${junit.version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/themes/pom.xml b/themes/pom.xml index 3d59ab14cf..002e04f726 100644 --- a/themes/pom.xml +++ b/themes/pom.xml @@ -33,22 +33,12 @@ <dependency> <groupId>com.vaadin</groupId> <artifactId>vaadin-sass-compiler</artifactId> - <version>${vaadin.sass.version}</version> - <scope>provided</scope> - </dependency> - - <!-- remove cssparser override once sass-compiler is updated --> - <dependency> - <groupId>net.sourceforge.cssparser</groupId> - <artifactId>cssparser</artifactId> - <version>0.9.11</version> <scope>provided</scope> </dependency> <dependency> <groupId>com.carrotsearch</groupId> <artifactId>smartsprites</artifactId> - <version>0.2.10</version> <scope>provided</scope> </dependency> </dependencies> diff --git a/uitest-common/pom.xml b/uitest-common/pom.xml index d46927fd2a..f1d413fb58 100644 --- a/uitest-common/pom.xml +++ b/uitest-common/pom.xml @@ -27,7 +27,7 @@ <dependencies> <!-- LIBRARY DEPENDENCIES (compile time) --> <dependency> - <groupId>com.vaadin</groupId> + <groupId>${project.groupId}</groupId> <artifactId>vaadin-server</artifactId> <version>${project.version}</version> <exclusions> @@ -41,19 +41,14 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.11</version> </dependency> - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>${commons-io.version}</version> </dependency> - <dependency> <groupId>com.vaadin</groupId> <artifactId>vaadin-testbench</artifactId> - <version>4.0.3</version> </dependency> </dependencies> diff --git a/uitest/pom.xml b/uitest/pom.xml index 01c1fd2799..20e800bdcd 100644 --- a/uitest/pom.xml +++ b/uitest/pom.xml @@ -11,7 +11,6 @@ <name>vaadin-uitest</name> <packaging>war</packaging> <properties> - <jetty.version>9.3.9.v20160517</jetty.version> <skip.uitest.deployment>true</skip.uitest.deployment> </properties> @@ -31,26 +30,22 @@ <dependency> <groupId>javax.portlet</groupId> <artifactId>portlet-api</artifactId> - <version>2.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>javax.validation</groupId> <artifactId>validation-api</artifactId> - <version>1.0.0.GA</version> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-validator</artifactId> - <version>4.2.0.Final</version> </dependency> <!-- Google App Engine --> <dependency> <groupId>com.google.appengine</groupId> <artifactId>appengine-api-1.0-sdk</artifactId> - <version>1.7.7</version> <scope>provided</scope> </dependency> @@ -59,19 +54,16 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>${jetty.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlets</artifactId> - <version>${jetty.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-server</artifactId> - <version>${jetty.version}</version> <scope>provided</scope> </dependency> <dependency> @@ -96,7 +88,7 @@ <!-- LIBRARY DEPENDENCIES (compile time) --> <!-- Project modules --> <dependency> - <groupId>com.vaadin</groupId> + <groupId>${project.groupId}</groupId> <artifactId>vaadin-server</artifactId> <version>${project.version}</version> <exclusions> @@ -108,7 +100,7 @@ </dependency> <dependency> - <groupId>com.vaadin</groupId> + <groupId>${project.groupId}</groupId> <artifactId>vaadin-client</artifactId> <version>${project.version}</version> <exclusions> @@ -122,27 +114,25 @@ <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-elemental</artifactId> - <version>${vaadin.gwt.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-servlet</artifactId> - <version>${vaadin.gwt.version}</version> </dependency> <dependency> - <groupId>com.vaadin</groupId> + <groupId>${project.groupId}</groupId> <artifactId>vaadin-client-compiled</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>com.vaadin</groupId> + <groupId>${project.groupId}</groupId> <artifactId>vaadin-themes</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>com.vaadin</groupId> + <groupId>${project.groupId}</groupId> <artifactId>vaadin-push</artifactId> <version>${project.version}</version> <exclusions> @@ -155,22 +145,21 @@ <!-- For compiling TestingWidgetSet --> <dependency> - <groupId>com.vaadin</groupId> + <groupId>${project.groupId}</groupId> <artifactId>vaadin-client-compiler</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> - <!-- Servlet 3.0 API --> + <!-- Servlet API --> <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>3.1.0</version> <scope>provided</scope> </dependency> <dependency> - <groupId>com.vaadin</groupId> + <groupId>${project.groupId}</groupId> <artifactId>vaadin-uitest-common</artifactId> <version>${project.version}</version> <scope>test</scope> @@ -179,52 +168,43 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.11</version> <scope>test</scope> </dependency> <dependency> <groupId>org.hamcrest</groupId> <artifactId>hamcrest-all</artifactId> - <version>1.3</version> <scope>test</scope> </dependency> <dependency> <groupId>com.jcraft</groupId> <artifactId>jsch</artifactId> - <version>0.1.52</version> </dependency> <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>1.5</version> </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>${commons-io.version}</version> </dependency> <!-- Mainly for SQLContainer tests --> <dependency> <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId> - <version>2.2.6</version> </dependency> <!-- This should be removed once tests have been updated to use lang3 --> <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.6</version> </dependency> <dependency> <groupId>com.vaadin</groupId> <artifactId>vaadin-sass-compiler</artifactId> - <version>${vaadin.sass.version}</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit</artifactId> - <version>3.5.1.201410131835-r</version> <exclusions> <exclusion> <groupId>org.apache.httpcomponents</groupId> |