diff options
| author | Arnstein Ressem <aressem@gmail.com> | 2023-07-28 11:56:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-28 11:56:06 +0200 |
| commit | e389fbee6406b69beb3718a04953f44589aee205 (patch) | |
| tree | fa4517246d731ecc9ffe95fe1d20c6de30664c57 /screwdriver/move-ossrh-deploy-profile.patch | |
| parent | b7195fc5a91b85daa2be5f648f6aafd1889f537a (diff) | |
Revert "Remove oss release workaround."
Diffstat (limited to 'screwdriver/move-ossrh-deploy-profile.patch')
| -rw-r--r-- | screwdriver/move-ossrh-deploy-profile.patch | 134 |
1 files changed, 134 insertions, 0 deletions
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> |