fix assembly after upgrade jar plugin

vharseko

10.52.2018 6cba5d9dd27fd852c3e0eb37247541e38267e688

fix assembly after upgrade jar plugin

 opendj-server-legacy/pom.xml

@@ -52,12 +52,7 @@
    <!-- Product information properties -->
    <patchFixIds />
    <isDebugBuild>false</isDebugBuild>
    <docHomepageUrl>http://opendj.forgerock.org/</docHomepageUrl>
    <docWikiUrl>http://opendj.forgerock.org/docs.html</docWikiUrl>
    <docGuideRefUrl>http://opendj.forgerock.org/opendj-server-legacy/doc/bootstrap/admin-guide/</docGuideRefUrl>
    <docGuideAdminUrl>http://opendj.forgerock.org/opendj-server-legacy/doc/bootstrap/admin-guide/</docGuideAdminUrl>

    <!-- Other properties -->
      <!-- Other properties -->
    <maven.build.timestamp.format>yyyyMMdd</maven.build.timestamp.format>

    <!-- Additional OSGI import package for this module -->
@@ -544,61 +539,61 @@
          </execution>

          <!-- Attach localized jars to this module -->
          <execution>
            <id>attach-localized-jars</id>
            <phase>package</phase>
            <goals>
              <goal>attach-artifact</goal>
            </goals>
            <configuration>
              <artifacts>
                <artifact>
                  <file>${jars.dir}/opendj_ca_ES-${localized.jars.classifier}-ca_ES.jar</file>
                  <classifier>${localized.jars.classifier}-ca_ES</classifier>
                </artifact>
<!--           <execution> -->
<!--             <id>attach-localized-jars</id> -->
<!--             <phase>package</phase> -->
<!--             <goals> -->
<!--               <goal>attach-artifact</goal> -->
<!--             </goals> -->
<!--             <configuration> -->
<!--               <artifacts> -->
<!--                 <artifact> -->
<!--                   <file>${jars.dir}/opendj-${localized.jars.classifier}-ca_ES.jar</file> -->
<!--                   <classifier>_ca_ES</classifier> -->
<!--                 </artifact> -->

                <artifact>
                  <file>${jars.dir}/opendj_de-${localized.jars.classifier}-de.jar</file>
                  <classifier>${localized.jars.classifier}-de</classifier>
                </artifact>
<!--                 <artifact> -->
<!--                   <file>${jars.dir}/opendj-${localized.jars.classifier}-de.jar</file> -->
<!--                   <classifier>${localized.jars.classifier}-de</classifier> -->
<!--                 </artifact> -->

                <artifact>
                  <file>${jars.dir}/opendj_es-${localized.jars.classifier}-es.jar</file>
                  <classifier>${localized.jars.classifier}-es</classifier>
                </artifact>
<!--                 <artifact> -->
<!--                   <file>${jars.dir}/opendj-${localized.jars.classifier}-es.jar</file> -->
<!--                   <classifier>${localized.jars.classifier}-es</classifier> -->
<!--                 </artifact> -->

                <artifact>
                  <file>${jars.dir}/opendj_fr-${localized.jars.classifier}-fr.jar</file>
                  <classifier>${localized.jars.classifier}-fr</classifier>
                </artifact>
<!--                 <artifact> -->
<!--                   <file>${jars.dir}/opendj-${localized.jars.classifier}-fr.jar</file> -->
<!--                   <classifier>${localized.jars.classifier}-fr</classifier> -->
<!--                 </artifact> -->

                <artifact>
                  <file>${jars.dir}/opendj_ja-${localized.jars.classifier}-ja.jar</file>
                  <classifier>${localized.jars.classifier}-ja</classifier>
                </artifact>
<!--                 <artifact> -->
<!--                   <file>${jars.dir}/opendj-${localized.jars.classifier}-ja.jar</file> -->
<!--                   <classifier>${localized.jars.classifier}-ja</classifier> -->
<!--                 </artifact> -->

                <artifact>
                  <file>${jars.dir}/opendj_ko-${localized.jars.classifier}-ko.jar</file>
                  <classifier>${localized.jars.classifier}-ko</classifier>
                </artifact>
<!--                 <artifact> -->
<!--                   <file>${jars.dir}/opendj-${localized.jars.classifier}-ko.jar</file> -->
<!--                   <classifier>${localized.jars.classifier}-ko</classifier> -->
<!--                 </artifact> -->

                <artifact>
                  <file>${jars.dir}/opendj_pl-${localized.jars.classifier}-pl.jar</file>
                  <classifier>${localized.jars.classifier}-pl</classifier>
                </artifact>
