Skip to content
Snippets Groups Projects
Commit d1bb880d authored by Locatelli's avatar Locatelli
Browse files

merge V4 to master

parent a6f20408
No related branches found
No related tags found
No related merge requests found
......@@ -12,7 +12,7 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
......
......@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>fr.ill.ics</groupId>
<artifactId>nomadcommandsystem-messages</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>0.0.29-SNAPSHOT</version>
<name>NomadCommandSystemMessages</name>
<description>Messages of the NomadCommandSystem library</description>
......@@ -43,8 +43,8 @@
<dependencies>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-lite</artifactId>
<version>3.0.1</version>
<artifactId>protobuf-javalite</artifactId>
<version>3.12.1</version>
</dependency>
</dependencies>
<build>
......@@ -72,7 +72,7 @@
<phase>process-resources</phase>
<configuration>
<target>
<property name="protoFlags" value="-I${env.NOMAD_HOME}/src/common/protobuf/proto --java_out=src/main/java" />
<property name="protoFlags" value="-I${env.NOMAD_HOME}/src/common/protobuf/proto --java_out=lite:src/main/java" />
<property name="protoDir" value="${env.NOMAD_HOME}/src/common/protobuf/proto" />
<delete dir="src/main/java/fr/ill/ics/nomadserver" />
......@@ -143,4 +143,4 @@
</plugins>
</build>
</project>
\ No newline at end of file
</project>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment