Merge "Update oparent version"

diff --git a/apiroute/apiroute-service/pom.xml b/apiroute/apiroute-service/pom.xml
index ca24c9b..c0346a3 100644 (file)
--- a/apiroute/apiroute-service/pom.xml
+++ b/apiroute/apiroute-service/pom.xml
@@ -12,14 +12,14 @@
        <parent>
                <groupId>org.onap.msb.apigateway.apiroute</groupId>
                <artifactId>apiroute-parent</artifactId>
-               <version>1.2.4-SNAPSHOT</version>
+               <version>1.2.5-SNAPSHOT</version>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.onap.msb.apigateway.apiroute</groupId>
        <artifactId>apiroute-service</artifactId>
        <name>onap/msb/apigateway/apiroute/apiroute-service</name>
        <packaging>jar</packaging>
-       <version>1.2.4-SNAPSHOT</version>
+       <version>1.2.5-SNAPSHOT</version>
 
 
        <dependencies>

diff --git a/apiroute/apiroute-standalone/pom.xml b/apiroute/apiroute-standalone/pom.xml
index a75fed5..7a901e5 100644 (file)
--- a/apiroute/apiroute-standalone/pom.xml
+++ b/apiroute/apiroute-standalone/pom.xml
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- 
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
             http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
- 
+
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.onap.msb.apigateway.apiroute</groupId>
     <artifactId>apiroute-parent</artifactId>
-    <version>1.2.4-SNAPSHOT</version>      
+    <version>1.2.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.onap.msb.apigateway.apiroute</groupId>
   <artifactId>apiroute-standalone</artifactId>
   <name>onap/msb/apigateway/apiroute/apiroute-standalone</name>
   <packaging>pom</packaging>
-  <version>1.2.4-SNAPSHOT</version>
+  <version>1.2.5-SNAPSHOT</version>
 
   <properties>
     <packageid>apiroute</packageid>
@@ -40,15 +40,15 @@
       <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
-  </dependencies>   
+  </dependencies>
   <build>
-   
-   <plugins>    
+
+   <plugins>
     <plugin>
       <artifactId>maven-resources-plugin</artifactId>
       <executions>
        <execution>
-        <id>copy-resources</id>                 
+        <id>copy-resources</id>
         <phase>process-resources</phase>
         <goals>
           <goal>copy-resources</goal>
@@ -56,14 +56,14 @@
         <configuration>
           <outputDirectory>${outputdir}</outputDirectory>
           <includeEmptyDirs>true</includeEmptyDirs>
