diff options
author | Sravan Kumar Lakkimsetti | 2017-09-13 15:18:18 +0000 |
---|---|---|
committer | Sravan Kumar Lakkimsetti | 2017-09-13 15:18:32 +0000 |
commit | f2683ea0d46b76d7f887d0d990ab3b3bab86736c (patch) | |
tree | 38a2822b4d96601efb0c341213d997d6eed8667d | |
parent | dad99fcdda57952b4488a8421b316c58992e6431 (diff) | |
download | eclipse.platform.releng.aggregator-f2683ea0d46b76d7f887d0d990ab3b3bab86736c.tar.gz eclipse.platform.releng.aggregator-f2683ea0d46b76d7f887d0d990ab3b3bab86736c.tar.xz eclipse.platform.releng.aggregator-f2683ea0d46b76d7f887d0d990ab3b3bab86736c.zip |
Revert "Bug 522086 - Disable mac app signing and dmg creation"I20170913-1120
This reverts commit ec5c56adbd89896dd0fd12acfddba174b3e027fe.
Change-Id: I7ac5c3c59b0937f6a6b08af531766169009160e9
4 files changed, 8 insertions, 15 deletions
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml index 7ed5c1d51..544a0bd3d 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml @@ -29,7 +29,7 @@ <platform id="SMCC64" name="Mac OSX (Mac/Cocoa/x86_64)" - fileName="eclipse-SDK-${BUILD_ID}-macosx-cocoa-x86_64.tar.gz"></platform> + fileName="eclipse-SDK-${BUILD_ID}-macosx-cocoa-x86_64.dmg"></platform> <platform id="SST" name="Source Tarball" @@ -103,7 +103,7 @@ <platform id="PMCC64" name="Mac OSX (Mac/Cocoa/x86_64)" - fileName="eclipse-platform-${BUILD_ID}-macosx-cocoa-x86_64.tar.gz"></platform> + fileName="eclipse-platform-${BUILD_ID}-macosx-cocoa-x86_64.dmg"></platform> <platform id="PLR" name="<img src = "repo.gif" alt="Runtime Repo" /> Platform Runtime Repo " diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml index a13694272..cb9655c48 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml @@ -134,7 +134,6 @@ </execution> </executions> </plugin> - <!-- <plugin> <groupId>org.eclipse.cbi.maven.plugins</groupId> <artifactId>eclipse-macsigner-plugin</artifactId> @@ -150,12 +149,11 @@ <fileName>Rt.app</fileName> </fileNames> <signerUrl>http://172.30.206.147:8282/macosx-signing-service/1.0.0-SNAPSHOT</signerUrl> - <connectTimeoutMillis>300000</connectTimeoutMillis> + <connectTimeoutMillis>300000</connectTimeoutMillis> <!-- 5 min --> </configuration> </execution> </executions> </plugin> - <plugin> <groupId>org.eclipse.cbi.maven.plugins</groupId> <artifactId>eclipse-dmg-packager</artifactId> @@ -170,13 +168,12 @@ <serviceUrl>http://172.30.206.147:8787/dmg-packaging-service/1.0.0-SNAPSHOT</serviceUrl> <source>${project.build.directory}/products/org.eclipse.rt.osgistarterkit.product-macosx.cocoa.x86_64.tar.gz</source> <continueOnFail>true</continueOnFail> - <connectTimeoutMillis>600000</connectTimeoutMillis> + <connectTimeoutMillis>600000</connectTimeoutMillis> <!-- 10 min --> <sign>true</sign> </configuration> </execution> </executions> </plugin> - --> </plugins> </build> </profile> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml index 0c0ff1f48..90c71f434 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml @@ -106,7 +106,6 @@ </execution> </executions> </plugin> - <!-- <plugin> <groupId>org.eclipse.cbi.maven.plugins</groupId> <artifactId>eclipse-macsigner-plugin</artifactId> @@ -119,7 +118,7 @@ <phase>package</phase> <configuration> <signerUrl>http://172.30.206.147:8282/macosx-signing-service/1.0.0-SNAPSHOT</signerUrl> - <connectTimeoutMillis>300000</connectTimeoutMillis> + <connectTimeoutMillis>300000</connectTimeoutMillis> <!-- 5 min --> </configuration> </execution> </executions> @@ -138,13 +137,12 @@ <serviceUrl>http://172.30.206.147:8787/dmg-packaging-service/1.0.0-SNAPSHOT</serviceUrl> <source>${project.build.directory}/products/org.eclipse.platform.ide-macosx.cocoa.x86_64.tar.gz</source> <continueOnFail>true</continueOnFail> - <connectTimeoutMillis>600000</connectTimeoutMillis> + <connectTimeoutMillis>600000</connectTimeoutMillis> <!-- 10 min --> <sign>true</sign> </configuration> </execution> </executions> </plugin> - --> </plugins> </build> </profile> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml index 0d66da686..67906d1ab 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml @@ -106,7 +106,6 @@ </execution> </executions> </plugin> - <!-- <plugin> <groupId>org.eclipse.cbi.maven.plugins</groupId> <artifactId>eclipse-macsigner-plugin</artifactId> @@ -119,7 +118,7 @@ <phase>package</phase> <configuration> <signerUrl>http://172.30.206.147:8282/macosx-signing-service/1.0.0-SNAPSHOT</signerUrl> - <connectTimeoutMillis>300000</connectTimeoutMillis> + <connectTimeoutMillis>300000</connectTimeoutMillis> <!-- 5 min --> </configuration> </execution> </executions> @@ -138,13 +137,12 @@ <serviceUrl>http://172.30.206.147:8787/dmg-packaging-service/1.0.0-SNAPSHOT</serviceUrl> <source>${project.build.directory}/products/org.eclipse.sdk.ide-macosx.cocoa.x86_64.tar.gz</source> <continueOnFail>true</continueOnFail> - <connectTimeoutMillis>600000</connectTimeoutMillis> + <connectTimeoutMillis>600000</connectTimeoutMillis> <!-- 10 min --> <sign>true</sign> </configuration> </execution> </executions> </plugin> - --> </plugins> </build> </profile> |