diff --git a/.gitignore b/.gitignore index 6f758a9..6d1acf7 100644 --- 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 index b6ae52d..7ff5597 100644 --- a/pom.xml +++ b/pom.xml @@ -1,54 +1,57 @@ - 4.0.0 - com.spotware.connect - connect-protobuf-messages - jar - 1.0-SNAPSHOT - Connect Open API protobuf messages - https://connect.spotware.com + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 + com.spotware.connect + connect-protobuf-messages + jar + 1.0-SNAPSHOT + Connect Open API protobuf messages + https://connect.spotware.com - - 2.5.0 - + + 1.8 + 3.6.2 + 3.3.0.1 + 3.3.1 - - - - maven-compiler-plugin - - 8 - 8 - - - - com.github.os72 - protoc-jar-maven-plugin - 2.5.0.4 - - - generate-sources - - run - - - - src/main/protobuf - - - src/main/protobuf - - - - - - - - - - com.google.protobuf - protobuf-java - 2.5.0 - - + UTF-8 + + + + + + maven-compiler-plugin + ${version-compiler-plugin} + + ${version-java} + ${version-java} + + + + com.github.os72 + protoc-jar-maven-plugin + ${version-protoc-plugin} + + + generate-sources + + run + + + + src/main/protobuf + + + + + + + + + + com.google.protobuf + protobuf-java + ${version-protobuf-java} + + \ No newline at end of file diff --git a/src/main/protobuf/CommonMessages.proto b/src/main/protobuf/CommonMessages.proto index e5e019e..d56bd22 100644 --- 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 index be976e5..c4aa262 100644 --- 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 index 3c08e87..0d56c9b 100644 --- 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 index 8d6eca7..7f02e58 100644 --- 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;