You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by ra...@apache.org on 2019/01/28 16:26:44 UTC
[tomee] 03/04: Fixed examples removed tomee.version for plugin
release to be happy.
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit b12b5571cf8b67556c7b6e975262b75dd0b9bf11
Author: Roberto Cortez <ra...@yahoo.com>
AuthorDate: Fri Jan 25 17:05:39 2019 +0000
Fixed examples removed tomee.version for plugin release to be happy.
(cherry picked from commit 0492a7c)
---
examples/jsonb-configuration/pom.xml | 3 +--
examples/jsonb-custom-serializer/pom.xml | 3 +--
examples/mp-custom-healthcheck/pom.xml | 7 +++----
examples/mp-faulttolerance-fallback/pom.xml | 7 +++----
examples/mp-faulttolerance-retry/pom.xml | 7 +++----
examples/mp-jsonb-configuration/pom.xml | 3 +--
examples/mp-metrics-counted/pom.xml | 9 ++++-----
examples/mp-metrics-histogram/pom.xml | 9 ++++-----
examples/mp-metrics-timed/pom.xml | 9 ++++-----
examples/mp-rest-client/pom.xml | 9 ++++-----
examples/websocket-tls-basic-auth/pom.xml | 5 ++---
11 files changed, 30 insertions(+), 41 deletions(-)
diff --git a/examples/jsonb-configuration/pom.xml b/examples/jsonb-configuration/pom.xml
index 4d60c58..53fd7a2 100644
--- a/examples/jsonb-configuration/pom.xml
+++ b/examples/jsonb-configuration/pom.xml
@@ -11,7 +11,6 @@
<properties>
<version.javaee-api>8.0</version.javaee-api>
- <tomee.version>${project.version}</tomee.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@@ -60,4 +59,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/examples/jsonb-custom-serializer/pom.xml b/examples/jsonb-custom-serializer/pom.xml
index 0d6e968..8759bf5 100644
--- a/examples/jsonb-custom-serializer/pom.xml
+++ b/examples/jsonb-custom-serializer/pom.xml
@@ -11,7 +11,6 @@
<properties>
<version.javaee-api>8.0</version.javaee-api>
- <tomee.version>${project.version}</tomee.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@@ -59,4 +58,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/examples/mp-custom-healthcheck/pom.xml b/examples/mp-custom-healthcheck/pom.xml
index dfc4d07..60ea3da 100644
--- a/examples/mp-custom-healthcheck/pom.xml
+++ b/examples/mp-custom-healthcheck/pom.xml
@@ -14,7 +14,6 @@
<microprofile-health-api.version>1.0</microprofile-health-api.version>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
<maven-war-plugin.version>3.1.0</maven-war-plugin.version>
- <tomee.version>${project.version}</tomee.version>
<javaee-api.version>8.0</javaee-api.version>
<junit.version>4.12</junit.version>
<maven.compiler.source>1.8</maven.compiler.source>
@@ -45,7 +44,7 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>openejb-cxf-rs</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -57,13 +56,13 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>arquillian-tomee-remote</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>apache-tomee</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<type>zip</type>
<classifier>microprofile</classifier>
<scope>test</scope>
diff --git a/examples/mp-faulttolerance-fallback/pom.xml b/examples/mp-faulttolerance-fallback/pom.xml
index b55a86c..d96d1c7 100644
--- a/examples/mp-faulttolerance-fallback/pom.xml
+++ b/examples/mp-faulttolerance-fallback/pom.xml
@@ -29,7 +29,6 @@
<arquillian-junit-container.version>1.4.0.Final</arquillian-junit-container.version>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
<maven-war-plugin.version>3.1.0</maven-war-plugin.version>
- <tomee.version>${project.version}</tomee.version>
<javaee-api.version>8.0</javaee-api.version>
<junit.version>4.12</junit.version>
<maven.compiler.source>1.8</maven.compiler.source>
@@ -58,7 +57,7 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>openejb-cxf-rs</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -70,13 +69,13 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>arquillian-tomee-remote</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>apache-tomee</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<type>zip</type>
<classifier>microprofile</classifier>
<scope>test</scope>
diff --git a/examples/mp-faulttolerance-retry/pom.xml b/examples/mp-faulttolerance-retry/pom.xml
index dbb9837..dc89929 100644
--- a/examples/mp-faulttolerance-retry/pom.xml
+++ b/examples/mp-faulttolerance-retry/pom.xml
@@ -15,7 +15,6 @@
<arquillian-junit-container.version>1.4.0.Final</arquillian-junit-container.version>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
<maven-war-plugin.version>3.1.0</maven-war-plugin.version>
- <tomee.version>${project.version}</tomee.version>
<javaee-api.version>8.0</javaee-api.version>
<junit.version>4.12</junit.version>
<maven.compiler.source>1.8</maven.compiler.source>
@@ -44,7 +43,7 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>openejb-cxf-rs</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -56,13 +55,13 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>arquillian-tomee-remote</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>apache-tomee</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<type>zip</type>
<classifier>microprofile</classifier>
<scope>test</scope>
diff --git a/examples/mp-jsonb-configuration/pom.xml b/examples/mp-jsonb-configuration/pom.xml
index 5e01c9e..28f82c1 100644
--- a/examples/mp-jsonb-configuration/pom.xml
+++ b/examples/mp-jsonb-configuration/pom.xml
@@ -11,7 +11,6 @@
<properties>
<version.javaee-api>8.0</version.javaee-api>
- <tomee.version>${project.version}</tomee.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@@ -60,4 +59,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/examples/mp-metrics-counted/pom.xml b/examples/mp-metrics-counted/pom.xml
index 67ddd8a..531f514 100644
--- a/examples/mp-metrics-counted/pom.xml
+++ b/examples/mp-metrics-counted/pom.xml
@@ -33,7 +33,6 @@
<version.javaee-api>8.0</version.javaee-api>
<microprofile.metrics.version>1.1</microprofile.metrics.version>
<version.arquillian.bom>1.1.13.Final</version.arquillian.bom>
- <tomee.version>${project.version}</tomee.version>
<junit.version>4.12</junit.version>
<docker.image.name>tomee/${artifactId}</docker.image.name>
<docker.file.name>Dockerfile</docker.file.name>
@@ -61,7 +60,7 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>openejb-cxf-rs</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -73,13 +72,13 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>arquillian-tomee-remote</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>apache-tomee</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<type>zip</type>
<classifier>microprofile</classifier>
<scope>test</scope>
@@ -155,4 +154,4 @@
</build>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
diff --git a/examples/mp-metrics-histogram/pom.xml b/examples/mp-metrics-histogram/pom.xml
index 5542a05..52b6e66 100644
--- a/examples/mp-metrics-histogram/pom.xml
+++ b/examples/mp-metrics-histogram/pom.xml
@@ -33,7 +33,6 @@
<version.javaee-api>8.0</version.javaee-api>
<microprofile.metrics.version>1.1</microprofile.metrics.version>
<version.arquillian.bom>1.1.13.Final</version.arquillian.bom>
- <tomee.version>${project.version}</tomee.version>
<junit.version>4.12</junit.version>
</properties>
@@ -59,7 +58,7 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>openejb-cxf-rs</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -71,13 +70,13 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>arquillian-tomee-remote</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>apache-tomee</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<type>zip</type>
<classifier>microprofile</classifier>
<scope>test</scope>
@@ -106,4 +105,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/examples/mp-metrics-timed/pom.xml b/examples/mp-metrics-timed/pom.xml
index 29082eb..9363d43 100644
--- a/examples/mp-metrics-timed/pom.xml
+++ b/examples/mp-metrics-timed/pom.xml
@@ -31,7 +31,6 @@
<properties>
<version.javaee-api>8.0</version.javaee-api>
<microprofile.metrics.version>1.1</microprofile.metrics.version>
- <tomee.version>${project.version}</tomee.version>
<junit.version>4.12</junit.version>
</properties>
@@ -57,7 +56,7 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>openejb-cxf-rs</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -69,13 +68,13 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>arquillian-tomee-remote</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>apache-tomee</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<type>zip</type>
<classifier>microprofile</classifier>
<scope>test</scope>
@@ -104,4 +103,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/examples/mp-rest-client/pom.xml b/examples/mp-rest-client/pom.xml
index 622bb3a..90a3230 100755
--- a/examples/mp-rest-client/pom.xml
+++ b/examples/mp-rest-client/pom.xml
@@ -34,7 +34,6 @@
<microprofile.rest-client.version>1.1</microprofile.rest-client.version>
<version.javaee-api>8.0</version.javaee-api>
<version.arquillian.bom>1.1.13.Final</version.arquillian.bom>
- <tomee.version>${project.version}</tomee.version>
<junit.version>4.12</junit.version>
</properties>
@@ -64,7 +63,7 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>openejb-cxf-rs</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -76,13 +75,13 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>arquillian-tomee-remote</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>apache-tomee</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<type>zip</type>
<classifier>microprofile</classifier>
<scope>test</scope>
@@ -118,4 +117,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/examples/websocket-tls-basic-auth/pom.xml b/examples/websocket-tls-basic-auth/pom.xml
index 77f49c9..89a5426 100644
--- a/examples/websocket-tls-basic-auth/pom.xml
+++ b/examples/websocket-tls-basic-auth/pom.xml
@@ -32,7 +32,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<javaee-api.version>8.0</javaee-api.version>
<javax.websocket-api.version>1.1</javax.websocket-api.version>
- <tomee.version>${pom.version}</tomee.version>
<tomee.classifier>webprofile</tomee.classifier>
<tomcat.version>9.0.12</tomcat.version>
<junit.version>4.12</junit.version>
@@ -73,7 +72,7 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>arquillian-tomee-remote</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -120,4 +119,4 @@
</snapshotRepository>
</distributionManagement>
-</project>
\ No newline at end of file
+</project>