From 77f8021b8a8aeef7b1256958fb8624cce98898bd Mon Sep 17 00:00:00 2001
From: vharseko <vharseko@3a-systems.ru>
Date: Tue, 21 Mar 2023 13:38:17 +0000
Subject: [PATCH] FIX add-source for generate-sources (#275)
---
opendj-server-legacy/pom.xml | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/opendj-server-legacy/pom.xml b/opendj-server-legacy/pom.xml
index 18b7b00..2769c97 100644
--- a/opendj-server-legacy/pom.xml
+++ b/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>
--
Gitblit v1.10.0