Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuentin Le Menez2022-03-24 08:33:30 +0000
committerQuentin Le Menez2022-03-24 12:56:56 +0000
commite81d8127803aa388e830c7c1eb97619cd82555b3 (patch)
treee50bdd9fa51aa4e79c6e89e8be75a19b69d9c5ec
parent422b072d23342e61d4f44f89747b4affb3ac2468 (diff)
downloadorg.eclipse.papyrus-bugs/qlemenez_updatercpsign.tar.gz
org.eclipse.papyrus-bugs/qlemenez_updatercpsign.tar.xz
org.eclipse.papyrus-bugs/qlemenez_updatercpsign.zip
Bug 577567 - [Releng] 2022-03 Update signing behavior and RCP6.1.0_RCPbugs/qlemenez_updatercpsign
Change-Id: Icba245339ce7dac3e196cd5269a5538258947fdc Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
-rwxr-xr-xreleng/main/pom.xml62
-rw-r--r--releng/main/site/category.xml2
-rw-r--r--releng/pom.xml2
-rwxr-xr-xreleng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml5
-rwxr-xr-xreleng/rcp/org.eclipse.papyrus.rcp.product/application.entitlement18
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product7
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml96
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp/icons/splash.svg28
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp/plugin.properties2
-rwxr-xr-xreleng/rcp/org.eclipse.papyrus.rcp/splash.bmpbin483054 -> 483054 bytes
-rw-r--r--releng/rcp/pom.xml2
-rwxr-xr-xreleng/toolsmiths/pom.xml29
12 files changed, 177 insertions, 76 deletions
diff --git a/releng/main/pom.xml b/releng/main/pom.xml
index 1a7d9c51be4..4599f5bf3f1 100755
--- a/releng/main/pom.xml
+++ b/releng/main/pom.xml
@@ -16,7 +16,7 @@
<!-- https://repo.maven.apache.org/maven2/ -->
<mojo.buildhelper.version>3.2.0</mojo.buildhelper.version>
<mylyn.wikitext.version>3.0.38</mylyn.wikitext.version>
-
+
<target.platform>org.eclipse.papyrus.main.targetplatform</target.platform>
</properties>
@@ -49,7 +49,7 @@
<defaultP2Metadata>false</defaultP2Metadata>
</configuration>
</plugin>
-
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
@@ -97,25 +97,11 @@
</pluginManagement>
<plugins>
- <!-- Test local parameters
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>3.0.0</version>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <echoproperties />
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin-->
+ <!-- Test local parameters <plugin> <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId> <version>3.0.0</version> <executions>
+ <execution> <phase>validate</phase> <goals> <goal>run</goal> </goals> <configuration>
+ <target> <echoproperties /> </target> </configuration> </execution> </executions>
+ </plugin -->
<!-- local plugins -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -180,7 +166,7 @@
only. Activation: SIGN=true pack: produce a simple update site (Packed).
Used for nightly or feature branch builds. Activation: SIGN=false -->
<profiles>
-
+
<!-- The update site is not needed during gerrit jobs -->
<profile>
<id>buildP2</id>
@@ -222,7 +208,8 @@
</build>
</profile>
- <!-- nightly profile is useful for developers that want to link to nightly build -->
+ <!-- nightly profile is useful for developers that want to link to nightly
+ build -->
<profile>
<id>nightly</id>
<activation>
@@ -262,13 +249,38 @@
<value>true</value>
</property>
</activation>
- <!-- Pack200 -->
<build>
<plugins>
<plugin>
<groupId>org.eclipse.cbi.maven.plugins</groupId>
<artifactId>eclipse-jarsigner-plugin</artifactId>
- <version>${jarSignerVersion}</version>
+ <version>${eclipse-cbi.version}</version>
+ <executions>
+ <execution>
+ <id>sign</id>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.cbi.maven.plugins</groupId>
+ <artifactId>eclipse-macsigner-plugin</artifactId>
+ <version>${eclipse-cbi.version}</version>
+ <executions>
+ <execution>
+ <id>sign</id>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.cbi.maven.plugins</groupId>
+ <artifactId>eclipse-winsigner-plugin</artifactId>
+ <version>${eclipse-cbi.version}</version>
<executions>
<execution>
<id>sign</id>
diff --git a/releng/main/site/category.xml b/releng/main/site/category.xml
index 928ad72dec2..e1673a18319 100644
--- a/releng/main/site/category.xml
+++ b/releng/main/site/category.xml
@@ -22,6 +22,6 @@
Papyrus User Examples offers a set of plugins dedicated to gather examples of Papyrus usage.
</description>
</category-def>
- <repository-reference location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository/" enabled="true" />
+ <repository-reference location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/" enabled="true" />
<repository-reference location="https://download.eclipse.org/xwt/milestones-1.7.0/1.7.0-S/" enabled="true" />
</site>
diff --git a/releng/pom.xml b/releng/pom.xml
index 62da6e78571..282799a8067 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -21,7 +21,7 @@
<maven.compiler.version>3.8.1</maven.compiler.version>
<!-- https://repo.eclipse.org/content/repositories/cbi-releases/ -->
- <jarSignerVersion>1.3.1</jarSignerVersion>
+ <eclipse-cbi.version>1.3.2</eclipse-cbi.version>
<java.source.version>11</java.source.version>
<java.target.version>11</java.target.version>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml
index a9cd06686ee..a01d1d0a70b 100755
--- a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml
@@ -20,9 +20,8 @@
</license>
<url>
- <discovery label="Eclipse latest" url="http://download.eclipse.org/releases/latest/"/>
- <discovery label="2021-12" url="http://download.eclipse.org/releases/2021-12/"/>
- <discovery label="Eclipse Platform 4.22" url="http://download.eclipse.org/eclipse/updates/4.22"/>
+ <discovery label="2022-03" url="http://download.eclipse.org/releases/2022-03/"/>
+ <discovery label="Eclipse Platform 4.23" url="http://download.eclipse.org/eclipse/updates/4.23"/>
</url>
<requires>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/application.entitlement b/releng/rcp/org.eclipse.papyrus.rcp.product/application.entitlement
new file mode 100755
index 00000000000..6fdb9d33d10
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp.product/application.entitlement
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>com.apple.security.cs.allow-jit</key>
+ <true/>
+ <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+ <true/>
+ <key>com.apple.security.cs.disable-executable-page-protection</key>
+ <true/>
+ <key>com.apple.security.cs.allow-dyld-environment-variables</key>
+ <true/>
+ <key>com.apple.security.cs.disable-library-validation</key>
+ <true/>
+ <key>com.apple.security.cs.debugger</key>
+ <true/>
+</dict>
+</plist> \ No newline at end of file
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product b/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product
index e9ca32b2e81..09f7a8f6ebc 100644
--- a/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product
+++ b/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product
@@ -207,10 +207,9 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
</configurations>
<repositories>
- <repository location="https://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/master/" enabled="true" />
- <repository location="https://download.eclipse.org/releases/latest/" enabled="true" />
- <repository location="https://download.eclipse.org/releases/2021-12/" enabled="true" />
- <repository location="https://download.eclipse.org/eclipse/updates/4.22/" enabled="true" />
+ <repository location="https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2022-03/" enabled="true" />
+ <repository location="https://download.eclipse.org/releases/2022-03/" enabled="true" />
+ <repository location="https://download.eclipse.org/eclipse/updates/4.23/" enabled="true" />
</repositories>
<preferencesInfo>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml b/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml
index 8654a0d857a..154c71ae5d9 100644
--- a/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml
@@ -29,30 +29,30 @@
</configuration>
</plugin>
<!-- The 32 bit launchers are not supported by the new 4.10 platform framework -->
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <environments>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <environments>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86_64</arch>
+ </environment>
+ </environments>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-director-plugin</artifactId>
@@ -88,9 +88,57 @@
<goals>
<goal>archive-products</goal>
</goals>
+ <phase>pre-integration-test</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>sign</id>
+ <activation>
+ <property>
+ <name>SIGN</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.cbi.maven.plugins</groupId>
+ <artifactId>eclipse-macsigner-plugin</artifactId>
+ <configuration>
+ <fileNames>Papyrus.app</fileNames>
+ <entitlements>${project.basedir}/application.entitlement</entitlements>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.cbi.maven.plugins</groupId>
+ <artifactId>eclipse-winsigner-plugin</artifactId>
+ <configuration>
+ <fileNames>Papyrus.exe,eclipsec.exe</fileNames>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/icons/splash.svg b/releng/rcp/org.eclipse.papyrus.rcp/icons/splash.svg
index 1a6b82301d3..ec2a3675015 100644
--- a/releng/rcp/org.eclipse.papyrus.rcp/icons/splash.svg
+++ b/releng/rcp/org.eclipse.papyrus.rcp/icons/splash.svg
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
id="svg2"
height="350"
width="460"
version="1.2"
sodipodi:docname="splash.svg"
- inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
inkscape:export-filename="C:\cygwin64\home\Papyrus\Papyrus-Master\releng\rcp\org.eclipse.papyrus.rcp\icons\splash.png"
inkscape:export-xdpi="96"
- inkscape:export-ydpi="96"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:dc="http://purl.org/dc/elements/1.1/">
+ inkscape:export-ydpi="96">
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -31,7 +31,7 @@
id="namedview334"
showgrid="false"
inkscape:zoom="1.3485714"
- inkscape:cx="39.671611"
+ inkscape:cx="-95.656782"
inkscape:cy="102.70127"
inkscape:window-x="-8"
inkscape:window-y="-8"
@@ -1776,7 +1776,7 @@
style="fill:#ffffff;fill-opacity:1;stroke:none" />
<text
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.6667px;line-height:0%;font-family:'Indie Flower';-inkscape-font-specification:'Indie Flower';letter-spacing:0px;word-spacing:0px;fill:#0099ba;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.66670036px;line-height:0%;font-family:'Indie Flower';-inkscape-font-specification:'Indie Flower';letter-spacing:0px;word-spacing:0px;fill:#0099ba;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1"
x="197.48167"
y="240.93285"
id="text4834"
@@ -1785,6 +1785,6 @@
id="tspan4832"
x="197.48167"
y="240.93285"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.6667px;line-height:1.25;font-family:'Open Sans';-inkscape-font-specification:'Open Sans';fill:#333333;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1"
- dy="-2.2245762 0 0 0 0 0 0 0 -2.2245762">2022-03N</tspan></text>
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.66670036px;line-height:1.25;font-family:'Open Sans';-inkscape-font-specification:'Open Sans';fill:#333333;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1"
+ dy="-2.2245762 0 0 0 0 0 0 -2.2245762">2022-03</tspan></text>
</svg>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/plugin.properties b/releng/rcp/org.eclipse.papyrus.rcp/plugin.properties
index ec0b9f75dee..122651986ca 100644
--- a/releng/rcp/org.eclipse.papyrus.rcp/plugin.properties
+++ b/releng/rcp/org.eclipse.papyrus.rcp/plugin.properties
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2008-2021 CEA LIST.
+# Copyright (c) 2008-2022 CEA LIST.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/splash.bmp b/releng/rcp/org.eclipse.papyrus.rcp/splash.bmp
index 2a47de3bd84..abb2fcd168c 100755
--- a/releng/rcp/org.eclipse.papyrus.rcp/splash.bmp
+++ b/releng/rcp/org.eclipse.papyrus.rcp/splash.bmp
Binary files differ
diff --git a/releng/rcp/pom.xml b/releng/rcp/pom.xml
index cdc3585a0e9..36d3bb7cd30 100644
--- a/releng/rcp/pom.xml
+++ b/releng/rcp/pom.xml
@@ -26,7 +26,7 @@
<eclipse.simultaneous.release.build>${maven.build.timestamp}</eclipse.simultaneous.release.build>
<!-- Human readable name of the release, e.g. used in the about dialog
(see about.mappings) -->
- <eclipse.simultaneous.release.name>2021-12 (4.22)</eclipse.simultaneous.release.name>
+ <eclipse.simultaneous.release.name>2022-03 (4.23)</eclipse.simultaneous.release.name>
<target.platform>org.eclipse.papyrus.rcp.targetplatform</target.platform>
</properties>
diff --git a/releng/toolsmiths/pom.xml b/releng/toolsmiths/pom.xml
index f26690c8972..fee84b81406 100755
--- a/releng/toolsmiths/pom.xml
+++ b/releng/toolsmiths/pom.xml
@@ -154,7 +154,6 @@
<!-- Stable release profile. Takes +30min. Eclipse servers only -->
<profile>
<id>sign</id>
- <!-- Pack200 -->
<activation>
<property>
<name>SIGN</name>
@@ -166,7 +165,33 @@
<plugin>
<groupId>org.eclipse.cbi.maven.plugins</groupId>
<artifactId>eclipse-jarsigner-plugin</artifactId>
- <version>${jarSignerVersion}</version>
+ <version>${eclipse-cbi.version}</version>
+ <executions>
+ <execution>
+ <id>sign</id>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.cbi.maven.plugins</groupId>
+ <artifactId>eclipse-macsigner-plugin</artifactId>
+ <version>${eclipse-cbi.version}</version>
+ <executions>
+ <execution>
+ <id>sign</id>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.cbi.maven.plugins</groupId>
+ <artifactId>eclipse-winsigner-plugin</artifactId>
+ <version>${eclipse-cbi.version}</version>
<executions>
<execution>
<id>sign</id>

Back to the top