Skip to content

Commit c3851f9

Browse files
committed
updates
1 parent c400910 commit c3851f9

910 files changed

Lines changed: 555 additions & 67493 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

External Plug-in Libraries/.searchable

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.
Binary file not shown.

de.vogella.tycho.feature/target/feature.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<feature
33
id="de.vogella.tycho.feature"
44
label="Feature"
5-
version="1.0.0.201208131503">
5+
version="1.0.0.v20120813-1558">
66

77
<description url="http://www.example.com/description">
88
[Enter Feature Description here.]
@@ -20,7 +20,7 @@
2020
id="de.vogella.tycho.plugin"
2121
download-size="5"
2222
install-size="6"
23-
version="1.0.0.201208131503"
23+
version="1.0.0.v20120813-1558"
2424
unpack="false"/>
2525

2626
</feature>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#Mon Aug 13 17:03:36 CEST 2012
1+
#Mon Aug 20 14:51:12 CEST 2012
22
artifact.attached.p2metadata=/home/vogella/workspace/vogella/de.vogella.tycho.feature/target/p2content.xml
33
artifact.main=/home/vogella/workspace/vogella/de.vogella.tycho.feature/target/de.vogella.tycho.feature-1.0.0-SNAPSHOT.jar
44
artifact.attached.p2artifacts=/home/vogella/workspace/vogella/de.vogella.tycho.feature/target/p2artifacts.xml
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#Generated by Maven
2-
#Mon Aug 13 17:03:36 CEST 2012
2+
#Mon Aug 20 14:51:10 CEST 2012
33
version=1.0.0-SNAPSHOT
44
groupId=com.vogella
55
artifactId=de.vogella.tycho.feature

de.vogella.tycho.feature/target/p2artifacts.xml

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
<?artifactRepository version='1.1.0'?>
33
<artifacts size='1'>
4-
<artifact classifier='org.eclipse.update.feature' id='de.vogella.tycho.feature' version='1.0.0.201208131503'>
4+
<artifact classifier='org.eclipse.update.feature' id='de.vogella.tycho.feature' version='1.0.0.v20120813-1558'>
55
<properties size='6'>
66
<property name='artifact.size' value='1879'/>
77
<property name='download.size' value='1879'/>

