summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Schindl2013-07-06 15:49:44 -0400
committerTom Schindl2013-07-06 15:49:44 -0400
commit1cf23d0b53ea6bb6e313313fbd9ac6c2ffdedc9c (patch)
tree17159d96ddbaada3914ad44074df96ad283fc843
parent8b37bdfa9ccd3d36e5a0868018c0a8b5662f812c (diff)
downloadorg.eclipse.efxclipse-1cf23d0b53ea6bb6e313313fbd9ac6c2ffdedc9c.zip
org.eclipse.efxclipse-1cf23d0b53ea6bb6e313313fbd9ac6c2ffdedc9c.tar.gz
org.eclipse.efxclipse-1cf23d0b53ea6bb6e313313fbd9ac6c2ffdedc9c.tar.xz
adding publishing to build
-rwxr-xr-xreleng/org.eclipse.fx.releng/pom.xml5
-rwxr-xr-xreleng/org.eclipse.fx.releng/pom_jdt8.xml244
-rw-r--r--releng/org.eclipse.fx.updatesite/pom.xml57
3 files changed, 5 insertions, 301 deletions
diff --git a/releng/org.eclipse.fx.releng/pom.xml b/releng/org.eclipse.fx.releng/pom.xml
index fddd6e3..621b58f 100755
--- a/releng/org.eclipse.fx.releng/pom.xml
+++ b/releng/org.eclipse.fx.releng/pom.xml
@@ -21,8 +21,7 @@
<mockito-version>1.8.4</mockito-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<platform-version>[3.7,3.8)</platform-version>
- <!-- signer-input-directory>/home/data/httpd/download-staging.priv/efxclipse</signer-input-directory>
- <download-publish-path>/home/data/httpd/download.eclipse.org/efxclipse/updates-nightly</download-publish-path-->
+ <download-publish-path>/home/data/httpd/download.eclipse.org/efxclipse/updates-nightly</download-publish-path>
<eclipse-repo.url>https://repo.eclipse.org/content/repositories/releases/</eclipse-repo.url>
</properties>
@@ -232,7 +231,7 @@
</build>
<profiles>
<profile>
- <id>eclipse-sign</id>
+ <id>build-server</id>
<build>
<plugins>
<plugin>
diff --git a/releng/org.eclipse.fx.releng/pom_jdt8.xml b/releng/org.eclipse.fx.releng/pom_jdt8.xml
deleted file mode 100755
index 086f3fe..0000000
--- a/releng/org.eclipse.fx.releng/pom_jdt8.xml
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <name>e(fx)clipse build</name>
-
- <prerequisites>
- <maven>3.0</maven>
- </prerequisites>
-
- <groupId>org.eclipse.fx</groupId>
- <artifactId>releng</artifactId>
- <version>0.8.1-SNAPSHOT</version>
- <packaging>pom</packaging>
- <properties>
- <tycho-version>0.16.0</tycho-version>
- <junit-version>4.8.1</junit-version>
- <mockito-version>1.8.4</mockito-version>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <platform-version>[3.7,3.8)</platform-version>
- <local-repo>/Users/tomschindl/.m2/repository</local-repo>
- <!-- local-repo>/var/lib/jenkins/.m2/repository</local-repo -->
- <jdt-core-version>3.9.0-SNAPSHOT</jdt-core-version>
- </properties>
-
- <modules>
- <!-- OSGI Support -->
- <module>../../bundles/runtime/org.eclipse.fx.javafx</module>
- <module>../../bundles/runtime/org.eclipse.fx.osgi</module>
- <module>../../bundles/runtime/org.eclipse.fx.osgi.util</module>
- <!-- Core Modules -->
- <module>../../bundles/runtime/org.eclipse.fx.core</module>
- <module>../../bundles/runtime/org.eclipse.fx.core.databinding</module>
- <module>../../bundles/runtime/org.eclipse.fx.core.p2</module>
- <module>../../bundles/runtime/org.eclipse.fx.core.log4j</module>
- <module>../../bundles/runtime/org.eclipse.fx.core.guice</module>
- <!-- UI Modules -->
- <module>../../bundles/runtime/org.eclipse.fx.ui.databinding</module>
- <module>../../bundles/runtime/org.eclipse.fx.ui.application</module>
- <module>../../bundles/runtime/org.eclipse.fx.ui.di</module>
- <!-- module>../../bundles/runtime/org.eclipse.fx.ui.di.interopt</module-->
- <module>../../bundles/runtime/org.eclipse.fx.ui.animation</module>
- <module>../../bundles/runtime/org.eclipse.fx.ui.panes</module>
- <module>../../bundles/runtime/org.eclipse.fx.ui.services</module>
- <module>../../bundles/runtime/org.eclipse.fx.ui.dialogs</module>
- <!-- EMF -->
- <module>../../bundles/runtime/org.eclipse.fx.emf.edit.ui</module>
- <module>../../bundles/runtime/org.eclipse.fx.emf.databinding</module>
-
- <!-- e4 -->
- <module>../../bundles/runtime/org.eclipse.fx.ui.keybindings</module>
- <module>../../bundles/runtime/org.eclipse.fx.ui.keybindings.generic</module>
- <module>../../bundles/runtime/org.eclipse.fx.ui.keybindings.e4</module>
- <module>../../bundles/runtime/org.eclipse.fx.ui.workbench.base</module>
- <module>../../bundles/runtime/org.eclipse.fx.ui.workbench.renderers.base</module>
-
- <module>../../bundles/runtime/org.eclipse.fx.ui.theme</module>
- <module>../../bundles/runtime/org.eclipse.fx.ui.workbench.fx</module>
- <module>../../bundles/runtime/org.eclipse.fx.ui.workbench.fx.controls</module>
- <module>../../bundles/runtime/org.eclipse.fx.ui.workbench.renderers.fx</module>
-
- <!-- 3.x / 4.x SDK -->
- <!-- module>../../bundles/runtime/org.eclipse.fx.ui.workbench3</module -->
-
- <!-- Format Conversion -->
- <module>../../bundles/runtime/org.eclipse.fx.formats.svg</module>
-
- <!-- Features -->
- <module>../runtime/org.eclipse.fx.core.feature</module>
- <module>../runtime/org.eclipse.fx.target.feature</module>
-
- <module>../org.eclipse.fx.updatesite</module>
- </modules>
-
- <repositories>
- <repository>
- <id>juno</id>
- <layout>p2</layout>
- <url>http://download.eclipse.org/releases/juno</url>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>tycho</id>
- <url>http://repository.sonatype.org/content/groups/sonatype-public-grid</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- <pluginRepository>
- <id>local-repo</id>
- <url>${local-repo}</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
-
- <build>
-
- <!-- build plugins -->
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-maven-plugin</artifactId>
- <version>${tycho-version}</version>
- <extensions>true</extensions>
- </plugin>
-
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <resolver>p2</resolver>
- <pomDependencies>consider</pomDependencies>
- <environments>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</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>
- </plugins>
-
-
- <!-- defines the default settings for the used plugins -->
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-compiler-plugin</artifactId>
- <version>${tycho-version}</version>
-
- <dependencies>
- <dependency>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>org.eclipse.jdt.core</artifactId>
- <version>${jdt-core-version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>org.eclipse.jdt.compiler.apt</artifactId>
- <version>${jdt-core-version}</version>
- </dependency>
- </dependencies>
-
- <configuration>
- <encoding>UTF-8</encoding>
- <source>1.8</source>
- <target>1.8</target>
- <debug>true</debug>
- <verbose>true</verbose>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
- <version>${tycho-version}</version>
- <executions>
- <execution>
- <id>plugin-source</id>
- <goals>
- <goal>plugin-source</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-source-feature-plugin</artifactId>
- <!-- version>${tycho-version}</version-->
- <executions>
- <execution>
- <id>source-feature</id>
- <phase>package</phase>
- <goals>
- <goal>source-feature</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-packaging-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <archiveSite>true</archiveSite>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit-version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>${mockito-version}</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project> \ No newline at end of file
diff --git a/releng/org.eclipse.fx.updatesite/pom.xml b/releng/org.eclipse.fx.updatesite/pom.xml
index 01f22e6..b6cfce6 100644
--- a/releng/org.eclipse.fx.updatesite/pom.xml
+++ b/releng/org.eclipse.fx.updatesite/pom.xml
@@ -30,62 +30,11 @@
</build>
<profiles>
- <!-- >profile>
+ <profile>
<id>build-server</id>
- <pluginRepositories>
- <pluginRepository>
- <id>Eclipse Nexus</id>
- <url>http://maven.eclipse.org/nexus/content/repositories/public/</url>
- </pluginRepository>
- </pluginRepositories>
<build>
<plugins>
<plugin>
- <groupId>org.eclipse.dash.maven</groupId>
- <artifactId>eclipse-signing-maven-plugin</artifactId>
- <version>1.0.5</version>
- <executions>
- <execution>
- <id>pack</id>
- <configuration>
- <inputFile>${p2repo-zip-path}</inputFile>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>pack</goal>
- </goals>
- </execution>
- <execution>
- <id>sign</id>
- <configuration>
- <inputFile>${p2repo-zip-path}</inputFile>
- <signerInputDirectory>${signer-input-directory}</signerInputDirectory>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- <execution>
- <id>repack</id>
- <configuration>
- <inputFile>${project.build.directory}/signed/site_assembly.zip</inputFile>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>pack</goal>
- </goals>
- </execution>
- <execution>
- <id>fixCheckSums</id>
- <phase>package</phase>
- <goals>
- <goal>fixCheckSums</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -102,7 +51,7 @@
</fileset>
</delete>
<copy includeemptydirs="false" todir="${download-publish-path}">
- <fileset dir="target/checksumFix">
+ <fileset dir="target">
<include name="**" />
</fileset>
</copy>
@@ -113,7 +62,7 @@
</plugin>
</plugins>
</build>
- </profile-->
+ </profile>
</profiles>
</project> \ No newline at end of file