From 407658dc7ca9cc311609a388d67e4f8cf9dd2ff1 Mon Sep 17 00:00:00 2001
From: Arnstein Ressem <aressem@yahooinc.com>
Date: Fri, 28 Jul 2023 11:04:43 +0200
Subject: Applied patch

---
 container-dependency-versions/pom.xml | 52 ---------------------------------
 dependency-versions/pom.xml           | 55 ++++++++++++++++++++++++++++++++++-
 2 files changed, 54 insertions(+), 53 deletions(-)

diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml
index e2bdc987354..72af951d965 100644
--- a/container-dependency-versions/pom.xml
+++ b/container-dependency-versions/pom.xml
@@ -189,58 +189,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>ossrh-deploy-vespa</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <properties>
-            </properties>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>${maven.gpg.plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <id>sign-artifacts</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                                <configuration>
-                                    <gpgArguments>
-                                        <arg>--pinentry-mode</arg>
-                                        <arg>loopback</arg>
-                                    </gpgArguments>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.sonatype.plugins</groupId>
-                        <artifactId>nexus-staging-maven-plugin</artifactId>
-                        <version>${nexus.staging.maven.plugin.version}</version>
-                        <extensions>true</extensions>
-                        <configuration>
-                            <serverId>ossrh</serverId>
-                            <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-            <distributionManagement>
-                <snapshotRepository>
-                    <id>ossrh</id>
-                    <url>${snapshotDeploymentRepository}</url>
-                </snapshotRepository>
-                <repository>
-                    <id>ossrh</id>
-                    <url>${releaseDeploymentRepository}</url>
-                </repository>
-            </distributionManagement>
-        </profile>
     </profiles>
 
 </project>
diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml
index 088356dd685..81bd836dc28 100644
--- a/dependency-versions/pom.xml
+++ b/dependency-versions/pom.xml
@@ -28,7 +28,6 @@
     </scm>
 
     <properties>
-        
         <!-- BEGIN Dependencies available from the Jdisc container, see container-dependency-versions/pom.xml -->
 
         <!-- DO NOT UPGRADE THESE TO A NEW MAJOR VERSION WITHOUT CHECKING FOR BINARY COMPATIBILITY -->
@@ -139,4 +138,58 @@
         <versions-maven-plugin.vespa.version>2.8.1</versions-maven-plugin.vespa.version>
     </properties>
 
+    <profiles>
+        <profile>
+            <id>ossrh-deploy-vespa</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <properties>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>${maven.gpg.plugin.version}</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                                <configuration>
+                                    <gpgArguments>
+                                        <arg>--pinentry-mode</arg>
+                                        <arg>loopback</arg>
+                                    </gpgArguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.sonatype.plugins</groupId>
+                        <artifactId>nexus-staging-maven-plugin</artifactId>
+                        <version>${nexus.staging.maven.plugin.version}</version>
+                        <extensions>true</extensions>
+                        <configuration>
+                            <serverId>ossrh</serverId>
+                            <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+            <distributionManagement>
+                <snapshotRepository>
+                    <id>ossrh</id>
+                    <url>${snapshotDeploymentRepository}</url>
+                </snapshotRepository>
+                <repository>
+                    <id>ossrh</id>
+                    <url>${releaseDeploymentRepository}</url>
+                </repository>
+            </distributionManagement>
+        </profile>
+    </profiles>
 </project>
-- 
cgit v1.2.3