From 9a8bb1d663ec2f306f116af1c31bdbfdb6c0e920 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= <laeubi@laeubi-soft.de>
Date: Fri, 24 Nov 2023 12:42:27 +0100
Subject: [PATCH] Adjust pom files

---
 .gitignore                                    |  2 +-
 org.eclipse.pde.doc.user/META-INF/MANIFEST.MF |  2 +-
 .../forceQualifierUpdate.txt                  |  2 -
 org.eclipse.pde.doc.user/pom.xml              | 46 ++++++++++---------
 pom.xml                                       |  1 +
 5 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1f64aec95e..11caa005ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,7 @@ Snap.*
 *.class
 
 # maven
-/*/*/target/
+target/
 .DS_Store
 .polyglot.*
 pom.tycho
diff --git a/org.eclipse.pde.doc.user/META-INF/MANIFEST.MF b/org.eclipse.pde.doc.user/META-INF/MANIFEST.MF
index 5453455e9f..45616ec1d1 100644
--- a/org.eclipse.pde.doc.user/META-INF/MANIFEST.MF
+++ b/org.eclipse.pde.doc.user/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.pde.doc.user; singleton:=true
-Bundle-Version: 3.14.2200.qualifier
+Bundle-Version: 3.15.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.help;bundle-version="[3.2.0,4.0.0)"
diff --git a/org.eclipse.pde.doc.user/forceQualifierUpdate.txt b/org.eclipse.pde.doc.user/forceQualifierUpdate.txt
index abad3aba6a..e69de29bb2 100644
--- a/org.eclipse.pde.doc.user/forceQualifierUpdate.txt
+++ b/org.eclipse.pde.doc.user/forceQualifierUpdate.txt
@@ -1,2 +0,0 @@
-Touch documentation bundles for javadoc regeneration
-Move to maven for generate javadocs
diff --git a/org.eclipse.pde.doc.user/pom.xml b/org.eclipse.pde.doc.user/pom.xml
index ea17a440cb..52cff9f852 100644
--- a/org.eclipse.pde.doc.user/pom.xml
+++ b/org.eclipse.pde.doc.user/pom.xml
@@ -12,27 +12,31 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>eclipse.platform.common</artifactId>
-    <groupId>eclipse.platform.common</groupId>
+    <groupId>org.eclipse.pde</groupId>
+    <artifactId>eclipse.pde</artifactId>
     <version>4.30.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.pde</groupId>
   <artifactId>org.eclipse.pde.doc.user</artifactId>
-  <version>3.14.2200-SNAPSHOT</version>
+  <version>3.15.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
-  <profiles>
-    <profile>
-      <id>build-docs</id>
-      <activation>
-        <property>
-          <!-- workaround. activeByDefault is disabled when another profile is
-            selected. -->
-          <name>!longnotexistingproperty</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
+  
+  <properties>
+    <eclipse.pde.ui.apitools>../apitools</eclipse.pde.ui.apitools>
+    <eclipse.pde.ui.ui>../ui</eclipse.pde.ui.ui>
+    <eclipse.pde.build>../build</eclipse.pde.build>
+  </properties>
+  
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+            <groupId>org.eclipse.tycho.extras</groupId>
+            <artifactId>tycho-document-bundle-plugin</artifactId>
+            <version>${tycho.version}</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
           <plugin>
             <groupId>org.eclipse.tycho</groupId>
             <artifactId>target-platform-configuration</artifactId>
@@ -197,13 +201,11 @@
                     <resource>
                       <directory>${project.build.directory}/site/apidocs</directory>
                     </resource>
-                  </resources>              
-                </configuration>            
+                  </resources>
+                </configuration>
               </execution>
             </executions>
           </plugin>
         </plugins>
-      </build>
-    </profile>
-  </profiles>
+  </build>
 </project>
diff --git a/pom.xml b/pom.xml
index f14b922ca6..8a01514f40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,6 +36,7 @@
     <module>ui</module>
     <module>build</module>
     <module>features</module>
+    <module>org.eclipse.pde.doc.user</module>
   </modules>
 
   <!--