Skip to content
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.

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

Releasing 2.0.0 (to sonatype) #337

Merged
merged 2 commits into from
Oct 3, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>io.brooklyn.clocker</groupId>
<artifactId>clocker-parent</artifactId>
<version>2.0.0-SNAPSHOT</version> <!-- CLOCKER_VERSION -->
<version>2.0.0</version> <!-- CLOCKER_VERSION -->
</parent>

<name>Clocker :: Common</name>
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/resources/common/ca.bom
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
brooklyn.catalog:
version: "2.0.0-SNAPSHOT" # CLOCKER_VERSION
version: "2.0.0" # CLOCKER_VERSION
publish:
description: |
An X.509 Certificate Authority tool using OpenSSL
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/resources/common/common.bom
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
brooklyn.catalog:
version: "2.0.0-SNAPSHOT" # CLOCKER_VERSION
version: "2.0.0" # CLOCKER_VERSION
publish:
description: |
Resources for common Apache Brooklyn entities
Expand Down
4 changes: 2 additions & 2 deletions common/src/main/resources/docker/docker.bom
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
brooklyn.catalog:
version: "2.0.0-SNAPSHOT" # CLOCKER_VERSION
version: "2.0.0" # CLOCKER_VERSION
publish:
description: |
Resources for working with Docker Engine from Apache Brooklyn
Expand Down Expand Up @@ -92,7 +92,7 @@ brooklyn.catalog:
DOCKER_REPOSITORY_URL: $brooklyn:config("docker.repository.url")
DOCKER_GPG_KEY_URL: $brooklyn:config("docker.gpgkey.url")
ENTITY_ID: $brooklyn:entityId()
CLOCKER_VERSION: "2.0.0-SNAPSHOT"
CLOCKER_VERSION: "2.0.0"

install.command: |
set -e # need all commands to execute successfully
Expand Down
2 changes: 1 addition & 1 deletion common/src/test/resources/docker/common.tests.bom
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
brooklyn.catalog:
version: "2.0.0-SNAPSHOT" # CLOCKER_VERSION
version: "2.0.0" # CLOCKER_VERSION
iconUrl: https://raw.githubusercontent.com/docker-library/docs/c350af05d3fac7b5c3f6327ac82fe4d990d8729c/docker/logo.png
license_code: APACHE-2.0

Expand Down
2 changes: 1 addition & 1 deletion common/src/test/resources/docker/docker.tests.bom
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
brooklyn.catalog:
version: "2.0.0-SNAPSHOT" # CLOCKER_VERSION
version: "2.0.0" # CLOCKER_VERSION
iconUrl: https://raw.githubusercontent.com/docker-library/docs/c350af05d3fac7b5c3f6327ac82fe4d990d8729c/docker/logo.png
dependsOn:
- tests/common.tests.bom
Expand Down
2 changes: 1 addition & 1 deletion common/src/test/resources/docker/tests.bom
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
brooklyn.catalog:
version: "2.0.0-SNAPSHOT" # CLOCKER_VERSION
version: "2.0.0" # CLOCKER_VERSION
iconUrl: https://raw.githubusercontent.com/docker-library/docs/471fa6e4cb58062ccbf91afc111980f9c7004981/swarm/logo.png
dependsOn:
- tests/docker.tests.bom
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>io.brooklyn.clocker</groupId>
<artifactId>clocker-parent</artifactId>
<version>2.0.0-SNAPSHOT</version> <!-- CLOCKER_VERSION -->
<version>2.0.0</version> <!-- CLOCKER_VERSION -->
</parent>

<name>Clocker :: Kubernetes</name>
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/src/main/resources/kubernetes/kubernetes.bom
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
brooklyn.catalog:
version: "2.0.0-SNAPSHOT" # CLOCKER_VERSION
version: "2.0.0" # CLOCKER_VERSION
publish:
description: |
Resources for working with Kubernetes from Apache Brooklyn
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/src/main/resources/kubernetes/plugins.bom
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
brooklyn.catalog:
version: "2.0.0-SNAPSHOT" # CLOCKER_VERSION
version: "2.0.0" # CLOCKER_VERSION
publish:
description: |
Resources for working with Docker Engine plugins from Apache Brooklyn
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/src/test/resources/kubernetes/common.tests.bom
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
brooklyn.catalog:
version: "2.0.0-SNAPSHOT" # CLOCKER_VERSION
version: "2.0.0" # CLOCKER_VERSION
license_code: APACHE-2.0

items:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
brooklyn.catalog:
items:
- id: kubernetes-cluster-tests
version: "2.0.0-SNAPSHOT" # CLOCKER_VERSION
version: "2.0.0" # CLOCKER_VERSION
itemType: template
iconUrl: https://twitter.com/kubernetesio/profile_image?size=original
name: Kubernetes Cluster Tests
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/src/test/resources/kubernetes/tests.bom
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
brooklyn.catalog:
version: "2.0.0-SNAPSHOT" # CLOCKER_VERSION
version: "2.0.0" # CLOCKER_VERSION
iconUrl: https://twitter.com/kubernetesio/profile_image?size=original
license_code: APACHE-2.0
dependsOn:
Expand Down
69 changes: 66 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@
<groupId>io.brooklyn.clocker</groupId>
<artifactId>clocker-parent</artifactId>
<packaging>pom</packaging>
<version>2.0.0-SNAPSHOT</version> <!-- CLOCKER_VERSION -->
<version>2.0.0</version> <!-- CLOCKER_VERSION -->

<name>Clocker</name>
<description>Clocker</description>

<description>Apache Brooklyn blueprints to deploy and manage Docker environments</description>
<url>https://github.com/brooklyncentral/clocker</url>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
Expand Down Expand Up @@ -46,6 +47,22 @@
</license>
</licenses>

<!-- For the full list of developers, see contributors to https://github.com/brooklyncentral/clocker -->
<developers>
<developer>
<name>Aled Sage</name>
<organizationUrl>https://github.com/aledsage</organizationUrl>
</developer>
<developer>
<name>Andrew Kennedy</name>
<organizationUrl>https://github.com/grkvlt</organizationUrl>
</developer>
<developer>
<name>Mark McKenna</name>
<organizationUrl>https://github.com/m4rkmckenna</organizationUrl>
</developer>
</developers>

<distributionManagement>
<snapshotRepository>
<id>sonatype-nexus-snapshots</id>
Expand Down Expand Up @@ -132,6 +149,10 @@
<artifactId>maven-jar-plugin</artifactId>
<version>${maven-jar-plugin.version}</version>
</plugin>
<plugin>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
</plugin>
</plugins>
</pluginManagement>

Expand Down Expand Up @@ -185,4 +206,46 @@
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>sonatype-release</id>
<activation>
<property>
<name>brooklyn.deployTo</name>
<value>sonatype</value>
</property>
</activation>
<distributionManagement>
<repository>
<id>sonatype-nexus-staging</id>
<name>Nexus Release Repository</name>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
<snapshotRepository>
<id>sonatype-nexus-snapshots</id>
<name>Sonatype Nexus Snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</snapshotRepository>
</distributionManagement>
<build>
<plugins>
<plugin>
<artifactId>maven-gpg-plugin</artifactId>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

</profile>
</profiles>

</project>
2 changes: 1 addition & 1 deletion swarm/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>io.brooklyn.clocker</groupId>
<artifactId>clocker-parent</artifactId>
<version>2.0.0-SNAPSHOT</version> <!-- CLOCKER_VERSION -->
<version>2.0.0</version> <!-- CLOCKER_VERSION -->
</parent>

<name>Clocker :: Swarm</name>
Expand Down
2 changes: 1 addition & 1 deletion swarm/src/main/resources/swarm/swarm.bom
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
brooklyn.catalog:
version: "2.0.0-SNAPSHOT" # CLOCKER_VERSION
version: "2.0.0" # CLOCKER_VERSION
publish:
description: |
Resources for working with Docker Swarm from Apache Brooklyn
Expand Down
2 changes: 1 addition & 1 deletion swarm/src/test/resources/docker/swarm.tests.bom
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
brooklyn.catalog:
version: "2.0.0-SNAPSHOT" # CLOCKER_VERSION
version: "2.0.0" # CLOCKER_VERSION
iconUrl: https://raw.githubusercontent.com/docker-library/docs/471fa6e4cb58062ccbf91afc111980f9c7004981/swarm/logo.png
dependsOn:
- tests/common.tests.bom
Expand Down
2 changes: 1 addition & 1 deletion swarm/src/test/resources/docker/tests.bom
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
brooklyn.catalog:
version: "2.0.0-SNAPSHOT" # CLOCKER_VERSION
version: "2.0.0" # CLOCKER_VERSION
iconUrl: https://raw.githubusercontent.com/docker-library/docs/471fa6e4cb58062ccbf91afc111980f9c7004981/swarm/logo.png
dependsOn:
- tests/docker.tests.bom
Expand Down