This is an automated email from the ASF dual-hosted git repository. struberg pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwebbeans-meecrowave-examples.git
commit f72669d66c2bffd8ff9d683feed3c5d0ee8e2a38 Author: Sven Ruppert <[email protected]> AuthorDate: Wed Jan 16 17:37:23 2019 +0100 version updates --- servlet-vaadin-v08/pom.xml | 6 -- servlet-vaadin-v10/pom.xml | 217 +++++++++++++++++++++++---------------------- 2 files changed, 109 insertions(+), 114 deletions(-) diff --git a/servlet-vaadin-v08/pom.xml b/servlet-vaadin-v08/pom.xml index ff22d19..6e02140 100644 --- a/servlet-vaadin-v08/pom.xml +++ b/servlet-vaadin-v08/pom.xml @@ -79,12 +79,6 @@ <!-- our test dependencies --> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit4.version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.meecrowave</groupId> <artifactId>meecrowave-junit</artifactId> <version>${meecrowave.version}</version> diff --git a/servlet-vaadin-v10/pom.xml b/servlet-vaadin-v10/pom.xml index f899b14..63854ed 100644 --- a/servlet-vaadin-v10/pom.xml +++ b/servlet-vaadin-v10/pom.xml @@ -20,115 +20,116 @@ <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns="http://maven.apache.org/POM/4.0.0"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <parent> - <groupId>org.apache.meecrowave</groupId> - <artifactId>meecrowave-examples</artifactId> - <version>1.2.5-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>samples-servlet-vaadin-v10</artifactId> - <name>Servlet (Vaadin - V10)</name> - <packaging>jar</packaging> - - <properties> - <transpilation.output>${project.build.directory}/build</transpilation.output> - <vaadin.version>10.0.1</vaadin.version> - </properties> - - <pluginRepositories> - <pluginRepository> - <id>vaadin-prereleases</id> - <url>https://maven.vaadin.com/vaadin-prereleases</url> - </pluginRepository> - </pluginRepositories> - - <repositories> - <!--Releases--> - <repository> - <id>vaadin-addons</id> - <url>http://maven.vaadin.com/vaadin-addons</url> - </repository> - - <!--Pre-Releases--> - <repository> - <id>vaadin-prereleases</id> - <url>http://maven.vaadin.com/vaadin-prereleases</url> - </repository> - </repositories> - - - <dependencyManagement> - <dependencies> - <!--Vaadin --> - <dependency> - <groupId>com.vaadin</groupId> - <artifactId>vaadin-bom</artifactId> - <version>${vaadin.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> - + <parent> + <groupId>org.apache.meecrowave</groupId> + <artifactId>meecrowave-examples</artifactId> + <version>1.2.5-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + + <artifactId>samples-servlet-vaadin-v10</artifactId> + <name>Servlet (Vaadin - V10 / VXX)</name> + <packaging>jar</packaging> + + <properties> + <transpilation.output>${project.build.directory}/build</transpilation.output> + <!--<vaadin.version>10.0.1</vaadin.version>--> + <vaadin.version>12.0.3</vaadin.version> + </properties> + + <pluginRepositories> + <pluginRepository> + <id>vaadin-prereleases</id> + <url>https://maven.vaadin.com/vaadin-prereleases</url> + </pluginRepository> + </pluginRepositories> + + <repositories> + <!--Releases--> + <repository> + <id>vaadin-addons</id> + <url>http://maven.vaadin.com/vaadin-addons</url> + </repository> + + <!--Pre-Releases--> + <repository> + <id>vaadin-prereleases</id> + <url>http://maven.vaadin.com/vaadin-prereleases</url> + </repository> + </repositories> + + + <dependencyManagement> <dependencies> - <!-- this package contains the javax APIs for CDI, JAX-RS, JSONP, JSONB and Servlet4 --> - <dependency> - <groupId>org.apache.meecrowave</groupId> - <artifactId>meecrowave-specs-api</artifactId> - <version>${meecrowave.version}</version> - </dependency> - - <!--Vaadin --> - <dependency> - <groupId>com.vaadin</groupId> - <artifactId>vaadin-core</artifactId> - </dependency> + <!--Vaadin --> + <dependency> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-bom</artifactId> + <version>${vaadin.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> </dependencies> - - - <build> - <plugins> - <plugin> - <!-- - For starting meecrowave via Maven. Just run - $> mvn clean install meecrowave:run - --> - <groupId>org.apache.meecrowave</groupId> - <artifactId>meecrowave-maven-plugin</artifactId> - <version>${meecrowave.version}</version> - </plugin> - - <plugin> - <groupId>com.vaadin</groupId> - <artifactId>vaadin-maven-plugin</artifactId> - <version>${vaadin.version}</version> - <executions> - <execution> - <goals> - <goal>copy-production-files</goal> - <goal>package-for-production</goal> - </goals> - <configuration> - <transpileOutputDirectory>${transpilation.output}</transpileOutputDirectory> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <version>3.1.0</version> - <configuration> - <webResources> - <resource> - <directory>${transpilation.output}</directory> - </resource> - </webResources> - </configuration> - </plugin> - </plugins> - </build> + </dependencyManagement> + + <dependencies> + <!-- this package contains the javax APIs for CDI, JAX-RS, JSONP, JSONB and Servlet4 --> + <dependency> + <groupId>org.apache.meecrowave</groupId> + <artifactId>meecrowave-specs-api</artifactId> + <version>${meecrowave.version}</version> + </dependency> + + <!--Vaadin --> + <dependency> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-core</artifactId> + </dependency> + </dependencies> + + + <build> + <plugins> + <plugin> + <!-- + For starting meecrowave via Maven. Just run + $> mvn clean install meecrowave:run + --> + <groupId>org.apache.meecrowave</groupId> + <artifactId>meecrowave-maven-plugin</artifactId> + <version>${meecrowave.version}</version> + </plugin> + + <plugin> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-maven-plugin</artifactId> + <version>${vaadin.version}</version> + <executions> + <execution> + <goals> + <goal>copy-production-files</goal> + <goal>package-for-production</goal> + </goals> + <configuration> + <transpileOutputDirectory>${transpilation.output}</transpileOutputDirectory> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <version>3.2.2</version> + <configuration> + <webResources> + <resource> + <directory>${transpilation.output}</directory> + </resource> + </webResources> + </configuration> + </plugin> + </plugins> + </build> </project> \ No newline at end of file
