Skip to content

Commit 23f39fb

Browse files
aledsagealedsage
authored
Merge pull request #337 from aledsage/2.0.x
Releasing 2.0.0 (to sonatype)
2 parents 37b7a73 + c94bdd2 commit 23f39fb

File tree

18 files changed

+84
-21
lines changed

18 files changed

+84
-21
lines changed

‎common/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>io.brooklyn.clocker</groupId>
99
<artifactId>clocker-parent</artifactId>
10-
<version>2.0.0-SNAPSHOT</version> <!-- CLOCKER_VERSION -->
10+
<version>2.0.0</version> <!-- CLOCKER_VERSION -->
1111
</parent>
1212

1313
<name>Clocker :: Common</name>

‎common/src/main/resources/common/ca.bom

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
brooklyn.catalog:
2-
version: "2.0.0-SNAPSHOT" # CLOCKER_VERSION
2+
version: "2.0.0" # CLOCKER_VERSION
33
publish:
44
description: |
55
An X.509 Certificate Authority tool using OpenSSL

‎common/src/main/resources/common/common.bom

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
brooklyn.catalog:
2-
version: "2.0.0-SNAPSHOT" # CLOCKER_VERSION
2+
version: "2.0.0" # CLOCKER_VERSION
33
publish:
44
description: |
55
Resources for common Apache Brooklyn entities

‎common/src/main/resources/docker/docker.bom

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
brooklyn.catalog:
2-
version: "2.0.0-SNAPSHOT" # CLOCKER_VERSION
2+
version: "2.0.0" # CLOCKER_VERSION
33
publish:
44
description: |
55
Resources for working with Docker Engine from Apache Brooklyn
@@ -92,7 +92,7 @@ brooklyn.catalog:
9292
DOCKER_REPOSITORY_URL: $brooklyn:config("docker.repository.url")
9393
DOCKER_GPG_KEY_URL: $brooklyn:config("docker.gpgkey.url")
9494
ENTITY_ID: $brooklyn:entityId()
95-
CLOCKER_VERSION: "2.0.0-SNAPSHOT"
95+
CLOCKER_VERSION: "2.0.0"
9696

9797
install.command: |
9898
set -e # need all commands to execute successfully

‎common/src/test/resources/docker/common.tests.bom

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
brooklyn.catalog:
2-
version: "2.0.0-SNAPSHOT" # CLOCKER_VERSION
2+
version: "2.0.0" # CLOCKER_VERSION
33
iconUrl: https://raw.githubusercontent.com/docker-library/docs/c350af05d3fac7b5c3f6327ac82fe4d990d8729c/docker/logo.png
44
license_code: APACHE-2.0
55

‎common/src/test/resources/docker/docker.tests.bom

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
brooklyn.catalog:
2-
version: "2.0.0-SNAPSHOT" # CLOCKER_VERSION
2+
version: "2.0.0" # CLOCKER_VERSION
33
iconUrl: https://raw.githubusercontent.com/docker-library/docs/c350af05d3fac7b5c3f6327ac82fe4d990d8729c/docker/logo.png
44
dependsOn:
55
- tests/common.tests.bom

‎common/src/test/resources/docker/tests.bom

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
brooklyn.catalog:
2-
version: "2.0.0-SNAPSHOT" # CLOCKER_VERSION
2+
version: "2.0.0" # CLOCKER_VERSION
33
iconUrl: https://raw.githubusercontent.com/docker-library/docs/471fa6e4cb58062ccbf91afc111980f9c7004981/swarm/logo.png
44
dependsOn:
55
- tests/docker.tests.bom

‎kubernetes/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>io.brooklyn.clocker</groupId>
99
<artifactId>clocker-parent</artifactId>
10-
<version>2.0.0-SNAPSHOT</version> <!-- CLOCKER_VERSION -->
10+
<version>2.0.0</version> <!-- CLOCKER_VERSION -->
1111
</parent>
1212

1313
<name>Clocker :: Kubernetes</name>

‎kubernetes/src/main/resources/kubernetes/kubernetes.bom

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
brooklyn.catalog:
2-
version: "2.0.0-SNAPSHOT" # CLOCKER_VERSION
2+
version: "2.0.0" # CLOCKER_VERSION
33
publish:
44
description: |
55
Resources for working with Kubernetes from Apache Brooklyn

‎kubernetes/src/main/resources/kubernetes/plugins.bom

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
brooklyn.catalog:
2-
version: "2.0.0-SNAPSHOT" # CLOCKER_VERSION
2+
version: "2.0.0" # CLOCKER_VERSION
33
publish:
44
description: |
55
Resources for working with Docker Engine plugins from Apache Brooklyn

‎kubernetes/src/test/resources/kubernetes/common.tests.bom

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
brooklyn.catalog:
2-
version: "2.0.0-SNAPSHOT" # CLOCKER_VERSION
2+
version: "2.0.0" # CLOCKER_VERSION
33
license_code: APACHE-2.0
44

55
items:

‎kubernetes/src/test/resources/kubernetes/kubernetes.tests.bom

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
brooklyn.catalog:
22
items:
33
- id: kubernetes-cluster-tests
4-
version: "2.0.0-SNAPSHOT" # CLOCKER_VERSION
4+
version: "2.0.0" # CLOCKER_VERSION
55
itemType: template
66
iconUrl: https://twitter.com/kubernetesio/profile_image?size=original
77
name: Kubernetes Cluster Tests

‎kubernetes/src/test/resources/kubernetes/tests.bom

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
brooklyn.catalog:
2-
version: "2.0.0-SNAPSHOT" # CLOCKER_VERSION
2+
version: "2.0.0" # CLOCKER_VERSION
33
iconUrl: https://twitter.com/kubernetesio/profile_image?size=original
44
license_code: APACHE-2.0
55
dependsOn:

‎pom.xml

+66-3
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@
77
<groupId>io.brooklyn.clocker</groupId>
88
<artifactId>clocker-parent</artifactId>
99
<packaging>pom</packaging>
10-
<version>2.0.0-SNAPSHOT</version> <!-- CLOCKER_VERSION -->
10+
<version>2.0.0</version> <!-- CLOCKER_VERSION -->
1111

1212
<name>Clocker</name>
13-
<description>Clocker</description>
14-
13+
<description>Apache Brooklyn blueprints to deploy and manage Docker environments</description>
14+
<url>https://github.com/brooklyncentral/clocker</url>
15+
1516
<properties>
1617
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1718
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -46,6 +47,22 @@
4647
</license>
4748
</licenses>
4849

50+
<!-- For the full list of developers, see contributors to https://github.com/brooklyncentral/clocker -->
51+
<developers>
52+
<developer>
53+
<name>Aled Sage</name>
54+
<organizationUrl>https://github.com/aledsage</organizationUrl>
55+
</developer>
56+
<developer>
57+
<name>Andrew Kennedy</name>
58+
<organizationUrl>https://github.com/grkvlt</organizationUrl>
59+
</developer>
60+
<developer>
61+
<name>Mark McKenna</name>
62+
<organizationUrl>https://github.com/m4rkmckenna</organizationUrl>
63+
</developer>
64+
</developers>
65+
4966
<distributionManagement>
5067
<snapshotRepository>
5168
<id>sonatype-nexus-snapshots</id>
@@ -132,6 +149,10 @@
132149
<artifactId>maven-jar-plugin</artifactId>
133150
<version>${maven-jar-plugin.version}</version>
134151
</plugin>
152+
<plugin>
153+
<artifactId>maven-gpg-plugin</artifactId>
154+
<version>1.6</version>
155+
</plugin>
135156
</plugins>
136157
</pluginManagement>
137158

@@ -185,4 +206,46 @@
185206
</plugin>
186207
</plugins>
187208
</build>
209+
210+
<profiles>
211+
<profile>
212+
<id>sonatype-release</id>
213+
<activation>
214+
<property>
215+
<name>brooklyn.deployTo</name>
216+
<value>sonatype</value>
217+
</property>
218+
</activation>
219+
<distributionManagement>
220+
<repository>
221+
<id>sonatype-nexus-staging</id>
222+
<name>Nexus Release Repository</name>
223+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
224+
</repository>
225+
<snapshotRepository>
226+
<id>sonatype-nexus-snapshots</id>
227+
<name>Sonatype Nexus Snapshots</name>
228+
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
229+
</snapshotRepository>
230+
</distributionManagement>
231+
<build>
232+
<plugins>
233+
<plugin>
234+
<artifactId>maven-gpg-plugin</artifactId>
235+
<executions>
236+
<execution>
237+
<id>sign-artifacts</id>
238+
<phase>verify</phase>
239+
<goals>
240+
<goal>sign</goal>
241+
</goals>
242+
</execution>
243+
</executions>
244+
</plugin>
245+
</plugins>
246+
</build>
247+
248+
</profile>
249+
</profiles>
250+
188251
</project>

‎swarm/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>io.brooklyn.clocker</groupId>
99
<artifactId>clocker-parent</artifactId>
10-
<version>2.0.0-SNAPSHOT</version> <!-- CLOCKER_VERSION -->
10+
<version>2.0.0</version> <!-- CLOCKER_VERSION -->
1111
</parent>
1212

1313
<name>Clocker :: Swarm</name>

‎swarm/src/main/resources/swarm/swarm.bom

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
brooklyn.catalog:
2-
version: "2.0.0-SNAPSHOT" # CLOCKER_VERSION
2+
version: "2.0.0" # CLOCKER_VERSION
33
publish:
44
description: |
55
Resources for working with Docker Swarm from Apache Brooklyn

‎swarm/src/test/resources/docker/swarm.tests.bom

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
brooklyn.catalog:
2-
version: "2.0.0-SNAPSHOT" # CLOCKER_VERSION
2+
version: "2.0.0" # CLOCKER_VERSION
33
iconUrl: https://raw.githubusercontent.com/docker-library/docs/471fa6e4cb58062ccbf91afc111980f9c7004981/swarm/logo.png
44
dependsOn:
55
- tests/common.tests.bom

‎swarm/src/test/resources/docker/tests.bom

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
brooklyn.catalog:
2-
version: "2.0.0-SNAPSHOT" # CLOCKER_VERSION
2+
version: "2.0.0" # CLOCKER_VERSION
33
iconUrl: https://raw.githubusercontent.com/docker-library/docs/471fa6e4cb58062ccbf91afc111980f9c7004981/swarm/logo.png
44
dependsOn:
55
- tests/docker.tests.bom

0 commit comments

Comments
 (0)