-          <resources>            
+          <resources>
             <resource>
               <directory>src/assembly/resources/</directory>
               <filtering>false</filtering>
               <includes>
                 <include>**/*</include>
               </includes>
-            </resource>  
+            </resource>
           </resources>
           <overwrite>true</overwrite>
         </configuration>
@@ -74,7 +74,7 @@
     <groupId>org.apache.maven.plugins</groupId>
     <artifactId>maven-dependency-plugin</artifactId>
     <version>2.8</version>
-    <executions>                   
+    <executions>
       <execution>
         <id>copy-jar</id>
         <goals>
@@ -90,13 +90,13 @@
               <overWrite>true</overWrite>
               <outputDirectory>${outputdir}/apiroute/</outputDirectory>
               <destFileName>apiroute-service.jar</destFileName>
-            </artifactItem>                             
+            </artifactItem>
           </artifactItems>
         </configuration>
       </execution>
     </executions>
   </plugin>
-  
+
   <plugin>
     <groupId>org.apache.maven.plugins</groupId>
     <artifactId>maven-antrun-plugin</artifactId>

diff --git a/apiroute/pom.xml b/apiroute/pom.xml
index 908cd8c..7262554 100644 (file)
--- a/apiroute/pom.xml
+++ b/apiroute/pom.xml
@@ -11,14 +11,14 @@
        <parent>
                <groupId>org.onap.msb.apigateway</groupId>
                <artifactId>msb-apigateway-parent</artifactId>
-               <version>1.2.4-SNAPSHOT</version>
+               <version>1.2.5-SNAPSHOT</version>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.onap.msb.apigateway.apiroute</groupId>
        <artifactId>apiroute-parent</artifactId>
        <name>onap/msb/apigateway/apiroute</name>
        <packaging>pom</packaging>
-       <version>1.2.4-SNAPSHOT</version>
+       <version>1.2.5-SNAPSHOT</version>
 
        <modules>
                <module>apiroute-service</module>

diff --git a/build4docker.sh b/build4docker.sh
index f0c3f49..4329646 100644 (file)
--- a/build4docker.sh
+++ b/build4docker.sh
@@ -36,7 +36,7 @@ mkdir  $RELEASE_DIR -p
 DOCKER_RUN_NAME=msb_apigateway
 DOCKER_IMAGE_NAME=msb_apigateway
 DOCKER_LATEST_VERSION=latest
-DOCKER_RELEASE_VERSION=1.2.4
+DOCKER_RELEASE_VERSION=1.2.5
 DOCKER_REPOSITORY=nexus3.onap.org:10003
 TIMESTAMP=$(date +"%Y%m%dT%H%M%SZ")
 

diff --git a/distributions/msb-apigateway/pom.xml b/distributions/msb-apigateway/pom.xml
index b34e14b..2a9f2fe 100644 (file)
--- a/distributions/msb-apigateway/pom.xml
+++ b/distributions/msb-apigateway/pom.xml
@@ -3,12 +3,12 @@
   <parent>
     <groupId>org.onap.msb.apigateway.distributions</groupId>
     <artifactId>distributions-parent</artifactId>
-    <version>1.2.4-SNAPSHOT</version>
+    <version>1.2.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.onap.msb.apigateway.distributions</groupId>
   <artifactId>msb-apigateway</artifactId>
-  <version>1.2.4-SNAPSHOT</version>
+  <version>1.2.5-SNAPSHOT</version>
   <name>onap/msb/apigateway/distributions/msb-apigateway</name>
   <packaging>pom</packaging>
 
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.onap.msb.apigateway.apiroute</groupId>
             <artifactId>apiroute-standalone</artifactId>
-            <type>zip</type>   
+            <type>zip</type>
             <version>${project.version}</version>
             <optional>true</optional>
         </dependency>
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.onap.msb.apigateway</groupId>
             <artifactId>redis-ext</artifactId>
-            <type>tar.gz</type>      
+            <type>tar.gz</type>
             <classifier>${classifier.linux64}</classifier>
             <version>${project.version}</version>
             <optional>true</optional>
@@ -45,7 +45,7 @@
         <dependency>
           <groupId>org.onap.msb.apigateway</groupId>
           <artifactId>openresty-ext</artifactId>
-          <type>tar.gz</type>      
+          <type>tar.gz</type>
           <classifier>${classifier.linux64}</classifier>
           <version>${project.version}</version>
           <optional>true</optional>
@@ -69,20 +69,20 @@
                       <artifactItem>
                         <groupId>org.onap.msb.apigateway.apiroute</groupId>
                         <artifactId>apiroute-standalone</artifactId>
-                        <type>zip</type>   
-                      </artifactItem>               
+                        <type>zip</type>
+                      </artifactItem>
                       <artifactItem>
                         <groupId>org.onap.msb.apigateway</groupId>
                         <artifactId>redis-ext</artifactId>
-                        <type>tar.gz</type>      
-                        <classifier>${classifier.linux64}</classifier>           
-                      </artifactItem>  
+                        <type>tar.gz</type>
+                        <classifier>${classifier.linux64}</classifier>
+                      </artifactItem>
                       <artifactItem>
                         <groupId>org.onap.msb.apigateway</groupId>
                         <artifactId>openresty-ext</artifactId>
-                        <type>tar.gz</type>      
-                        <classifier>${classifier.linux64}</classifier>          
-                      </artifactItem>                      
+                        <type>tar.gz</type>
+                        <classifier>${classifier.linux64}</classifier>
+                      </artifactItem>
                   </artifactItems>
                   <excludes>**/*.bat,**/*.cmd,**/*.exe</excludes>
                   <outputDirectory>${linux64outputdir}</outputDirectory>
@@ -90,7 +90,7 @@
                   <overWriteSnapshots>true</overWriteSnapshots>
                   <outputAbsoluteArtifactFilename>true</outputAbsoluteArtifactFilename>
                 </configuration>
-            </execution>      
+            </execution>
           </executions>
         </plugin>
 
@@ -98,7 +98,7 @@
           <artifactId>maven-resources-plugin</artifactId>
           <executions>
             <execution>
-              <id>copy-msb-resources-linux</id>                 
+              <id>copy-msb-resources-linux</id>
               <phase>prepare-package</phase>
               <goals>
                 <goal>copy-resources</goal>
@@ -106,7 +106,7 @@
               <configuration>
                 <outputDirectory>${linux64outputdir}</outputDirectory>
                 <includeEmptyDirs>true</includeEmptyDirs>
-                <resources>     
+                <resources>
                   <resource>
                     <directory>src/assembly/resources/</directory>
                     <filtering>false</filtering>
