Skip to content
Snippets Groups Projects
Commit 42e84eef authored by legoc's avatar legoc
Browse files

Removed proto generation and added dependency to NomadCommandSystemMessages

parent d3aa4d3a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 7 additions and 86 deletions
pom.xml
+ 7
− 86
View file @ 42e84eef
......@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>fr.ill.ics</groupId>
<artifactId>nomadcommandsystem</artifactId>
<version>4.0.19</version>
<version>4.0.20-SNAPSHOT</version>
<name>NomadCommandSystem</name>
<description>Java bridge for the communication with the Nomad server</description>
<scm>
......@@ -58,11 +58,11 @@
<artifactId>logkit</artifactId>
<version>2.0</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-lite</artifactId>
<version>3.0.1</version>
</dependency>
<dependency>
<groupId>fr.ill.ics</groupId>
<artifactId>nomadcommandsystem-messages</artifactId>
<version>0.0.1</version>
</dependency>
<dependency>
<groupId>fr.ill.ics</groupId>
<artifactId>cameo-api</artifactId>
......@@ -129,86 +129,7 @@
</archive>
</configuration>
</plugin>
<!-- We generate the sources from IDL and proto in process-resources to ensure to have them before the compile phase -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<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="protoDir" value="${env.NOMAD_HOME}/src/common/protobuf/proto" />
<delete dir="src/main/java/fr/ill/ics/nomadserver" />
<!-- proto files -->
<echo message="Generating ServantConfiguration.java" />
<exec executable="protoc">
<arg line="${protoFlags} ${protoDir}/ServantConfiguration.proto" />
</exec>
<echo message="Generating NotificationMessages.java" />
<exec executable="protoc">
<arg line="${protoFlags} ${protoDir}/NotificationMessages.proto" />
</exec>
<echo message="Generating CommonResponses.java" />
<exec executable="protoc">
<arg line="${protoFlags} ${protoDir}/CommonResponses.proto" />
</exec>
<echo message="Generating DatabaseRequests.java" />
<exec executable="protoc">
<arg line="${protoFlags} ${protoDir}/DatabaseRequests.proto" />
</exec>
<echo message="Generating ServantManagerRequests.java" />
<exec executable="protoc">
<arg line="${protoFlags} ${protoDir}/ServantManagerRequests.proto" />
</exec>
<echo message="Generating CommandLineRequests.java" />
<exec executable="protoc">
<arg line="${protoFlags} ${protoDir}/CommandLineRequests.proto" />
</exec>
<echo message="Generating VariableManagerRequests.java" />
<exec executable="protoc">
<arg line="${protoFlags} ${protoDir}/VariableManagerRequests.proto" />
</exec>
<echo message="Generating ConditionManagerRequests.java" />
<exec executable="protoc">
<arg line="${protoFlags} ${protoDir}/ConditionManagerRequests.proto" />
</exec>
<echo message="Generating CommandZoneRequests.java" />
<exec executable="protoc">
<arg line="${protoFlags} ${protoDir}/CommandZoneRequests.proto" />
</exec>
<echo message="Generating SessionRequests.java" />
<exec executable="protoc">
<arg line="${protoFlags} ${protoDir}/SessionRequests.proto" />
</exec>
<echo message="Generating DataPlotMessages.java" />
<exec executable="protoc">
<arg line="${protoFlags} ${protoDir}/DataPlotMessages.proto" />
</exec>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment