struberg closed pull request #2: version updates, prepare for docker based examples URL: https://github.com/apache/openwebbeans-meecrowave-examples/pull/2
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/docker/pom.xml b/docker/pom.xml new file mode 100644 index 0000000..bfe20c8 --- /dev/null +++ b/docker/pom.xml @@ -0,0 +1,15 @@ +<?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";> + <parent> + <artifactId>meecrowave-examples</artifactId> + <groupId>org.apache.meecrowave</groupId> + <version>1.2.3-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + + <artifactId>samples-docker</artifactId> + + +</project> \ No newline at end of file diff --git a/mw_bundle_config/pom.xml b/mw_bundle_config/pom.xml index 8b36824..4c0d06d 100644 --- a/mw_bundle_config/pom.xml +++ b/mw_bundle_config/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.meecrowave</groupId> <artifactId>meecrowave-examples</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.2.3-SNAPSHOT</version> </parent> <artifactId>samples-bundle-config</artifactId> diff --git a/pom.xml b/pom.xml index bd2b650..d553529 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ <groupId>org.apache.meecrowave</groupId> <artifactId>meecrowave-examples</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.2.3-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache Meecrowave Examples</name> @@ -42,10 +42,11 @@ <module>mw_bundle_config</module> <module>servlet-vaadin-v08</module> <module>servlet-vaadin-v10</module> + <module>docker</module> </modules> <properties> - <meecrowave.version>1.2.2</meecrowave.version> + <meecrowave.version>1.2.3</meecrowave.version> <maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.source>1.8</maven.compiler.source> diff --git a/rest-trivial/pom.xml b/rest-trivial/pom.xml index 5a1b18a..df9eccc 100644 --- a/rest-trivial/pom.xml +++ b/rest-trivial/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.apache.meecrowave</groupId> <artifactId>meecrowave-examples</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.2.3-SNAPSHOT</version> </parent> diff --git a/rest/pom.xml b/rest/pom.xml index 8503ee2..4ef7333 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.apache.meecrowave</groupId> <artifactId>meecrowave-examples</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.2.3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/servlet-trivial/pom.xml b/servlet-trivial/pom.xml index fdc91b8..d4dc32b 100644 --- a/servlet-trivial/pom.xml +++ b/servlet-trivial/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.meecrowave</groupId> <artifactId>meecrowave-examples</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.2.3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/servlet-vaadin-v08/pom.xml b/servlet-vaadin-v08/pom.xml index 12d3364..a87cff9 100644 --- a/servlet-vaadin-v08/pom.xml +++ b/servlet-vaadin-v08/pom.xml @@ -23,20 +23,26 @@ <parent> <groupId>org.apache.meecrowave</groupId> <artifactId>meecrowave-examples</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.2.3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>samples-servlet-vaadin-v08</artifactId> <name>Servlet (Vaadin - V08)</name> + <properties> + <vaadin.version>8.4.5</vaadin.version> + </properties> + + <packaging>jar</packaging> + <dependencyManagement> <dependencies> <!--Vaadin --> <dependency> <groupId>com.vaadin</groupId> <artifactId>vaadin-bom</artifactId> - <version>8.4.2</version> + <version>${vaadin.version}</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/servlet-vaadin-v10/pom.xml b/servlet-vaadin-v10/pom.xml index 5cf644b..ce43eae 100644 --- a/servlet-vaadin-v10/pom.xml +++ b/servlet-vaadin-v10/pom.xml @@ -23,13 +23,13 @@ <parent> <groupId>org.apache.meecrowave</groupId> <artifactId>meecrowave-examples</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.2.3-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> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
