Skip to content
This repository was archived by the owner on Nov 21, 2020. It is now read-only.

Commit f7b70ef

Browse files
ajermakovicsajermakovics
committed
Merge pull request #74 from paulvi/master
streamline maven/tycho build:
2 parents 7ea2bee + d4526b2 commit f7b70ef

File tree

8 files changed

+23
-17
lines changed

8 files changed

+23
-17
lines changed

‎instasearch.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="it.unibz.instasearch.feature.indigo"
44
label="InstaSearch"
5-
version="1.5.6"
5+
version="1.5.7.qualifier"
66
provider-name="Andrejs Jermakovics"
77
plugin="it.unibz.instasearch">
88

‎instasearch.feature/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project>
3-
<modelVersion>4.0.0</modelVersion>
4-
<version>1.5.6</version>
5-
<artifactId>it.unibz.instasearch.feature.indigo</artifactId>
6-
<packaging>eclipse-feature</packaging>
7-
83
<parent>
94
<groupId>ajermakovics</groupId>
105
<artifactId>instasearch</artifactId>
116
<version>1.5.7-SNAPSHOT</version>
127
<relativePath>../pom.xml</relativePath>
138
</parent>
149

10+
<modelVersion>4.0.0</modelVersion>
11+
12+
<artifactId>it.unibz.instasearch.feature.indigo</artifactId>
13+
<packaging>eclipse-feature</packaging>
14+
1515
</project>

‎instasearch.site/category.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<description name="InstaSearch Update Site" url="http://dl.bintray.com/ajermakovics/InstaSearch/">
44
InstaSearch Eclipse Plug-in Update Site
55
</description>
6-
<feature url="features/it.unibz.instasearch.feature.indigo_1.5.6.jar" id="it.unibz.instasearch.feature.indigo" version="1.5.6">
6+
<feature url="features/it.unibz.instasearch.feature.indigo_0.0.0.jar" id="it.unibz.instasearch.feature.indigo" version="0.0.0">
77
<category name="InstaSearch"/>
88
</feature>
99
<category-def name="InstaSearch" label="InstaSearch">

‎instasearch.site/pom.xml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
5-
<artifactId>instasearch-site</artifactId>
6-
<version>1.5.6</version>
7-
<packaging>eclipse-repository</packaging>
8-
5+
96
<parent>
107
<groupId>ajermakovics</groupId>
118
<artifactId>instasearch</artifactId>
129
<version>1.5.7-SNAPSHOT</version>
1310
<relativePath>../pom.xml</relativePath>
1411
</parent>
12+
13+
<artifactId>instasearch-site</artifactId>
14+
15+
<packaging>eclipse-repository</packaging>
16+
1517
</project>

‎instasearch.site/site.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<feature url="features/org.apache.lucene_2.9.1.jar" id="org.apache.lucene" version="2.9.1">
77
<category name="Apache Lucene (for Eclipse 3.6 Helios)"/>
88
</feature>
9-
<feature url="features/it.unibz.instasearch.feature.indigo_1.5.6.jar" id="it.unibz.instasearch.feature.indigo" version="1.5.6">
9+
<feature url="features/it.unibz.instasearch.feature.indigo_0.0.0.jar" id="it.unibz.instasearch.feature.indigo" version="0.0.0">
1010
<category name="InstaSearch"/>
1111
</feature>
1212
<category-def name="InstaSearch" label="InstaSearch">

‎instasearch/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: InstaSearch
44
Bundle-SymbolicName: it.unibz.instasearch;singleton:=true
5-
Bundle-Version: 1.5.7
5+
Bundle-Version: 1.5.7.qualifier
66
Bundle-Activator: it.unibz.instasearch.InstaSearchPlugin
77
Bundle-DocURL: https://github.com/ajermakovics/eclipse-instasearch
88
Bundle-UpdateLocation: http://code.inf.unibz.it/instasearch/downloads/ver.php

‎instasearch/pom.xml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,16 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
44
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
55
<modelVersion>4.0.0</modelVersion>
6-
<artifactId>it.unibz.instasearch</artifactId>
7-
<version>1.5.7</version>
8-
<packaging>eclipse-plugin</packaging>
9-
6+
107
<parent>
118
<groupId>ajermakovics</groupId>
129
<artifactId>instasearch</artifactId>
1310
<version>1.5.7-SNAPSHOT</version>
1411
<relativePath>../pom.xml</relativePath>
1512
</parent>
13+
14+
<artifactId>it.unibz.instasearch</artifactId>
15+
16+
<packaging>eclipse-plugin</packaging>
17+
1618
</project>

‎pom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
4+
45
<groupId>ajermakovics</groupId>
56
<artifactId>instasearch</artifactId>
67
<version>1.5.7-SNAPSHOT</version>
78
<packaging>pom</packaging>
9+
810
<name>Master project</name>
911

1012
<modules>

0 commit comments

Comments
 (0)