OPENDJ-2447 PR-156 snmp jar is duplicated

Gaetan Boismal

18.40.2015 8ce92c697a3611cd17106d80366b9ea8f457fd55

OPENDJ-2447 PR-156 snmp jar is duplicated

Create a maven property for the snmp jar name
Remove the snmp jar from the lib/ directory.

 opendj-server-legacy/pom.xml

@@ -1305,6 +1305,7 @@
        <snmp.dir>${basedir}/src/snmp</snmp.dir>
        <snmp.gen.dir>${snmp.dir}/generated</snmp.gen.dir>
        <snmp.mib.dir>${snmp.dir}/resource/mib</snmp.mib.dir>
        <snmp.jar.name>snmp-mib2605</snmp.jar.name>
      </properties>

      <dependencies>
@@ -1424,7 +1425,7 @@
            </executions>
          </plugin>

          <!-- Creates snmp-mib2605 jar file -->
          <!-- Creates snmp jar file -->
          <plugin>
            <artifactId>maven-jar-plugin</artifactId>
            <executions>
@@ -1436,7 +1437,7 @@
                </goals>
                <configuration>
                  <outputDirectory>${jars.dir}</outputDirectory>
                  <finalName>snmp-mib2605</finalName>
                  <finalName>${snmp.jar.name}</finalName>
                  <includes>
                    <include>org/opends/server/snmp/**</include>
                    <include>admin/extension.manifest</include>
@@ -1445,7 +1446,7 @@
                    <index>true</index>
                    <addMavenDescriptor>false</addMavenDescriptor>
                    <manifestEntries>
                      <Extension-Name>snmp-mib2605</Extension-Name>
                      <Extension-Name>${snmp.jar.name}</Extension-Name>
                      <Implementation-Version>${project.version}</Implementation-Version>
                      <Revision-Number>${buildRevision}</Revision-Number>
                    </manifestEntries>

 opendj-server-legacy/src/main/assembly/opendj-archive-component.xml

@@ -291,6 +291,7 @@
      <outputDirectory>lib</outputDirectory>
      <excludes>
        <exclude>build-tools.jar</exclude>
        <exclude>${snmp.jar.name}.jar</exclude>
      </excludes>
    </fileSet>
    <fileSet>

 opendj-server-legacy/src/main/assembly/opendj-snmp-archive-assembly.xml

@@ -49,7 +49,7 @@
        </file>
        <!-- Adds generated snmp jar -->
        <file>
            <source>${jars.dir}/snmp-mib2605.jar</source>
            <source>${jars.dir}/${snmp.jar.name}.jar</source>
            <outputDirectory>lib/extensions</outputDirectory>
        </file>
    </files>