<!--                 <artifact> -->
<!--                   <file>${jars.dir}/opendj-${localized.jars.classifier}-pl.jar</file> -->
<!--                   <classifier>${localized.jars.classifier}-pl</classifier> -->
<!--                 </artifact> -->

                <artifact>
                  <file>${jars.dir}/opendj_zh_CN-${localized.jars.classifier}-zh_CN.jar</file>
                  <classifier>${localized.jars.classifier}-zh_CN</classifier>
                </artifact>
<!--                 <artifact> -->
<!--                   <file>${jars.dir}/opendj-${localized.jars.classifier}-zh_CN.jar</file> -->
<!--                   <classifier>${localized.jars.classifier}-zh_CN</classifier> -->
<!--                 </artifact> -->

                <artifact>
                  <file>${jars.dir}/opendj_zh_TW-${localized.jars.classifier}-zh_TW.jar</file>
                  <classifier>${localized.jars.classifier}-zh_TW</classifier>
                </artifact>
              </artifacts>
            </configuration>
          </execution>
<!--                 <artifact> -->
<!--                   <file>${jars.dir}/opendj-${localized.jars.classifier}-zh_TW.jar</file> -->
<!--                   <classifier>${localized.jars.classifier}-zh_TW</classifier> -->
<!--                 </artifact> -->
<!--               </artifacts> -->
<!--             </configuration> -->
<!--           </execution> -->
        </executions>
      </plugin>

@@ -713,7 +708,6 @@
              <goal>jar</goal>
            </goals>
            <configuration>
              <finalName>bootstrap</finalName>
              <classifier>bootstrap</classifier>
              <includes>
                <include>nothing</include>
@@ -733,7 +727,6 @@
              <goal>jar</goal>
            </goals>
            <configuration>
              <finalName>bootstrap-client</finalName>
              <classifier>bootstrap-client</classifier>
              <includes>
                <include>nothing</include>
@@ -753,7 +746,6 @@
              <goal>jar</goal>
            </goals>
            <configuration>
              <finalName>build-tools</finalName>
              <classifier>build-tools</classifier>
              <includes>
                <include>**/messages/Severity.class</include>
@@ -779,7 +771,6 @@
              <goal>jar</goal>
            </goals>
            <configuration>
              <finalName>quicksetup</finalName>
              <classifier>quicksetup</classifier>
              <includes>
                <include>**/quicksetup/**</include>
@@ -810,8 +801,7 @@
              <goal>jar</goal>
            </goals>
            <configuration>
              <finalName>opendj-slf4j-adapter</finalName>
              <classifier>opendj-slf4j-adapter</classifier>
              <classifier>slf4j-adapter</classifier>
              <includes>
                <include>**/org/slf4j/**</include>
                <include>**/org/opends/server/loggers/slf4j/**</include>
@@ -831,8 +821,7 @@
              <goal>jar</goal>
            </goals>
            <configuration>
              <finalName>opendj-je-backend</finalName>
              <classifier>opendj-je-backend</classifier>
              <classifier>je-backend</classifier>
              <includes>
                <include>org/opends/server/backends/jeb/**</include>
                <include>org/opends/server/replication/server/changelog/je/**</include>
@@ -852,7 +841,6 @@
              <goal>jar</goal>
            </goals>
            <configuration>
              <finalName>opendj_ca_ES</finalName>
              <classifier>${localized.jars.classifier}-ca_ES</classifier>
              <includes>
                <include>**/*_ca_ES.properties</include>
@@ -867,7 +855,6 @@
              <goal>jar</goal>
            </goals>
            <configuration>
              <finalName>opendj_de</finalName>
              <classifier>${localized.jars.classifier}-de</classifier>
              <includes>
                <include>**/*_de.properties</include>
@@ -882,7 +869,6 @@
              <goal>jar</goal>
            </goals>
            <configuration>
              <finalName>opendj_es</finalName>
              <classifier>${localized.jars.classifier}-es</classifier>
              <includes>
                <include>**/*_es.properties</include>
@@ -897,7 +883,6 @@
              <goal>jar</goal>
            </goals>
            <configuration>
              <finalName>opendj_fr</finalName>
              <classifier>${localized.jars.classifier}-fr</classifier>
              <includes>
                <include>**/*_fr.properties</include>
@@ -912,7 +897,6 @@
              <goal>jar</goal>
            </goals>
            <configuration>
              <finalName>opendj_ja</finalName>
              <classifier>${localized.jars.classifier}-ja</classifier>
              <includes>
                <include>**/*_ja.properties</include>
