Skip to content

Commit 5a435fb

Browse files
committed
Sign JARs, remove usage data plugins
1 parent 4714b3f commit 5a435fb

File tree

3 files changed

+19
-25
lines changed

3 files changed

+19
-25
lines changed

commons-releng/commons-releng.target

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit">
55
<unit id="org.eclipse.dltk.core.feature.group" version="0.0.0"/>
66
<unit id="org.eclipse.dltk.core.index.feature.group" version="0.0.0"/>
7-
<repository location="http://il-studiodev2.zend.net:8080/job/zend-dltk/lastSuccessfulBuild/artifact/org.eclipse.dltk.releng/build/update.site/target/site"/>
7+
<repository location="http://il-studiodev2.zend.net:8080/job/zend-dltk/lastSuccessfulBuild/artifact/org.eclipse.dltk.releng/build/update.site/target/repository"/>
88
</location>
99
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit">
1010
<unit id="org.eclipse.php.feature.group" version="0.0.0"/>
11-
<repository location="http://il-studiodev2.zend.net:8080/job/zend-pdt/lastSuccessfulBuild/artifact/result/"/>
11+
<repository location="http://il-studiodev2.zend.net:8080/job/zend-pdt/lastSuccessfulBuild/artifact/dev/org.eclipse.php-repository/target/repository"/>
1212
</location>
1313
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">\
1414
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -20,7 +20,7 @@
2020
<unit id="org.eclipse.wst.web_ui.feature.feature.group" version="0.0.0"/>
2121
<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
2222
<unit id="org.eclipse.wst.common.fproj.feature.group" version="0.0.0"/>
23-
<repository location="http://il-studiodev2.zend.net:8080/job/MirrorKepler/lastSuccessfulBuild/artifact/mirrors/kepler/target/repository"/>
23+
<repository location="http://il-studiodev2.zend.net:8080/job/MirrorMars/lastSuccessfulBuild/artifact/mirrors/mars/target/repository"/>
2424
</location>
2525
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit">
2626
<unit id="org.apache.commons.httpclient" version="0.0.0"/>

commons-releng/pom.xml

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
<modules>
1111
<module>../org.zend.core.notifications</module>
1212
<module>../org.zend.notifications-feature</module>
13-
<module>../org.zend.usagedata</module>
13+
<!-- module>../org.zend.usagedata</module>
1414
<module>../org.zend.usagedata-feature</module>
1515
<module>../org.zend.usagedata.monitors</module>
16-
<module>../org.zend.usagedata.ui</module>
16+
<module>../org.zend.usagedata.ui</module -->
1717
<module>../org.zend.commons-updatesite</module>
1818
</modules>
1919
<properties>
20-
<tycho-version>0.18.1</tycho-version>
20+
<tycho-version>0.23.0</tycho-version>
2121
</properties>
2222
<build>
2323
<plugins>
@@ -48,11 +48,11 @@
4848
<ws>win32</ws>
4949
<arch>x86</arch>
5050
</environment>
51-
<!-- <environment> -->
52-
<!-- <os>win32</os> -->
53-
<!-- <ws>win32</ws> -->
54-
<!-- <arch>x86_64</arch> -->
55-
<!-- </environment> -->
51+
<environment>
52+
<os>win32</os>
53+
<ws>win32</ws>
54+
<arch>x86_64</arch>
55+
</environment>
5656
<environment>
5757
<os>macosx</os>
5858
<ws>cocoa</ws>
@@ -84,29 +84,23 @@
8484
<profiles>
8585
<profile>
8686
<id>sign</id>
87-
<activation>
88-
<property>
89-
<name>sign</name>
90-
</property>
91-
</activation>
9287
<build>
9388
<plugins>
9489
<plugin>
90+
<groupId>org.apache.maven.plugins</groupId>
9591
<artifactId>maven-jarsigner-plugin</artifactId>
96-
<version>1.2</version>
92+
<version>1.4</version>
93+
<configuration>
94+
<tsa>https://timestamp.geotrust.com/tsa</tsa>
95+
</configuration>
9796
<executions>
9897
<execution>
99-
<phase>package</phase>
98+
<id>sign</id>
10099
<goals>
101100
<goal>sign</goal>
102101
</goals>
103102
</execution>
104103
</executions>
105-
<configuration>
106-
<keystore>${keystore}</keystore>
107-
<alias>zend</alias>
108-
<storepass>${password}</storepass>
109-
</configuration>
110104
</plugin>
111105
</plugins>
112106
</build>

org.zend.commons-updatesite/category.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<feature url="features/org.zend.notifications.feature_1.0.0.qualifier.jar" id="org.zend.notifications.feature" version="1.0.0.qualifier">
44
<category name="org.zend.commons"/>
55
</feature>
6-
<feature url="features/org.zend.usagedata_1.0.1.qualifier.jar" id="org.zend.usagedata" version="1.0.1.qualifier">
6+
<!--feature url="features/org.zend.usagedata_1.0.1.qualifier.jar" id="org.zend.usagedata" version="1.0.1.qualifier">
77
<category name="org.zend.commons"/>
8-
</feature>
8+
</feature-->
99
<category-def name="org.zend.commons" label="Zend Commons Eclipse Features"/>
1010
</site>

0 commit comments

Comments
 (0)