[WSO2 Release] [Jenkins #5] [Release 2.4.0] prepare for next developm…

…ent iteration
wso2 · Sep 22, 2017 · d46f3ae · d46f3ae
1 parent 955ef58
commit d46f3ae
Show file tree

Hide file tree

Showing 61 changed files with 73 additions and 77 deletions.
diff --git a/analytics/msf4j-analytics-common/pom.xml b/analytics/msf4j-analytics-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.msf4j</groupId>
         <artifactId>msf4j-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath>../../poms/parent/pom.xml</relativePath>
     </parent>
 

diff --git a/analytics/msf4j-analytics/pom.xml b/analytics/msf4j-analytics/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.msf4j</groupId>
         <artifactId>msf4j-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath>../../poms/parent/pom.xml</relativePath>
     </parent>
 

diff --git a/analytics/wso2das-tracing-capp/pom.xml b/analytics/wso2das-tracing-capp/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.msf4j</groupId>
         <artifactId>msf4j-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath>../../poms/parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/analytics/zipkin-tracing/pom.xml b/analytics/zipkin-tracing/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.msf4j</groupId>
         <artifactId>msf4j-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath>../../poms/parent/pom.xml</relativePath>
     </parent>
 

diff --git a/archetypes/msf4j-microservice/pom.xml b/archetypes/msf4j-microservice/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.msf4j</groupId>
         <artifactId>msf4j-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath>../../poms/parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/client/pom.xml b/client/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.msf4j</groupId>
         <artifactId>msf4j-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath>../poms/parent/pom.xml</relativePath>
     </parent>
 

diff --git a/core/pom.xml b/core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.msf4j</groupId>
         <artifactId>msf4j-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath>../poms/parent/pom.xml</relativePath>
     </parent>
 

diff --git a/deployer/pom.xml b/deployer/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.wso2.msf4j</groupId>
         <artifactId>msf4j-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath>../poms/parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/distribution/binary/pom.xml b/distribution/binary/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.msf4j</groupId>
         <artifactId>msf4j-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath>../../poms/parent/pom.xml</relativePath>
     </parent>
 

diff --git a/distribution/msf4j-all/pom.xml b/distribution/msf4j-all/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.msf4j</groupId>
         <artifactId>msf4j-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath>../../poms/parent/pom.xml</relativePath>
     </parent>
 

diff --git a/features/org.wso2.msf4j.deployer.feature/pom.xml b/features/org.wso2.msf4j.deployer.feature/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.wso2.msf4j</groupId>
         <artifactId>msf4j-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath>../../poms/parent/pom.xml</relativePath>
     </parent>
 

diff --git a/features/org.wso2.msf4j.feature/pom.xml b/features/org.wso2.msf4j.feature/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.msf4j</groupId>
         <artifactId>msf4j-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath>../../poms/parent/pom.xml</relativePath>
     </parent>
 

diff --git a/jaxrs-delegates/pom.xml b/jaxrs-delegates/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.wso2.msf4j</groupId>
         <artifactId>msf4j-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath>../poms/parent/pom.xml</relativePath>
     </parent>
 

diff --git a/perf-benchmark/Samples/wso2msf4j/pom.xml b/perf-benchmark/Samples/wso2msf4j/pom.xml
@@ -22,13 +22,13 @@
     <parent>
         <groupId>org.wso2.msf4j</groupId>
         <artifactId>msf4j-service</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath>../../../poms/msf4j-service/pom.xml</relativePath>
     </parent>
 
     <groupId>org.wso2.msf4j.perftest.echo</groupId>
     <artifactId>wso2msf4j-echo-message</artifactId>
-    <version>2.4.0</version>
+    <version>2.4.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>WSO2 MSF4J Microservice benchmark service</name>

diff --git a/pom.xml b/pom.xml
@@ -27,13 +27,13 @@
     <groupId>org.wso2.msf4j</groupId>
     <artifactId>msf4j</artifactId>
     <packaging>pom</packaging>
-    <version>2.4.0</version>
+    <version>2.4.1-SNAPSHOT</version>
 
     <scm>
         <url>https://github.com/wso2/msf4j.git</url>
         <developerConnection>scm:git:https://github.com/wso2/msf4j.git</developerConnection>
         <connection>scm:git:https://github.com/wso2/msf4j.git</connection>
-        <tag>v2.4.0</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <developers>

diff --git a/poms/msf4j-service/pom.xml b/poms/msf4j-service/pom.xml
@@ -20,7 +20,7 @@
     <groupId>org.wso2.msf4j</groupId>
     <artifactId>msf4j-service</artifactId>
     <packaging>pom</packaging>
-    <version>2.4.0</version>
+    <version>2.4.1-SNAPSHOT</version>
 
     <name>MSF4J-Parent</name>
 
@@ -151,7 +151,7 @@
         <connection>scm:git:https://github.com/wso2/carbon-parent.git</connection>
         <url>https://github.com/wso2/carbon-parent.git</url>
         <developerConnection>scm:git:https://github.com/wso2/carbon-parent.git</developerConnection>
-        <tag>v2.4.0</tag>
+        <tag>carbon-parent-4</tag>
     </scm>
 
     <build>
@@ -574,7 +574,7 @@
         <!-- Other dependency versions -->
         <maven.wagon.ssh.version>2.10</maven.wagon.ssh.version>
 
-        <msf4j.version>2.4.0</msf4j.version>
+        <msf4j.version>2.4.1-SNAPSHOT</msf4j.version>
 
         <wso2.maven.compiler.source>1.8</wso2.maven.compiler.source>
         <wso2.maven.compiler.target>1.8</wso2.maven.compiler.target>

diff --git a/poms/parent/pom.xml b/poms/parent/pom.xml
@@ -28,7 +28,7 @@
     <groupId>org.wso2.msf4j</groupId>
     <artifactId>msf4j-parent</artifactId>
     <packaging>pom</packaging>
-    <version>2.4.0</version>
+    <version>2.4.1-SNAPSHOT</version>
     <name>WSO2 MSF4J - Parent Pom</name>
     <description>WSO2 MSF4J Parent Pom</description>
     <url>http://wso2.org</url>
@@ -689,7 +689,7 @@
         <carbon.jndi.version>1.0.4</carbon.jndi.version>
         <carbon.datasources.version>1.1.3</carbon.datasources.version>
         <org.apache.httpcomponents.httpclient.version>4.5.2</org.apache.httpcomponents.httpclient.version>
-        <msf4j.version>2.4.0</msf4j.version>
+        <msf4j.version>2.4.1-SNAPSHOT</msf4j.version>
         <zipkin.brave.version>3.9.1</zipkin.brave.version>
         <carbon.metrics.version>2.3.2</carbon.metrics.version>
         <carbon.metrics.version.range>[2.0,3)</carbon.metrics.version.range>
@@ -788,8 +788,4 @@
         <org.jacoco.ant.version>0.7.5.201505241946</org.jacoco.ant.version>
         <org.osgi.compendium.version>4.3.1</org.osgi.compendium.version>
     </properties>
-
-  <scm>
-    <tag>v2.4.0</tag>
-  </scm>
 </project>
diff --git a/samples/basicauth-security/pom.xml b/samples/basicauth-security/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.msf4j</groupId>
         <artifactId>msf4j-service</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath>../../poms/msf4j-service/pom.xml</relativePath>
     </parent>
 

diff --git a/samples/circuitbreaker/pom.xml b/samples/circuitbreaker/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.msf4j</groupId>
         <artifactId>msf4j-service</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath>../../poms/msf4j-service/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/samples/fileserver/pom.xml b/samples/fileserver/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.msf4j</groupId>
         <artifactId>msf4j-service</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath>../../poms/msf4j-service/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/samples/formparam/pom.xml b/samples/formparam/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.msf4j</groupId>
         <artifactId>msf4j-service</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath>../../poms/msf4j-service/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/samples/helloworld/pom.xml b/samples/helloworld/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.msf4j</groupId>
         <artifactId>msf4j-service</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath>../../poms/msf4j-service/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/samples/http-monitoring/pom.xml b/samples/http-monitoring/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.msf4j</groupId>
         <artifactId>msf4j-service</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath>../../poms/msf4j-service/pom.xml</relativePath>
     </parent>
 

diff --git a/samples/http-session/pom.xml b/samples/http-session/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.msf4j</groupId>
         <artifactId>msf4j-service</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath>../../poms/msf4j-service/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/samples/interceptor/deployable-jar-interceptor-service/pom.xml b/samples/interceptor/deployable-jar-interceptor-service/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2.msf4j</groupId>
         <artifactId>msf4j-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath>../../../poms/parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/samples/interceptor/fatjar-interceptor-service/pom.xml b/samples/interceptor/fatjar-interceptor-service/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.msf4j</groupId>
         <artifactId>msf4j-service</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath>../../../poms/msf4j-service/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -59,7 +59,7 @@
     </build>
 
     <properties>
-        <interceptor-common.version>2.4.0</interceptor-common.version>
+        <interceptor-common.version>2.4.1-SNAPSHOT</interceptor-common.version>
         <microservice.mainClass>org.wso2.msf4j.samples.fatjarinterceptorservice.Application</microservice.mainClass>
     </properties>
 </project>
diff --git a/samples/interceptor/interceptor-common/pom.xml b/samples/interceptor/interceptor-common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.msf4j</groupId>
         <artifactId>msf4j-service</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath>../../../poms/msf4j-service/pom.xml</relativePath>
     </parent>
 

diff --git a/samples/interceptor/osgi-interceptor-service/pom.xml b/samples/interceptor/osgi-interceptor-service/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.msf4j</groupId>
         <artifactId>msf4j-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath>../../../poms/parent/pom.xml</relativePath>
     </parent>
 
@@ -64,7 +64,7 @@
     </dependencies>
 
     <properties>
-        <interceptor-common.version>2.4.0</interceptor-common.version>
+        <interceptor-common.version>2.4.1-SNAPSHOT</interceptor-common.version>
         <maven-bundle-plugin.version>3.2.0</maven-bundle-plugin.version>
         <import.package>
             org.osgi.framework.*;version="${osgi.framework.import.version.range}",

diff --git a/samples/jpa/pom.xml b/samples/jpa/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.msf4j</groupId>
         <artifactId>msf4j-service</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath>../../poms/msf4j-service/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/samples/jwt-claims/JWTAccessTokenBuilder/pom.xml b/samples/jwt-claims/JWTAccessTokenBuilder/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>jwt-claims</artifactId>
         <groupId>org.wso2.msf4j</groupId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/samples/jwt-claims/jwt-sample/pom.xml b/samples/jwt-claims/jwt-sample/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>msf4j-service</artifactId>
         <groupId>org.wso2.msf4j</groupId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath>../../../poms/msf4j-service/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/samples/jwt-claims/pom.xml b/samples/jwt-claims/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2.msf4j</groupId>
         <artifactId>msf4j-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath>../../poms/parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/samples/jwt-claims/sso-agent-for-jwt-webapp/pom.xml b/samples/jwt-claims/sso-agent-for-jwt-webapp/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.wso2.msf4j</groupId>
     <artifactId>sso-agent-sample-webapp</artifactId>
-    <version>2.4.0</version>
+    <version>2.4.1-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>Travelocity.COM ServiceProvider / RelyingParty Webapp</name>
 

diff --git a/samples/lifecycle/pom.xml b/samples/lifecycle/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.msf4j</groupId>
         <artifactId>msf4j-service</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath>../../poms/msf4j-service/pom.xml</relativePath>
     </parent>
 

diff --git a/samples/message-tracing/das/pom.xml b/samples/message-tracing/das/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.msf4j</groupId>
         <artifactId>msf4j-service</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath>../../../poms/msf4j-service/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/samples/message-tracing/zipkin/pom.xml b/samples/message-tracing/zipkin/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.msf4j</groupId>
         <artifactId>msf4j-service</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath>../../../poms/msf4j-service/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>