You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2018/07/28 09:29:37 UTC
[openwebbeans-meecrowave-examples] branch master updated (bdf3ecf
-> 36a3ec7)
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/openwebbeans-meecrowave-examples.git.
from bdf3ecf add an example about how Meecrowave can get configured
new 3f68254 adding patch and diff to ignore files
new 36a3ec7 version updates and prepare for docker examples
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 2 ++
docker/pom.xml | 15 +++++++++++++++
mw_bundle_config/pom.xml | 2 +-
pom.xml | 5 +++--
rest-trivial/pom.xml | 2 +-
rest/pom.xml | 2 +-
servlet-trivial/pom.xml | 2 +-
servlet-vaadin-v08/pom.xml | 10 ++++++++--
servlet-vaadin-v10/pom.xml | 4 ++--
9 files changed, 34 insertions(+), 10 deletions(-)
create mode 100644 docker/pom.xml
[openwebbeans-meecrowave-examples] 01/02: adding patch and diff to
ignore files
Posted by st...@apache.org.
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 3f682548f77e0d48ab3fcd8f2ad96a7054ef42bf
Author: Mark Struberg <st...@apache.org>
AuthorDate: Sat Jul 28 10:06:12 2018 +0200
adding patch and diff to ignore files
---
.gitignore | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitignore b/.gitignore
index b59638f..ed4d3bc 100755
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@ target
*.iml
*.log
*~
+*.diff
+*.patch
[openwebbeans-meecrowave-examples] 02/02: version updates and
prepare for docker examples
Posted by st...@apache.org.
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 36a3ec7d92919ff69f867655345bc01d6a3a8cd4
Author: Sven Ruppert <sv...@gmail.com>
AuthorDate: Mon Jul 23 16:35:21 2018 +0200
version updates and prepare for docker examples
---
docker/pom.xml | 15 +++++++++++++++
mw_bundle_config/pom.xml | 2 +-
pom.xml | 5 +++--
rest-trivial/pom.xml | 2 +-
rest/pom.xml | 2 +-
servlet-trivial/pom.xml | 2 +-
servlet-vaadin-v08/pom.xml | 10 ++++++++--
servlet-vaadin-v10/pom.xml | 4 ++--
8 files changed, 32 insertions(+), 10 deletions(-)
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>