de.vogella.tycho.feature/target/p2content.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<units size='2'>
3-
<unit id='de.vogella.tycho.feature.feature.group' version='1.0.0.201208131503' singleton='false'>
4-
<update id='de.vogella.tycho.feature.feature.group' range='[0.0.0,1.0.0.201208131503)' severity='0'/>
3+
<unit id='de.vogella.tycho.feature.feature.group' version='1.0.0.v20120813-1558' singleton='false'>
4+
<update id='de.vogella.tycho.feature.feature.group' range='[0.0.0,1.0.0.v20120813-1558)' severity='0'/>
55
<properties size='7'>
66
<property name='org.eclipse.equinox.p2.name' value='Feature'/>
77
<property name='org.eclipse.equinox.p2.description' value='[Enter Feature Description here.]'/>
@@ -12,11 +12,11 @@
1212
<property name='maven-version' value='1.0.0-SNAPSHOT'/>
1313
</properties>
1414
<provides size='1'>
15-
<provided namespace='org.eclipse.equinox.p2.iu' name='de.vogella.tycho.feature.feature.group' version='1.0.0.201208131503'/>
15+
<provided namespace='org.eclipse.equinox.p2.iu' name='de.vogella.tycho.feature.feature.group' version='1.0.0.v20120813-1558'/>
1616
</provides>
1717
<requires size='2'>
18-
<required namespace='org.eclipse.equinox.p2.iu' name='de.vogella.tycho.plugin' range='[1.0.0.201208131503,1.0.0.201208131503]'/>
19-
<required namespace='org.eclipse.equinox.p2.iu' name='de.vogella.tycho.feature.feature.jar' range='[1.0.0.201208131503,1.0.0.201208131503]'>
18+
<required namespace='org.eclipse.equinox.p2.iu' name='de.vogella.tycho.plugin' range='[1.0.0.v20120813-1558,1.0.0.v20120813-1558]'/>
19+
<required namespace='org.eclipse.equinox.p2.iu' name='de.vogella.tycho.feature.feature.jar' range='[1.0.0.v20120813-1558,1.0.0.v20120813-1558]'>
2020
<filter>
2121
(org.eclipse.update.install.features=true)
2222
</filter>
@@ -32,7 +32,7 @@
3232
[Enter Copyright Description here.]
3333
</copyright>
3434
</unit>
35-
<unit id='de.vogella.tycho.feature.feature.jar' version='1.0.0.201208131503'>
35+
<unit id='de.vogella.tycho.feature.feature.jar' version='1.0.0.v20120813-1558'>
3636
<properties size='6'>
3737
<property name='org.eclipse.equinox.p2.name' value='Feature'/>
3838
<property name='org.eclipse.equinox.p2.description' value='[Enter Feature Description here.]'/>
@@ -42,15 +42,15 @@
4242
<property name='maven-version' value='1.0.0-SNAPSHOT'/>
4343
</properties>
4444
<provides size='3'>
45-
<provided namespace='org.eclipse.equinox.p2.iu' name='de.vogella.tycho.feature.feature.jar' version='1.0.0.201208131503'/>
45+
<provided namespace='org.eclipse.equinox.p2.iu' name='de.vogella.tycho.feature.feature.jar' version='1.0.0.v20120813-1558'/>
4646
<provided namespace='org.eclipse.equinox.p2.eclipse.type' name='feature' version='1.0.0'/>
47-
<provided namespace='org.eclipse.update.feature' name='de.vogella.tycho.feature' version='1.0.0.201208131503'/>
47+
<provided namespace='org.eclipse.update.feature' name='de.vogella.tycho.feature' version='1.0.0.v20120813-1558'/>
4848
</provides>
4949
<filter>
5050
(org.eclipse.update.install.features=true)
5151
</filter>
5252
<artifacts size='1'>
53-
<artifact classifier='org.eclipse.update.feature' id='de.vogella.tycho.feature' version='1.0.0.201208131503'/>
53+
<artifact classifier='org.eclipse.update.feature' id='de.vogella.tycho.feature' version='1.0.0.v20120813-1558'/>
5454
</artifacts>
5555
<touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
5656
<touchpointData size='1'>
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project>
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>com.vogella</groupId>
5+
<artifactId>parent</artifactId>
6+
<version>1.0.0-SNAPSHOT</version>
7+
<packaging>pom</packaging>
8+
<modules>
9+
<module>../de.vogella.tycho.plugin</module>
10+
<module>../de.vogella.tycho.feature</module>
11+
<module>../de.vogella.tycho.p2updatesite</module>
12+
</modules>
13+
14+
<properties>
15+
<tycho-version>0.16.0.SNAPSHOT</tycho-version>
16+
</properties>
17+
18+
<repositories>
19+
<repository>
20+
<id>juno</id>
21+
<layout>p2</layout>
22+
<url>http://download.eclipse.org/releases/juno</url>
23+
</repository>
24+
</repositories>
25+
26+
<build>
27+
<plugins>
28+
<plugin>
29+
<groupId>org.eclipse.tycho</groupId>
30+
<artifactId>tycho-maven-plugin</artifactId>
31+
<version>${tycho-version}</version>
32+
<extensions>true</extensions>
33+
</plugin>
34+
35+
<plugin>
36+
<groupId>org.eclipse.tycho</groupId>
37+
<artifactId>tycho-p2-director-plugin</artifactId>
38+
<version>${tycho-version}</version>
39+
<executions>
40+
<execution>
41+
<id>materialize-products</id>
42+
<goals>
43+
<goal>materialize-products</goal>
44+
</goals>
45+
</execution>
46+
<execution>
47+
<id>archive-products</id>
48+
<goals>
49+
<goal>archive-products</goal>
50+
</goals>
51+
</execution>
52+
</executions>
53+
</plugin>
54+
</plugins>
55+
56+
57+
58+
</build>
59+
60+
</project>

de.vogella.tycho.master/pom.xml

Lines changed: 151 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,49 +12,180 @@
1212
</modules>
1313

1414
<properties>
15-
<tycho-version>0.15.0</tycho-version>
15+
<tycho.version>0.16.0-SNAPSHOT</tycho.version>
16+
<tycho-extras.version>0.16.0-SNAPSHOT</tycho-extras.version>
17+
18+
<juno-repo.url>http://download.eclipse.org/releases/juno</juno-repo.url>
19+
<tycho-repo.url>https://oss.sonatype.org/content/groups/public/</tycho-repo.url>
1620
</properties>
1721

22+
1823
<repositories>
19-
<repository>
20-
<id>juno</id>
21-
<layout>p2</layout>
22-
<url>http://download.eclipse.org/releases/juno</url>
23-
</repository>
24-
</repositories>
24+
<repository>
25+
<id>juno</id>
26+
<url>${juno-repo.url}</url>
27+
<layout>p2</layout>
28+
</repository>
29+
30+
</repositories>
31+
32+
<pluginRepositories>
33+
<pluginRepository>
34+
<id>tycho</id>
35+
<url>${tycho-repo.url}</url>
36+
<releases>
37+
<enabled>false</enabled>
38+
</releases>
39+
<snapshots>
40+
<enabled>true</enabled>
41+
</snapshots>
42+
</pluginRepository>
43+
</pluginRepositories>
2544

2645
<build>
2746
<plugins>
2847
<plugin>
2948
<groupId>org.eclipse.tycho</groupId>
3049
<artifactId>tycho-maven-plugin</artifactId>
31-
<version>${tycho-version}</version>
50+
<version>${tycho.version}</version>
3251
<extensions>true</extensions>
3352
</plugin>
3453

3554
<plugin>
3655
<groupId>org.eclipse.tycho</groupId>
37-
<artifactId>tycho-p2-director-plugin</artifactId>
38-
<version>${tycho-version}</version>
56+
<artifactId>target-platform-configuration</artifactId>
57+
<configuration>
58+
<environments>
59+
<environment>
60+
<os>linux</os>
61+
<ws>gtk</ws>
62+
<arch>x86</arch>
63+
</environment>
64+
<environment>
65+
<os>linux</os>
66+
<ws>gtk</ws>
67+
<arch>x86_64</arch>
68+
</environment>
69+
<environment>
70+
<os>win32</os>
71+
<ws>win32</ws>
72+
<arch>x86</arch>
73+
</environment>
74+
<environment>
75+
<os>win32</os>
76+
<ws>win32</ws>
77+
<arch>x86_64</arch>
78+
</environment>
79+
<environment>
80+
<os>macosx</os>
81+
<ws>cocoa</ws>
82+
<arch>x86_64</arch>
83+
</environment>
84+
</environments>
85+
</configuration>
86+
</plugin>
87+
88+
<plugin>
89+
<groupId>org.eclipse.tycho</groupId>
90+
<artifactId>tycho-source-plugin</artifactId>
3991
<executions>
4092
<execution>
41-
<id>materialize-products</id>
93+
<id>plugin-source</id>
4294
<goals>
43-
<goal>materialize-products</goal>
44-
</goals>
45-
</execution>
46-
<execution>
47-
<id>archive-products</id>
48-
<goals>
49-
<goal>archive-products</goal>
95+
<goal>plugin-source</goal>
5096
</goals>
5197
</execution>
5298
</executions>
5399
</plugin>
54100
</plugins>
55101

56-
57-
102+
<pluginManagement>
103+
<plugins>
104+
<plugin>
105+
<groupId>org.eclipse.tycho</groupId>
106+
<artifactId>target-platform-configuration</artifactId>
107+
<version>${tycho.version}</version>
108+
</plugin>
109+
<plugin>
110+
<groupId>org.eclipse.tycho</groupId>
111+
<artifactId>tycho-compiler-plugin</artifactId>
112+
<version>${tycho.version}</version>
113+
<configuration>
114+
<compilerArguments>
115+
<inlineJSR />
116+
<enableJavadoc />
117+
<encoding>ISO-8859-1</encoding>
118+
</compilerArguments>
119+
</configuration>
120+
</plugin>
121+
<plugin>
122+
<groupId>org.eclipse.tycho</groupId>
123+
<artifactId>tycho-packaging-plugin</artifactId>
124+
<version>${tycho.version}</version>
125+
<dependencies>
126+
<dependency>
127+
<groupId>org.eclipse.tycho.extras</groupId>
128+
<artifactId>tycho-buildtimestamp-jgit</artifactId>
129+
<version>${tycho-extras.version}</version>
130+
</dependency>
131+
</dependencies>
132+
<configuration>
133+
<strictBinIncludes>false</strictBinIncludes>
134+
<format>'v'yyyyMMdd-HHmm</format>
135+
<timestampProvider>jgit</timestampProvider>
136+
<jgit.ignore>
137+
</jgit.ignore>
138+
</configuration>
139+
</plugin>
140+
<plugin>
141+
<groupId>org.eclipse.tycho</groupId>
142+
<artifactId>tycho-surefire-plugin</artifactId>
143+
<version>${tycho.version}</version>
144+
</plugin>
145+
<plugin>
146+
<groupId>org.eclipse.tycho</groupId>
147+
<artifactId>tycho-source-plugin</artifactId>
148+
<version>${tycho.version}</version>
149+
<configuration>
150+
<strictSrcIncludes>false</strictSrcIncludes>
151+
</configuration>
152+
</plugin>
153+
<plugin>
154+
<groupId>org.eclipse.tycho</groupId>
155+
<artifactId>tycho-p2-director-plugin</artifactId>
156+
<version>${tycho.version}</version>
157+
</plugin>
158+
<plugin>
159+
<groupId>org.eclipse.tycho</groupId>
160+
<artifactId>tycho-p2-repository-plugin</artifactId>
161+
<version>${tycho.version}</version>
162+
</plugin>
163+
<plugin>
164+
<groupId>org.eclipse.tycho.extras</groupId>
165+
<artifactId>tycho-source-feature-plugin</artifactId>
166+
<version>${tycho-extras.version}</version>
167+
</plugin>
168+
<plugin>
169+
<groupId>org.eclipse.tycho.extras</groupId>
170+
<artifactId>tycho-custom-bundle-plugin</artifactId>
171+
<version>${tycho-extras.version}</version>
172+
</plugin>
173+
<plugin>
174+
<groupId>org.eclipse.tycho</groupId>
175+
<artifactId>tycho-p2-plugin</artifactId>
176+
<version>${tycho.version}</version>
177+
<configuration>
178+
<baselineMode>warn</baselineMode>
179+
<baselineReplace>none</baselineReplace>
180+
<baselineRepositories>
181+
<repository>
182+
<url>http://download.eclipse.org/eclipse/updates/4.2</url>
183+
</repository>
184+
</baselineRepositories>
185+
</configuration>
186+
</plugin>
187+
</plugins>
188+
</pluginManagement>
58189
</build>
59190

60191
</project>
Binary file not shown.

0 commit comments

Comments
 (0)