diff options
| author | Arnstein Ressem <aressem@verizonmedia.com> | 2021-09-28 13:52:18 +0200 |
|---|---|---|
| committer | Arnstein Ressem <aressem@verizonmedia.com> | 2021-09-28 13:52:18 +0200 |
| commit | d629b53a3abc474d93a72ae0bb6803ee66b37061 (patch) | |
| tree | b655c19a53f5d53230b1338dd1121da988c037db | |
| parent | 05f118fcca1dad818960248a4fe24c76f33f4bbb (diff) | |
Make it possible to deploy on Maven Central with maven.
25 files changed, 194 insertions, 5 deletions
diff --git a/bundle-plugin-test/integration-test/pom.xml b/bundle-plugin-test/integration-test/pom.xml index e65cf077d62..80e2661d39d 100644 --- a/bundle-plugin-test/integration-test/pom.xml +++ b/bundle-plugin-test/integration-test/pom.xml @@ -88,4 +88,10 @@ </plugin> </plugins> </build> + + <properties> + <maven.javadoc.skip>true</maven.javadoc.skip> + <maven.deploy.skip>true</maven.deploy.skip> + </properties> + </project> diff --git a/bundle-plugin-test/pom.xml b/bundle-plugin-test/pom.xml index 67e869a841d..c899a051a43 100644 --- a/bundle-plugin-test/pom.xml +++ b/bundle-plugin-test/pom.xml @@ -23,6 +23,7 @@ <properties> <!-- This project only builds test artifacts --> <maven.deploy.skip>true</maven.deploy.skip> + <maven.javadoc.skip>true</maven.javadoc.skip> </properties> </project> diff --git a/bundle-plugin-test/test-bundles/pom.xml b/bundle-plugin-test/test-bundles/pom.xml index ab19b3578c5..f6de1dea3d5 100644 --- a/bundle-plugin-test/test-bundles/pom.xml +++ b/bundle-plugin-test/test-bundles/pom.xml @@ -64,5 +64,6 @@ <properties> <maven.javadoc.skip>true</maven.javadoc.skip> + <maven.deploy.skip>true</maven.deploy.skip> </properties> </project> diff --git a/config-bundle/src/main/javadoc/README b/config-bundle/src/main/javadoc/README new file mode 100644 index 00000000000..6695538e308 --- /dev/null +++ b/config-bundle/src/main/javadoc/README @@ -0,0 +1 @@ +No javadoc available for module
\ No newline at end of file diff --git a/config-model-fat/src/main/javadoc/README b/config-model-fat/src/main/javadoc/README new file mode 100644 index 00000000000..6695538e308 --- /dev/null +++ b/config-model-fat/src/main/javadoc/README @@ -0,0 +1 @@ +No javadoc available for module
\ No newline at end of file diff --git a/container-apache-http-client-bundle/src/main/javadoc/README b/container-apache-http-client-bundle/src/main/javadoc/README new file mode 100644 index 00000000000..6695538e308 --- /dev/null +++ b/container-apache-http-client-bundle/src/main/javadoc/README @@ -0,0 +1 @@ +No javadoc available for module
\ No newline at end of file diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index 762318c8306..5380da5726a 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -141,4 +141,9 @@ </profile> </profiles> + <properties> + <maven.javadoc.skip>true</maven.javadoc.skip> + <maven.deploy.skip>true</maven.deploy.skip> + </properties> + </project> diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index 30af057b119..daade359e28 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -352,6 +352,53 @@ </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> + </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> + <autoReleaseAfterClose>true</autoReleaseAfterClose> + </configuration> + </plugin> + </plugins> + </build> + <distributionManagement> + <snapshotRepository> + <id>ossrh</id> + <url>${snapshotDeploymentRepository}</url> + </snapshotRepository> + <repository> + <id>ossrh</id> + <url>${releaseDeploymentRepository}</url> + </repository> + </distributionManagement> + </profile> </profiles> <properties> diff --git a/container-dev/src/main/javadoc/README b/container-dev/src/main/javadoc/README new file mode 100644 index 00000000000..6695538e308 --- /dev/null +++ b/container-dev/src/main/javadoc/README @@ -0,0 +1 @@ +No javadoc available for module
\ No newline at end of file diff --git a/container-test/src/main/javadoc/README b/container-test/src/main/javadoc/README new file mode 100644 index 00000000000..6695538e308 --- /dev/null +++ b/container-test/src/main/javadoc/README @@ -0,0 +1 @@ +No javadoc available for module
\ No newline at end of file diff --git a/container/src/main/javadoc/README b/container/src/main/javadoc/README new file mode 100644 index 00000000000..6695538e308 --- /dev/null +++ b/container/src/main/javadoc/README @@ -0,0 +1 @@ +No javadoc available for module
\ No newline at end of file diff --git a/documentgen-test/pom.xml b/documentgen-test/pom.xml index 72fbe1682a7..883907d5e8d 100644 --- a/documentgen-test/pom.xml +++ b/documentgen-test/pom.xml @@ -124,4 +124,10 @@ </plugin> </plugins> </build> + + <properties> + <maven.javadoc.skip>true</maven.javadoc.skip> + <maven.deploy.skip>true</maven.deploy.skip> + </properties> + </project> diff --git a/hosted-tenant-base/pom.xml b/hosted-tenant-base/pom.xml index 08648f47ce2..d99d9e73e76 100644 --- a/hosted-tenant-base/pom.xml +++ b/hosted-tenant-base/pom.xml @@ -298,6 +298,53 @@ <vespaVersion>${vespa.runtime.version}</vespaVersion> </properties> </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> + </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> + <autoReleaseAfterClose>true</autoReleaseAfterClose> + </configuration> + </plugin> + </plugins> + </build> + <distributionManagement> + <snapshotRepository> + <id>ossrh</id> + <url>${snapshotDeploymentRepository}</url> + </snapshotRepository> + <repository> + <id>ossrh</id> + <url>${releaseDeploymentRepository}</url> + </repository> + </distributionManagement> + </profile> </profiles> <build> diff --git a/jdisc_core_test/pom.xml b/jdisc_core_test/pom.xml index e5cde58caa1..23eba93201b 100644 --- a/jdisc_core_test/pom.xml +++ b/jdisc_core_test/pom.xml @@ -24,6 +24,7 @@ <properties> <!-- This project only builds test artifacts --> <maven.deploy.skip>true</maven.deploy.skip> + <maven.javadoc.skip>true</maven.javadoc.skip> </properties> </project> diff --git a/jdisc_jetty/src/main/javadoc/README b/jdisc_jetty/src/main/javadoc/README new file mode 100644 index 00000000000..6695538e308 --- /dev/null +++ b/jdisc_jetty/src/main/javadoc/README @@ -0,0 +1 @@ +No javadoc available for module
\ No newline at end of file diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml index 5d3fe638d4d..7fe2412fad9 100644 --- a/maven-plugins/pom.xml +++ b/maven-plugins/pom.xml @@ -23,4 +23,9 @@ <module>../configgen</module> <module>../vespa-application-maven-plugin</module> </modules> + + <properties> + <maven.javadoc.skip>true</maven.javadoc.skip> + <maven.deploy.skip>true</maven.deploy.skip> + </properties> </project> diff --git a/parent/pom.xml b/parent/pom.xml index ca61f6707e7..dd13971968d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -315,11 +315,35 @@ </build> </profile> <profile> + <id>custom-javadoc</id> + <activation> + <file><exists>src/main/javadoc</exists></file> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <classifier>javadoc</classifier> + <classesDirectory>${project.basedir}/src/main/javadoc</classesDirectory> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>generate-javadoc</id> <activation> - <property> - <name>!skipJavadoc</name> - </property> + <file><missing>src/main/javadoc</missing></file> </activation> <build> <plugins> @@ -148,5 +148,5 @@ <module>zookeeper-command-line-client</module> <module>zookeeper-server</module> </modules> -</project> +</project> diff --git a/provided-dependencies/src/main/javadoc/README b/provided-dependencies/src/main/javadoc/README new file mode 100644 index 00000000000..6695538e308 --- /dev/null +++ b/provided-dependencies/src/main/javadoc/README @@ -0,0 +1 @@ +No javadoc available for module
\ No newline at end of file diff --git a/screwdriver/pubring.gpg.enc b/screwdriver/pubring.gpg.enc Binary files differnew file mode 100644 index 00000000000..aee68d7aab9 --- /dev/null +++ b/screwdriver/pubring.gpg.enc diff --git a/screwdriver/secring.gpg.enc b/screwdriver/secring.gpg.enc Binary files differnew file mode 100644 index 00000000000..f12013a1ba8 --- /dev/null +++ b/screwdriver/secring.gpg.enc diff --git a/screwdriver/settings-publish.xml b/screwdriver/settings-publish.xml new file mode 100644 index 00000000000..33b6e48ea40 --- /dev/null +++ b/screwdriver/settings-publish.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd"> + <servers> + <server> + <id>ossrh</id> + <username>${env.OSSRH_USER}</username> + <password>${env.OSSRH_TOKEN}</password> + </server> + </servers> + + <profiles> + <profile> + <id>ossrh-deploy-vespa</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <properties> + <snapshotDeploymentRepository>https://oss.sonatype.org/content/repositories/snapshots</snapshotDeploymentRepository> + <releaseDeploymentRepository>https://oss.sonatype.org/service/local/staging/deploy/maven2/</releaseDeploymentRepository> + <altDeploymentRepository>ossrh::default::${snapshotDeploymentRepository}</altDeploymentRepository> + <altSnapshotDeploymentRepository>ossrh::default::${snapshotDeploymentRepository}</altSnapshotDeploymentRepository> + <altReleaseDeploymentRepository>ossrh::default::${releaseDeploymentRepository}</altReleaseDeploymentRepository> + <gpg.executable>gpg</gpg.executable> + <gpg.keyname>${env.GPG_KEYNAME}</gpg.keyname> + <gpg.passphrase>${env.GPG_PASSPHRASE}</gpg.passphrase> + <gpg.defaultKeyring>false</gpg.defaultKeyring> + <gpg.homedir>${env.SD_SOURCE_DIR}/screwdriver/deploy</gpg.homedir> + <gpg.publickeyring>pubring.gpg</gpg.publickeyring> + <gpg.secretkeyring>secring.gpg</gpg.secretkeyring> + <maven.gpg.plugin.version>1.6</maven.gpg.plugin.version> + <nexus.staging.maven.plugin.version>1.6.7</nexus.staging.maven.plugin.version> + </properties> + </profile> + </profiles> + +</settings> diff --git a/socket_test/pom.xml b/socket_test/pom.xml index 402fe812af2..db88d03ea42 100644 --- a/socket_test/pom.xml +++ b/socket_test/pom.xml @@ -47,6 +47,8 @@ </plugins> </build> <properties> + <maven.javadoc.skip>true</maven.javadoc.skip> + <maven.deploy.skip>true</maven.deploy.skip> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> </project> diff --git a/vespa-feed-client-cli/pom.xml b/vespa-feed-client-cli/pom.xml index ebbea35f4a4..a85d760dcc2 100644 --- a/vespa-feed-client-cli/pom.xml +++ b/vespa-feed-client-cli/pom.xml @@ -13,7 +13,6 @@ <version>7-SNAPSHOT</version> <properties> - <maven.javadoc.skip>true</maven.javadoc.skip> <!-- Used by internal properties that are still using JDK8--> <maven.compiler.release>8</maven.compiler.release> </properties> diff --git a/vespa-feed-client-cli/src/main/javadoc/README b/vespa-feed-client-cli/src/main/javadoc/README new file mode 100644 index 00000000000..6695538e308 --- /dev/null +++ b/vespa-feed-client-cli/src/main/javadoc/README @@ -0,0 +1 @@ +No javadoc available for module
\ No newline at end of file |