Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ The above command invokes both unit and integration test suites. To execute only
tests, run the command as follows:

```
mvn verify -Dfirebase.it.certificate=path/to/your/serviceAccount.json -Dskip.surefire.tests=true
mvn verify -Dfirebase.it.certificate=path/to/your/serviceAccount.json -DskipUTs

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this an existing convention? Or could we spell this out as skipUnitTests (which I think would be much clearer)? :-)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maven failsafe plugin which is in charge of running integration tests supports a skipITs flag out of the box. I thought we could support a similarly named flag for skipping unit tests. WDYT?

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, cool. If it's an existing convention I'm fine with it.

```

### Generating API Docs
Expand Down
24 changes: 9 additions & 15 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,15 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<skipUTs>${skipTests}</skipUTs>
</properties>

<scm>
<connection>scm:git:https://github.com/firebase/firebase-admin-java.git</connection>
<developerConnection>scm:git:ssh://git@github.com/firebase/firebase-admin-java.git</developerConnection>
<url>http://github.com/firebase/firebase-admin-java</url>
<tag>HEAD</tag>
</scm>
<tag>HEAD</tag>
</scm>

<distributionManagement>
<snapshotRepository>
Expand Down Expand Up @@ -80,7 +81,6 @@
<plugins>
<plugin>
<!-- Generate API docs using Doclava for the developer site -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
Expand Down Expand Up @@ -137,11 +137,13 @@
</profile>
<profile>
<id>release</id>
<properties>
<!-- Prevent executing integration tests twice during a release -->
<skipITs>true</skipITs>
</properties>
<build>
<plugins>
<plugin>
<!-- Generate API docs using Doclava for the developer site -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
Expand All @@ -167,11 +169,11 @@
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<configuration>
<excludes>
<!-- Exclude all files until we go open source -->
<exclude>com/**</exclude>
</excludes>
</configuration>
Expand All @@ -185,7 +187,6 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version>
<executions>
Expand Down Expand Up @@ -243,17 +244,12 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<configuration>
<skipTests>${skip.surefire.tests}</skipTests>
<skipTests>${skipUTs}</skipTests>
</configuration>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.19.1</version>
<configuration>
<includes>
<include>**/*IT.java</include>
</includes>
</configuration>
<executions>
<execution>
<goals>
Expand All @@ -264,12 +260,10 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.3</version>
<configuration>
Expand Down