Skip to content

Commit f8816f0

Browse files
authored
remove photon support (#3614)
* remove photon support * turn on photon ignored test
1 parent f164b11 commit f8816f0

File tree

10 files changed

+2
-173
lines changed

10 files changed

+2
-173
lines changed

.travis.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ install:
2020
# We run jacoco on photon
2121
matrix:
2222
include:
23-
- name: "Eclipse Photon (4.8) on Java 8"
24-
jdk: openjdk8
25-
env: ECLIPSE_TARGET=photon MAVEN_FLAGS='-Pjacoco'
2623
- name: "Eclipse 2018-09 (4.9) on Java 8"
2724
jdk: openjdk8
2825
- name: "Eclipse 2018-09 (4.9) on Java 11"

README.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Maven for building Eclipse bundles and features.
2626

2727
4. The [Eclipse IDE](https://www.eclipse.org/downloads/eclipse-packages/).
2828
It's easiest to use the _Eclipse IDE for Java EE Developers_ package. You must use
29-
Eclipse 4.7 (Oxygen) or later. We use _target platforms_ to support building
29+
Eclipse 4.9 or later. We use _target platforms_ to support building
3030
for earlier versions of Eclipse. You also need the following:
3131

3232
1. The [M2Eclipse plugin](http://www.eclipse.org/m2e/) (also called m2e) is
@@ -77,8 +77,7 @@ The tests need to find the Google Cloud SDK. You can either:
7777
### Changing the Eclipse Platform compilation and testing target
7878

7979
By default, the build is targeted against Eclipse `2018-09` (4.9).
80-
You can explicitly set the `eclipse.target` property to
81-
`photon` (4.8), or `2018-12` (4.10).
80+
You can explicitly set the `eclipse.target` property to `2018-12` (4.10).
8281
```
8382
$ mvn -Declipse.target=2018-12 package
8483
```
@@ -265,7 +264,6 @@ features being built against. We currently maintain three target platforms,
265264
targeting the latest version of the current, previous, and next releases.
266265
This is currently:
267266

268-
- Eclipse Photon (4.8): [`eclipse/photon/gcp-eclipse-photon.target`](eclipse/photon/gcp-eclipse-photon.target)
269267
- Eclipse 2018-09 (4.9): [`eclipse/eclipse-2018-09/gcp-eclipse-2018-09.target`](eclipse/eclipse-2018-09/gcp-eclipse-2018-09.target)
270268
- Eclipse 2018-12 (4.10): [`eclipse/eclipse-2018-12/gcp-eclipse-2018-12.target`](eclipse/eclipse-2018-12/gcp-eclipse-2018-12.target)
271269

eclipse/photon/.settings/org.eclipse.core.resources.prefs

Lines changed: 0 additions & 2 deletions
This file was deleted.

eclipse/photon/.settings/org.eclipse.m2e.core.prefs

Lines changed: 0 additions & 4 deletions
This file was deleted.

eclipse/photon/gcp-eclipse-photon.target

Lines changed: 0 additions & 56 deletions
This file was deleted.

eclipse/photon/gcp-eclipse-photon.tpd

Lines changed: 0 additions & 51 deletions
This file was deleted.

eclipse/photon/pom.xml

Lines changed: 0 additions & 15 deletions
This file was deleted.

eclipse/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<packaging>pom</packaging>
1515

1616
<modules>
17-
<module>photon</module>
1817
<module>eclipse-2018-09</module>
1918
<module>eclipse-2018-12</module>
2019
<module>eclipse-2019-09</module>

plugins/com.google.cloud.tools.eclipse.integration.appengine/src/com/google/cloud/tools/eclipse/integration/appengine/ImportMavenAppEngineStandardProjectTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
3636
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
3737
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
38-
import org.junit.Ignore;
3938
import org.junit.Rule;
4039
import org.junit.Test;
4140
import org.junit.rules.TemporaryFolder;
@@ -52,8 +51,6 @@ public class ImportMavenAppEngineStandardProjectTest extends BaseProjectTest {
5251
@Rule
5352
public TemporaryFolder tempFolder = new TemporaryFolder();
5453

55-
// flaking on Photon: https://github.com/GoogleCloudPlatform/google-cloud-eclipse/pull/3256
56-
@Ignore
5754
@Test
5855
public void runImport() throws IOException, CoreException {
5956
assertFalse(projectExists("springboot-appengine-standard"));

pom.xml

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -415,40 +415,6 @@
415415
</properties>
416416
</profile>
417417

418-
<profile>
419-
<id>build-eclipse-photon</id>
420-
<activation>
421-
<property>
422-
<name>eclipse.target</name> <value>photon</value>
423-
</property>
424-
</activation>
425-
<properties>
426-
<jettyMinVersion>9.4</jettyMinVersion>
427-
<jettyMaxVersion>9.5</jettyMaxVersion>
428-
</properties>
429-
<!-- build against a known target platform -->
430-
<modules>
431-
<module>eclipse/photon</module>
432-
</modules>
433-
<build>
434-
<plugins>
435-
<plugin>
436-
<groupId>org.eclipse.tycho</groupId>
437-
<artifactId>target-platform-configuration</artifactId>
438-
<configuration>
439-
<target>
440-
<artifact>
441-
<groupId>com.google.cloud.tools.eclipse</groupId>
442-
<artifactId>gcp-eclipse-photon</artifactId>
443-
<version>4.8.0-SNAPSHOT</version>
444-
</artifact>
445-
</target>
446-
</configuration>
447-
</plugin>
448-
</plugins>
449-
</build>
450-
</profile>
451-
452418
<profile>
453419
<!-- Default target if no eclipse.target specified. -->
454420
<id>build-eclipse-2018-09</id>

0 commit comments

Comments
 (0)