Skip to content

Fixes clean up related issues #3855

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
pmakani wants to merge 8 commits into from
Closed

Fixes clean up related issues #3855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
67f6956
Fixes
Oct 25, 2018
6589d13
#3708
Oct 26, 2018
73801fa
Merge remote-tracking branch 'upstream/master'
Oct 26, 2018
4fd562c
Merge remote-tracking branch 'origin/master' into google-cloud-java-3…
Oct 26, 2018
5e0bca4
Added explicit decencies for surefile-junit4 in order to fix testing …
silverdev Oct 29, 2018
f552c7a
Fixes
Oct 25, 2018
b63fe2f
#3708
Oct 26, 2018
ae5908f
fix conflicts
Oct 30, 2018
File filter

Filter by extension

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: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ nosetests.xml
.settings
.DS_Store
.classpath
.factorypath
logging.properties

# Built documentation
docs/
Expand Down
211 changes: 0 additions & 211 deletions google-cloud-bom/pom.xml
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions google-cloud-clients/google-cloud-bigtable-admin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,11 @@
<artifactId>grpc-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit4</artifactId>
<version>2.19.1</version>
</dependency>
</dependencies>
<profiles>
<profile>
Expand Down Expand Up @@ -125,6 +130,13 @@
<perCoreThreadCount>true</perCoreThreadCount>
<threadCount>2</threadCount>
</configuration>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit4</artifactId>
<version>2.19.1</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
Expand Down
12 changes: 12 additions & 0 deletions google-cloud-clients/google-cloud-bigtable/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,11 @@
<artifactId>grpc-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit4</artifactId>
<version>2.19.1</version>
</dependency>
</dependencies>
<profiles>
<profile>
Expand Down Expand Up @@ -128,6 +133,13 @@
<perCoreThreadCount>true</perCoreThreadCount>
<threadCount>2</threadCount>
</configuration>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit4</artifactId>
<version>2.19.1</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
Expand Down
5 changes: 5 additions & 0 deletions google-cloud-clients/google-cloud-logging/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,5 +88,10 @@
<classifier>testlib</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit4</artifactId>
<version>2.19.1</version>
</dependency>
</dependencies>
</project>
88 changes: 1 addition & 87 deletions google-cloud-testing/google-cloud-managedtest/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,36 +13,21 @@
<version>0.68.1-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-testing:current} -->
</parent>

<dependencies>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-bigquery</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-bigquery</artifactId>
<type>test-jar</type>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-compute</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-compute</artifactId>
<type>test-jar</type>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-nio</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-nio</artifactId>
<type>test-jar</type>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
Expand All @@ -58,142 +43,71 @@
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-datastore</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-datastore</artifactId>
<type>test-jar</type>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-dns</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-dns</artifactId>
<type>test-jar</type>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-errorreporting</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-errorreporting</artifactId>
<type>test-jar</type>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-language</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-language</artifactId>
<type>test-jar</type>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-logging</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-logging</artifactId>
<type>test-jar</type>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-monitoring</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-monitoring</artifactId>
<type>test-jar</type>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-pubsub</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-pubsub</artifactId>
<type>test-jar</type>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-resourcemanager</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-resourcemanager</artifactId>
<type>test-jar</type>
</dependency>


<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-speech</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-speech</artifactId>
<type>test-jar</type>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-spanner</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-spanner</artifactId>
<type>test-jar</type>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-storage</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-storage</artifactId>
<type>test-jar</type>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-trace</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-trace</artifactId>
<type>test-jar</type>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-translate</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-translate</artifactId>
<type>test-jar</type>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-vision</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-vision</artifactId>
<type>test-jar</type>
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
Expand Down
13 changes: 13 additions & 0 deletions google-cloud-util/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,19 @@
<modules>
<module>google-cloud-compat-checker</module>
</modules>
<dependencies>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.17</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit4</artifactId>
<version>2.17</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
Expand Down