You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2018/08/15 16:25:35 UTC
[02/11] tomee git commit: Cleanup MP poms configuration.
Cleanup MP poms configuration.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/31ee9435
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/31ee9435
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/31ee9435
Branch: refs/heads/tomee-7.1.x
Commit: 31ee9435c66635fa2026e2689b04004ea93b0b7d
Parents: 6bf4ed2
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Fri Jul 27 17:11:01 2018 +0100
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Fri Aug 10 18:23:59 2018 +0100
----------------------------------------------------------------------
mp-jwt/pom.xml | 22 ++++++++++------------
pom.xml | 11 +++++++++--
tck/microprofile-tck/config/pom.xml | 25 -------------------------
tck/microprofile-tck/jwt/pom.xml | 4 ++--
tomee/tomee-microprofile-webapp/pom.xml | 20 ++------------------
5 files changed, 23 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/31ee9435/mp-jwt/pom.xml
----------------------------------------------------------------------
diff --git a/mp-jwt/pom.xml b/mp-jwt/pom.xml
index 5bd0303..75624cc 100644
--- a/mp-jwt/pom.xml
+++ b/mp-jwt/pom.xml
@@ -29,6 +29,12 @@
<dependencies>
<dependency>
+ <groupId>org.eclipse.microprofile.jwt</groupId>
+ <artifactId>microprofile-jwt-auth-api</artifactId>
+ <version>${microprofile.jwt.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>javaee-api</artifactId>
<version>${version.javaee-api}</version>
@@ -47,15 +53,10 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.bitbucket.b_c</groupId>
- <artifactId>jose4j</artifactId>
- <version>0.6.0</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-jsonb</artifactId>
<version>${johnzon.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -69,12 +70,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.microprofile.jwt</groupId>
- <artifactId>microprofile-jwt-auth-api</artifactId>
- <version>${mp-jwt.version}</version>
- <scope>provided</scope>
+ <groupId>org.bitbucket.b_c</groupId>
+ <artifactId>jose4j</artifactId>
+ <version>0.6.0</version>
</dependency>
</dependencies>
-
-
</project>
http://git-wip-us.apache.org/repos/asf/tomee/blob/31ee9435/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 88395c3..84e638c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -194,8 +194,15 @@
<version.arquillian.bom>1.1.13.Final</version.arquillian.bom>
<version.shrinkwrap.resolver.bom>2.1.0</version.shrinkwrap.resolver.bom>
- <mp-jwt.version>1.0</mp-jwt.version>
- <mp-jwt-tck.version>${mp-jwt.version}</mp-jwt-tck.version>
+ <!-- Micro Profile -->
+ <microprofile.version>1.2</microprofile.version>
+ <!-- Micro Profile Config -->
+ <microprofile.config.version>1.2</microprofile.config.version>
+ <!-- Geronimo Config 1.1 targets MP Config 1.2 API -->
+ <microprofile.config.impl.version>1.1</microprofile.config.impl.version>
+ <!-- Micro Profile JWT -->
+ <microprofile.jwt.version>1.0</microprofile.jwt.version>
+ <microprofile.jwt.impl.version>${project.version}</microprofile.jwt.impl.version>
</properties>
<build>
http://git-wip-us.apache.org/repos/asf/tomee/blob/31ee9435/tck/microprofile-tck/config/pom.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/config/pom.xml b/tck/microprofile-tck/config/pom.xml
index 4d09935..a496ea9 100644
--- a/tck/microprofile-tck/config/pom.xml
+++ b/tck/microprofile-tck/config/pom.xml
@@ -29,10 +29,6 @@
<artifactId>microprofile-config-tck</artifactId>
<name>OpenEJB :: TCK :: MicroProfile Config TCK</name>
- <properties>
- <microprofile.config.version>1.2</microprofile.config.version>
- </properties>
-
<build>
<plugins>
<plugin>
@@ -42,32 +38,12 @@
<dependenciesToScan>
<dependency>org.eclipse.microprofile.config:microprofile-config-tck</dependency>
</dependenciesToScan>
- <!-- TODO - This requires a fix in geronimo-config-impl to use the Thread ClassLoader in ClassConverter. -->
- <excludes>
- <exclude>org.eclipse.microprofile.config.tck.ClassConverterTest</exclude>
- </excludes>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
- <!-- debug libs -->
- <dependency>
- <groupId>org.apache.geronimo.config</groupId>
- <artifactId>geronimo-config-impl</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>tomee-catalina</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- distro -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-tomee</artifactId>
@@ -77,7 +53,6 @@
<scope>test</scope>
</dependency>
- <!-- tck stack -->
<dependency>
<groupId>org.eclipse.microprofile.config</groupId>
<artifactId>microprofile-config-api</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/31ee9435/tck/microprofile-tck/jwt/pom.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/jwt/pom.xml b/tck/microprofile-tck/jwt/pom.xml
index b0fc04e..7bf88aa 100644
--- a/tck/microprofile-tck/jwt/pom.xml
+++ b/tck/microprofile-tck/jwt/pom.xml
@@ -61,14 +61,14 @@
<dependency>
<groupId>org.eclipse.microprofile.jwt</groupId>
<artifactId>microprofile-jwt-auth-tck</artifactId>
- <version>${mp-jwt-tck.version}</version>
+ <version>${microprofile.jwt.version}</version>
</dependency>
<!-- This is the actual MP-JWT TCK test classes -->
<dependency>
<groupId>org.eclipse.microprofile.jwt</groupId>
<artifactId>microprofile-jwt-auth-tck</artifactId>
- <version>${mp-jwt-tck.version}</version>
+ <version>${microprofile.jwt.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/31ee9435/tomee/tomee-microprofile-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-microprofile-webapp/pom.xml b/tomee/tomee-microprofile-webapp/pom.xml
index c9c2f0c..aca8dc7 100644
--- a/tomee/tomee-microprofile-webapp/pom.xml
+++ b/tomee/tomee-microprofile-webapp/pom.xml
@@ -35,14 +35,6 @@
<packaging>war</packaging>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
- <microprofile.version>1.3</microprofile.version>
-
- <!-- Geronimo Config 1.1 targets MP Config 1.2 API -->
- <microprofile.config.api.version>1.2</microprofile.config.api.version>
- <microprofile.config.impl.version>1.1</microprofile.config.impl.version>
-
<microprofile.jwt.api.version>1.0</microprofile.jwt.api.version>
<microprofile.jwt.impl.version>${project.version}</microprofile.jwt.impl.version>
</properties>
@@ -55,19 +47,10 @@
<type>war</type>
</dependency>
- <!-- When we have everything
- <dependency>
- <groupId>org.eclipse.microprofile</groupId>
- <artifactId>microprofile</artifactId>
- <version>${microprofile.version}</version>
- <type>pom</type>
- </dependency>
- -->
-
<dependency>
<groupId>org.eclipse.microprofile.config</groupId>
<artifactId>microprofile-config-api</artifactId>
- <version>${microprofile.config.api.version}</version>
+ <version>${microprofile.config.version}</version>
</dependency>
<dependency>
@@ -87,6 +70,7 @@
<artifactId>mp-jwt</artifactId>
<version>${microprofile.jwt.impl.version}</version>
</dependency>
+
</dependencies>
<build>