Merge pull request #337 from aledsage/2.0.x

Releasing 2.0.0 (to sonatype)
brooklyncentral · Oct 3, 2016 · 23f39fb · 23f39fb
2 parents 37b7a73 + c94bdd2
commit 23f39fb
Show file tree

Hide file tree

Showing 18 changed files with 84 additions and 21 deletions.
diff --git a/common/pom.xml b/common/pom.xml
@@ -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>

diff --git a/common/src/main/resources/common/ca.bom b/common/src/main/resources/common/ca.bom
@@ -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

diff --git a/common/src/main/resources/common/common.bom b/common/src/main/resources/common/common.bom
@@ -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

diff --git a/common/src/main/resources/docker/docker.bom b/common/src/main/resources/docker/docker.bom
@@ -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
@@ -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

diff --git a/common/src/test/resources/docker/common.tests.bom b/common/src/test/resources/docker/common.tests.bom
@@ -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
 

diff --git a/common/src/test/resources/docker/docker.tests.bom b/common/src/test/resources/docker/docker.tests.bom
@@ -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

diff --git a/common/src/test/resources/docker/tests.bom b/common/src/test/resources/docker/tests.bom
@@ -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

diff --git a/kubernetes/pom.xml b/kubernetes/pom.xml
@@ -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>

diff --git a/kubernetes/src/main/resources/kubernetes/kubernetes.bom b/kubernetes/src/main/resources/kubernetes/kubernetes.bom
@@ -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

diff --git a/kubernetes/src/main/resources/kubernetes/plugins.bom b/kubernetes/src/main/resources/kubernetes/plugins.bom
@@ -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

diff --git a/kubernetes/src/test/resources/kubernetes/common.tests.bom b/kubernetes/src/test/resources/kubernetes/common.tests.bom
@@ -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:

diff --git a/kubernetes/src/test/resources/kubernetes/kubernetes.tests.bom b/kubernetes/src/test/resources/kubernetes/kubernetes.tests.bom
@@ -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

diff --git a/kubernetes/src/test/resources/kubernetes/tests.bom b/kubernetes/src/test/resources/kubernetes/tests.bom
@@ -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:

diff --git a/pom.xml b/pom.xml
@@ -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>
@@ -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>
@@ -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>
 
@@ -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>
diff --git a/swarm/pom.xml b/swarm/pom.xml
@@ -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>

diff --git a/swarm/src/main/resources/swarm/swarm.bom b/swarm/src/main/resources/swarm/swarm.bom
@@ -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

diff --git a/swarm/src/test/resources/docker/swarm.tests.bom b/swarm/src/test/resources/docker/swarm.tests.bom
@@ -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

diff --git a/swarm/src/test/resources/docker/tests.bom b/swarm/src/test/resources/docker/tests.bom
@@ -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