From b8c148b381ac33f22af00feefc8b49282cc7305f Mon Sep 17 00:00:00 2001
From: Jon Bratseth <bratseth@gmail.com>
Date: Tue, 1 Dec 2020 12:15:05 +0100
Subject: Revert "Merge pull request #15552 from
 vespa-engine/revert-15550-bratseth/apply-on-restart-take-8"

This reverts commit 916492da87189ff9a07e39b22c64f2e1e31ff53a, reversing
changes made to 3e5cf1de4c336c2e8d4f3a380dc242f402cb6dea.
---
 configgen/pom.xml | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

(limited to 'configgen/pom.xml')

diff --git a/configgen/pom.xml b/configgen/pom.xml
index 7d316061a99..a335e345234 100644
--- a/configgen/pom.xml
+++ b/configgen/pom.xml
@@ -52,6 +52,38 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-install-plugin</artifactId>
       </plugin>
+      <plugin>
+        <!-- Add headers making this an OSGi bundle (cannot use bundle plugin as this is needed at bootstrap).
+             This is needed because the model of config definitions is part of codegen but needed by modules
+             doing generic access over config.
+        -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <configuration>
+          <finalName>${project.artifactId}</finalName>
+          <transformers>
+            <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+              <manifestEntries>
+                <Export-Package>com.yahoo.config.codegen</Export-Package>
+                <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
+                <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                <Bundle-Version>7.0.0</Bundle-Version>
+                <Bundle-Name>${project.artifactId}</Bundle-Name>
+                <Bundle-Vendor>Yahoo!</Bundle-Vendor>
+                <Bundle-ClassPath>.</Bundle-ClassPath>
+              </manifestEntries>
+            </transformer>
+          </transformers>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>
-- 
cgit v1.2.3