tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andygumbre...@apache.org
Subject tomee git commit: CXF 2.6.17-TomEE - Fixes CVE-2017-3156 Fix test versions
Date Wed, 27 Sep 2017 04:37:19 GMT
Repository: tomee
Updated Branches:
  refs/heads/tomee-1.7.x 38d7b2a41 -> b3de6e5b0


CXF 2.6.17-TomEE - Fixes CVE-2017-3156
Fix test versions


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/b3de6e5b
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/b3de6e5b
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/b3de6e5b

Branch: refs/heads/tomee-1.7.x
Commit: b3de6e5b0738fc01d8b94ddb918e726f7c3b4ce4
Parents: 38d7b2a
Author: Andy Gumbrecht <agumbrecht@tomitribe.com>
Authored: Tue Sep 26 21:34:02 2017 -0700
Committer: Andy Gumbrecht <agumbrecht@tomitribe.com>
Committed: Tue Sep 26 21:34:02 2017 -0700

----------------------------------------------------------------------
 doap_tomee.rdf                                       |  8 ++++----
 examples/bval-evaluation-redeployment/pom.xml        | 12 ++++++------
 examples/bval-evaluation-redeployment/runner/pom.xml |  4 ++--
 examples/polling-parent/polling-client/pom.xml       |  2 +-
 examples/polling-parent/pom.xml                      |  8 ++++----
 pom.xml                                              |  9 ++++++++-
 server/openejb-cxf-rs/pom.xml                        | 10 +++++-----
 server/openejb-cxf-transport/pom.xml                 |  4 ++--
 server/openejb-cxf/pom.xml                           |  4 ++--
 tomee/tomee-deb/pom.xml                              |  2 +-
 10 files changed, 35 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/b3de6e5b/doap_tomee.rdf
----------------------------------------------------------------------
diff --git a/doap_tomee.rdf b/doap_tomee.rdf
index 0c84c5d..7507314 100644
--- a/doap_tomee.rdf
+++ b/doap_tomee.rdf
@@ -117,15 +117,15 @@
     <release>
       <Version>
         <name>Apache TomEE</name>
-        <revision>1.7.2</revision>
-        <file-release>http://repo.maven.apache.org/maven2/org/apache/openejb/tomee/1.7.2/tomee-1.7.2.pom</file-release>
+        <revision>1.7.5</revision>
+        <file-release>http://repo.maven.apache.org/maven2/org/apache/openejb/tomee/1.7.5/tomee-1.7.5.pom</file-release>
       </Version>
     </release>
     <release>
       <Version>
         <name>Apache OpenEJB</name>
-        <revision>4.7.2</revision>
-        <file-release>http://central.maven.org/maven2/org/apache/openejb/openejb/4.7.2/openejb-4.7.2.pom</file-release>
+        <revision>4.7.5</revision>
+        <file-release>http://central.maven.org/maven2/org/apache/openejb/openejb/4.7.5/openejb-4.7.5.pom</file-release>
       </Version>
     </release>
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/b3de6e5b/examples/bval-evaluation-redeployment/pom.xml
----------------------------------------------------------------------
diff --git a/examples/bval-evaluation-redeployment/pom.xml b/examples/bval-evaluation-redeployment/pom.xml
index a6de36a..de10835 100644
--- a/examples/bval-evaluation-redeployment/pom.xml
+++ b/examples/bval-evaluation-redeployment/pom.xml
@@ -28,8 +28,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.test.version>1.7.2-SNAPSHOT</tomee.test.version>
-    <openejb.test.version>4.7.2-SNAPSHOT</openejb.test.version>
+    <tomee.test.version>1.7.5-SNAPSHOT</tomee.test.version>
+    <openejb.test.version>4.7.5-SNAPSHOT</openejb.test.version>
   </properties>
 
   <modules>
@@ -44,7 +44,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.1</version>
+          <version>3.5.1</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -109,7 +109,7 @@
       <dependency>
         <groupId>org.apache.openejb</groupId>
         <artifactId>arquillian-tomee-remote</artifactId>
-        <version>1.7.2-SNAPSHOT</version>
+        <version>1.7.5-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -125,9 +125,9 @@
         <scope>test</scope>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>org.apache.tomee.patch</groupId>
         <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-        <version>2.6.13</version>
+        <version>2.6.17-TomEE</version>
         <scope>test</scope>
       </dependency>
     </dependencies>

http://git-wip-us.apache.org/repos/asf/tomee/blob/b3de6e5b/examples/bval-evaluation-redeployment/runner/pom.xml
----------------------------------------------------------------------
diff --git a/examples/bval-evaluation-redeployment/runner/pom.xml b/examples/bval-evaluation-redeployment/runner/pom.xml
index 3cb4322..6ffc185 100644
--- a/examples/bval-evaluation-redeployment/runner/pom.xml
+++ b/examples/bval-evaluation-redeployment/runner/pom.xml
@@ -45,13 +45,13 @@
       <artifactId>arquillian-junit-container</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>org.apache.tomee.patch</groupId>
       <artifactId>cxf-rt-frontend-jaxrs</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>apache-tomee</artifactId>
-      <version>1.7.2-SNAPSHOT</version>
+      <version>1.7.5-SNAPSHOT</version>
       <type>zip</type>
       <classifier>jaxrs</classifier>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/b3de6e5b/examples/polling-parent/polling-client/pom.xml
