diff options
Diffstat (limited to 'releng/org.eclipse.epp.config/parent')
5 files changed, 93 insertions, 94 deletions
diff --git a/releng/org.eclipse.epp.config/parent/bundle-feature/pom.xml b/releng/org.eclipse.epp.config/parent/bundle-feature/pom.xml index 0ed1f0c6..7245a89a 100644 --- a/releng/org.eclipse.epp.config/parent/bundle-feature/pom.xml +++ b/releng/org.eclipse.epp.config/parent/bundle-feature/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2017, 2020 Eclipse Foundation and others. + Copyright (C) 2017, 2023 Eclipse Foundation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.epp</groupId> <artifactId>org.eclipse.epp-parent</artifactId> - <version>4.18.0-SNAPSHOT</version> + <version>4.28.0-SNAPSHOT</version> <relativePath>..</relativePath> </parent> @@ -34,19 +34,6 @@ <build> <plugins> <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-pack200a-plugin</artifactId> - <executions> - <execution> - <id>pack200-normalize</id> - <goals> - <goal>normalize</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> <groupId>org.eclipse.cbi.maven.plugins</groupId> <artifactId>eclipse-jarsigner-plugin</artifactId> <executions> @@ -60,19 +47,6 @@ </plugin> <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-pack200b-plugin</artifactId> - <executions> - <execution> - <id>pack200-pack</id> - <goals> - <goal>pack</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-p2-plugin</artifactId> <executions> diff --git a/releng/org.eclipse.epp.config/parent/bundle/pom.xml b/releng/org.eclipse.epp.config/parent/bundle/pom.xml index 0364c613..db401c28 100644 --- a/releng/org.eclipse.epp.config/parent/bundle/pom.xml +++ b/releng/org.eclipse.epp.config/parent/bundle/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2017, 2020 Eclipse Foundation and others. + Copyright (C) 2017, 2023 Eclipse Foundation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.epp</groupId> <artifactId>org.eclipse.epp-bundle-feature-parent</artifactId> - <version>4.18.0-SNAPSHOT</version> + <version>4.28.0-SNAPSHOT</version> <relativePath>../bundle-feature</relativePath> </parent> diff --git a/releng/org.eclipse.epp.config/parent/feature/pom.xml b/releng/org.eclipse.epp.config/parent/feature/pom.xml index 19400bf4..40272178 100644 --- a/releng/org.eclipse.epp.config/parent/feature/pom.xml +++ b/releng/org.eclipse.epp.config/parent/feature/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2017, 2020 Eclipse Foundation and others. + Copyright (C) 2017, 2023 Eclipse Foundation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.epp</groupId> <artifactId>org.eclipse.epp-bundle-feature-parent</artifactId> - <version>4.18.0-SNAPSHOT</version> + <version>4.28.0-SNAPSHOT</version> <relativePath>../bundle-feature</relativePath> </parent> diff --git a/releng/org.eclipse.epp.config/parent/pom.xml b/releng/org.eclipse.epp.config/parent/pom.xml index c7d844bd..85438f40 100644 --- a/releng/org.eclipse.epp.config/parent/pom.xml +++ b/releng/org.eclipse.epp.config/parent/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2013, 2020 EclipseSource and others. + Copyright (C) 2013, 2023 EclipseSource and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at @@ -19,14 +19,15 @@ <groupId>org.eclipse.epp</groupId> <artifactId>org.eclipse.epp-parent</artifactId> - <version>4.18.0-SNAPSHOT</version> + <version>4.28.0-SNAPSHOT</version> <packaging>pom</packaging> <properties> <maven.version>3.6.3</maven.version> - <tycho.version>2.0.0</tycho.version> + <!-- Due to Bug 580592 we are currently stuck with older version of Tycho --> + <tycho.version>2.7.1</tycho.version> <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/epp/org.eclipse.epp.packages.git</tycho.scmUrl> - <cbi.version>1.1.8-SNAPSHOT</cbi.version> + <cbi.version>1.3.2</cbi.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format> <build>${maven.build.timestamp}</build> @@ -34,14 +35,28 @@ <eclipse.epp.archiveDirectory>${basedir}/../../archive/</eclipse.epp.archiveDirectory> <!-- The location that is used to assemble the single EPP configuration p2 repository --> <eclipse.epp.targetRepository>${eclipse.epp.archiveDirectory}/repository/</eclipse.epp.targetRepository> + <!-- Name of the release (no milestone) --> + <RELEASE_NAME>2023-06</RELEASE_NAME> + <!-- Name of the milestone --> + <RELEASE_MILESTONE>RC1</RELEASE_MILESTONE> + <!-- Version of the release --> + <RELEASE_VERSION>4.28.0</RELEASE_VERSION> + <!-- Name release directory on download.eclipse.org --> + <RELEASE_DIR>202303021200</RELEASE_DIR> + <!-- SimRel Repo to build from --> + <SIMREL_REPO>https://download.eclipse.org/staging/2023-06</SIMREL_REPO> <!-- ID used to generate the filename of the packages --> - <eclipse.simultaneous.release.id>2020-12-M2</eclipse.simultaneous.release.id> + <eclipse.simultaneous.release.id>${RELEASE_NAME}-${RELEASE_MILESTONE}</eclipse.simultaneous.release.id> <!-- Timestamp used in various places, e.g. the about dialog (see about.mappings) --> <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>2020-12 M2 (4.18.0 M2)</eclipse.simultaneous.release.name> + <!-- TODO the two alternative values of eclipse.simultaneous.release.name could be automated, perhaps with a profile dependent on RELEASE_MILESTONE --> + <!-- eclipse.simultaneous.release.name value for non-R builds --> + <eclipse.simultaneous.release.name>${RELEASE_NAME} ${RELEASE_MILESTONE} (${RELEASE_VERSION} ${RELEASE_MILESTONE})</eclipse.simultaneous.release.name> + <!-- eclipse.simultaneous.release.name value for R builds --> + <!-- <eclipse.simultaneous.release.name>${RELEASE_NAME} (${RELEASE_VERSION})</eclipse.simultaneous.release.name> --> <!-- Upstream p2 repository, used as a source for pre-compiled build artifacts --> - <eclipse.simultaneous.release.repository>https://download.eclipse.org/staging/2020-12/</eclipse.simultaneous.release.repository> + <eclipse.simultaneous.release.repository>${SIMREL_REPO}</eclipse.simultaneous.release.repository> </properties> <prerequisites> @@ -72,19 +87,18 @@ </repository> <repository> <id>justj</id> - <url>https://download.eclipse.org/justj/jres/15/updates/milestone/latest</url> + <url>https://download.eclipse.org/justj/jres/17/updates/release/latest/</url> <layout>p2</layout> </repository> <repository> - <id>corrosion</id> + <id>justj-epp</id> + <url>https://download.eclipse.org/justj/epp/milestone/latest/</url> <layout>p2</layout> - <url>https://download.eclipse.org/corrosion/releases/0.4.2/</url> </repository> </repositories> <build> <plugins> - <plugin> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-maven-plugin</artifactId> @@ -125,6 +139,11 @@ <ws>cocoa</ws> <arch>x86_64</arch> </environment> + <environment> + <os>macosx</os> + <ws>cocoa</ws> + <arch>aarch64</arch> + </environment> </environments> </configuration> </plugin> @@ -186,7 +205,12 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>3.2.0</version> + <version>3.3.0</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>properties-maven-plugin</artifactId> + <version>1.1.0</version> </plugin> <plugin> <groupId>org.eclipse.tycho</groupId> @@ -240,16 +264,6 @@ </executions> </plugin> <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-pack200a-plugin</artifactId> - <version>${tycho.version}</version> - </plugin> - <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-pack200b-plugin</artifactId> - <version>${tycho.version}</version> - </plugin> - <plugin> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-p2-plugin</artifactId> <version>${tycho.version}</version> @@ -327,6 +341,7 @@ </product> </products> <profile>${project.artifactId}</profile> + <source>repository</source> </configuration> </plugin> <plugin> @@ -337,7 +352,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> - <version>3.0.0</version> + <version>3.1.0</version> </plugin> </plugins> </pluginManagement> diff --git a/releng/org.eclipse.epp.config/parent/product/pom.xml b/releng/org.eclipse.epp.config/parent/product/pom.xml index c90ba3e0..5d0cf829 100644 --- a/releng/org.eclipse.epp.config/parent/product/pom.xml +++ b/releng/org.eclipse.epp.config/parent/product/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2017, 2020 Eclipse Foundation and others. + Copyright (C) 2017, 2023 Eclipse Foundation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.epp</groupId> <artifactId>org.eclipse.epp-parent</artifactId> - <version>4.18.0-SNAPSHOT</version> + <version>4.28.0-SNAPSHOT</version> <relativePath>..</relativePath> </parent> @@ -35,22 +35,10 @@ <plugin> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-p2-repository-plugin</artifactId> - <executions> - <execution> - <id>default-assemble-repository</id> - <phase></phase> - <configuration> - <skip>true</skip> - </configuration> - </execution> - <execution> - <id>default-archive-repository</id> - <phase></phase> - <configuration> - <skip>true</skip> - </configuration> - </execution> - </executions> + <configuration> + <includeAllDependencies>true</includeAllDependencies> + <skipArchive>true</skipArchive> + </configuration> </plugin> <plugin> @@ -71,7 +59,7 @@ <ius> <iu> <query> - <expression>id ~= /*epp.package*/</expression> + <expression>id ~= /org.eclipse.epp.package*/ || id ~= /${project.artifactId}/ || id ~= /epp.package*executable*/ || id ~= /toolingepp.package*/</expression> </query> </iu> </ius> @@ -97,30 +85,12 @@ </plugin> <plugin> - <groupId>org.eclipse.cbi.maven.plugins</groupId> - <artifactId>eclipse-dmg-packager</artifactId> - <executions> - <execution> - <goals> - <goal>package-dmg</goal> - </goals> - <phase>pre-integration-test</phase> - <configuration> - <source>${project.build.directory}/products/${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}-macosx.cocoa.x86_64.tar.gz</source> - <sign>${eclipse-sign-dmg-property}</sign> - <timeoutMillis>600000</timeoutMillis> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> <id>copy-zips-to-archive-folder</id> - <phase>pre-integration-test</phase> + <phase>integration-test</phase> <configuration> <target> <copy todir="${basedir}/../../archive"> @@ -144,6 +114,46 @@ <profiles> <profile> + <id>eclipse-package-dmg</id> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.cbi.maven.plugins</groupId> + <artifactId>eclipse-dmg-packager</artifactId> + <executions> + <execution> + <id>dmg-package-platform-aarch64</id> + <goals> + <goal>package-dmg</goal> + </goals> + <phase>pre-integration-test</phase> + <configuration> + <serviceUrl>https://cbi.eclipse.org/macos/packager/dmg/create</serviceUrl> + <source>${project.build.directory}/products/${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}-macosx.cocoa.aarch64.tar.gz</source> + <sign>${eclipse-sign-dmg-property}</sign> + <timeoutMillis>600000</timeoutMillis> + </configuration> + </execution> + <execution> + <id>dmg-package-platform-x86_64</id> + <goals> + <goal>package-dmg</goal> + </goals> + <phase>pre-integration-test</phase> + <configuration> + <serviceUrl>https://cbi.eclipse.org/macos/packager/dmg/create</serviceUrl> + <source>${project.build.directory}/products/${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}-macosx.cocoa.x86_64.tar.gz</source> + <sign>${eclipse-sign-dmg-property}</sign> + <timeoutMillis>600000</timeoutMillis> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <profile> <id>eclipse-sign-mac</id> <build> <plugins> @@ -206,7 +216,7 @@ <profile> <id>eclipse-sign-dmg</id> <properties> - <eclipse-sign-dmg-property>true</eclipse-sign-dmg-property> + <eclipse-sign-dmg-property>true</eclipse-sign-dmg-property> </properties> </profile> |