Skip to content
Snippets Groups Projects
Commit 1462f224 authored by Guylaine Prat's avatar Guylaine Prat
Browse files

Update pom.xml to compile from sources zip (no git directory).

parent ef3c6fa5
No related branches found
No related tags found
No related merge requests found
......@@ -216,21 +216,6 @@
<compilerArgument>-Xlint:deprecation</compilerArgument>
</configuration>
</plugin>
<plugin>
<groupId>ru.concerteza.buildnumber</groupId>
<artifactId>maven-jgit-buildnumber-plugin</artifactId>
<version>${rugged.jgit.buildnumber.version}</version>
<executions>
<execution>
<phase>prepare-package</phase>
<goals>
<goal>extract-buildnumber</goal>
</goals>
</execution>
</executions>
<configuration>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
......@@ -239,7 +224,6 @@
<archive>
<manifestFile>${project.build.directory}/osgi/MANIFEST.MF</manifestFile>
<manifestEntries>
<Implementation-Build>${rugged.implementation.build}</Implementation-Build>
<X-Compile-Source-JDK>${rugged.compiler.source}</X-Compile-Source-JDK>
<X-Compile-Target-JDK>${rugged.compiler.target}</X-Compile-Target-JDK>
</manifestEntries>
......@@ -414,9 +398,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
......@@ -565,6 +546,48 @@
</reporting>
<profiles>
<profile>
<id>git</id>
<activation>
<file>
<exists>.git</exists>
</file>
</activation>
<build>
<plugins>
<plugin>
<groupId>ru.concerteza.buildnumber</groupId>
<artifactId>maven-jgit-buildnumber-plugin</artifactId>
<version>${rugged.jgit.buildnumber.version}</version>
<executions>
<execution>
<phase>prepare-package</phase>
<goals>
<goal>extract-buildnumber</goal>
</goals>
</execution>
</executions>
<configuration>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>${rugged.maven-jar-plugin.version}</version>
<configuration>
<archive>
<manifestFile>${project.build.directory}/osgi/MANIFEST.MF</manifestFile>
<manifestEntries>
<Implementation-Build>${rugged.implementation.build}</Implementation-Build>
<X-Compile-Source-JDK>${rugged.compiler.source}</X-Compile-Source-JDK>
<X-Compile-Target-JDK>${rugged.compiler.target}</X-Compile-Target-JDK>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>release</id>
<build>
......
......@@ -121,7 +121,6 @@ public class Observables {
public SensorToSensorMapping getInterMapping(final String ruggedNameA, final String sensorNameA,
final String ruggedNameB, final String sensorNameB) {
//TODO GP revoir la creation de string par "+"
final String keyA = ruggedNameA + RUGGED_SENSOR_SEPARATOR + sensorNameA;
final String keyB = ruggedNameB + RUGGED_SENSOR_SEPARATOR + sensorNameB;
final SensorToSensorMapping mapping = interMappings.get(keyA + SENSORS_SEPARATOR + keyB);
......@@ -134,7 +133,6 @@ public class Observables {
*/
private String createKey(final SensorToGroundMapping groundMapping)
{
//TODO GP revoir la creation de string par "+"
final String key = groundMapping.getRuggedName() + RUGGED_SENSOR_SEPARATOR + groundMapping.getSensorName();
return key;
}
......@@ -145,7 +143,6 @@ public class Observables {
*/
private String createKey(final SensorToSensorMapping sensorMapping)
{
//TODO GP revoir la creation de string par "+"
final String keyA = sensorMapping.getRuggedNameA() + RUGGED_SENSOR_SEPARATOR + sensorMapping.getSensorNameA();
final String keyB = sensorMapping.getRuggedNameB() + RUGGED_SENSOR_SEPARATOR + sensorMapping.getSensorNameB();
return keyA + SENSORS_SEPARATOR + keyB;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment