You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rz...@apache.org on 2021/06/17 06:20:19 UTC
[tomee] branch master updated (57ada73 -> f462a5d)
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git.
from 57ada73 Merge branch 'master' of github.com:apache/tomee into master
new 82bae70 Fixes some inconsistencies: Duplicate artifact id, missing vesions
new f462a5d Make sure, that the quick build profile also builds "tomee-webapp".
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:
examples/mp-metrics-gauge/pom.xml | 3 ++-
examples/security-tomcat-user-identitystore/pom.xml | 2 +-
examples/xa-datasource/pom.xml | 1 +
tomee/apache-tomee/pom.xml | 7 +++++++
4 files changed, 11 insertions(+), 2 deletions(-)
[tomee] 01/02: Fixes some inconsistencies: Duplicate artifact id,
missing vesions
Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 82bae7033297b978d36a12cc397b6a040ca8c382
Author: Richard Zowalla <13...@users.noreply.github.com>
AuthorDate: Thu Jun 17 08:12:45 2021 +0200
Fixes some inconsistencies: Duplicate artifact id, missing vesions
---
examples/mp-metrics-gauge/pom.xml | 3 ++-
examples/security-tomcat-user-identitystore/pom.xml | 2 +-
examples/xa-datasource/pom.xml | 1 +
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/examples/mp-metrics-gauge/pom.xml b/examples/mp-metrics-gauge/pom.xml
index 1778461..f86ac8b 100644
--- a/examples/mp-metrics-gauge/pom.xml
+++ b/examples/mp-metrics-gauge/pom.xml
@@ -79,6 +79,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>3.5.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
@@ -98,7 +99,7 @@
<version>${tomee.version}</version>
<configuration>
<tomeeClassifier>microprofile</tomeeClassifier>
- <context>${artifactId}</context>
+ <context>${project.artifactId}</context>
</configuration>
</plugin>
<plugin>
diff --git a/examples/security-tomcat-user-identitystore/pom.xml b/examples/security-tomcat-user-identitystore/pom.xml
index 4206f47..b1e4a98 100644
--- a/examples/security-tomcat-user-identitystore/pom.xml
+++ b/examples/security-tomcat-user-identitystore/pom.xml
@@ -19,7 +19,7 @@
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.superbiz</groupId>
- <artifactId>serverless-tomee-microprofile</artifactId>
+ <artifactId>security-tomcat-user-identitystore</artifactId>
<version>8.0.8-SNAPSHOT</version>
<name>TomEE :: Examples :: Jakarta Security tomcat-user.xml Identity Store</name>
diff --git a/examples/xa-datasource/pom.xml b/examples/xa-datasource/pom.xml
index 3d88b35..1c04682 100644
--- a/examples/xa-datasource/pom.xml
+++ b/examples/xa-datasource/pom.xml
@@ -45,6 +45,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
+ <version>3.1.0</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
[tomee] 02/02: Make sure,
that the quick build profile also builds "tomee-webapp".
Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit f462a5d05277a2ae7ee6a275626d0bdeb9c9cdfc
Author: Richard Zowalla <13...@users.noreply.github.com>
AuthorDate: Thu Jun 17 08:19:07 2021 +0200
Make sure, that the quick build profile also builds "tomee-webapp".
---
tomee/apache-tomee/pom.xml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml
index 4d9927f..3efb68d 100644
--- a/tomee/apache-tomee/pom.xml
+++ b/tomee/apache-tomee/pom.xml
@@ -92,6 +92,13 @@
</dependency>
<dependency> <!-- to be sure to have it -->
<groupId>${project.groupId}</groupId>
+ <artifactId>tomee-webapp</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency> <!-- to be sure to have it -->
+ <groupId>${project.groupId}</groupId>
<artifactId>tomee-plus-webapp</artifactId>
<version>${project.version}</version>
<type>war</type>