Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMat Booth2019-10-24 13:05:26 +0000
committerMat Booth2019-10-24 15:46:17 +0000
commit45fce2a1ed54407a11cbaaf307d90546b46dd92a (patch)
tree98fab577a404ee18239fd792a0f783ef532e857b
parentd1e3f86d7433758ec41a4609fbf9633e52b2717b (diff)
downloadorg.eclipse.ecf-45fce2a1ed54407a11cbaaf307d90546b46dd92a.tar.gz
org.eclipse.ecf-45fce2a1ed54407a11cbaaf307d90546b46dd92a.tar.xz
org.eclipse.ecf-45fce2a1ed54407a11cbaaf307d90546b46dd92a.zip
Various releng updates
* Fix maven warning about use of <prerequisites> * Fix javadocs versioning * Add baseline version checker (bump some versions where indicated) * Update tycho version Change-Id: I6268279643f9d8993d581fdcb149d3d434c1e43b Signed-off-by: Mat Booth <mat.booth@redhat.com>
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/pom.xml14
-rw-r--r--pom.xml32
-rw-r--r--releng/features/org.eclipse.ecf.discovery.zookeeper.feature/feature.xml2
-rw-r--r--releng/features/org.eclipse.ecf.discovery.zookeeper.feature/pom.xml2
-rw-r--r--releng/features/org.eclipse.ecf.filetransfer.httpclient4.ssl.feature/feature.xml2
-rw-r--r--releng/features/org.eclipse.ecf.filetransfer.httpclient4.ssl.feature/pom.xml2
-rw-r--r--releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature/feature.xml2
-rw-r--r--releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature/pom.xml2
-rw-r--r--releng/features/org.eclipse.ecf.filetransfer.ssl.feature/feature.xml2
-rw-r--r--releng/features/org.eclipse.ecf.filetransfer.ssl.feature/pom.xml2
-rw-r--r--releng/features/org.eclipse.ecf.provider.generic.feature/feature.xml2
-rw-r--r--releng/features/org.eclipse.ecf.provider.generic.feature/pom.xml2
-rw-r--r--releng/features/org.eclipse.ecf.remoteservice.rest.feature/feature.xml2
-rw-r--r--releng/features/org.eclipse.ecf.remoteservice.rest.feature/pom.xml2
-rw-r--r--releng/org.eclipse.ecf.releng.repository/pom.xml2
17 files changed, 53 insertions, 23 deletions
diff --git a/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF
index 5492207aa..1d2766ace 100644
--- a/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-SymbolicName: org.eclipse.ecf.provider;singleton:=true
Automatic-Module-Name: org.eclipse.ecf.provider
-Bundle-Version: 4.8.100.qualifier
+Bundle-Version: 4.8.200.qualifier
Bundle-Name: %plugin.name
Bundle-Vendor: %plugin.provider
Bundle-Activator: org.eclipse.ecf.internal.provider.ProviderPlugin
diff --git a/framework/bundles/org.eclipse.ecf.provider/pom.xml b/framework/bundles/org.eclipse.ecf.provider/pom.xml
index fb531edca..8e949fcf4 100644
--- a/framework/bundles/org.eclipse.ecf.provider/pom.xml
+++ b/framework/bundles/org.eclipse.ecf.provider/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.provider</artifactId>
- <version>4.8.100-SNAPSHOT</version>
+ <version>4.8.200-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/pom.xml b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/pom.xml
index a7b0e1403..da675d8fa 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/pom.xml
+++ b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/pom.xml
@@ -12,4 +12,18 @@
<artifactId>org.eclipse.ecf.remoteservice.asyncproxy</artifactId>
<version>1.1.101-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-p2-extras-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <!-- Skip this check for this bundle due to false "version goes backwards" result caused by multiple bundles with same BSN in the baseline repository -->
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/pom.xml b/pom.xml
index 090c1081b..374c8de0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,10 +23,6 @@
</description>
<url>https://www.eclipse.org/ecf/</url>
- <prerequisites>
- <maven>3.5.4</maven>
- </prerequisites>
-
<organization>
<name>Eclipse Foundation</name>
<url>http://www.eclipse.org/</url>
@@ -81,8 +77,8 @@
</distributionManagement>
<properties>
- <tycho-version>1.4.0</tycho-version>
- <cbi-version>1.1.5</cbi-version>
+ <tycho-version>1.5.0</tycho-version>
+ <cbi-version>1.1.7</cbi-version>
<target-platform>photon</target-platform>
<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
<project.resources.sourceEncoding>ISO-8859-1</project.resources.sourceEncoding>
@@ -413,7 +409,7 @@
</additionalDependencies>
<additionalOptions>-Xdoclint:none</additionalOptions>
<author>false</author>
- <doctitle>${project.name} 3.14.5 API</doctitle>
+ <doctitle>${project.name} 3.14.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>
<links>
<link>https://osgi.org/javadoc/r6/core/</link>
@@ -436,7 +432,7 @@
<name>nooverride</name><placement>a</placement><head>Restriction:</head>
</tag>
</tags>
- <windowtitle>${project.name} 3.14.5 API</windowtitle>
+ <windowtitle>${project.name} 3.14.6 API</windowtitle>
</configuration>
</plugin>
</plugins>
@@ -513,6 +509,26 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-p2-extras-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <executions>
+ <execution>
+ <id>compare-version-with-baseline</id>
+ <goals>
+ <goal>compare-version-with-baselines</goal>
+ </goals>
+ <configuration>
+ <baselines>
+ <url>https://download.eclipse.org/rt/ecf/latest/site.p2/</url>
+ </baselines>
+ <comparator>zip</comparator>
+ <onIllegalVersion>warn</onIllegalVersion>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
diff --git a/releng/features/org.eclipse.ecf.discovery.zookeeper.feature/feature.xml b/releng/features/org.eclipse.ecf.discovery.zookeeper.feature/feature.xml
index 14e12a46d..fa6867242 100644
--- a/releng/features/org.eclipse.ecf.discovery.zookeeper.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.discovery.zookeeper.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.ecf.discovery.zookeeper.feature"
label="ECF Discovery Zookeeper Provider"
- version="1.0.0.qualifier"
+ version="1.0.100.qualifier"
provider-name="%providerName">
<description url="http://wiki.eclipse.org/Zookeeper_Based_ECF_Discovery">
diff --git a/releng/features/org.eclipse.ecf.discovery.zookeeper.feature/pom.xml b/releng/features/org.eclipse.ecf.discovery.zookeeper.feature/pom.xml
index 7a5acb2a7..b2443b148 100644
--- a/releng/features/org.eclipse.ecf.discovery.zookeeper.feature/pom.xml
+++ b/releng/features/org.eclipse.ecf.discovery.zookeeper.feature/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.discovery.zookeeper.feature</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.100-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/releng/features/org.eclipse.ecf.filetransfer.httpclient4.ssl.feature/feature.xml b/releng/features/org.eclipse.ecf.filetransfer.httpclient4.ssl.feature/feature.xml
index 7699fd43c..c1341d579 100644
--- a/releng/features/org.eclipse.ecf.filetransfer.httpclient4.ssl.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient4.ssl.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature"
label="ECF Httpclient4 Filetransfer SSL Provider"
- version="1.1.100.qualifier"
+ version="1.1.200.qualifier"
provider-name="Eclipse.org - ECF"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/releng/features/org.eclipse.ecf.filetransfer.httpclient4.ssl.feature/pom.xml b/releng/features/org.eclipse.ecf.filetransfer.httpclient4.ssl.feature/pom.xml
index fa574a127..513c96791 100644
--- a/releng/features/org.eclipse.ecf.filetransfer.httpclient4.ssl.feature/pom.xml
+++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient4.ssl.feature/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.filetransfer.httpclient4.ssl.feature</artifactId>
- <version>1.1.100-SNAPSHOT</version>
+ <version>1.1.200-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature/feature.xml b/releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature/feature.xml
index 635864e77..3b274a0cc 100644
--- a/releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.ecf.filetransfer.httpclient45.feature"
label="%featureName"
- version="1.0.0.qualifier"
+ version="1.0.100.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature/pom.xml b/releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature/pom.xml
index be3e23c04..e41edbd09 100644
--- a/releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature/pom.xml
+++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.filetransfer.httpclient45.feature</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.100-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/releng/features/org.eclipse.ecf.filetransfer.ssl.feature/feature.xml b/releng/features/org.eclipse.ecf.filetransfer.ssl.feature/feature.xml
index 28c6f97b8..c99d6d634 100644
--- a/releng/features/org.eclipse.ecf.filetransfer.ssl.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.filetransfer.ssl.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.ecf.filetransfer.ssl.feature"
label="ECF Filetransfer SSL Feature"
- version="1.1.100.qualifier"
+ version="1.1.200.qualifier"
provider-name="Eclipse.org - ECF"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/releng/features/org.eclipse.ecf.filetransfer.ssl.feature/pom.xml b/releng/features/org.eclipse.ecf.filetransfer.ssl.feature/pom.xml
index 7fc02d9fa..280ac7839 100644
--- a/releng/features/org.eclipse.ecf.filetransfer.ssl.feature/pom.xml
+++ b/releng/features/org.eclipse.ecf.filetransfer.ssl.feature/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.filetransfer.ssl.feature</artifactId>
- <version>1.1.100-SNAPSHOT</version>
+ <version>1.1.200-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/releng/features/org.eclipse.ecf.provider.generic.feature/feature.xml b/releng/features/org.eclipse.ecf.provider.generic.feature/feature.xml
index e1181be6b..a38d12c1a 100644
--- a/releng/features/org.eclipse.ecf.provider.generic.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.provider.generic.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.ecf.provider.generic.feature"
label="ECF Generic Provider Feature"
- version="1.0.200.qualifier"
+ version="1.0.300.qualifier"
provider-name="Eclipse.org - ECF"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/releng/features/org.eclipse.ecf.provider.generic.feature/pom.xml b/releng/features/org.eclipse.ecf.provider.generic.feature/pom.xml
index 2b3b82ebd..4b5db74b9 100644
--- a/releng/features/org.eclipse.ecf.provider.generic.feature/pom.xml
+++ b/releng/features/org.eclipse.ecf.provider.generic.feature/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.provider.generic.feature</artifactId>
- <version>1.0.200-SNAPSHOT</version>
+ <version>1.0.300-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/releng/features/org.eclipse.ecf.remoteservice.rest.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.rest.feature/feature.xml
index 1c00e86a4..8db514225 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.rest.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.remoteservice.rest.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.ecf.remoteservice.rest.feature"
label="ECF Remote Services REST Support"
- version="1.0.100.qualifier"
+ version="1.0.200.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/ecf">
diff --git a/releng/features/org.eclipse.ecf.remoteservice.rest.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.rest.feature/pom.xml
index 8205d440c..bc2d273db 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.rest.feature/pom.xml
+++ b/releng/features/org.eclipse.ecf.remoteservice.rest.feature/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.remoteservice.rest.feature</artifactId>
- <version>1.0.100-SNAPSHOT</version>
+ <version>1.0.200-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/releng/org.eclipse.ecf.releng.repository/pom.xml b/releng/org.eclipse.ecf.releng.repository/pom.xml
index d2a59c849..4df320216 100644
--- a/releng/org.eclipse.ecf.releng.repository/pom.xml
+++ b/releng/org.eclipse.ecf.releng.repository/pom.xml
@@ -10,7 +10,7 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.releng.repository</artifactId>
- <version>3.14.5-SNAPSHOT</version>
+ <version>3.14.6-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
<name>ECF p2 Repository</name>

Back to the top