@@ -927,7 +911,6 @@
              <goal>jar</goal>
            </goals>
            <configuration>
              <finalName>opendj_ko</finalName>
              <classifier>${localized.jars.classifier}-ko</classifier>
              <includes>
                <include>**/*_ko.properties</include>
@@ -942,7 +925,6 @@
              <goal>jar</goal>
            </goals>
            <configuration>
              <finalName>opendj_pl</finalName>
              <classifier>${localized.jars.classifier}-pl</classifier>
              <includes>
                <include>**/*_pl.properties</include>
@@ -957,7 +939,6 @@
              <goal>jar</goal>
            </goals>
            <configuration>
              <finalName>opendj_zh_CN</finalName>
              <classifier>${localized.jars.classifier}-zh_CN</classifier>
              <includes>
                <include>**/*_zh_CN.properties</include>
@@ -972,7 +953,6 @@
              <goal>jar</goal>
            </goals>
            <configuration>
              <finalName>opendj_zh_TW</finalName>
              <classifier>${localized.jars.classifier}-zh_TW</classifier>
              <includes>
                <include>**/*_zh_TW.properties</include>

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

@@ -294,6 +294,21 @@
      <excludes>
        <exclude>build-tools.jar</exclude>
        <exclude>${snmp.jar.name}.jar</exclude>
        <exclude>opendj-bootstrap.jar</exclude>
        <exclude>opendj-bootstrap-client.jar</exclude>
        <exclude>opendj-build-tools.jar</exclude>
        <exclude>opendj-quicksetup.jar</exclude>
<!--         <exclude>opendj-slf4j-adapter.jar</exclude> -->
<!--         <exclude>opendj-je-backend.jar</exclude> -->
        <exclude>opendj-i18n-ca_ES.jar</exclude>
        <exclude>opendj-i18n-de.jar</exclude>
        <exclude>opendj-i18n-es.jar</exclude>
        <exclude>opendj-i18n-fr.jar</exclude>
        <exclude>opendj-i18n-ja.jar</exclude>
        <exclude>opendj-i18n-ko.jar</exclude>
        <exclude>opendj-i18n-pl.jar</exclude>
        <exclude>opendj-i18n-zh_CN.jar</exclude>
        <exclude>opendj-i18n-zh_TW.jar</exclude>
      </excludes>
    </fileSet>
    <fileSet>
@@ -305,7 +320,66 @@
    </fileSet>
  </fileSets>
  <files>

    <file>
        <source>${jars.dir}/opendj-bootstrap.jar</source>
        <outputDirectory>lib</outputDirectory>
        <destName>bootstrap.jar</destName>
    </file>
    <file>
        <source>${jars.dir}/opendj-bootstrap-client.jar</source>
        <outputDirectory>lib</outputDirectory>
        <destName>bootstrap-client.jar</destName>
    </file>
    <file>
        <source>${jars.dir}/opendj-quicksetup.jar</source>
        <outputDirectory>lib</outputDirectory>
        <destName>quicksetup.jar</destName>
    </file>
    <file>
        <source>${jars.dir}/opendj-i18n-ca_ES.jar</source>
        <outputDirectory>lib</outputDirectory>
        <destName>opendj_ca_ES.jar</destName>
    </file>
    <file>
        <source>${jars.dir}/opendj-i18n-de.jar</source>
        <outputDirectory>lib</outputDirectory>
        <destName>opendj_de.jar</destName>
    </file>
        <file>
        <source>${jars.dir}/opendj-i18n-es.jar</source>
        <outputDirectory>lib</outputDirectory>
        <destName>opendj_es.jar</destName>
    </file>
        <file>
        <source>${jars.dir}/opendj-i18n-fr.jar</source>
        <outputDirectory>lib</outputDirectory>
        <destName>opendj_fr.jar</destName>
    </file>
        <file>
        <source>${jars.dir}/opendj-i18n-ja.jar</source>
        <outputDirectory>lib</outputDirectory>
        <destName>opendj_ja.jar</destName>
    </file>
        <file>
        <source>${jars.dir}/opendj-i18n-ko.jar</source>
        <outputDirectory>lib</outputDirectory>
        <destName>opendj_ko.jar</destName>
    </file>
        <file>
        <source>${jars.dir}/opendj-i18n-pl.jar</source>
        <outputDirectory>lib</outputDirectory>
        <destName>opendj_pl.jar</destName>
    </file>
        <file>
        <source>${jars.dir}/opendj-i18n-zh_CN.jar</source>
        <outputDirectory>lib</outputDirectory>
        <destName>opendj_zh_CN.jar</destName>
    </file>
        <file>
        <source>${jars.dir}/opendj-i18n-zh_TW.jar</source>
        <outputDirectory>lib</outputDirectory>
        <destName>opendj_zh_TW.jar</destName>
    </file>
    <!-- Adds Generated config.ldif file -->
    <file>
      <source>${project.build.directory}/template/config/config.ldif</source>