You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ks...@apache.org on 2015/03/16 22:56:16 UTC

[1/2] servicemix git commit: SM-2471: Upgrade to Swagger 1.3.11

Repository: servicemix
Updated Branches:
  refs/heads/master b5f1c7853 -> ef1099aa4


SM-2471: Upgrade to Swagger 1.3.11


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

Branch: refs/heads/master
Commit: 33455a60a86d785b74b9826d8841778c31038daa
Parents: b5f1c78
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Mon Mar 16 22:15:31 2015 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Mon Mar 16 22:15:31 2015 +0100

----------------------------------------------------------------------
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix/blob/33455a60/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c828d98..e2c0fbe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,7 +88,7 @@
         <swagger.jaxrs.bundle.version>1.3.11_1</swagger.jaxrs.bundle.version>
         <javassist.bundle.version>3.12.1.GA_2</javassist.bundle.version>
         <reflections.bundle.version>0.9.8_1</reflections.bundle.version>
-        <json4s.bundle.version>3.2.4_1</json4s.bundle.version>
+        <json4s.bundle.version>3.2.11_1</json4s.bundle.version>
         <thoughtworks.paranamer.version>2.7</thoughtworks.paranamer.version>
 
         <!-- ServiceMix legal shared resources -->


[2/2] servicemix git commit: Swagger dependency moved to dependencymanagement, version corrected

Posted by ks...@apache.org.
Swagger dependency moved to dependencymanagement, version corrected


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

Branch: refs/heads/master
Commit: ef1099aa4f1c18ab169d006c4b01c77b8eb72a09
Parents: 33455a6
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Mon Mar 16 22:16:21 2015 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Mon Mar 16 22:16:21 2015 +0100

----------------------------------------------------------------------
 18.patch                                 | 75 +++++++++++++++++++++++++++
 examples/cxf/cxf-jaxrs-blueprint/pom.xml |  1 -
 parent/pom.xml                           |  6 +++
 3 files changed, 81 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix/blob/ef1099aa/18.patch
----------------------------------------------------------------------
diff --git a/18.patch b/18.patch
new file mode 100644
index 0000000..b9fa103
--- /dev/null
+++ b/18.patch
@@ -0,0 +1,75 @@
+From 9006c08eed3961109c79ff6fa69b0ffcb06e4289 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= <ja...@cominvent.com>
+Date: Tue, 10 Mar 2015 10:59:24 +0100
+Subject: [PATCH] Fixed wrong url in README and wrong version numbers in
+ BUILDING
+
+---
+ BUILDING | 14 +++++++-------
+ README   |  2 +-
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/BUILDING b/BUILDING
+index 260e8d2..7f7ca8e 100644
+--- a/BUILDING
++++ b/BUILDING
+@@ -15,20 +15,20 @@
+  * limitations under the License.
+  */
+ 
+-Building Apache ServiceMix 5
++Building Apache ServiceMix 6
+ ============================
+ 
+ Initial Setup
+ -------------
+ 
+-1) Install J2SE 5.0 SDK, which can be downloaded from 
+-   http://java.sun.com/j2se/1.5.0/download.jsp. Use version of 1.5.0_06 JDK.
++1) Install J2SE 8.0 SDK, which can be downloaded from
++   http://www.oracle.com/technetwork/java/javase/downloads/index.html. Use latest version.
+ 
+ 2) Make sure that your JAVA_HOME environment variable is set to the newly installed 
+    JDK location, and that your PATH includes %JAVA_HOME%\bin (windows) or 
+    $JAVA_HOME$/bin (unix).
+ 
+-3) Install Maven 3.0.5, which can be downloaded from 
++3) Install Maven 3.2.5, which can be downloaded from
+    http://maven.apache.org/download.html. Make sure that your PATH includes 
+    the MVN_HOME/bin directory. 
+ 
+@@ -36,18 +36,18 @@ Initial Setup
+ Building
+ --------
+ 
+-1) Change to the top level directory of Apache ServiceMix 5 source distribution.
++1) Change to the top level directory of Apache ServiceMix source distribution.
+ 
+ 2) Run
+          $> mvn
+          
+-   This will compile Apache ServiceMix 4 and run all of the tests in the 
++   This will compile Apache ServiceMix and run all of the tests in the
+    Apache ServiceMix Kernel source distribution. 
+    
+    Alternatively, you can run
+          $> mvn -Pfastinstall
+          
+-   This will compile Apache ServiceMix 4 without running the tests and takes less
++   This will compile Apache ServiceMix without running the tests and takes less
+    time to build.
+    
+    Depending on the load of remote Maven repositories, you may have 
+diff --git a/README b/README
+index 8657be6..d15149c 100644
+--- a/README
++++ b/README
+@@ -43,7 +43,7 @@ Alternatively, you can also find out how to get started here:
+     http://servicemix.apache.org/docs/6.x/
+ 
+ If you need more help try talking to us on our mailing lists
+-    http://servicemix.apache.org/mailing-lists.html
++    http://servicemix.apache.org/community/mailing-lists.html
+ 
+ If you find any issues with ServiceMix 6, please submit reports
+ with JIRA here:

http://git-wip-us.apache.org/repos/asf/servicemix/blob/ef1099aa/examples/cxf/cxf-jaxrs-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-jaxrs-blueprint/pom.xml b/examples/cxf/cxf-jaxrs-blueprint/pom.xml
index eedb74f..0921375 100644
--- a/examples/cxf/cxf-jaxrs-blueprint/pom.xml
+++ b/examples/cxf/cxf-jaxrs-blueprint/pom.xml
@@ -44,7 +44,6 @@
         <dependency>
             <groupId>com.wordnik</groupId>
             <artifactId>swagger-jaxrs_2.10</artifactId>
-            <version>1.3.0</version>
         </dependency>
     </dependencies>
 

http://git-wip-us.apache.org/repos/asf/servicemix/blob/ef1099aa/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index d58407d..9820a40 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -60,6 +60,7 @@
     <mybatis.version>3.2.7</mybatis.version>
     <jodatime2.bundle.version>2.6</jodatime2.bundle.version>
     <jpa.version>2.1.0</jpa.version>
+    <swagger.version>1.3.11</swagger.version>
 
     <servicemix.specs.version>2.4.0</servicemix.specs.version>
 
@@ -414,6 +415,11 @@
         <artifactId>pax-logging-api</artifactId>
         <version>${pax.logging.version}</version>
       </dependency>
+      <dependency>
+        <groupId>com.wordnik</groupId>
+        <artifactId>swagger-jaxrs_2.10</artifactId>
+        <version>${swagger.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>