Merge pull request #64 from guidomedina/master

Extracted variable, bump slf4j and plugins versions
Conflicts:
	pom.xml

Author: chrjohn

pom.xml

@@ -70,21 +70,23 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<jdkLevel>1.6</jdkLevel>
 		<slf4j.version>1.7.18</slf4j.version>
+		<slf4j.version>1.7.19</slf4j.version>
 		<mainClass/>
 
         <maven-resources-plugin-version>2.7</maven-resources-plugin-version>
         <maven-compiler-plugin-version>3.5.1</maven-compiler-plugin-version>
         <maven-jar-plugin-version>2.6</maven-jar-plugin-version>
         <maven-surefire-plugin-version>2.19.1</maven-surefire-plugin-version>
         <maven-pmd-plugin-version>3.6</maven-pmd-plugin-version>
-        <maven-source-plugin-version>2.4</maven-source-plugin-version>
+        <maven-source-plugin-version>3.0.0</maven-source-plugin-version>
         <maven-javadoc-plugin-version>2.10.3</maven-javadoc-plugin-version>
         <maven-shade-plugin-version>2.4.3</maven-shade-plugin-version>
         <maven-assembly-plugin-version>2.6</maven-assembly-plugin-version>
         <maven-bundle-plugin-version>2.5.3</maven-bundle-plugin-version>
         <maven-gpg-plugin-version>1.6</maven-gpg-plugin-version>
         <maven-deploy-plugin-version>2.8.2</maven-deploy-plugin-version>
-        <nexus-staging-maven-plugin-version>1.6.6</nexus-staging-maven-plugin-version>
+        <nexus-staging-maven-plugin-version>1.6.7</nexus-staging-maven-plugin-version>
+        <build-helper-maven-plugin-version>1.10</build-helper-maven-plugin-version>
     </properties>
 
     <build>

quickfixj-core/src/main/java/quickfix/DataDictionary.java

@@ -454,8 +454,8 @@ public boolean isDataField(int field) {
     }
 
     private boolean isMultipleValueStringField(int field) {
-        return (fieldTypes.get(field) == FieldType.MultipleValueString)
-                || (fieldTypes.get(field) == FieldType.MultipleStringValue);
+        final FieldType fieldType = fieldTypes.get(field);
+        return fieldType == FieldType.MultipleValueString || fieldType == FieldType.MultipleStringValue;
     }
 
     /**

quickfixj-messages/quickfixj-messages-fix40/pom.xml

@@ -27,7 +27,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.9.1</version>
+				<version>${build-helper-maven-plugin-version}</version>
 				<executions>
 					<execution>
 						<phase>prepare-package</phase>
@@ -81,7 +81,7 @@
 			<plugin>
 				<artifactId>maven-source-plugin</artifactId>
 				<groupId>org.apache.maven.plugins</groupId>
-                <version>2.4</version>
+                <version>${maven-source-plugin-version}</version>
 				<configuration>
 					<includes>
 						<include>FIX40.xml</include>	

quickfixj-messages/quickfixj-messages-fix41/pom.xml

@@ -27,7 +27,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.9.1</version>
+				<version>${build-helper-maven-plugin-version}</version>
 				<executions>
 					<execution>
 						<phase>prepare-package</phase>
@@ -82,7 +82,7 @@
 			<plugin>
 				<artifactId>maven-source-plugin</artifactId>
 				<groupId>org.apache.maven.plugins</groupId>
-                <version>2.4</version>
+                <version>${maven-source-plugin-version}</version>
 				<configuration>
 					<includes>
 						<include>FIX41.xml</include>

quickfixj-messages/quickfixj-messages-fix42/pom.xml

@@ -27,7 +27,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.9.1</version>
+				<version>${build-helper-maven-plugin-version}</version>
 				<executions>
 					<execution>
 						<phase>prepare-package</phase>
@@ -82,7 +82,7 @@
 			<plugin>
 				<artifactId>maven-source-plugin</artifactId>
 				<groupId>org.apache.maven.plugins</groupId>
-                <version>2.4</version>
+                <version>${maven-source-plugin-version}</version>
 				<configuration>
 					<includes>
 						<include>FIX42.xml</include>

quickfixj-messages/quickfixj-messages-fix43/pom.xml

@@ -27,7 +27,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.9.1</version>
+				<version>${build-helper-maven-plugin-version}</version>
 				<executions>
 					<execution>
 						<phase>prepare-package</phase>
@@ -82,7 +82,7 @@
 			<plugin>
 				<artifactId>maven-source-plugin</artifactId>
 				<groupId>org.apache.maven.plugins</groupId>
-                <version>2.4</version>
+                <version>${maven-source-plugin-version}</version>
 				<configuration>
 					<includes>
 						<include>FIX43.xml</include>

quickfixj-messages/quickfixj-messages-fix44/pom.xml

@@ -27,7 +27,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.9.1</version>
+				<version>${build-helper-maven-plugin-version}</version>
 				<executions>
 					<execution>
 						<phase>prepare-package</phase>
@@ -83,7 +83,7 @@
 			<plugin>
 				<artifactId>maven-source-plugin</artifactId>
 				<groupId>org.apache.maven.plugins</groupId>
-                <version>2.4</version>
+                <version>${maven-source-plugin-version}</version>
 				<configuration>
 					<includes>
 						<include>FIX44.xml</include>

quickfixj-messages/quickfixj-messages-fix50/pom.xml

@@ -27,7 +27,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.9.1</version>
+				<version>${build-helper-maven-plugin-version}</version>
 				<executions>
 					<execution>
 						<phase>prepare-package</phase>
@@ -82,7 +82,7 @@
 			<plugin>
 				<artifactId>maven-source-plugin</artifactId>
 				<groupId>org.apache.maven.plugins</groupId>
-                <version>2.4</version>
+                <version>${maven-source-plugin-version}</version>
 				<configuration>
 					<includes>
 						<include>FIX50.xml</include>

quickfixj-messages/quickfixj-messages-fix50sp1/pom.xml

@@ -27,7 +27,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.9.1</version>
+				<version>${build-helper-maven-plugin-version}</version>
 				<executions>
 					<execution>
 						<phase>prepare-package</phase>
@@ -83,7 +83,7 @@
 			<plugin>
 				<artifactId>maven-source-plugin</artifactId>
 				<groupId>org.apache.maven.plugins</groupId>
-                <version>2.4</version>
+                <version>${maven-source-plugin-version}</version>
 				<configuration>
 					<includes>
 						<include>FIX50SP1.xml</include>

quickfixj-messages/quickfixj-messages-fix50sp2/pom.xml

@@ -27,7 +27,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.9.1</version>
+				<version>${build-helper-maven-plugin-version}</version>
 				<executions>
 					<execution>
 						<phase>prepare-package</phase>
@@ -83,7 +83,7 @@
 			<plugin>
 				<artifactId>maven-source-plugin</artifactId>
 				<groupId>org.apache.maven.plugins</groupId>
-                <version>2.4</version>
+                <version>${maven-source-plugin-version}</version>
 				<configuration>
 					<includes>
 						<include>FIX50SP2.xml</include>