Skip to content

Commit 2f79c8c

Browse files
authored
Update build/jacoco for new bundles & tests (#1597)
1 parent 29b30c3 commit 2f79c8c

2 files changed

Lines changed: 37 additions & 1 deletion

File tree

README.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ The tests need to find the Google Cloud SDK. You can either:
5252

5353
By default, the build is targeted against Eclipse Mars / 4.5.
5454
You can explicitly set the `eclipse.target` property to
55-
`neon` (4.6).
55+
`neon` (4.6) or `oxygen` (4.7).
5656
```
5757
$ mvn -Declipse.target=neon package
5858
```
@@ -98,6 +98,17 @@ indicate a misconfigured _jdkHome_.
9898
You can disable the use of toolchains by setting the `tycho.toolchains`
9999
property to `SYSTEM`.
100100

101+
### Adding a new bundle/fragment
102+
103+
We normally put production code into a bundle and tests as a fragment hosted
104+
by that bundle, put under the `plugins/` directory.
105+
For now we have been committing both the `pom.xml` and Eclipse's
106+
`.project`, `.classpath`, and `.settings/` files.
107+
108+
Our CI process is configured to run our tests with JaCoCo, which requires
109+
some additional configuration to add new bundles and fragments
110+
in `build/jacoco/`.
111+
101112

102113
## Import into Eclipse
103114

@@ -259,6 +270,7 @@ This is currently:
259270

260271
- Eclipse Mars (4.5 SR2): [`eclipse/mars/gcp-eclipse-mars.target`](eclipse/mars/gcp-eclipse-mars.target)
261272
- Eclipse Neon (4.6): [`eclipse/neon/gcp-eclipse-neon.target`](eclipse/neon/gcp-eclipse-neon.target)
273+
- Eclipse Oxygen (4.7): [`eclipse/oxygen/gcp-eclipse-oxygen.target`](eclipse/oxygen/gcp-eclipse-oxygen.target)
262274

263275
These `.target` files are generated and *should not be manually updated*.
264276
Updating `.target` files directly becomes a chore once it has more than a

build/jacoco/pom.xml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,18 @@
9898
<version>0.1.0-SNAPSHOT</version>
9999
<scope>compile</scope>
100100
</dependency>
101+
<dependency>
102+
<groupId>com.google.cloud.tools.eclipse</groupId>
103+
<artifactId>com.google.cloud.tools.eclipse.appengine.flex.test</artifactId>
104+
<version>0.1.0-SNAPSHOT</version>
105+
<scope>test</scope>
106+
</dependency>
107+
<dependency>
108+
<groupId>com.google.cloud.tools.eclipse</groupId>
109+
<artifactId>com.google.cloud.tools.eclipse.appengine.flex</artifactId>
110+
<version>0.1.0-SNAPSHOT</version>
111+
<scope>compile</scope>
112+
</dependency>
101113
<dependency>
102114
<groupId>com.google.cloud.tools.eclipse</groupId>
103115
<artifactId>com.google.cloud.tools.eclipse.appengine.libraries.test</artifactId>
@@ -182,6 +194,18 @@
182194
<version>0.1.0-SNAPSHOT</version>
183195
<scope>compile</scope>
184196
</dependency>
197+
<dependency>
198+
<groupId>com.google.cloud.tools.eclipse</groupId>
199+
<artifactId>com.google.cloud.tools.eclipse.googleapis.test</artifactId>
200+
<version>0.1.0-SNAPSHOT</version>
201+
<scope>test</scope>
202+
</dependency>
203+
<dependency>
204+
<groupId>com.google.cloud.tools.eclipse</groupId>
205+
<artifactId>com.google.cloud.tools.eclipse.googleapis</artifactId>
206+
<version>0.1.0-SNAPSHOT</version>
207+
<scope>compile</scope>
208+
</dependency>
185209
<dependency>
186210
<groupId>com.google.cloud.tools.eclipse</groupId>
187211
<artifactId>com.google.cloud.tools.eclipse.integration.appengine</artifactId>

0 commit comments

Comments
 (0)