@@ -116,34 +116,34 @@
                     <excludes>
                       <exclude>**/*.bat</exclude>
                     </excludes>
-                  </resource>  
+                  </resource>
                 </resources>
                 <overwrite>true</overwrite>
               </configuration>
             </execution>
             <execution>
-              <id>copy-resources-dockerfile</id>                 
+              <id>copy-resources-dockerfile</id>
               <phase>process-resources</phase>
               <goals>
                 <goal>copy-resources</goal>
               </goals>
-              <configuration>            
+              <configuration>
                 <outputDirectory>${version.output}</outputDirectory>
                 <includeEmptyDirs>true</includeEmptyDirs>
-                <resources>     
+                <resources>
                   <resource>
                     <directory>${dockerFileDir}</directory>
                     <filtering>false</filtering>
                     <includes>
                       <include>**/*</include>
                     </includes>
-                  </resource>  
+                  </resource>
                 </resources>
                 <overwrite>true</overwrite>
               </configuration>
-            </execution>     
+            </execution>
           </executions>
-        </plugin>  
+        </plugin>
 
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -178,14 +178,14 @@
               </configuration>
             </execution>
           </executions>
-        </plugin> 
+        </plugin>
 
 
       </plugins>
       </build>
     </profile>
 
-  </profiles>    
+  </profiles>
 
 </project>
 

diff --git a/distributions/pom.xml b/distributions/pom.xml
index a21ca74..5c6fb7b 100644 (file)
--- a/distributions/pom.xml
+++ b/distributions/pom.xml
@@ -4,16 +4,16 @@
     <parent>
       <groupId>org.onap.msb.apigateway</groupId>
       <artifactId>msb-apigateway-parent</artifactId>
-      <version>1.2.4-SNAPSHOT</version>
+      <version>1.2.5-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.msb.apigateway.distributions</groupId>
     <artifactId>distributions-parent</artifactId>
-    <version>1.2.4-SNAPSHOT</version>
+    <version>1.2.5-SNAPSHOT</version>
     <name>onap/msb/apigateway/distributions</name>
     <packaging>pom</packaging>
     <modules>
-        <module>msb-apigateway</module>    
+        <module>msb-apigateway</module>
     </modules>
 
 

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index c3e9e38..245c022 100644 (file)
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -9,6 +9,61 @@ Microservices Bus(MSB) provides a reliable, resilient and scalable communication
 
 MSB is platform independent, while it is integrated with Kubernetes(OOM) to provide transparent service registration for ONAP microservices, MSB also supports OpenStack(Heat) and bare metal deployment.
 
+Release Notes
+=============
+
+Version: 1.2.4 Dublin Release
+-----------------------------
+
+:Release Date: 2019-06-10
+
+**New Features**
+
+This release only contains some security improvements and a few fixes.
+
+**Security improvements**
+* MSB-295 Nexus IQ Issue: bootstrap
+* MSB-320 Run API Gateway as a non-root user
+* MSB-321 Run Discovery as a non-root user
+* MSB-322 Run Kube2msb as a non-root user
+* MSB-328 Security issue reported by Nexus-iq : jetty-http
+* MSB-329 Security issue reported by Nexus-iq : spring-core
+* MSB-330 Security issue reported by Nexus-iq : commons-beanutils
+* MSB-331 Jackson datatype security issue
+
+**Bug Fixes**
+
+- `MSB-98  No information is available to select proper node IP from registered services
+- `MSB-281 improve CLM for swagger sdk
+- `MSB-325 consul container is outdated
+- `MSB-326 non STAGING version on master
+
+**Known Issues**
+
+**Security Notes**
+
+MSB code has been formally scanned during build time using NexusIQ and all Critical vulnerabilities have been addressed.
+The remaining issues are identified as false positive and their risk assessment have been documented as part of the `project <https://wiki.onap.org/pages/viewpage.action?pageId=64003723>`_.
+
+Quick Links:
+       - `MSB project page <https://wiki.onap.org/display/DW/Microservices+Bus+Project>`_
+
+       - `Passing Badge information for MSB <https://bestpractices.coreinfrastructure.org/en/projects/1601>`_
+
+       - `Project Vulnerability Review Table for MSB <https://wiki.onap.org/pages/viewpage.action?pageId=64003723>`_
+
+**Upgrade Notes**
+
+N/A
+
+**Deprecation Notes**
+
+N/A
+
+**Other**
+
+N/A
+
 Version: 1.2.3
 --------------
 
@@ -17,7 +72,7 @@ Version: 1.2.3
 
 **New Features**
 
