Releng updates
* Add metadata required by maven central
* Update to latest version of Tycho
* Avoid duplicate invokations of p2-metadata goal
Change-Id: Ieef65b13c1e05c6955a4e8b37781340986223b62
Signed-off-by: Mat Booth <mat.booth@redhat.com>
diff --git a/pom.xml b/pom.xml
index d6a91d9..5c2eaeb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,13 +15,30 @@
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Eclipse Communication Framework</name>
+ <name>Eclipse Communication Framework (ECF)</name>
+ <description>
+ ECF is a set of frameworks for building communications into applications and services. It
+ provides a lightweight, modular, transport-independent, fully-compliant implementation of
+ the OSGi Remote Services standard.
+ </description>
<url>https://www.eclipse.org/ecf/</url>
<prerequisites>
<maven>3.1.1</maven>
</prerequisites>
+ <organization>
+ <name>Eclipse Foundation</name>
+ <url>http://www.eclipse.org/</url>
+ </organization>
+
+ <developers>
+ <developer>
+ <name>ECF Developers</name>
+ <url>https://projects.eclipse.org/projects/rt.ecf/who</url>
+ </developer>
+ </developers>
+
<licenses>
<license>
<name>Eclipse Public License v1.0</name>
@@ -38,6 +55,12 @@
</license>
</licenses>
+ <scm>
+ <connection>scm:git:http://git.eclipse.org/gitroot/ecf/org.eclipse.ecf.git</connection>
+ <developerConnection>scm:git:ssh://git.eclipse.org/gitroot/ecf/org.eclipse.ecf.git</developerConnection>
+ <url>http://git.eclipse.org/c/ecf/org.eclipse.ecf.git</url>
+ </scm>
+
<issueManagement>
<url>https://bugs.eclipse.org/bugs/buglist.cgi?product=ECF</url>
<system>Bugzilla</system>
@@ -58,12 +81,12 @@
</distributionManagement>
<properties>
- <tycho-version>0.26.0</tycho-version>
+ <tycho-version>1.0.0</tycho-version>
<cbi-version>1.1.3</cbi-version>
<target-platform>neon</target-platform>
<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
<project.resources.sourceEncoding>ISO-8859-1</project.resources.sourceEncoding>
- <tycho.scmUrl>scm:git:https://git.eclipse.org/r/ecf/org.eclipse.ecf</tycho.scmUrl>
+ <tycho.scmUrl>${project.scm.connection}</tycho.scmUrl>
<!-- Skip tests by default because they take a long time -->
<skipTests>true</skipTests>
</properties>
@@ -325,6 +348,11 @@
<version>${tycho-version}</version>
<executions>
<execution>
+ <!-- disable default execution due it occurring too early for source features -->
+ <id>default-p2-metadata-default</id>
+ <phase>no-execute</phase>
+ </execution>
+ <execution>
<id>attach-p2-metadata</id>
<phase>package</phase>
<goals>
@@ -365,7 +393,7 @@
<configuration>
<format>'v'yyyyMMdd-HHmm</format>
<archive>
- <addMavenDescriptor>true</addMavenDescriptor>
+ <addMavenDescriptor>false</addMavenDescriptor>
</archive>
<sourceReferences>
<generate>true</generate>
@@ -404,7 +432,6 @@
<author>false</author>
<doctitle>${project.name} 3.13.6 API</doctitle>
<excludePackageNames>*.ui*:*.smack.*:*.incubation.*:*.internal.*:ch.*:*.jmdns.*:*.tests.*:*.sdo.*:*.twitter.*:*.jivesoftware.*:*.collab.*:*.osgi.services.discovery.*:com.mycorp.*:org.eclipse.ecf.core.start:org.eclipse.ecf.core.user:org.eclipse.ecf.docshare.*:org.eclipse.ecf.datashare.*:org.eclipse.ecf.example.*:org.eclipse.ecf.presence.*:org.eclipse.ecf.protocol.bittorrent:org.eclipse.ecf.protocol.msn:org.eclipse.ecf.provider.irc:org.eclipse.ecf.provider.datashare.*:org.eclipse.ecf.provider.discovery.*:org.eclipse.ecf.provider.xmpp:org.eclipse.ecf.remoteservice.rpc:org.eclipse.ecf.remoteservice.soap:org.eclipse.ecf.server:org.eclipse.ecf.storage:org.eclipse.ecf.sync:org.eclipse.ecf.telephony:org.eclipse.ecf.remoteservice.asyncproxy.j8:org.eclipse.ecf.remoteservices.tooling.pde:org.eclipse.ecf.tests.*:org.eclipse.ecf.remoteservices.rest.rss:org.eclipse.ecf.examples.*</excludePackageNames>
- <!-- <excludePackageNames>org.jivesoftware.*,ch.ethz.*,javax.*,com.mycorp.*,*.ui,*.internal,*.impl,*.example,*.examples,*.tests</excludePackageNames> -->
<links>
<link>https://osgi.org/javadoc/r6/core/</link>
</links>
@@ -495,16 +522,13 @@
<version>${tycho-version}</version>
<executions>
<execution>
- <id>p2-metadata</id>
+ <id>attach-p2-metadata</id>
<goals>
<goal>p2-metadata</goal>
</goals>
<phase>verify</phase>
</execution>
</executions>
- <configuration>
- <defaultP2Metadata>false</defaultP2Metadata>
- </configuration>
</plugin>
</plugins>
</build>
