spotware · claasahl · Aug 7, 2017 · Aug 8, 2017 · Aug 8, 2017 · Aug 9, 2017
diff --git a/.gitignore b/.gitignore
@@ -1,23 +1,139 @@
-# Maven
-target/
 
-*.class
+# Created by https://www.gitignore.io/api/maven,eclipse,intellij
+
+### Eclipse ###
+
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+.recommenders
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# PyDev specific (Python IDE for Eclipse)
+*.pydevproject
+
+# CDT-specific (C/C++ Development Tooling)
+.cproject
+
+# Java annotation processor (APT)
+.factorypath
+
+# PDT-specific (PHP Development Tools)
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# Tern plugin
+.tern-project
+
+# TeXlipse plugin
+.texlipse
+
+# STS (Spring Tool Suite)
+.springBeans
+
+# Code Recommenders
+.recommenders/
+
+# Scala IDE specific (Scala & Java development for Eclipse)
+.cache-main
+.scala_dependencies
+.worksheet
+
+### Eclipse Patch ###
+# Eclipse Core		
+.project
 
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
+# JDT-specific (Eclipse Java Development Tools)		
+.classpath
 
-# Package Files #
-*.jar
-*.war
-*.ear
+### Intellij ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
+# User-specific stuff:
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/dictionaries
+
+# Sensitive or high-churn files:
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.xml
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+
+# Gradle:
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# CMake
+cmake-build-debug/
+
+# Mongo Explorer plugin:
+.idea/**/mongoSettings.xml
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+### Intellij Patch ###
+# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
+
+# *.iml
+# modules.xml
+# .idea/misc.xml
+# *.ipr
+
+# Sonarlint plugin
+.idea/sonarlint
+
+### Maven ###
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
 
-# Intellij Idea
-.idea/workspace.xml
-.idea/tasks.xml
+# Avoid ignoring Maven wrapper jar file (.jar files are usually ignored)
+!/.mvn/wrapper/maven-wrapper.jar
 
-# Dependency directory
-# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
-node_modules
+# End of https://www.gitignore.io/api/maven,eclipse,intellij
diff --git a/pom.xml b/pom.xml
@@ -1,54 +1,57 @@
 <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">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.spotware.connect</groupId>
-  <artifactId>connect-protobuf-messages</artifactId>
-  <packaging>jar</packaging>
-  <version>1.0-SNAPSHOT</version>
-  <name>Connect Open API protobuf messages</name>
-  <url>https://connect.spotware.com</url>
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com.spotware.connect</groupId>
+	<artifactId>connect-protobuf-messages</artifactId>
+	<packaging>jar</packaging>
+	<version>1.0-SNAPSHOT</version>
+	<name>Connect Open API protobuf messages</name>
+	<url>https://connect.spotware.com</url>
 
-  <properties>
-      <protobuf.version>2.5.0</protobuf.version>
-  </properties>
+	<properties>
+		<version-java>1.8</version-java>
+		<version-compiler-plugin>3.6.2</version-compiler-plugin>
+		<version-protoc-plugin>3.3.0.1</version-protoc-plugin>
+		<version-protobuf-java>3.3.1</version-protobuf-java>
 
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>8</source>
-          <target>8</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>com.github.os72</groupId>
-        <artifactId>protoc-jar-maven-plugin</artifactId>
-        <version>2.5.0.4</version> <!-- for protobuf 2.5.0 -->
-        <executions>
-          <execution>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <includeDirectories>
-                <include>src/main/protobuf</include>
-              </includeDirectories>
-              <inputDirectories>
-                <include>src/main/protobuf</include>
-              </inputDirectories>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-      <version>2.5.0</version>
-    </dependency>
-  </dependencies>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>${version-compiler-plugin}</version>
+				<configuration>
+					<source>${version-java}</source>
+					<target>${version-java}</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>com.github.os72</groupId>
+				<artifactId>protoc-jar-maven-plugin</artifactId>
+				<version>${version-protoc-plugin}</version>
+				<executions>
+					<execution>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<inputDirectories>
+								<include>src/main/protobuf</include>
+							</inputDirectories>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+		<dependency>
+			<groupId>com.google.protobuf</groupId>
+			<artifactId>protobuf-java</artifactId>
+			<version>${version-protobuf-java}</version>
+		</dependency>
+	</dependencies>
 </project>
diff --git a/src/main/protobuf/CommonMessages.proto b/src/main/protobuf/CommonMessages.proto
@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 option java_multiple_files = true;
 option java_generate_equals_and_hash = true;
 option java_package = "com.xtrader.protocol.proto.commons";

diff --git a/src/main/protobuf/CommonModelMessages.proto b/src/main/protobuf/CommonModelMessages.proto
@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 option java_multiple_files = true;
 option java_generate_equals_and_hash = true;
 option java_package = "com.xtrader.protocol.proto.commons.model";

diff --git a/src/main/protobuf/OpenApiMessages.proto b/src/main/protobuf/OpenApiMessages.proto
@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 option java_multiple_files = true;
 
 option java_generate_equals_and_hash = true;

diff --git a/src/main/protobuf/OpenApiModelMessages.proto b/src/main/protobuf/OpenApiModelMessages.proto
@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 option java_multiple_files = true;
 
 option java_generate_equals_and_hash = true;