-In Casablanca Release, MSB mainly focuses on the integration of Istio service mesh with ONAP to enhance OMSA, while keeping the Istio integration compatible with the existing MSB API Gateway approaches. 
+In Casablanca Release, MSB mainly focuses on the integration of Istio service mesh with ONAP to enhance OMSA, while keeping the Istio integration compatible with the existing MSB API Gateway approaches.
 
 How to manage ONAP microservices with Istio service mesh:
 
@@ -27,7 +82,7 @@ How to manage ONAP microservices with Istio service mesh:
 **Bug Fixes**
 
 - `MSB-196 <https://jira.onap.org/browse/MSB-196>`_ IUI displays raw placeholder texts when failed to load translation
-- `MSB-291 <https://jira.onap.org/browse/MSB-291>`_ Incomplete Apache-2.0 header 
+- `MSB-291 <https://jira.onap.org/browse/MSB-291>`_ Incomplete Apache-2.0 header
 - `MSB-293 <https://jira.onap.org/browse/MSB-293>`_ Portal to MSB pairwise test failing in WindRiver with OOM deployment
 - `MSB-294 <https://jira.onap.org/browse/MSB-294>`_ Nexus IQ Issue: okhttp3
 - `MSB-296 <https://jira.onap.org/browse/MSB-296>`_ Nexus IQ Issue: guava
@@ -43,7 +98,7 @@ How to manage ONAP microservices with Istio service mesh:
 
 **Security Notes**
 
-MSB code has been formally scanned during build time using NexusIQ and all Critical vulnerabilities have been addressed, items that remain open have been assessed for risk and actions to be taken in future release. 
+MSB code has been formally scanned during build time using NexusIQ and all Critical vulnerabilities have been addressed, items that remain open have been assessed for risk and actions to be taken in future release.
 The MSB open Critical security vulnerabilities and their risk assessment have been documented as part of the `project <https://wiki.onap.org/pages/viewpage.action?pageId=45305668>`_.
 
 Quick Links:
@@ -137,7 +192,7 @@ Provides client request routing, client request load balancing, transformation,
 **msb/discovery**
 
 Provides service registration and discovery for ONAP microservices, which leverage Consul and build an abstract layer on top of it to make it agnostic to the registration provider and add needed extension.
- 
+
 **msb/java-sdk**
 
 Provides a JAVA SDK for rapid microservices development, including service registration, service discovery, request routing, load balancing, retry, etc.
@@ -161,16 +216,16 @@ In the future release, MSB plans to provide service mesh for ONAP.
 - `MSB-71 <https://jira.onap.org/browse/MSB-71>`_ API Gateway service Registration and discovery api causes confusion
 - `MSB-70 <https://jira.onap.org/browse/MSB-70>`_ Swagger SDK site job build failed
 - `MSB-69 <https://jira.onap.org/browse/MSB-69>`_ Discovery checkstyle issue
-- `MSB-68 <https://jira.onap.org/browse/MSB-68>`_ Discovery daily build jenkins job failed 
+- `MSB-68 <https://jira.onap.org/browse/MSB-68>`_ Discovery daily build jenkins job failed
 - `MSB-67 <https://jira.onap.org/browse/MSB-67>`_ API Gateway check style warnning
 - `MSB-66 <https://jira.onap.org/browse/MSB-66>`_ API Gateway daily build failed
 - `MSB-60 <https://jira.onap.org/browse/MSB-60>`_ API gateway test coverage data not in snoar
 - `MSB-59 <https://jira.onap.org/browse/MSB-59>`_ Swagger SDK build failed
 - `MSB-58 <https://jira.onap.org/browse/MSB-58>`_ MSB Java SDK Jenkins merge job failed
 - `MSB-57 <https://jira.onap.org/browse/MSB-57>`_ Discovery site jenkins job failed
-- `MSB-55 <https://jira.onap.org/browse/MSB-55>`_ Discovery site jenkins job failed 
+- `MSB-55 <https://jira.onap.org/browse/MSB-55>`_ Discovery site jenkins job failed
 - `MSB-54 <https://jira.onap.org/browse/MSB-54>`_ API Gateway site jenkins job failed
-- `MSB-21 <https://jira.onap.org/browse/MSB-21>`_ Merge and daily jenkins job failed 
+- `MSB-21 <https://jira.onap.org/browse/MSB-21>`_ Merge and daily jenkins job failed
 - `MSB-17 <https://jira.onap.org/browse/MSB-17>`_ Release version java daily job failed
 
 **Known Issues**

