Skip to content
This repository has been archived by the owner on Sep 16, 2023. It is now read-only.

Commit

Permalink
samples: fix samples build (#30)
Browse files Browse the repository at this point in the history
* samples: fix samples build

Snippets samples artifact will use the released artifact directly until
this library is available in libraries-bom (post-GA). Updating the
README accordingly.

* samples: fix snapshot version
  • Loading branch information
chingor13 committed May 5, 2020
1 parent 055a522 commit 5d5e1a4
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 129 deletions.
24 changes: 2 additions & 22 deletions README.md
Expand Up @@ -13,28 +13,8 @@ Java idiomatic client for [OS Config API][product-docs].
## Quickstart

If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
```xml
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>libraries-bom</artifactId>
<version>5.1.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-os-config</artifactId>
</dependency>
</dependencies>
```

If you are using Maven without BOM, add this to your dependencies:
If you are using Maven, add this to your pom.xml file:

```xml
<dependency>
Expand Down Expand Up @@ -102,13 +82,13 @@ Java 7 or above is required for using this client.

## Versioning


This library follows [Semantic Versioning](http://semver.org/).


It is currently in major version zero (``0.y.z``), which means that anything may change at any time
and the public API should not be considered stable.


## Contributing


Expand Down
84 changes: 0 additions & 84 deletions samples/install-without-bom/pom.xml

This file was deleted.

1 change: 0 additions & 1 deletion samples/pom.xml
Expand Up @@ -28,7 +28,6 @@
</properties>

<modules>
<module>install-without-bom</module>
<module>snapshot</module>
<module>snippets</module>
</modules>
Expand Down
6 changes: 3 additions & 3 deletions samples/snapshot/pom.xml
Expand Up @@ -23,13 +23,14 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<!-- {x-version-update-start::current} -->
<dependencies>
<!-- {x-version-update-start:google-cloud-os-config:current} -->
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-os-config</artifactId>
<version>0.0.0</version>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<!-- {x-version-update-end} -->

<dependency>
<groupId>junit</groupId>
Expand All @@ -44,7 +45,6 @@
<scope>test</scope>
</dependency>
</dependencies>
<!-- {x-version-update-end} -->

<!-- compile and run all snippet tests -->
<build>
Expand Down
18 changes: 3 additions & 15 deletions samples/snippets/pom.xml
Expand Up @@ -23,26 +23,14 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>


<!-- [START os-config_install_with_bom] -->
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>libraries-bom</artifactId>
<version>4.3.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<!-- [START os_config_install_without_bom] -->
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-os-config</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<!-- [END os-config_install_with_bom] -->
<!-- [END os_config_install_without_bom] -->

<dependency>
<groupId>junit</groupId>
Expand Down
6 changes: 3 additions & 3 deletions synth.metadata
Expand Up @@ -3,8 +3,8 @@
{
"git": {
"name": ".",
"remote": "https://github.com/googleapis/java-os-config.git",
"sha": "45e54336acce8e430b9a28dd0a3247f10d816ce5"
"remote": "git@github.com:googleapis/java-os-config.git",
"sha": "91d111abedcbd10c6fd8c9bb4a2d0f8eb87e19c8"
}
},
{
Expand All @@ -19,7 +19,7 @@
"git": {
"name": "synthtool",
"remote": "https://github.com/googleapis/synthtool.git",
"sha": "52638600f387deb98efb5f9c85fec39e82aa9052"
"sha": "a2c1c4f89a5e220e7b39420ebea33623c7c72804"
}
}
],
Expand Down
4 changes: 3 additions & 1 deletion synth.py
Expand Up @@ -31,4 +31,6 @@
destination_name='os-config',
)

java.common_templates()
java.common_templates(excludes=[
'samples/install-without-bom/*'
])

0 comments on commit 5d5e1a4

Please sign in to comment.