diff options
-rw-r--r-- | admin/pom-config.xml | 37 | ||||
-rw-r--r-- | admin/settings.xml | 75 | ||||
-rw-r--r-- | features/org.eclipse.tcf.repo/pom.xml | 30 |
3 files changed, 36 insertions, 106 deletions
diff --git a/admin/pom-config.xml b/admin/pom-config.xml index 5ef939b98..7c3b75a18 100644 --- a/admin/pom-config.xml +++ b/admin/pom-config.xml @@ -8,17 +8,24 @@ <maven>3.0</maven> </prerequisites> - <parent> - <groupId>org.eclipse</groupId> - <artifactId>eclipse-parent</artifactId> - <version>3</version> - </parent> - <groupId>org.eclipse.tcf</groupId> <artifactId>org.eclipse.tcf.maven-config</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>TCF and Target Explorer, Maven Configuration Master</name> + + <licenses> + <license> + <name>Eclipse Public License</name> + <url>http://www.eclipse.org/legal/epl-v10.html</url> + <distribution>repo</distribution> + </license> + </licenses> + + <organization> + <name>Eclipse Foundation</name> + <url>http://www.eclipse.org/</url> + </organization> <properties> <!-- Define version id's to be used in the plugins section --> @@ -46,20 +53,6 @@ <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/S20120428190502/repository/</orbit-site> </properties> - <licenses> - <license> - <name>Eclipse Public License v1.0</name> - <comments> - All rights reserved. - - This program and the accompanying materials are made - available under the terms of the Eclipse Public License v1.0 - which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.htm - </comments> - </license> - </licenses> - <repositories> <repository> <id>platform</id> @@ -90,10 +83,6 @@ <pluginRepositories> <pluginRepository> - <id>maven.eclipse.org</id> - <url>http://mavem.eclipse.org/nexus/content/groups/public/</url> - </pluginRepository> - <pluginRepository> <id>sonatype</id> <url>https://repository.sonatype.org/content/repositories/public</url> <snapshots> diff --git a/admin/settings.xml b/admin/settings.xml deleted file mode 100644 index 314b102b4..000000000 --- a/admin/settings.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<settings> - -<!-- - Eclipse.org committers or build engineers should uncomment this section and fill in as - appropriate for releasing and deploying items to the Nexus repository. Add as many - server entries as you need. These should correspond to your Distribution management ids as well. - - <servers> - <server> - <id>eclipse-milestone</id> - <username>my_login</username> - <password>my_password</password> - <privateKey>${user.home}/.ssh/id_dsa</privateKey> - </server> - </servers> ---> - <mirrors> - <mirror> - <id>eclipse-central</id> - <mirrorOf>central</mirrorOf> - <url>http://maven.eclipse.org/nexus/content/groups/central/</url> - </mirror> - <mirror> - <id>eclipse-repositories</id> - <mirrorOf>milestone,integration,nightly,*</mirrorOf> - <url>http://maven.eclipse.org/nexus/content/groups/public/</url> - </mirror> - </mirrors> - -<profiles> - <profile> - <id>milestone</id> - <activation><activeByDefault>false</activeByDefault></activation> - <repositories> - <repository> - <id>milestone</id> - <name>Milestone releases</name> - <url>http://maven.eclipse.org/milestone</url> - <snapshots><enabled>false</enabled></snapshots> - </repository> - </repositories> - </profile> - <profile> - <id>integration</id> - <activation><activeByDefault>false</activeByDefault></activation> - <repositories> - <repository> - <id>integration</id> - <name>Integration releases</name> - <url>http://maven.eclipse.org/integration</url> - <snapshots><enabled>true</enabled></snapshots> - </repository> - </repositories> - </profile> - <profile> - <id>nightly</id> - <activation><activeByDefault>false</activeByDefault></activation> - <repositories> - <repository> - <id>nightly</id> - <name>Nightly releases</name> - <url>http://maven.eclipse.org/nightly</url> - <snapshots><enabled>true</enabled></snapshots> - </repository> - </repositories> - </profile> - </profiles> - - <activeProfiles> - <activeProfile>milestone</activeProfile> - <activeProfile>nightly</activeProfile> - </activeProfiles> - -</settings> diff --git a/features/org.eclipse.tcf.repo/pom.xml b/features/org.eclipse.tcf.repo/pom.xml index b01d1e10f..38774466e 100644 --- a/features/org.eclipse.tcf.repo/pom.xml +++ b/features/org.eclipse.tcf.repo/pom.xml @@ -21,34 +21,43 @@ <tcf-install>/home/data/httpd/download.eclipse.org/tools/tcf/builds/${tcf-stream}/nightly</tcf-install> <jacoco.skip>true</jacoco.skip> </properties> - + <pluginRepositories> - <pluginRepository> + <pluginRepository> <id>maven.eclipse.org</id> <url>http://maven.eclipse.org/nexus/content/repositories/public</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> </pluginRepository> - </pluginRepositories> + </pluginRepositories> + <!-- Packaging and signing --> <profiles> <profile> - <id>production</id> + <id>sign</id> <build> <plugins> <plugin> <groupId>org.eclipse.dash.maven</groupId> <artifactId>eclipse-signing-maven-plugin</artifactId> - <version>1.0.3</version> + <version>1.0.5</version> <executions> + <!-- Pack the p2 repository. --> <execution> <id>pack</id> + <phase>package</phase> <configuration> <inputFile>${project.build.directory}/${tcf-zipfile}</inputFile> </configuration> - <phase>package</phase> <goals> <goal>pack</goal> </goals> </execution> + <!-- Sign the p2 repository --> <execution> <id>sign</id> <configuration> @@ -60,16 +69,19 @@ <goal>sign</goal> </goals> </execution> + <!-- Repack the p2 repository --> <execution> <id>repack</id> <configuration> - <inputFile>${project.build.directory}/signed/site_assembly.zip</inputFile> + <!-- this is output from signer mojo --> + <inputFile>${project.build.directory}/signed/site_assembly.zip</inputFile> </configuration> <phase>package</phase> <goals> <goal>pack</goal> </goals> </execution> + <!-- Signing and packing alters checksums so fix them --> <execution> <id>fixCheckSums</id> <phase>package</phase> @@ -79,6 +91,9 @@ </execution> </executions> </plugin> + <!-- + This is what I use to deploy a p2 repository someplace to test from before manually making active. + --> <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> @@ -111,6 +126,7 @@ </fileset> </chmod> </tasks> + </configuration> </execution> </executions> |