diff options
author | Matthias Sohn | 2018-11-22 15:48:03 +0000 |
---|---|---|
committer | Matthias Sohn | 2018-11-22 16:04:23 +0000 |
commit | fde41b3e9907290e37255dc294fc3322026c08d5 (patch) | |
tree | 47370b0e8de86843e02500ff29c0a2e1acdcf47e | |
parent | 0ef9c59cbb90eede5053c749c40c9e968f72868b (diff) | |
download | egit-github-fde41b3e9907290e37255dc294fc3322026c08d5.tar.gz egit-github-fde41b3e9907290e37255dc294fc3322026c08d5.tar.xz egit-github-fde41b3e9907290e37255dc294fc3322026c08d5.zip |
Implement explicit target platform
Add a proper target platform definition and also use that in the Tycho
build to ensure we use the same classpath in Eclipse and during Maven
build.
Run org.eclipse.mylyn.github.tests during Maven test phase.
Change-Id: I6010f301f157525357b741d1d699a8a2207ac647
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
21 files changed, 584 insertions, 76 deletions
diff --git a/org.eclipse.mylyn.github-feature/github.target b/org.eclipse.mylyn.github-feature/github.target deleted file mode 100644 index 63ca8535..00000000 --- a/org.eclipse.mylyn.github-feature/github.target +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<?pde version="3.6"?> - -<target includeMode="feature" name="Mylyn GitHub Connector Target" sequenceNumber="5"> -<locations> -<location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit"> -<unit id="org.hamcrest" version="1.1.0.v20090501071000"/> -<unit id="com.google.gson" version="2.8.2.v20180104-1110"/> -<unit id="org.mockito" version="2.13.0.v20180426-1843"/> -<unit id="net.bytebuddy.byte-buddy" version="1.7.9.v20180420-1519"/> -<unit id="net.bytebuddy.byte-buddy-agent" version="1.7.9.v20180420-1519"/> -<unit id="org.objenesis" version="2.6.0.v20180420-1519"/> -<unit id="org.junit" version="4.12.0.v201504281640"/> -<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20181120221132/repository/"/> -</location> -<location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit"> -<unit id="org.eclipse.egit.feature.group" version="0.0.0"/> -<unit id="org.eclipse.egit.source.feature.group" version="0.0.0"/> -<unit id="org.eclipse.jgit.feature.group" version="0.0.0"/> -<unit id="org.eclipse.jgit.source.feature.group" version="0.0.0"/> -<repository location="http://download.eclipse.org/egit/updates-nightly"/> -</location> -<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.platform.ide" version="0.0.0"/> - <unit id="org.eclipse.mylyn.commons.sdk.feature.group" version="0.0.0"/> - <unit id="org.eclipse.mylyn_feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.mylyn.context_feature.feature.group" version="0.0.0"/> - <repository location="http://download.eclipse.org/releases/oxygen/"/> -</location> -</locations> -<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> -</target> diff --git a/org.eclipse.mylyn.github.target/.classpath b/org.eclipse.mylyn.github.target/.classpath new file mode 100644 index 00000000..cc9f9e3d --- /dev/null +++ b/org.eclipse.mylyn.github.target/.classpath @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> + <classpathentry kind="output" path="bin"/> +</classpath> diff --git a/org.eclipse.mylyn.github.target/.project b/org.eclipse.mylyn.github.target/.project new file mode 100644 index 00000000..cc40ee13 --- /dev/null +++ b/org.eclipse.mylyn.github.target/.project @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.mylyn.github.target</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> diff --git a/org.eclipse.mylyn.github.target/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.github.target/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..3a215370 --- /dev/null +++ b/org.eclipse.mylyn.github.target/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,11 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/org.eclipse.mylyn.github.target/MANIFEST.MF b/org.eclipse.mylyn.github.target/MANIFEST.MF new file mode 100644 index 00000000..3a79bd12 --- /dev/null +++ b/org.eclipse.mylyn.github.target/MANIFEST.MF @@ -0,0 +1,6 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: EGit Mylyn Github Target Platform Bundle +Bundle-SymbolicName: org.eclipse.mylyn.github.target +Bundle-Version: 5.2.0.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.mylyn.github.target/build.properties b/org.eclipse.mylyn.github.target/build.properties new file mode 100644 index 00000000..34d2e4d2 --- /dev/null +++ b/org.eclipse.mylyn.github.target/build.properties @@ -0,0 +1,4 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + . diff --git a/org.eclipse.mylyn.github.target/github.target b/org.eclipse.mylyn.github.target/github.target new file mode 100644 index 00000000..13826ec6 --- /dev/null +++ b/org.eclipse.mylyn.github.target/github.target @@ -0,0 +1,116 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?pde?> +<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> +<target name="github" sequenceNumber="1542892371"> + <locations> + <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> + <unit id="org.eclipse.jetty.client" version="9.4.11.v20180605"/> + <unit id="org.eclipse.jetty.client.source" version="9.4.11.v20180605"/> + <unit id="org.eclipse.jetty.continuation" version="9.4.11.v20180605"/> + <unit id="org.eclipse.jetty.continuation.source" version="9.4.11.v20180605"/> + <unit id="org.eclipse.jetty.http" version="9.4.11.v20180605"/> + <unit id="org.eclipse.jetty.http.source" version="9.4.11.v20180605"/> + <unit id="org.eclipse.jetty.io" version="9.4.11.v20180605"/> + <unit id="org.eclipse.jetty.io.source" version="9.4.11.v20180605"/> + <unit id="org.eclipse.jetty.security" version="9.4.11.v20180605"/> + <unit id="org.eclipse.jetty.security.source" version="9.4.11.v20180605"/> + <unit id="org.eclipse.jetty.server" version="9.4.11.v20180605"/> + <unit id="org.eclipse.jetty.server.source" version="9.4.11.v20180605"/> + <unit id="org.eclipse.jetty.servlet" version="9.4.11.v20180605"/> + <unit id="org.eclipse.jetty.servlet.source" version="9.4.11.v20180605"/> + <unit id="org.eclipse.jetty.util" version="9.4.11.v20180605"/> + <unit id="org.eclipse.jetty.util.source" version="9.4.11.v20180605"/> + <repository id="jetty-9.4.11" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.11.v20180605"/> + </location> + <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> + <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/> + <unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/> + <unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/> + <repository id="swtbot-snapshot" location="http://download.eclipse.org/technology/swtbot/snapshots/"/> + </location> + <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> + <unit id="com.google.gson" version="2.8.2.v20180104-1110"/> + <unit id="com.google.gson.source" version="2.8.2.v20180104-1110"/> + <unit id="com.jcraft.jsch" version="0.1.54.v20170116-1932"/> + <unit id="com.jcraft.jsch.source" version="0.1.54.v20170116-1932"/> + <unit id="javaewah" version="1.1.6.v20160919-1400"/> + <unit id="javaewah.source" version="1.1.6.v20160919-1400"/> + <unit id="javax.activation" version="1.1.0.v201211130549"/> + <unit id="javax.servlet" version="3.1.0.v201410161800"/> + <unit id="javax.servlet.source" version="3.1.0.v201410161800"/> + <unit id="javax.xml.bind" version="2.2.0.v201105210648"/> + <unit id="javax.xml.stream" version="1.0.1.v201004272200"/> + <unit id="org.apache.ant" version="1.10.5.v20180808-0324"/> + <unit id="org.apache.ant.source" version="1.10.5.v20180808-0324"/> + <unit id="org.apache.commons.codec" version="1.10.0.v20180409-1845"/> + <unit id="org.apache.commons.codec.source" version="1.10.0.v20180409-1845"/> + <unit id="org.apache.commons.compress" version="1.15.0.v20180119-1613"/> + <unit id="org.apache.commons.compress.source" version="1.15.0.v20180119-1613"/> + <unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/> + <unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/> + <unit id="org.apache.httpcomponents.httpclient" version="4.5.5.v20180409-1525"/> + <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.5.v20180409-1525"/> + <unit id="org.apache.httpcomponents.httpcore" version="4.4.9.v20180409-1525"/> + <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.9.v20180409-1525"/> + <unit id="org.apache.log4j" version="1.2.15.v201012070815"/> + <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/> + <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/> + <unit id="org.kohsuke.args4j.source" version="2.33.0.v20160323-2218"/> + <unit id="org.hamcrest" version="1.1.0.v20090501071000"/> + <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/> + <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/> + <unit id="org.hamcrest.generator" version="1.3.0.v201305210900"/> + <unit id="org.hamcrest.generator.source" version="1.3.0.v201305210900"/> + <unit id="org.hamcrest.integration" version="1.3.0.v201305210900"/> + <unit id="org.hamcrest.integration.source" version="1.3.0.v201305210900"/> + <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/> + <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/> + <unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/> + <unit id="org.hamcrest.text.source" version="1.1.0.v20090501071000"/> + <unit id="org.junit" version="4.12.0.v201504281640"/> + <unit id="org.junit.source" version="4.12.0.v201504281640"/> + <unit id="org.mockito" version="2.13.0.v20180426-1843"/> + <unit id="org.mockito.source" version="2.13.0.v20180426-1843"/> + <unit id="net.bytebuddy.byte-buddy" version="1.7.9.v20180420-1519"/> + <unit id="net.bytebuddy.byte-buddy.source" version="1.7.9.v20180420-1519"/> + <unit id="net.bytebuddy.byte-buddy-agent" version="1.7.9.v20180420-1519"/> + <unit id="net.bytebuddy.byte-buddy-agent.source" version="1.7.9.v20180420-1519"/> + <unit id="org.objenesis" version="2.6.0.v20180420-1519"/> + <unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/> + <unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/> + <unit id="org.slf4j.api.source" version="1.7.2.v20121108-1250"/> + <unit id="org.slf4j.impl.log4j12" version="1.7.2.v20131105-2200"/> + <unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/> + <unit id="org.tukaani.xz" version="1.6.0.v20170629-1752"/> + <unit id="org.tukaani.xz.source" version="1.6.0.v20170629-1752"/> + <unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/> + <unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/> + <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/> + <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/> + <unit id="org.apache.sshd.core" version="2.0.0.v20181102-1323"/> + <unit id="org.apache.sshd.core.source" version="2.0.0.v20181102-1323"/> + <unit id="org.apache.sshd.sftp" version="2.0.0.v20181102-1323"/> + <unit id="org.apache.sshd.sftp.source" version="2.0.0.v20181102-1323"/> + <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20181120221132/repository"/> + </location> + <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> + <unit id="org.eclipse.sdk.ide" version="0.0.0"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/> + <unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/> + <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="0.0.0"/> + <unit id="org.eclipse.mylyn.commons.sdk.feature.group" version="0.0.0"/> + <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="0.0.0"/> + <unit id="org.eclipse.mylyn.team_feature.feature.group" version="0.0.0"/> + <unit id="org.eclipse.mylyn_feature.feature.group" version="0.0.0"/> + <unit id="org.eclipse.mylyn.context_feature.feature.group" version="0.0.0"/> + <unit id="org.eclipse.mylyn.bugzilla_feature.feature.group" version="0.0.0"/> + <unit id="javax.xml" version="0.0.0"/> + <unit id="org.apache.lucene.queryparser" version="0.0.0"/> + <unit id="org.apache.xerces" version="0.0.0"/> + <unit id="org.apache.xml.resolver" version="0.0.0"/> + <unit id="org.apache.xml.serializer" version="0.0.0"/> + <unit id="org.eclipse.tools.layout.spy" version="0.0.0"/> + <repository location="http://download.eclipse.org/releases/oxygen/"/> + </location> + </locations> +</target> diff --git a/org.eclipse.mylyn.github.target/github.tpd b/org.eclipse.mylyn.github.target/github.tpd new file mode 100644 index 00000000..fa598d55 --- /dev/null +++ b/org.eclipse.mylyn.github.target/github.tpd @@ -0,0 +1,6 @@ +target "github" with source configurePhase + +include "projects/jetty-9.4.11.tpd" +include "projects/swtbot-snapshot.tpd" +include "orbit/S20181120221132-2018-12.tpd" +include "releasetrain/4.7-oxygen.tpd"
\ No newline at end of file diff --git a/org.eclipse.mylyn.github.target/orbit/S20181120221132-2018-12.tpd b/org.eclipse.mylyn.github.target/orbit/S20181120221132-2018-12.tpd new file mode 100644 index 00000000..19643261 --- /dev/null +++ b/org.eclipse.mylyn.github.target/orbit/S20181120221132-2018-12.tpd @@ -0,0 +1,67 @@ +target "S20181120221132-2018-12" with source configurePhase +// see http://download.eclipse.org/tools/orbit/downloads/ + +location "http://download.eclipse.org/tools/orbit/downloads/drops/S20181120221132/repository" { + com.google.gson [2.8.2.v20180104-1110,2.8.2.v20180104-1110] + com.google.gson.source [2.8.2.v20180104-1110,2.8.2.v20180104-1110] + com.jcraft.jsch [0.1.54.v20170116-1932,0.1.54.v20170116-1932] + com.jcraft.jsch.source [0.1.54.v20170116-1932,0.1.54.v20170116-1932] + javaewah [1.1.6.v20160919-1400,1.1.6.v20160919-1400] + javaewah.source [1.1.6.v20160919-1400,1.1.6.v20160919-1400] + javax.activation [1.1.0.v201211130549,1.1.0.v201211130549] + javax.servlet [3.1.0.v201410161800,3.1.0.v201410161800] + javax.servlet.source [3.1.0.v201410161800,3.1.0.v201410161800] + javax.xml.bind [2.2.0.v201105210648,2.2.0.v201105210648] + javax.xml.stream [1.0.1.v201004272200,1.0.1.v201004272200] + org.apache.ant [1.10.5.v20180808-0324,1.10.5.v20180808-0324] + org.apache.ant.source [1.10.5.v20180808-0324,1.10.5.v20180808-0324] + org.apache.commons.codec [1.10.0.v20180409-1845,1.10.0.v20180409-1845] + org.apache.commons.codec.source [1.10.0.v20180409-1845,1.10.0.v20180409-1845] + org.apache.commons.compress [1.15.0.v20180119-1613,1.15.0.v20180119-1613] + org.apache.commons.compress.source [1.15.0.v20180119-1613,1.15.0.v20180119-1613s] + org.apache.commons.logging [1.2.0.v20180409-1502,1.2.0.v20180409-1502] + org.apache.commons.logging.source [1.2.0.v20180409-1502,1.2.0.v20180409-1502] + org.apache.httpcomponents.httpclient [4.5.5.v20180409-1525,4.5.5.v20180409-1525] + org.apache.httpcomponents.httpclient.source [4.5.5.v20180409-1525,4.5.5.v20180409-1525] + org.apache.httpcomponents.httpcore [4.4.9.v20180409-1525,4.4.9.v20180409-1525] + org.apache.httpcomponents.httpcore.source [4.4.9.v20180409-1525,4.4.9.v20180409-1525] + org.apache.log4j [1.2.15.v201012070815,1.2.15.v201012070815] + org.apache.log4j.source [1.2.15.v201012070815,1.2.15.v201012070815] + org.kohsuke.args4j [2.33.0.v20160323-2218,2.33.0.v20160323-2218] + org.kohsuke.args4j.source [2.33.0.v20160323-2218,2.33.0.v20160323-2218] + org.hamcrest [1.1.0.v20090501071000,1.1.0.v20090501071000] + org.hamcrest.core [1.3.0.v20180420-1519,1.3.0.v20180420-1519] + org.hamcrest.core.source [1.3.0.v20180420-1519,1.3.0.v20180420-1519] + org.hamcrest.generator [1.3.0.v201305210900,1.3.0.v201305210900] + org.hamcrest.generator.source [1.3.0.v201305210900,1.3.0.v201305210900] + org.hamcrest.integration [1.3.0.v201305210900,1.3.0.v201305210900] + org.hamcrest.integration.source [1.3.0.v201305210900,1.3.0.v201305210900] + org.hamcrest.library [1.3.0.v20180524-2246,1.3.0.v20180524-2246] + org.hamcrest.library.source [1.3.0.v20180524-2246,1.3.0.v20180524-2246] + org.hamcrest.text [1.1.0.v20090501071000,1.1.0.v20090501071000] + org.hamcrest.text.source [1.1.0.v20090501071000,1.1.0.v20090501071000] + org.junit [4.12.0.v201504281640,4.12.0.v201504281640] + org.junit.source [4.12.0.v201504281640,4.12.0.v201504281640] + org.mockito [2.13.0.v20180426-1843,2.13.0.v20180426-1843] + org.mockito.source [2.13.0.v20180426-1843,2.13.0.v20180426-1843] + net.bytebuddy.byte-buddy [1.7.9.v20180420-1519,1.7.9.v20180420-1519] + net.bytebuddy.byte-buddy.source [1.7.9.v20180420-1519,1.7.9.v20180420-1519] + net.bytebuddy.byte-buddy-agent [1.7.9.v20180420-1519,1.7.9.v20180420-1519] + net.bytebuddy.byte-buddy-agent.source [1.7.9.v20180420-1519,1.7.9.v20180420-1519] + org.objenesis [2.6.0.v20180420-1519,2.6.0.v20180420-1519] + org.objenesis.source [2.6.0.v20180420-1519,2.6.0.v20180420-1519] + org.slf4j.api [1.7.2.v20121108-1250,1.7.2.v20121108-1250] + org.slf4j.api.source [1.7.2.v20121108-1250,1.7.2.v20121108-1250] + org.slf4j.impl.log4j12 [1.7.2.v20131105-2200,1.7.2.v20131105-2200] + org.slf4j.impl.log4j12.source [1.7.2.v20131105-2200,1.7.2.v20131105-2200] + org.tukaani.xz [1.6.0.v20170629-1752,1.6.0.v20170629-1752] + org.tukaani.xz.source [1.6.0.v20170629-1752,1.6.0.v20170629-1752] + com.jcraft.jzlib [1.1.1.v201205102305,1.1.1.v201205102305] + com.jcraft.jzlib.source [1.1.1.v201205102305,1.1.1.v201205102305] + net.i2p.crypto.eddsa [0.3.0.v20181102-1323,0.3.0.v20181102-1323] + net.i2p.crypto.eddsa.source [0.3.0.v20181102-1323,0.3.0.v20181102-1323] + org.apache.sshd.core [2.0.0.v20181102-1323,2.0.0.v20181102-1323] + org.apache.sshd.core.source [2.0.0.v20181102-1323,2.0.0.v20181102-1323] + org.apache.sshd.sftp [2.0.0.v20181102-1323,2.0.0.v20181102-1323] + org.apache.sshd.sftp.source [2.0.0.v20181102-1323,2.0.0.v20181102-1323] +} diff --git a/org.eclipse.mylyn.github.target/pom.xml b/org.eclipse.mylyn.github.target/pom.xml new file mode 100644 index 00000000..c22a23d1 --- /dev/null +++ b/org.eclipse.mylyn.github.target/pom.xml @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (C) 2018, Matthias Sohn <matthias.sohn@sap.com> + + 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 + https://www.eclipse.org/legal/epl-2.0/ + + SPDX-License-Identifier: EPL-2.0 +--> +<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> + + <artifactId>org.eclipse.mylyn.github.target</artifactId> + <packaging>pom</packaging> + <name>EGit Github Target Platform Definition</name> + + <parent> + <artifactId>github-parent</artifactId> + <groupId>org.eclipse.mylyn.github</groupId> + <version>5.2.0-SNAPSHOT</version> + </parent> + + <properties> + <target-platform>github</target-platform> + </properties> + + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>attach-artifacts</id> + <phase>package</phase> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>${target-platform}.target</file> + <type>target</type> + <classifier>${target-platform}</classifier> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> diff --git a/org.eclipse.mylyn.github.target/projects/jetty-9.4.11.tpd b/org.eclipse.mylyn.github.target/projects/jetty-9.4.11.tpd new file mode 100644 index 00000000..d2fd9017 --- /dev/null +++ b/org.eclipse.mylyn.github.target/projects/jetty-9.4.11.tpd @@ -0,0 +1,20 @@ +target "jetty-9.4.11" with source configurePhase + +location jetty-9.4.11 "http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.11.v20180605" { + org.eclipse.jetty.client [9.4.11.v20180605,9.4.11.v20180605] + org.eclipse.jetty.client.source [9.4.11.v20180605,9.4.11.v20180605] + org.eclipse.jetty.continuation [9.4.11.v20180605,9.4.11.v20180605] + org.eclipse.jetty.continuation.source [9.4.11.v20180605,9.4.11.v20180605] + org.eclipse.jetty.http [9.4.11.v20180605,9.4.11.v20180605] + org.eclipse.jetty.http.source [9.4.11.v20180605,9.4.11.v20180605] + org.eclipse.jetty.io [9.4.11.v20180605,9.4.11.v20180605] + org.eclipse.jetty.io.source [9.4.11.v20180605,9.4.11.v20180605] + org.eclipse.jetty.security [9.4.11.v20180605,9.4.11.v20180605] + org.eclipse.jetty.security.source [9.4.11.v20180605,9.4.11.v20180605] + org.eclipse.jetty.server [9.4.11.v20180605,9.4.11.v20180605] + org.eclipse.jetty.server.source [9.4.11.v20180605,9.4.11.v20180605] + org.eclipse.jetty.servlet [9.4.11.v20180605,9.4.11.v20180605] + org.eclipse.jetty.servlet.source [9.4.11.v20180605,9.4.11.v20180605] + org.eclipse.jetty.util [9.4.11.v20180605,9.4.11.v20180605] + org.eclipse.jetty.util.source [9.4.11.v20180605,9.4.11.v20180605] +} diff --git a/org.eclipse.mylyn.github.target/projects/swtbot-snapshot.tpd b/org.eclipse.mylyn.github.target/projects/swtbot-snapshot.tpd new file mode 100644 index 00000000..eb0f3675 --- /dev/null +++ b/org.eclipse.mylyn.github.target/projects/swtbot-snapshot.tpd @@ -0,0 +1,7 @@ +target "swtbot-snapshot" with source configurePhase + +location swtbot-snapshot "http://download.eclipse.org/technology/swtbot/snapshots/" { + org.eclipse.swtbot.eclipse.feature.group lazy + org.eclipse.swtbot.feature.group lazy + org.eclipse.swtbot.eclipse.test.junit.feature.group lazy +}
\ No newline at end of file diff --git a/org.eclipse.mylyn.github.target/releasetrain/4.5-mars.tpd b/org.eclipse.mylyn.github.target/releasetrain/4.5-mars.tpd new file mode 100644 index 00000000..af683f6f --- /dev/null +++ b/org.eclipse.mylyn.github.target/releasetrain/4.5-mars.tpd @@ -0,0 +1,17 @@ +target "4.5-mars" with source configurePhase + +location "http://download.eclipse.org/releases/mars/" { + // Eclipse platform + org.eclipse.sdk.ide lazy + org.eclipse.emf.sdk.feature.group lazy + + // Mylyn integration + org.eclipse.mylyn.commons.sdk.feature.group lazy + org.eclipse.mylyn.ide_feature.feature.group lazy + org.eclipse.mylyn.team_feature.feature.group lazy + org.eclipse.mylyn_feature.feature.group lazy + org.eclipse.mylyn.context_feature.feature.group lazy + org.eclipse.mylyn.sdk_feature.feature.group lazy + + // SWT layout spy not available +} diff --git a/org.eclipse.mylyn.github.target/releasetrain/4.6-neon.tpd b/org.eclipse.mylyn.github.target/releasetrain/4.6-neon.tpd new file mode 100644 index 00000000..3c70d3f6 --- /dev/null +++ b/org.eclipse.mylyn.github.target/releasetrain/4.6-neon.tpd @@ -0,0 +1,19 @@ +target "4.6-neon" with source configurePhase + +location "http://download.eclipse.org/releases/neon/" { + // Eclipse platform + org.eclipse.sdk.ide lazy + org.eclipse.emf.sdk.feature.group lazy + org.eclipse.ecf.core.feature.feature.group lazy + org.eclipse.ecf.filetransfer.feature.feature.group lazy + + // Mylyn integration + org.eclipse.mylyn.commons.sdk.feature.group lazy + org.eclipse.mylyn.ide_feature.feature.group lazy + org.eclipse.mylyn.team_feature.feature.group lazy + org.eclipse.mylyn_feature.feature.group lazy + org.eclipse.mylyn.context_feature.feature.group lazy + org.eclipse.mylyn.sdk_feature.feature.group lazy + + // SWT layout spy not available +} diff --git a/org.eclipse.mylyn.github.target/releasetrain/4.7-oxygen.tpd b/org.eclipse.mylyn.github.target/releasetrain/4.7-oxygen.tpd new file mode 100644 index 00000000..6e9511c9 --- /dev/null +++ b/org.eclipse.mylyn.github.target/releasetrain/4.7-oxygen.tpd @@ -0,0 +1,26 @@ +target "4.7-oxygen" with source configurePhase + +location "http://download.eclipse.org/releases/oxygen/" { + // Eclipse platform + org.eclipse.sdk.ide lazy + org.eclipse.emf.sdk.feature.group lazy + org.eclipse.ecf.core.feature.feature.group lazy + org.eclipse.ecf.filetransfer.feature.feature.group lazy + + // Mylyn integration + org.eclipse.mylyn.commons.sdk.feature.group lazy + org.eclipse.mylyn.ide_feature.feature.group lazy + org.eclipse.mylyn.team_feature.feature.group lazy + org.eclipse.mylyn_feature.feature.group lazy + org.eclipse.mylyn.context_feature.feature.group lazy + org.eclipse.mylyn.bugzilla_feature.feature.group lazy + // some Mylyn dependencies as bundles, to avoid mylyn.trac, which would lead to conflicts + javax.xml lazy + org.apache.lucene.queryparser lazy + org.apache.xerces lazy + org.apache.xml.resolver lazy + org.apache.xml.serializer lazy + + // debugging SWT layouts + org.eclipse.tools.layout.spy lazy +} diff --git a/org.eclipse.mylyn.github.target/releasetrain/4.8-photon.tpd b/org.eclipse.mylyn.github.target/releasetrain/4.8-photon.tpd new file mode 100644 index 00000000..380b8fff --- /dev/null +++ b/org.eclipse.mylyn.github.target/releasetrain/4.8-photon.tpd @@ -0,0 +1,30 @@ +target "4.8-photon" with source configurePhase + +location "http://download.eclipse.org/releases/photon/" { + // Eclipse platform + org.eclipse.sdk.ide lazy + org.eclipse.ecf.console.feature.feature.group lazy + org.eclipse.ecf.core.feature.feature.group lazy + org.eclipse.ecf.filetransfer.feature.feature.group lazy + org.eclipse.emf.sdk.feature.group lazy + org.eclipse.equinox.concurrent lazy + + // Mylyn integration + org.eclipse.mylyn.commons.sdk.feature.group lazy + org.eclipse.mylyn.ide_feature.feature.group lazy + org.eclipse.mylyn.team_feature.feature.group lazy + org.eclipse.mylyn_feature.feature.group lazy + org.eclipse.mylyn.context_feature.feature.group lazy + org.eclipse.mylyn.bugzilla_feature.feature.group lazy + // some Mylyn dependencies as bundles, to avoid mylyn.trac, which would lead to conflicts + javax.xml lazy + org.apache.lucene.analyzers-common [6.1.0,6.2.0) + org.apache.lucene.core [6.1.0,6.2.0) + org.apache.lucene.queryparser [6.1.0,6.2.0) + org.apache.xerces lazy + org.apache.xml.resolver lazy + org.apache.xml.serializer lazy + + // debugging SWT layouts + org.eclipse.tools.layout.spy lazy +} diff --git a/org.eclipse.mylyn.github.target/releasetrain/4.9-2018-09.tpd b/org.eclipse.mylyn.github.target/releasetrain/4.9-2018-09.tpd new file mode 100644 index 00000000..a4422f76 --- /dev/null +++ b/org.eclipse.mylyn.github.target/releasetrain/4.9-2018-09.tpd @@ -0,0 +1,32 @@ +target "staging" with source configurePhase + +location "http://download.eclipse.org/releases/2018-09/" { + // Eclipse platform + org.eclipse.sdk.ide lazy + org.eclipse.ecf.core.feature.feature.group lazy + org.eclipse.ecf.filetransfer.feature.feature.group lazy + org.eclipse.emf.sdk.feature.group lazy + org.eclipse.equinox.concurrent lazy + + // Mylyn integration + org.eclipse.mylyn.commons.sdk.feature.group lazy + org.eclipse.mylyn.ide_feature.feature.group lazy + org.eclipse.mylyn.team_feature.feature.group lazy + org.eclipse.mylyn_feature.feature.group lazy + org.eclipse.mylyn.context_feature.feature.group lazy + org.eclipse.mylyn.bugzilla_feature.feature.group lazy + + // debugging SWT layouts + org.eclipse.tools.layout.spy lazy +} + +location "http://download.eclipse.org/mylyn/releases/latest" { + // some Mylyn dependencies as bundles, to avoid mylyn.trac, which would lead to conflicts + javax.xml lazy + org.apache.lucene.analyzers-common [6.1.0,6.2.0) + org.apache.lucene.core [6.1.0,6.2.0) + org.apache.lucene.queryparser [6.1.0,6.2.0) + org.apache.xerces lazy + org.apache.xml.resolver lazy + org.apache.xml.serializer lazy +}
\ No newline at end of file diff --git a/org.eclipse.mylyn.github.target/releasetrain/staging.tpd b/org.eclipse.mylyn.github.target/releasetrain/staging.tpd new file mode 100644 index 00000000..b7e12180 --- /dev/null +++ b/org.eclipse.mylyn.github.target/releasetrain/staging.tpd @@ -0,0 +1,32 @@ +target "staging" with source configurePhase + +location "http://download.eclipse.org/staging/2018-12/" { + // Eclipse platform + org.eclipse.sdk.ide lazy + org.eclipse.ecf.core.feature.feature.group lazy + org.eclipse.ecf.filetransfer.feature.feature.group lazy + org.eclipse.emf.sdk.feature.group lazy + org.eclipse.equinox.concurrent lazy + + // Mylyn integration + org.eclipse.mylyn.commons.sdk.feature.group lazy + org.eclipse.mylyn.ide_feature.feature.group lazy + org.eclipse.mylyn.team_feature.feature.group lazy + org.eclipse.mylyn_feature.feature.group lazy + org.eclipse.mylyn.context_feature.feature.group lazy + org.eclipse.mylyn.bugzilla_feature.feature.group lazy + + // debugging SWT layouts + org.eclipse.tools.layout.spy lazy +} + +location "http://download.eclipse.org/mylyn/releases/latest" { + // some Mylyn dependencies as bundles, to avoid mylyn.trac, which would lead to conflicts + javax.xml lazy + org.apache.lucene.analyzers-common [6.1.0,6.2.0) + org.apache.lucene.core [6.1.0,6.2.0) + org.apache.lucene.queryparser [6.1.0,6.2.0) + org.apache.xerces lazy + org.apache.xml.resolver lazy + org.apache.xml.serializer lazy +}
\ No newline at end of file diff --git a/org.eclipse.mylyn.github.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.github.tests/META-INF/MANIFEST.MF index 145dfed6..03f466f8 100644 --- a/org.eclipse.mylyn.github.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.github.tests/META-INF/MANIFEST.MF @@ -5,16 +5,9 @@ Automatic-Module-Name: org.eclipse.mylyn.github.tests Bundle-SymbolicName: org.eclipse.mylyn.github.tests Bundle-Version: 5.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)", - org.eclipse.mylyn.tasks.ui;bundle-version="[3.2.0,4.0.0)", - org.eclipse.mylyn.tasks.core, - org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", - org.junit;bundle-version="[4.8.1,5.0.0)", - org.hamcrest;bundle-version="[1.1.0,2.0.0)", - org.objenesis;bundle-version="[2.6.0,3.0.0)" +Require-Bundle: org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)", + org.eclipse.mylyn.tasks.core;bundle-version="[3.4.0,4.0.0)", + org.junit;bundle-version="[4.12.0,5.0.0)" Bundle-Vendor: Eclipse EGit Import-Package: org.eclipse.mylyn.internal.github.core;version="[5.2.0,5.3.0)", - org.eclipse.mylyn.internal.github.ui.issue;version="[5.2.0,5.3.0)", - org.mockito;version="[2.13.0,3.0.0)", - org.mockito.runners;version="[2.13.0,3.0.0)", - org.mockito.stubbing;version="[2.13.0,3.0.0)" + org.eclipse.mylyn.internal.github.ui.issue;version="[5.2.0,5.3.0)" diff --git a/org.eclipse.mylyn.github.tests/pom.xml b/org.eclipse.mylyn.github.tests/pom.xml index f51058bf..d70b9da8 100644 --- a/org.eclipse.mylyn.github.tests/pom.xml +++ b/org.eclipse.mylyn.github.tests/pom.xml @@ -25,5 +25,67 @@ <packaging>eclipse-test-plugin</packaging> <name>Eclipse EGit Mylyn GitHub Test Plug-in</name> + + <properties> + <test.vmparams></test.vmparams> + <uitest.vmparams>-Xmx512m -Dorg.eclipse.swtbot.search.timeout=30000 -Dorg.eclipse.swtbot.screenshots.dir=target/screenshots -Xmx1024m</uitest.vmparams> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho-version}</version> + <configuration> + <dependency-resolution> + <extraRequirements> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.mylyn.github.feature</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.e4.rcp</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.pde</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.cvs</id> + <versionRange>0.0.0</versionRange> + </requirement> + </extraRequirements> + </dependency-resolution> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-surefire-plugin</artifactId> + <configuration> + <includes> + <include>**/*Test.java</include> + </includes> + <useUIHarness>true</useUIHarness> + <useUIThread>false</useUIThread> + <argLine>${ui.test.vmargs}</argLine> + <application>org.eclipse.ui.ide.workbench</application> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-pmd-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/*Test.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> </project> @@ -59,21 +59,19 @@ <tycho-extras-version>${tycho-version}</tycho-extras-version> <spotbugs-maven-plugin-version>3.1.6</spotbugs-maven-plugin-version> <egit-site>file:/${basedir}/../../egit/org.eclipse.egit.repository/target/repository</egit-site> - <platform-version-name>mars</platform-version-name> - <mylyn-site>http://download.eclipse.org/mylyn/releases/3.7</mylyn-site> - <eclipse-site>http://download.eclipse.org/releases/${platform-version-name}</eclipse-site> - <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/</orbit-site> + <platform-version-name>oxygen</platform-version-name> <download-publish-path>/home/data/httpd/download.eclipse.org/egit/github/updates-nightly</download-publish-path> <license-site>http://download.eclipse.org/cbi/updates/license</license-site> </properties> <modules> + <module>org.eclipse.mylyn.github.target</module> <module>org.eclipse.egit.github.core</module> <module>org.eclipse.mylyn.github.core</module> <module>org.eclipse.mylyn.github.ui</module> <module>org.eclipse.mylyn.github-feature</module> <module>org.eclipse.egit.github.core.tests</module> - <!--module>org.eclipse.mylyn.github.tests</module --> + <module>org.eclipse.mylyn.github.tests</module> <module>org.eclipse.mylyn.github-site</module> <module>org.eclipse.mylyn.github.doc</module> </modules> @@ -85,21 +83,6 @@ <url>${egit-site}</url> </repository> <repository> - <id>eclipse</id> - <layout>p2</layout> - <url>${eclipse-site}</url> - </repository> - <repository> - <id>orbit</id> - <layout>p2</layout> - <url>${orbit-site}</url> - </repository> - <repository> - <id>mylyn</id> - <layout>p2</layout> - <url>${mylyn-site}</url> - </repository> - <repository> <id>eclipse.license</id> <layout>p2</layout> <url>${license-site}</url> @@ -145,7 +128,14 @@ <groupId>org.eclipse.tycho</groupId> <artifactId>target-platform-configuration</artifactId> <configuration> - <resolver>p2</resolver> + <target> + <artifact> + <groupId>org.eclipse.mylyn.github</groupId> + <artifactId>org.eclipse.mylyn.github.target</artifactId> + <version>5.2.0-SNAPSHOT</version> + <classifier>github</classifier> + </artifact> + </target> </configuration> </plugin> </plugins> @@ -292,51 +282,51 @@ <profiles> <profile> - <id>platform-juno</id> + <id>platform-oxygen</id> <activation> <property> <name>platform-version-name</name> - <value>juno</value> + <value>oxygen</value> </property> </activation> <properties> - <eclipse-site>http://download.eclipse.org/releases/juno</eclipse-site> + <eclipse-site>http://download.eclipse.org/releases/oxygen</eclipse-site> </properties> </profile> <profile> - <id>platform-kepler</id> + <id>platform-photon</id> <activation> <property> <name>platform-version-name</name> - <value>kepler</value> + <value>photon</value> </property> </activation> <properties> - <eclipse-site>http://download.eclipse.org/releases/kepler</eclipse-site> + <eclipse-site>http://download.eclipse.org/releases/photon</eclipse-site> </properties> </profile> <profile> - <id>platform-luna</id> + <id>platform-2018-09</id> <activation> <property> <name>platform-version-name</name> - <value>luna</value> + <value>2018-09</value> </property> </activation> <properties> - <eclipse-site>http://download.eclipse.org/releases/luna</eclipse-site> + <eclipse-site>http://download.eclipse.org/releases/2018-09</eclipse-site> </properties> </profile> <profile> - <id>platform-mars</id> + <id>platform-2018-12</id> <activation> <property> <name>platform-version-name</name> - <value>mars</value> + <value>2018-12</value> </property> </activation> <properties> - <eclipse-site>http://download.eclipse.org/releases/mars</eclipse-site> + <eclipse-site>http://download.eclipse.org/releases/2018-12</eclipse-site> </properties> </profile> <profile> @@ -477,6 +467,30 @@ </plugins> </build> </profile> + <profile> + <id>macosx</id> + <activation> + <os> + <name>mac os x</name> + <family>mac</family> + </os> + </activation> + <properties> + <ui.test.vmargs>${test.vmparams} ${uitest.vmparams} -XstartOnFirstThread</ui.test.vmargs> + </properties> + </profile> + <profile> + <id>other-os</id> + <activation> + <os> + <name>not-mac</name> + <family>!mac</family> + </os> + </activation> + <properties> + <ui.test.vmargs>${test.vmparams} ${uitest.vmparams}</ui.test.vmargs> + </properties> + </profile> </profiles> <distributionManagement> |