tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgallim...@apache.org
Subject [04/26] tomee git commit: Cleanup MP poms configuration.
Date Wed, 15 Aug 2018 15:41:55 GMT
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/2bd4df7b
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/2bd4df7b
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/2bd4df7b

Branch: refs/heads/master
Commit: 2bd4df7b48390cd138de6e1ff59537e1f917827f
Parents: e616d2d
Author: Roberto Cortez <radcortez@yahoo.com>
Authored: Fri Jul 27 17:11:01 2018 +0100
Committer: Roberto Cortez <radcortez@yahoo.com>
Committed: Fri Jul 27 17:11:01 2018 +0100

----------------------------------------------------------------------
 mp-jwt/pom.xml                          | 22 +++++++--------
 pom.xml                                 | 11 ++++++--
 tck/microprofile-tck/config/pom.xml     | 41 ----------------------------
 tck/microprofile-tck/jwt/pom.xml        |  4 +--
 tomee/tomee-microprofile-webapp/pom.xml |  7 +----
 5 files changed, 22 insertions(+), 63 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/2bd4df7b/mp-jwt/pom.xml
----------------------------------------------------------------------
diff --git a/mp-jwt/pom.xml b/mp-jwt/pom.xml
index b1b86f6..e544e33 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.tomcat</groupId>
@@ -64,12 +65,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/2bd4df7b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5669211..fb28d60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -192,8 +192,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/2bd4df7b/tck/microprofile-tck/config/pom.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/config/pom.xml b/tck/microprofile-tck/config/pom.xml
index a218412..5f509e8 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>
-
   <!-- TODO - see ServerClassConverter: requires a fix in geronimo-config-impl to use
the Thread ClassLoader in ClassConverter. -->
 
   <build>
@@ -52,21 +48,6 @@
   </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>
@@ -76,7 +57,6 @@
       <scope>test</scope>
     </dependency>
 
-    <!-- tck stack -->
     <dependency>
       <groupId>org.eclipse.microprofile.config</groupId>
       <artifactId>microprofile-config-api</artifactId>
@@ -94,7 +74,6 @@
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
-      <version>6.9.9</version>
       <scope>test</scope>
     </dependency>
 
@@ -109,26 +88,6 @@
       <groupId>org.jboss.arquillian.testng</groupId>
       <artifactId>arquillian-testng-core</artifactId>
       <version>${version.arquillian}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jboss.shrinkwrap.resolver</groupId>
-      <artifactId>shrinkwrap-resolver-api-maven</artifactId>
-      <version>2.2.2</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jboss.shrinkwrap.resolver</groupId>
-      <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
-      <version>2.2.2</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jboss.shrinkwrap.resolver</groupId>
-      <artifactId>shrinkwrap-resolver-spi</artifactId>
-      <version>2.2.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

http://git-wip-us.apache.org/repos/asf/tomee/blob/2bd4df7b/tck/microprofile-tck/jwt/pom.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/jwt/pom.xml b/tck/microprofile-tck/jwt/pom.xml
index 088e128..44a1966 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/2bd4df7b/tomee/tomee-microprofile-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-microprofile-webapp/pom.xml b/tomee/tomee-microprofile-webapp/pom.xml
index 09d3f5b..9e0db8d 100644
--- a/tomee/tomee-microprofile-webapp/pom.xml
+++ b/tomee/tomee-microprofile-webapp/pom.xml
@@ -35,11 +35,6 @@
   <packaging>war</packaging>
 
   <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
-    <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,7 +50,7 @@
     <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>


Mime
View raw message