diff options
| author | Morten Tokle <morten.tokle@gmail.com> | 2017-12-06 15:19:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-06 15:19:36 +0100 |
| commit | 885e43f0fa85c7a0afaef905fb652399d5237bb3 (patch) | |
| tree | 08d972c333f8d5d187a0db4ae37c4e6d1ac04e59 | |
| parent | 0ed268bd055cd659daf5862d4887eb391839a5d5 (diff) | |
| parent | afd9597a22df594e034c0656f9195cf704c58230 (diff) | |
Merge pull request #4371 from vespa-engine/gjoranv/parent-pom-fix
Add missing elements to container-dependency-versions pom.
| -rw-r--r-- | container-dependency-versions/pom.xml | 73 | ||||
| -rw-r--r-- | parent/pom.xml | 13 |
2 files changed, 51 insertions, 35 deletions
diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index 5479cace414..2e23e550352 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -6,7 +6,8 @@ <artifactId>container-dependency-versions</artifactId> <packaging>pom</packaging> <version>6-SNAPSHOT</version> - <description>Dependency versions for all Vespa maven projects.</description> + <name>container-dependency-versions</name> + <description>Versions for all 3rd party dependencies provided from the Vespa container.</description> <url>https://github.com/vespa-engine</url> <licenses> @@ -15,33 +16,51 @@ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> </license> </licenses> + <developers> + <developer> + <name>Vespa</name> + <url>https://github.com/vespa-engine</url> + </developer> + </developers> + <distributionManagement> + <repository> + <id>bintray-vespa-repo</id> + <url>https://api.bintray.com/maven/yahoo/maven/vespa;publish=1</url> + </repository> + </distributionManagement> + <scm> + <connection>scm:git:git@github.com:vespa-engine/vespa.git</connection> + <developerConnection>scm:git:git@github.com:vespa-engine/vespa.git</developerConnection> + <url>git@github.com:vespa-engine/vespa.git</url> + </scm> -<!-- TODO: add pluginManagement for bundle-plugin and/or compiler-plugin? - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.6.1</version> - <configuration> - <source>1.8</source> - <target>1.8</target> - <optimize>true</optimize> - </configuration> - </plugin> - <plugin> - <groupId>com.yahoo.vespa</groupId> - <artifactId>bundle-plugin</artifactId> - <version>${project.version}</version> - <configuration> - <configGenVersion>${project.version}</configGenVersion> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> ---> + + <!-- TODO: add pluginManagement for bundle-plugin and/or compiler-plugin? + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.6.1</version> + <configuration> + <source>1.8</source> + <target>1.8</target> + <optimize>true</optimize> + </configuration> + </plugin> + <plugin> + <groupId>com.yahoo.vespa</groupId> + <artifactId>bundle-plugin</artifactId> + <version>${project.version}</version> + <configuration> + <configGenVersion>${project.version}</configGenVersion> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + --> <dependencyManagement> <dependencies> <dependency> diff --git a/parent/pom.xml b/parent/pom.xml index 48d35410fff..0a19d66d674 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -22,20 +22,23 @@ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> </license> </licenses> - <developers> <developer> <name>Vespa</name> <url>https://github.com/vespa-engine</url> </developer> </developers> - <distributionManagement> <repository> <id>bintray-vespa-repo</id> <url>https://api.bintray.com/maven/yahoo/maven/vespa;publish=1</url> </repository> </distributionManagement> + <scm> + <connection>scm:git:git@github.com:vespa-engine/vespa.git</connection> + <developerConnection>scm:git:git@github.com:vespa-engine/vespa.git</developerConnection> + <url>git@github.com:vespa-engine/vespa.git</url> + </scm> <repositories> <!-- Required for Athenz libraries --> @@ -49,12 +52,6 @@ </repository> </repositories> - <scm> - <connection>scm:git:git@github.com:vespa-engine/vespa.git</connection> - <developerConnection>scm:git:git@github.com:vespa-engine/vespa.git</developerConnection> - <url>git@github.com:vespa-engine/vespa.git</url> - </scm> - <build> <finalName>${project.artifactId}</finalName> <extensions> |