Skip to content

Commit 324f95f

Browse files
committed
Revert to simpler update site building
Eclipse Marketplace seems to ignore `Solution Version` as the version number of what is trying to be installed and instead goes for the latest feature version available. This means even though the update site might be hosting multiple versions, registered correctly in the content.jar, we can't control version release via the Eclipse Marketplace, it will always install the latest available feature.
1 parent f0f91d1 commit 324f95f

File tree

9 files changed

+9
-36
lines changed

9 files changed

+9
-36
lines changed

src/ServiceStackEclipse/ServiceStackEclipse.Bundle/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: Eclipse
44
Bundle-SymbolicName: net.servicestack.eclipse;singleton:=true
5-
Bundle-Version: 1.0.6
5+
Bundle-Version: 1.0.6.qualifier
66
Bundle-Vendor: ServiceStack
77
Require-Bundle: org.eclipse.ui,
88
org.eclipse.core.resources,

src/ServiceStackEclipse/ServiceStackEclipse.Bundle/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

7-
<version>1.0.6</version>
7+
<version>1.0.6-SNAPSHOT</version>
88
<artifactId>net.servicestack.eclipse</artifactId>
99
<packaging>eclipse-plugin</packaging>
1010
<name>ServiceStackEclipse.Bundle</name>

src/ServiceStackEclipse/ServiceStackEclipse.BundleTesting/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<dependency>
1616
<groupId>net.servicestack.eclipse</groupId>
1717
<artifactId>net.servicestack.eclipse</artifactId>
18-
<version>1.0.6</version>
18+
<version>1.0.6-SNAPSHOT</version>
1919
<scope>compile</scope>
2020
</dependency>
2121
<dependency>
@@ -61,5 +61,5 @@
6161
</plugins>
6262
</build>
6363

64-
<version>1.0.6</version>
64+
<version>1.0.6-SNAPSHOT</version>
6565
</project>

src/ServiceStackEclipse/ServiceStackEclipse.Feature/feature.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<feature
33
id="net.servicestack.eclipse.feature"
44
label="ServiceStackEclipse"
5-
version="1.0.6"
5+
version="1.0.6.qualifier"
66
provider-name="ServiceStack">
77

88
<description url="http://github.com/ServiceStack/ServiceStack.Java">

src/ServiceStackEclipse/ServiceStackEclipse.Feature/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

7-
<version>1.0.6</version>
7+
<version>1.0.6-SNAPSHOT</version>
88
<artifactId>net.servicestack.eclipse.feature</artifactId>
99
<packaging>eclipse-feature</packaging>
1010
<name>ServiceStackEclipse.Feature</name>

src/ServiceStackEclipse/ServiceStackEclipse.Repository/category.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<site>
3-
<feature url="features/net.servicestack.eclipse.feature_1.0.6.jar" id="net.servicestack.eclipse.feature" version="1.0.6">
3+
<feature url="features/net.servicestack.eclipse.feature_1.0.6.qualifier.jar" id="net.servicestack.eclipse.feature" version="1.0.6.qualifier">
44
<category name="net.servicestack.eclipse.category"/>
55
</feature>
66
<category-def name="net.servicestack.eclipse.category" label="ServiceStack Tools"/>

src/ServiceStackEclipse/ServiceStackEclipse.Repository/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

7-
<version>1.0.6</version>
7+
<version>1.0.6-SNAPSHOT</version>
88
<artifactId>ServiceStackEclipse.Repository</artifactId>
99
<packaging>eclipse-repository</packaging>
1010
<name>ServiceStackEclipse.Repository</name>

src/ServiceStackEclipse/ServiceStackEclipse.Repository/product.product

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<?pde version="3.5"?>
33

4-
<product name="ServiceStackEclipse" uid="net.servicestack.eclipse.product" id="net.servicestack.eclipse.ServiceStackEclipse" application="org.eclipse.ui.ide.workbench" version="1.0.6" useFeatures="false" includeLaunchers="true">
4+
<product name="ServiceStackEclipse" uid="net.servicestack.eclipse.product" id="net.servicestack.eclipse.ServiceStackEclipse" application="org.eclipse.ui.ide.workbench" version="1.0.6.qualifier" useFeatures="false" includeLaunchers="true">
55

66
<configIni use="default">
77
</configIni>

src/ServiceStackEclipse/pom.xml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -83,33 +83,6 @@
8383
</execution>
8484
</executions>
8585
</plugin>
86-
<plugin>
87-
<groupId>org.eclipse.tycho.extras</groupId>
88-
<artifactId>tycho-p2-extras-plugin</artifactId>
89-
<version>${tycho-version}</version>
90-
<executions>
91-
<execution>
92-
<phase>prepare-package</phase>
93-
<goals>
94-
<goal>mirror</goal>
95-
</goals>
96-
</execution>
97-
</executions>
98-
<configuration>
99-
<source>
100-
<!--<repository>-->
101-
<!--<url>http://download.eclipse.org/releases/mars</url>-->
102-
<!--<layout>p2</layout>-->
103-
<!--</repository>-->
104-
<!-- source repositories to mirror from -->
105-
<repository>
106-
<url>https://s3.amazonaws.com/ci-dist/sseclipse/repository/</url>
107-
<layout>p2</layout>
108-
<!-- supported layouts are "p2-metadata", "p2-artifacts", and "p2" (for joint repositories; default) -->
109-
</repository>
110-
</source>
111-
</configuration>
112-
</plugin>
11386
</plugins>
11487
</build>
11588
</project>

0 commit comments

Comments
 (0)