Revert "Remove oss release workaround."

4 files changed, 192 insertions, 55 deletions

diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml
index 72af951d965..e2bdc987354 100644
--- a/container-dependency-versions/pom.xml
+++ b/container-dependency-versions/pom.xml
@@ -189,6 +189,58 @@
                 </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 81bd836dc28..088356dd685 100644
--- a/dependency-versions/pom.xml
+++ b/dependency-versions/pom.xml
@@ -28,6 +28,7 @@
     </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 -->
@@ -138,58 +139,4 @@
         <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>
diff --git a/screwdriver/move-ossrh-deploy-profile.patch b/screwdriver/move-ossrh-deploy-profile.patch
new file mode 100644
index 00000000000..5ac9c85eeb3
--- /dev/null
+++ b/screwdriver/move-ossrh-deploy-profile.patch
@@ -0,0 +1,134 @@
+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>
diff --git a/screwdriver/release-java-artifacts.sh b/screwdriver/release-java-artifacts.sh
index cb892b86e80..f8491571d23 100755
--- a/screwdriver/release-java-artifacts.sh
+++ b/screwdriver/release-java-artifacts.sh
@@ -30,6 +30,10 @@ git clone https://github.com/vespa-engine/vespa.git $VESPA_DIR
 cd $VESPA_DIR
 git checkout $VESPA_REF
 
+#TODO(aressem): Remove after validation
+patch -p1 < $SD_SOURCE_DIR/screwdriver/move-ossrh-deploy-profile.patch
+
+
 mkdir -p $SD_SOURCE_DIR/screwdriver/deploy
 # gpg-agent in RHEL 8 runs out of memory if we use Maven and sign in parallel. Add option to overcome this.
 echo "auto-expand-secmem" >> $SD_SOURCE_DIR/screwdriver/deploy/gpg-agent.conf
@@ -61,7 +65,7 @@ export FACTORY_VESPA_VERSION=$VESPA_RELEASE
 
 COMMON_MAVEN_OPTS="$VESPA_MAVEN_EXTRA_OPTS --no-snapshot-updates --settings $(pwd)/screwdriver/settings-publish.xml --activate-profiles ossrh-deploy-vespa -DskipTests"
 TMPFILE=$(mktemp)
-mvn $COMMON_MAVEN_OPTS  -pl :dependency-versions -DskipStagingRepositoryClose=true deploy 2>&1 | tee $TMPFILE
+mvn -X $COMMON_MAVEN_OPTS  -pl :dependency-versions -DskipStagingRepositoryClose=true deploy 2>&1 | tee $TMPFILE
 
 # Find the stage repo name
 STG_REPO=$(cat $TMPFILE | grep 'Staging repository at http' | head -1 | awk -F/ '{print $NF}')