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 2016/01/30 23:47:03 UTC
[1/7] servicemix git commit: SM-2778: Upgrade to Apache ActiveMQ
5.12.2
Repository: servicemix
Updated Branches:
refs/heads/master 0ba5db69b -> b9a966ccd
SM-2778: Upgrade to Apache ActiveMQ 5.12.2
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/4757f9e6
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/4757f9e6
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/4757f9e6
Branch: refs/heads/master
Commit: 4757f9e6a99c145ccd305c90ff7227e9c1eb616d
Parents: 0ba5db6
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Sat Jan 30 20:57:52 2016 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Sat Jan 30 20:57:52 2016 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/4757f9e6/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index ea7b706..9d14a24 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -38,7 +38,7 @@
<!-- Properties -->
<properties>
- <activemq.version>5.12.1</activemq.version>
+ <activemq.version>5.12.2</activemq.version>
<activiti.version>5.19.0.2</activiti.version>
<akka.version>2.3.9</akka.version>
<aries.blueprint.core.version>1.5.0</aries.blueprint.core.version>
[5/7] servicemix git commit: SM-2848: cxf-wsn-client client fails due
to wrong slf4j version
Posted by ks...@apache.org.
SM-2848: cxf-wsn-client client fails due to wrong slf4j version
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/fecbbce8
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/fecbbce8
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/fecbbce8
Branch: refs/heads/master
Commit: fecbbce85f2ae8413d5a52552efcbd9694541382
Parents: 7bc0b37
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Sat Jan 30 22:54:42 2016 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Sat Jan 30 22:54:42 2016 +0100
----------------------------------------------------------------------
examples/cxf/cxf-wsn/cxf-wsn-client/pom.xml | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/fecbbce8/examples/cxf/cxf-wsn/cxf-wsn-client/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-wsn/cxf-wsn-client/pom.xml b/examples/cxf/cxf-wsn/cxf-wsn-client/pom.xml
index 81a771c..59c08ec 100644
--- a/examples/cxf/cxf-wsn/cxf-wsn-client/pom.xml
+++ b/examples/cxf/cxf-wsn/cxf-wsn-client/pom.xml
@@ -32,8 +32,6 @@
<artifactId>cxf-wsn-client</artifactId>
<name>Apache ServiceMix :: Examples :: CXF WSN :: Client</name>
-
-
<dependencies>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -75,6 +73,18 @@
<mainClass>org.apache.servicemix.examples.cxf.client.Client</mainClass>
<includePluginDependencies>true</includePluginDependencies>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
[3/7] servicemix git commit: SM-2846: Upgrade maven-compiler-plugin
to 3.3
Posted by ks...@apache.org.
SM-2846: Upgrade maven-compiler-plugin to 3.3
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/f845dabd
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/f845dabd
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/f845dabd
Branch: refs/heads/master
Commit: f845dabded981418c594c8f942c76855725f956b
Parents: 2117b78
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Sat Jan 30 21:21:42 2016 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Sat Jan 30 21:21:42 2016 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/f845dabd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0b1e961..7640f25 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,7 @@
<exec-maven-plugin.version>1.3.2</exec-maven-plugin.version>
<lifecycle-mapping-plugin.version>1.0.0</lifecycle-mapping-plugin.version>
<maven-assembly-plugin.version>2.4.1</maven-assembly-plugin.version>
- <maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
+ <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
<maven-dependency-plugin.version>2.9</maven-dependency-plugin.version>
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
<maven-eclipse-plugin.version>2.9</maven-eclipse-plugin.version>
[2/7] servicemix git commit: SM-2821: Upgrade to Apache Camel 2.16.2
Posted by ks...@apache.org.
SM-2821: Upgrade to Apache Camel 2.16.2
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/2117b78a
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/2117b78a
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/2117b78a
Branch: refs/heads/master
Commit: 2117b78a341cd13551c6b60d1ad1e1d8b267b483
Parents: 4757f9e
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Sat Jan 30 21:02:46 2016 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Sat Jan 30 21:02:46 2016 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/2117b78a/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 9d14a24..edf3958 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -46,7 +46,7 @@
<aries.proxy.version>1.0.4</aries.proxy.version>
<aries.transaction.version>1.3.0</aries.transaction.version>
<aries.util.version>1.1.1</aries.util.version>
- <camel.version>2.16.1</camel.version>
+ <camel.version>2.16.2</camel.version>
<commons-codec.bundle.version>1.10</commons-codec.bundle.version>
<commons-dbcp.version>1.4</commons-dbcp.version>
<commons-fileupload.version>1.3.1</commons-fileupload.version>
[6/7] servicemix git commit: SM-2759: Upgrade to Apache ActiveMQ
5.13.0
Posted by ks...@apache.org.
SM-2759: Upgrade to Apache ActiveMQ 5.13.0
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/f5757124
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/f5757124
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/f5757124
Branch: refs/heads/master
Commit: f5757124d26b6c9f97381fe7e1fc6859b484d388
Parents: fecbbce
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Sat Jan 30 22:55:39 2016 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Sat Jan 30 22:55:39 2016 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/f5757124/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index edf3958..531b2da 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -38,7 +38,7 @@
<!-- Properties -->
<properties>
- <activemq.version>5.12.2</activemq.version>
+ <activemq.version>5.13.0</activemq.version>
<activiti.version>5.19.0.2</activiti.version>
<akka.version>2.3.9</akka.version>
<aries.blueprint.core.version>1.5.0</aries.blueprint.core.version>
[4/7] servicemix git commit: SM-2847: Upgrade maven-eclipse-plugin to
2.10
Posted by ks...@apache.org.
SM-2847: Upgrade maven-eclipse-plugin to 2.10
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/7bc0b376
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/7bc0b376
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/7bc0b376
Branch: refs/heads/master
Commit: 7bc0b3763e70b9c3c9bb8dfa0f7fa45f98b29631
Parents: f845dab
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Sat Jan 30 21:22:34 2016 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Sat Jan 30 21:22:34 2016 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/7bc0b376/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7640f25..4daf517 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,7 @@
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
<maven-dependency-plugin.version>2.9</maven-dependency-plugin.version>
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
- <maven-eclipse-plugin.version>2.9</maven-eclipse-plugin.version>
+ <maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
<maven-enforcer-plugin.version>1.3.1</maven-enforcer-plugin.version>
<maven-idea-plugin.version>2.2.1</maven-idea-plugin.version>
<maven-jxr-plugin.version>2.4</maven-jxr-plugin.version>
[7/7] servicemix git commit: SM-2878: Test failures in
CxfWsnExamplesTest
Posted by ks...@apache.org.
SM-2878: Test failures in CxfWsnExamplesTest
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/b9a966cc
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/b9a966cc
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/b9a966cc
Branch: refs/heads/master
Commit: b9a966ccd1c87f5f2a3056d1c5933defa3aea285
Parents: f575712
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Sat Jan 30 23:36:44 2016 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Sat Jan 30 23:36:44 2016 +0100
----------------------------------------------------------------------
.../src/main/resources/OSGI-INF/blueprint/blueprint.xml | 3 ++-
.../org/apache/servicemix/itests/ExamplesIntegrationTests.scala | 3 +--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/b9a966cc/examples/cxf/cxf-wsn/cxf-wsn-receive/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-wsn/cxf-wsn-receive/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/examples/cxf/cxf-wsn/cxf-wsn-receive/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 434727c..a61eebc 100755
--- a/examples/cxf/cxf-wsn/cxf-wsn-receive/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/examples/cxf/cxf-wsn/cxf-wsn-receive/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -52,7 +52,8 @@ under the License.
<unmarshal>
<jaxb prettyPrint="true" contextPath="org.apache.servicemix.examples.cxf.base"/>
</unmarshal>
- <log message="\n\n### YOU GOT MAIL ####\nFrom: ${body.from}\nTo: ${body.to}\nSubject: ${body.subject}?\n${body.body}\n"/>
+ <log message="\n\n### YOU GOT MAIL ####\nFrom: ${body.from}\nTo: ${body.to}\nSubject: ${body.subject}?\n${body.body}\n"
+ loggingLevel="INFO"/>
</route>
</camelContext>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/b9a966cc/itests/src/test/scala/org/apache/servicemix/itests/ExamplesIntegrationTests.scala
----------------------------------------------------------------------
diff --git a/itests/src/test/scala/org/apache/servicemix/itests/ExamplesIntegrationTests.scala b/itests/src/test/scala/org/apache/servicemix/itests/ExamplesIntegrationTests.scala
index 3a5513c..c220618 100644
--- a/itests/src/test/scala/org/apache/servicemix/itests/ExamplesIntegrationTests.scala
+++ b/itests/src/test/scala/org/apache/servicemix/itests/ExamplesIntegrationTests.scala
@@ -205,7 +205,6 @@ class CxfWsnExamplesTest extends ExamplesIntegrationTests {
def cxfWsnExampleTestConfiguration =
Array(
editConfigurationFilePut("etc/org.apache.cxf.wsn.cfg", "cxf.wsn.activemq.username", "smx"),
- editConfigurationFilePut("etc/org.apache.cxf.wsn.cfg", "cxf.wsn.activemq.password", "smx"),
- editConfigurationFilePut("etc/org.ops4j.pax.logging.cfg", "log4j.rootLogger", "DEBUG,stdout,osgi:*")
+ editConfigurationFilePut("etc/org.apache.cxf.wsn.cfg", "cxf.wsn.activemq.password", "smx")
)
}
\ No newline at end of file