----------------------------------------------------------------------
diff --git a/examples/polling-parent/polling-client/pom.xml b/examples/polling-parent/polling-client/pom.xml
index 9005345..4eaa5a8 100644
--- a/examples/polling-parent/polling-client/pom.xml
+++ b/examples/polling-parent/polling-client/pom.xml
@@ -30,7 +30,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>org.apache.tomee.patch</groupId>
       <artifactId>cxf-bundle</artifactId>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/b3de6e5b/examples/polling-parent/pom.xml
----------------------------------------------------------------------
diff --git a/examples/polling-parent/pom.xml b/examples/polling-parent/pom.xml
index 6797a07..5b28e7d 100644
--- a/examples/polling-parent/pom.xml
+++ b/examples/polling-parent/pom.xml
@@ -31,7 +31,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.1</version>
+        <version>3.5.1</version>
         <configuration>
           <source>1.6</source>
           <target>1.6</target>
@@ -40,7 +40,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.17</version>
+        <version>2.19.1</version>
         <configuration>
           <forkMode>always</forkMode>
         </configuration>
@@ -135,9 +135,9 @@
 
       <!-- client -->
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>org.apache.tomee.patch</groupId>
         <artifactId>cxf-bundle</artifactId>
-        <version>2.6.14</version>
+        <version>2.6.17-TomEE</version>
       </dependency>
       <dependency>
         <groupId>org.apache.xbean</groupId>

http://git-wip-us.apache.org/repos/asf/tomee/blob/b3de6e5b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 624e686..db5fed0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,7 +130,7 @@
 
     <tomcat.version>7.0.81</tomcat.version>
 
-    <cxf.version>2.6.17</cxf.version>
+    <cxf.version>2.6.17-TomEE</cxf.version>
     <!--2.6.4 requires wss4j 1.6.8-->
     <ehcache.version>2.6.7</ehcache.version>
     <!-- used by cxf for security (replay attack) -->
@@ -680,6 +680,13 @@
           <id>Codehaus Snapshots</id>
           <url>http://snapshots.repository.codehaus.org/</url>
         </repository>
+        <repository>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <id>TomEE-CXF</id>
+          <url>https://repository.apache.org/content/repositories/orgapachetomee-1109/</url>
+        </repository>
       </repositories>
 
       <pluginRepositories>

http://git-wip-us.apache.org/repos/asf/tomee/blob/b3de6e5b/server/openejb-cxf-rs/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-cxf-rs/pom.xml b/server/openejb-cxf-rs/pom.xml
index 3b12cb4..4824d3b 100644
--- a/server/openejb-cxf-rs/pom.xml
+++ b/server/openejb-cxf-rs/pom.xml
@@ -47,7 +47,7 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>org.apache.tomee.patch</groupId>
       <artifactId>cxf-rt-frontend-jaxrs</artifactId>
       <version>${cxf.version}</version>
       <exclusions>
@@ -74,22 +74,22 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>org.apache.tomee.patch</groupId>
       <artifactId>cxf-rt-rs-extension-providers</artifactId>
       <version>${cxf.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>org.apache.tomee.patch</groupId>
       <artifactId>cxf-rt-rs-extension-search</artifactId>
       <version>${cxf.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>org.apache.tomee.patch</groupId>
       <artifactId>cxf-rt-rs-security-cors</artifactId>
       <version>${cxf.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>org.apache.tomee.patch</groupId>
       <artifactId>cxf-rt-rs-security-oauth2</artifactId>
       <version>${cxf.version}</version>
       <exclusions>

http://git-wip-us.apache.org/repos/asf/tomee/blob/b3de6e5b/server/openejb-cxf-transport/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-cxf-transport/pom.xml b/server/openejb-cxf-transport/pom.xml
index 7c21dd8..e3a04e6 100644
--- a/server/openejb-cxf-transport/pom.xml
+++ b/server/openejb-cxf-transport/pom.xml
@@ -33,12 +33,12 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>org.apache.tomee.patch</groupId>
       <artifactId>cxf-rt-transports-http</artifactId>
       <version>${cxf.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>org.apache.tomee.patch</groupId>
       <artifactId>cxf-rt-management</artifactId>
       <version>${cxf.version}</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/b3de6e5b/server/openejb-cxf/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-cxf/pom.xml b/server/openejb-cxf/pom.xml
index a97876c..255affb 100644
--- a/server/openejb-cxf/pom.xml
+++ b/server/openejb-cxf/pom.xml
@@ -105,7 +105,7 @@
       <artifactId>slf4j-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>org.apache.tomee.patch</groupId>
       <artifactId>cxf-rt-frontend-jaxws</artifactId>
       <version>${cxf.version}</version>
       <exclusions>
@@ -120,7 +120,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
+      <groupId>org.apache.tomee.patch</groupId>
       <artifactId>cxf-rt-ws-security</artifactId>
       <version>${cxf.version}</version>
       <exclusions>

http://git-wip-us.apache.org/repos/asf/tomee/blob/b3de6e5b/tomee/tomee-deb/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-deb/pom.xml b/tomee/tomee-deb/pom.xml
index 6010efad..34221fe 100644
--- a/tomee/tomee-deb/pom.xml
+++ b/tomee/tomee-deb/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <artifactId>tomee</artifactId>
         <groupId>org.apache.openejb</groupId>
-        <version>1.7.2-SNAPSHOT</version>
+        <version>1.7.5-SNAPSHOT</version>
     </parent>
 	
     <modelVersion>4.0.0</modelVersion>


Mime
View raw message