diff --git a/openresty-ext/pom.xml b/openresty-ext/pom.xml
index d678287..e1709a3 100644 (file)
--- a/openresty-ext/pom.xml
+++ b/openresty-ext/pom.xml
@@ -21,14 +21,14 @@
     <parent>
         <groupId>org.onap.msb.apigateway</groupId>
         <artifactId>msb-apigateway-parent</artifactId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.2.5-SNAPSHOT</version>
     </parent>
 
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.msb.apigateway</groupId>
     <artifactId>openresty-ext</artifactId>
-    <version>1.2.4-SNAPSHOT</version>
+    <version>1.2.5-SNAPSHOT</version>
     <name>onap/msb/apigateway/openresty-ext</name>
     <packaging>pom</packaging>
 

diff --git a/pom.xml b/pom.xml
index da25013..b646d31 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
   </parent>
   <groupId>org.onap.msb.apigateway</groupId>
   <artifactId>msb-apigateway-parent</artifactId>
-  <version>1.2.4-SNAPSHOT</version>
+  <version>1.2.5-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>msb-apigateway</name>
   <properties>

diff --git a/redis-ext/pom.xml b/redis-ext/pom.xml
index 227256d..5645d4f 100644 (file)
--- a/redis-ext/pom.xml
+++ b/redis-ext/pom.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- 
+
     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- 
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
             http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
- 
+
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.onap.msb.apigateway</groupId>
         <artifactId>msb-apigateway-parent</artifactId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.2.5-SNAPSHOT</version>
     </parent>
 
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.msb.apigateway</groupId>
     <artifactId>redis-ext</artifactId>
-    <version>1.2.4-SNAPSHOT</version>
+    <version>1.2.5-SNAPSHOT</version>
     <name>onap/msb/apigateway/redis-ext</name>
     <packaging>pom</packaging>
 
@@ -57,11 +57,11 @@
         </dependencies>
         <build>
           <plugins>
-            <!-- 
+            <!--
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-dependency-plugin</artifactId>
-              <executions>      
+              <executions>
                 <execution>
                   <id>unpack-dependency-file</id>
                   <goals>
@@ -69,22 +69,22 @@
                   </goals>
                   <phase>generate-resources</phase>
                   <configuration>
-                     <artifactItems>  
+                     <artifactItems>
                        <artifactItem>
                          <groupId>org.redis.centos.7</groupId>
                          <artifactId>redis</artifactId>
                          <type>tar.gz</type>
                          <outputDirectory>${linux64outputdir}</outputDirectory>
-                       </artifactItem>                    
+                       </artifactItem>
                      </artifactItems>
                     <excludes>**/redis-benchmark**,**/*.pdb,**/*.docx</excludes>
                     <overWriteReleases>false</overWriteReleases>
                     <overWriteSnapshots>true</overWriteSnapshots>
                     <outputAbsoluteArtifactFilename>true</outputAbsoluteArtifactFilename>
                   </configuration>
-                </execution>          
+                </execution>
               </executions>
-            </plugin> 
+            </plugin>
 
             <plugin>
               <groupId>com.coderplus.maven.plugins</groupId>
@@ -101,11 +101,11 @@
                     <sourceFile>${linux64outputdir}/redis-${redis.version}</sourceFile>
                     <destinationFile>${linux64outputdir}/redis</destinationFile>
                   </configuration>
-                </execution>          
+                </execution>
               </executions>
-            </plugin> 
+            </plugin>
             -->
-            
+
             <plugin>
               <artifactId>maven-resources-plugin</artifactId>
               <configuration>
@@ -113,25 +113,25 @@
               </configuration>
               <executions>
                 <execution>
-                <id>copy-resources</id>                 
+                <id>copy-resources</id>
                 <phase>process-resources</phase>
                 <goals>
                     <goal>copy-resources</goal>
                 </goals>
-                <configuration>    
-                <outputDirectory>${linux64outputdir}</outputDirectory>           
-                    <resources>           
+                <configuration>
+                <outputDirectory>${linux64outputdir}</outputDirectory>
+                    <resources>
                         <resource>
                         <directory>src/assembly/resources/linux</directory>
                         <filtering>false</filtering>
                         <includes>
                             <include>**/*</include>
                         </includes>
-                        </resource>                  
+                        </resource>
                     </resources>
                     <overwrite>true</overwrite>
                 </configuration>
-                </execution> 
+                </execution>
               </executions>
             </plugin>
 
@@ -165,7 +165,7 @@
             </plugin>
 
           </plugins>
-        </build>    
+        </build>
       </profile>
     </profiles>
 </project>

diff --git a/version.properties b/version.properties
index 1b6b05f..4fd02cd 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
 major=1
 minor=2
-patch=4
+patch=5
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT