FIX add-source for generate-sources (#275)

vharseko

21.38.2023 77f8021b8a8aeef7b1256958fb8624cce98898bd

FIX add-source for generate-sources (#275)

 opendj-cli/pom.xml

@@ -88,7 +88,23 @@
                    </execution>
                </executions>
            </plugin>

            <plugin>
                <groupId>org.codehaus.mojo</groupId>
                <artifactId>build-helper-maven-plugin</artifactId>
                <executions>
                  <execution>
                    <phase>process-sources</phase>
                    <goals>
                      <goal>add-source</goal>
                    </goals>
                    <configuration>
                      <sources>
                        <source>target/generated-sources/messages</source>
                      </sources>
                    </configuration>
                  </execution>
                </executions>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-surefire-plugin</artifactId>

 opendj-config/pom.xml

@@ -140,6 +140,24 @@
          </execution>
        </executions>
      </plugin>
      <plugin>
        <groupId>org.codehaus.mojo</groupId>
        <artifactId>build-helper-maven-plugin</artifactId>
        <executions>
          <execution>
            <phase>process-sources</phase>
            <goals>
              <goal>add-source</goal>
            </goals>
            <configuration>
              <sources>
                <source>target/generated-sources/config</source>
                <source>target/generated-sources/messages</source>
              </sources>
            </configuration>
          </execution>
         </executions>
      </plugin>
      <!-- Validate core components XML definition files and generate the components. -->
      <plugin>
        <groupId>org.openidentityplatform.opendj</groupId>

 opendj-core/pom.xml

@@ -143,7 +143,23 @@
                    </execution>
                </executions>
            </plugin>

              <plugin>
                <groupId>org.codehaus.mojo</groupId>
                <artifactId>build-helper-maven-plugin</artifactId>
                <executions>
                  <execution>
                    <phase>process-sources</phase>
                    <goals>
                      <goal>add-source</goal>
                    </goals>
                    <configuration>
                      <sources>
                        <source>target/generated-sources/messages</source>
                      </sources>
                    </configuration>
                  </execution>
                 </executions>
              </plugin>
            <!-- Retrieve the SCM revision number and store it into the ${buildRevision} property -->
            <plugin>
                <groupId>org.codehaus.mojo</groupId>

 opendj-doc-maven-plugin/pom.xml

@@ -91,6 +91,23 @@
                    </execution>
                </executions>
            </plugin>
            <plugin>
                <groupId>org.codehaus.mojo</groupId>
                <artifactId>build-helper-maven-plugin</artifactId>
                <executions>
                  <execution>
                    <phase>process-sources</phase>
                    <goals>
                      <goal>add-source</goal>
                    </goals>
                    <configuration>
                      <sources>
                        <source>target/generated-sources/messages</source>
                      </sources>
                    </configuration>
                  </execution>
                </executions>
            </plugin>
        </plugins>
    </build>
</project>

 opendj-grizzly/pom.xml

@@ -102,7 +102,23 @@
                    </execution>
                </executions>
            </plugin>

            <plugin>
                <groupId>org.codehaus.mojo</groupId>
                <artifactId>build-helper-maven-plugin</artifactId>
                <executions>
                  <execution>
                    <phase>process-sources</phase>
                    <goals>
                      <goal>add-source</goal>
                    </goals>
                    <configuration>
                      <sources>
                        <source>target/generated-sources/messages</source>
                      </sources>
                    </configuration>
                  </execution>
                </executions>
            </plugin>
            <plugin>
                <groupId>org.apache.felix</groupId>
                <artifactId>maven-bundle-plugin</artifactId>

 opendj-ldap-toolkit/pom.xml

@@ -100,7 +100,23 @@
                    </execution>
                </executions>
            </plugin>

            <plugin>
                <groupId>org.codehaus.mojo</groupId>
                <artifactId>build-helper-maven-plugin</artifactId>
                <executions>
                  <execution>
                    <phase>process-sources</phase>
                    <goals>
                      <goal>add-source</goal>
                    </goals>
                    <configuration>
                      <sources>
                        <source>target/generated-sources/messages</source>
                      </sources>
                    </configuration>
                  </execution>
                </executions>
              </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-jar-plugin</artifactId>
@@ -116,6 +132,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-surefire-plugin</artifactId>
                <version>3.0.0-M4</version>
            </plugin>

            <plugin>

 opendj-rest2ldap/pom.xml

@@ -106,7 +106,23 @@
                    </execution>
                </executions>
            </plugin>

            <plugin>
                <groupId>org.codehaus.mojo</groupId>
                <artifactId>build-helper-maven-plugin</artifactId>
                <executions>
                  <execution>
                    <phase>process-sources</phase>
                    <goals>
                      <goal>add-source</goal>
                    </goals>
                    <configuration>
                      <sources>
                        <source>target/generated-sources/messages</source>
                      </sources>
                    </configuration>
                  </execution>
                 </executions>
              </plugin>
            <plugin>
                <groupId>org.apache.felix</groupId>
                <artifactId>maven-bundle-plugin</artifactId>

 opendj-server-legacy/pom.xml

@@ -70,11 +70,6 @@
  </properties>

  <dependencies>
    <!-- ForgeRock libraries -->
    <dependency>
      <groupId>org.openidentityplatform.opendj</groupId>
      <artifactId>opendj-cli</artifactId>
    </dependency>

    <dependency>
      <groupId>org.openidentityplatform.opendj</groupId>
@@ -90,6 +85,16 @@
      <groupId>org.openidentityplatform.opendj</groupId>
      <artifactId>opendj-config</artifactId>
    </dependency>
    
    <dependency>
      <groupId>org.openidentityplatform.opendj</groupId>
      <artifactId>opendj-cli</artifactId>
    </dependency>
    
     <dependency>
      <groupId>org.openidentityplatform.opendj</groupId>
      <artifactId>opendj-legacy</artifactId>
    </dependency>

    <dependency>
      <groupId>org.openidentityplatform.opendj</groupId>
@@ -525,7 +530,7 @@
          <!-- Take into account several sources directories for the build -->
          <execution>
            <id>main-java-sources</id>
            <phase>generate-sources</phase>
            <phase>process-sources</phase>
            <goals>
              <goal>add-source</goal>
            </goals>
@@ -535,7 +540,7 @@
                <source>src/messages/src</source>
                <source>src/build-tools</source>
                <source>${project.build.directory}/java-stubs</source>
                <source>../opendj-legacy/src/main/java</source>
<!--                <source>../opendj-legacy/src/main/java</source>-->
              </sources>
            </configuration>
          </execution>
@@ -1211,8 +1216,8 @@
                    <org.opends.test.copyClassesToTestPackage>false</org.opends.test.copyClassesToTestPackage>
                  </systemPropertyVariables>
                  <argLine>-server -Xmx2048M -XX:MaxPermSize=256m</argLine>
                  <parallel>methods</parallel>
                  <threadCount>1</threadCount>
<!--                  <parallel>methods</parallel>-->
<!--                  <threadCount>10</threadCount>-->
                </configuration>
              </execution>
            </executions>
@@ -1269,16 +1274,19 @@
              <!-- Add snmp source directory and snmp generated directory as sources -->
              <execution>
                <id>snmp-java-sources</id>
                <phase>generate-sources</phase>
               <phase>process-sources</phase>
                <goals>
                  <goal>add-source</goal>
                </goals>
                <configuration>
                  <sources>
                    <source>src/snmp</source>
                    <source>src/snmp/generated</source>
                    <source>src/snmp/src</source>
                     <source>src/snmp/resource</source>
                  </sources>
                </configuration>
              </execution>
             
            </executions>
          </plugin>


 pom.xml

@@ -386,7 +386,7 @@
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-jar-plugin</artifactId>
                    <version>3.2.0</version>
                    <version>3.3.0</version>
                </plugin>
                
                <plugin>
@@ -448,7 +448,7 @@
                    <artifactId>maven-surefire-plugin</artifactId>
                    <version>3.0.0-M4</version> <!-- M6 DecodeException but got java.nio.BufferOverflowException -->
                    <configuration>
                        <properties>
                        <properties>
                            <property>
                                <name>usedefaultlisteners</name>
                                <value>false</value>
@@ -616,7 +616,7 @@
                <plugin>
                    <groupId>org.codehaus.mojo</groupId>
                    <artifactId>build-helper-maven-plugin</artifactId>
                    <version>1.8</version>
                    <version>3.3.0</version>
                    <executions>
                        <!-- Parse version to generate properties (major.version, minor.version, ...) -->
                        <execution>