Skip to content
This repository was archived by the owner on Mar 11, 2022. It is now read-only.

Commit 3833def

Browse files
pvlugterpvlugter
committed
Set up automatic deploy via bintray
1 parent cf3f706 commit 3833def

39 files changed

+151
-101
lines changed

‎.mvn/extensions.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
3+
<extension>
4+
<groupId>fr.brouillard.oss</groupId>
5+
<artifactId>jgitver-maven-plugin</artifactId>
6+
<version>1.5.1</version>
7+
</extension>
8+
</extensions>

‎.mvn/snapshot.jgitver.config.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<configuration xmlns="http://jgitver.github.io/maven/configuration/1.1.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://jgitver.github.io/maven/configuration/1.1.0 https://jgitver.github.io/maven/configuration/jgitver-configuration-v1_1_0.xsd">
4+
<!-- Configuration below provides snapshot versions like those used with other cloudstate projects (that use sbt-dynver plugin) -->
5+
<strategy>CONFIGURABLE</strategy>
6+
<useCommitDistance>true</useCommitDistance>
7+
<useGitCommitId>true</useGitCommitId>
8+
<gitCommitIdLength>8</gitCommitIdLength>
9+
<failIfDirty>true</failIfDirty>
10+
<nonQualifierBranches>master</nonQualifierBranches>
11+
</configuration>

‎.travis.yml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@ jdk: openjdk8
22
script:
33
- chmod +x build.sh
44
- "./build.sh"
5+
56
env:
67
global:
7-
- secure: dW6robk0b2l+KI9FgjEATH4o/XuGtmoLIhgSYz09/GvVxF5Fpc3Dhmi43Smy2t23F5pFyh6lo+wJJvYaYlyhFJeb0CwTh7s0y4w4E+XWFffLd50wMBoY5jts7JI8z7AtvyVts1zJgofCU9Yj42tgfxUpB7icwmpL2dcIB8v1ooR3ZK8xU9IMMjVKkFtoTiAHZ/w+OMbKeTKeq8OwbM8NB0K+GZsW5iZoJaQ7PSqbOvNYjM6GED08LA4/EAIyBLxi/9OiBNOkNcka6FI6b205al2s2KajoEj7LEdUWhJrJ8Za5hB7/AYANTZdBbPJbupsctXJv4l2ll01VBF0HkvNUbSqN3kv0f2Zlfj6TqT0gxd3Oo7VRhQTNqZT0L4IX12xD2SsmB+fhT0hbcDu3viFnhLhxcEYzI3VRzYhE2LdRjEJsykOvnrhvyXpEm0rGpnB9tT/Zb1cYYHz+NXEEFRcoKuerKZ8/amyHcPHmFVPquRv2Y+MjHHOQJO+d4xhMqVqCccXSEa4YCdnCKAuxZGKm1tFn9eoFXYXFk9M1N3KewziUUk0/l3O+NADqXBkm8SE9eLUN5mLAt1L/AlNlHwEiwdlBktPBX+HJwkfmZHQzqPwNEWDVJhYDacv+gkokz+1lOw2SoLt2zYtpMr1KRtlSXjf+z/2+NGX/DqYjF3AyLs=
8-
- secure: sDHWFJVM+p5CIsZpWsnz6rbEkjR5KDodW+/h7hgcbDWhU63D/5QxosZFAdSvVk5rXxhSnjYYgPFm2CSmjQLRJNanefaoIrcJ0VJFnIT8SbdyuJqtVyiPOQHrYpKX7cBRhqFM+MU4SIrXFsuHaEWypfMw/odDRyEkI1TKZGfECJRKpC74/AHqmXqnYLp8qCLfkPgSlw3vXv6a8bPcJHkRIYJLGbuTLTmKy4ecdYEeN8WGCjaDSGfpBr6qBbpxfnGmkVUwNPW+LWqwFM2LXFnXtVzx3VaTgqiApgQ7ARmhqF07s/gETzSR2XPFSz7WAnPurEZ2/KhTnd2ShBl32h2WaFNXr19a/89tD2UD39hCim6plt+nfxWyCSeQgvsVh3cXlZFpmyz0SivHRW501cLbnt3FMwsfsi+UbFCj7PUNFIAY4RI1xsbwebQDwsk2Q5DagMoSzYBpuiKUb3di0zDNHMOFcSMxG/fDWtqsyYjwtdf6OAkcNwxdMKS+I+YfRcQ+UZDfHSqmfDlMECOTP7hDvfMwVel8cgtjuYeJccdt66r5XNr7OiO8qRsZVMBSHmGnXHQhqKGvGpygPaWisDEWlyjoTgp6GRrMqdu7y1CpmtGwge82P2vwkJr1kfOsNFQzFxdU66Qk+O/YXmPlB+l5tqxmgle3vEKMQvBsRjWFNZE=
9-
- secure: FeAK5wW9iL7p+5ugCbCQi6XODlLriXhtT0FNSlvLKr+Nz9TadoI+eZBRqDQDnl6AP5Y9FLg8HHmAbA6bUP/85tx/NuqN0oZ/xrlBgz6nNJ8t325PGK2VEnm+H2XclvRELqLx5rIEwxJA9D67Uex9cjOwE/e4RaxpwN8SPdVpsjodelolUlblNYw1j/PxiBVy+jBVl3qqmsP9EmfZ/IXppg1lwADLV+1r+xkdNcdhbnKWwyHfDY+g1tZxUYexya4jsl7wH+BdRSGOtCtjCPVLwE5uaokHNnEHYJNZKt3RO8KannQpoYY549ucDR6YIGpFgpVd1AAui2orYWcQXFBj+NArgQNq5BwqNB+dYqlbIpv0hh7LH6Hvq2cD+48DOZj4L7D0SZfGlalxCYwaN8lJkPxv3Ny32zfeHKx92Vif7odH4O9JZyf0ETNDijGKmVJp1px1ZPlpZ4hWQXXiz2CyNtXQ17QbNBP+ZoHhpuGj7g+HEk8bdytjMgeEcn8PCook81/ZmB0B3TeY3pqQCd4f3ILwo/huG15dpjMFPSAdLf6p5On/FXXpPwvn01gj/nPRXR4hYhSCrYVU7LP3iUa+315wR5TCsr/klCA5QPPrzM/HqmTnBb4CkGxN08LkerK8H96k8wnQwMNoEEc4dW88CC17czFQxuWIfhhku8Aaaow=
10-
- secure: tKSZzMZdJJR+AGKI78vAcP1pocR/XU4ifclN4VNpA+cX6QYaF7QHirAZ1c88qVoKHgX3pSvLQV9oGFasiBFIW/jad7sNDEG2/y02tezfBDJ26Of4QdEg6DHO1ID1DClaAlzYhWtpp46Y6npYn9eU/q46yMzprKjXwAhebBQVKRRt//6o62Mdx8SCXLrXZtVQnKQdAIjTJ27TKUvyhSJaoBEuT1yPiRo8m473/OBzSfqsZAwieh8z9/ttIF26hu/OIEaV/BoC8ovPCyzRd1UsyR0m9RExcBj7cGHUyUj5+yUaDXv4+p8+tOdsr0cEHK0WIV9DTa6iW0kU96niuBmBzz4yznAUWsoH2dGvLYbZ1dtVHgmdUyXFM6vOaCkFGhxubG4Mf437XFMb1iBPIL/nAiMxmMHfuTCPPeszz9HtyBQPr4749ckO4o12e8cJnfeWF2SWpxV/s24y00AVfVSNm5s2zKLtrN5K5LMdjVDuj7Z1zMALLoqAAdIV9HyT4B0NgFfAphy6qLvTRlJy7IMna0+m6NqeMYwoAIuhuFzMv+6+LSl8FshiJSRIeupbWzFulk8SCwgXTyceqE4ZEwje7LksUbVjN0aczbpaNHteOv3Ua45Fukg61hwiH+m3sabs8Cpq9/9Mai80MmbGQ4d8C5X0sYRyYfSAXEFEjR8pSv4=
11-
- secure: QwyTOG+NqNBU7ywPv3BFrdeJFGUdPjt7B5DG85u5O3fEXmWJowra1sr0yyQ4sfA0ag5G3ZzY6zacgeD6lumNpofA4RuBwVZ5BGwEe3b0BmNXbWwVjG1RGgL3NlNMvwgOGh/fV3zs+IplddUU+/yedtHaCXkRqtvgNUyxFCmeEP4XHaPsXpCYOIDebXiNH6VNjUY7WBDnYCNDZgRW9MMMbuQoRpzVJw21VG6kp/jgVZfNUZ6T2QZG5spFp91yVXfKWVr4/T44CbXfXdtOilNz6GnI8qZi1cjbTEhswVmgrxedmxM6cJ5IGLvvJNvs4lHNMDQIhBJ/6HvCGBAuklOqRsefkyJhXpu2DQDC82rP73hx6RU/x6JoAWy48N3cmt+vlCdwndJoeEHAIjhkv/m2rFdBbfH2XTIi/FaUNgx7masSayIFoaRckN8ZYamDw8yv/rrl0sRYOeGLyrsjNePAu8ciswqWelOWkEjznzpUA0Jl9BZE60vfRPp6dOvhrSwcR5uK9mzRP0UfuuL/L6fp1lboOaNtxTbPo+AlNm8MElrNZBDxn7dj8jXQsu3+9U1g9mihGRYC/f9hHymgC8KuwlSjBTUliJDxF3cQPOtAZrfAUTykxdj3HY3bTCI2wZmATmNTb55GOzWDbog8CzULtUHnnCqe7QXKVnTfv+QmMMw=
12-
- secure: EaUmYC407TdES/fC6TDFD8hy8TaRrDqerHeGz7tq6AaQlGdz/ii7tctvjOet9Opl1lhULtVjPr2CkdZjz6ziwJ3n/tFrAjqxh2b5RBH33aIdGOgWXQPmqev8bqhTdnnvYvex9IVptnbK7EYNtWXoNoML5RZKfV4H/uaAmOXz/0HJn1EnBwuF4c6Y8wZaFQZ8X7mepWJxjrtlvPoIkm3yIvKA46l5kOVCdV9IHXoKWJ8KVyesi2ntyd8zmvPNjvrg2XNcl8dj0+Q1hC/jdsrzlpJER1DU94FmRfo8nU6KVD8JmeOiUEJqlqj1RHwd+Z66TODvLruq15BwLtYJrdMw5fwSMfS1GhN16zAFuL0fF+V0tFwloG2X0cCNug459ntC8YuQl/hFS9xZ0ugdpW1GLnxeAR9FOKoYPf63zyvI8gdxko5lyNL2v8r+5eMmv3ifTjdSjvfoUQrYT67dyo8BAU4mTXLtay5kEn1n+XlO5kvY1biYDN52gWsbfTDs87Sd4G6pyfbJtqW8CES0NV25y5Ms3//04adtDYW6lkMwspv7baDstxxXmBxo+ZUtDGHYqAjT9Gqmnff56Sl9/mGW+9RDQ2+BS7YzHYLFkHBR44SkaC5jL1P18XKdTRaEaYPMCMq0XBxnUwGtbJIlS/PcE4kvrdenqle8LG3SILkDJSc=
13-
after_success:
14-
- ./deployment/deploy.sh
15-
before_install:
16-
- openssl aes-256-cbc -K $encrypted_c8424e151bad_key -iv $encrypted_c8424e151bad_iv
17-
-in deployment/signingkey.asc.enc -out deployment/signingkey.asc -d
8+
- BINTRAY_USERNAME=cloudstatebot
9+
# API key encrypted with: travis encrypt --pro -r cloudstateio/springboot-support BINTRAY_PASSWORD={password}
10+
- secure: "aYxwzNgvlh8hLpRUDu+p8RfhmjUCA3HoJ3iJgcaDoBdttsIS7vQbWIOALhbauoYjQvmNfbW3p9vpog/YlxEnEQQSN+UvA7QttAPFE24TCiqOAxD1JTBQ5k8L6ZmOJBhsl8l/zIejQ4XVLO8GfEhXrFziBxAzmnIumQmvuonAz6qmhvk/q2aWHzLuYml0vvHkRCL2n5Rf75S5/Wsnpgm9BcVoGj6d0+HyQY5T3GOHHykgExXQdXRkrdfG1IDWYmlXGif+TL/tZN7RMJLHBstFaPalQfvu25RoNGcTK3j+daYUDoSu00CMugd6AutlmSFKqTfDLUR5mPeKbh0x9s75tSjCjsgBwrD/uB405FYvYNZcJhXpvARENCBXGoPMxFbe237/doB6LZAN0kTmcoY1zx13aymcooAinq7hj0fBW6pP7O7AKGbY/AsQUw6BAgo7vbBPoXKi6d3KaEUjbFqNi8Z14Gocdy+xUG70vW/ot8oaryGmAgjooIjHQVf7vwxYSPnFJg9iHZMwF09HAxlmx83zLhLEMscrhbBIX0ZbEkYYc5OEit4mz/OTPnly9M8REarb4xvYxC+tRN1l4Zt0OnBvAnB8l05aIOX8QJ9mWv/2XgG5dycbDagApcWCYAOR9B84FywvhPvkXEFVE9n7RWfaeGWgtZYBdphTIfvf81g="
11+
12+
deploy:
13+
provider: script
14+
script: deployment/deploy-release.sh
15+
skip_cleanup: true
16+
on:
17+
tags: true
18+
repo: cloudstateio/springboot-support

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ First add the dependency of the cloudstater starter to your project. Here an Mav
1919
<dependencies>
2020
<dependency>
2121
<groupId>io.cloudstate</groupId>
22-
<artifactId>springboot-support</artifactId>
22+
<artifactId>cloudstate-springboot-support</artifactId>
2323
<version>0.5.1</version>
2424
</dependency>
2525
</dependencies>
@@ -91,7 +91,7 @@ Here we have an example of a pom.xml file with all the necessary parts present:
9191
<dependencies>
9292
<dependency>
9393
<groupId>io.cloudstate</groupId>
94-
<artifactId>springboot-support</artifactId>
94+
<artifactId>cloudstate-springboot-support</artifactId>
9595
<version>0.5.1</version>
9696
</dependency>
9797
</dependencies>

‎RELEASING.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Releasing
2+
3+
1. Wait for any running [Travis builds](https://travis-ci.com/github/cloudstateio/springboot-support/builds) to complete.
4+
5+
2. Create a [release and tag](https://github.com/cloudstateio/springboot-support/releases) for the next version.
6+
7+
3. Travis will start a [build](https://travis-ci.com/github/cloudstateio/springboot-support/builds) and publish to Bintray.
8+
9+
4. Go to the [Bintray package](https://bintray.com/cloudstateio/releases/cloudstate-springboot-support) and select the released version.
10+
11+
5. Log in, go to the Maven Central tab, check the _Close and release repository when done_ checkbox and sync with Sonatype (using your Sonatype **User Token** key and password).
12+
13+
14+
## Snapshots
15+
16+
Configuration in `.mvn/snapshot.jgitver.config.xml` provides snapshot versions like those used with other Cloudstate projects (that use sbt-dynver plugin), such as `0.5.1-7-abcd1234`.
17+
18+
To publish a versioned snapshot to https://bintray.com/cloudstateio/snapshots, use the `deployment/deploy-snapshot.sh` script, with BINTRAY_USERNAME and BINTARY_PASSWORD environment variables set.
19+
20+
```
21+
BINTRAY_USERNAME={username} BINTARY_PASSWORD={apikey} deployment/deploy-snapshot.sh
22+
```
23+
24+
Note: the repository must not be dirty when using the above configuration. Commit before releasing a versioned snapshot.

‎benchmark/pom.xml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,9 @@
33
xmlns="http://maven.apache.org/POM/4.0.0"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
6+
<groupId>io.cloudstate</groupId>
67
<artifactId>benchmark</artifactId>
7-
8-
<parent>
9-
<groupId>io.cloudstate</groupId>
10-
<artifactId>spring-boot-cloudstate-starter</artifactId>
11-
<version>0.5.1</version>
12-
</parent>
8+
<version>0</version>
139

1410
<properties>
1511
<spring-boot.version>2.2.4.RELEASE</spring-boot.version>
@@ -29,8 +25,8 @@
2925
<dependencies>
3026
<dependency>
3127
<groupId>io.cloudstate</groupId>
32-
<artifactId>springboot-support</artifactId>
33-
<version>0.5.1</version>
28+
<artifactId>cloudstate-springboot-support</artifactId>
29+
<version>${project.version}</version>
3430
</dependency>
3531

3632
<!-- Tests -->
@@ -133,4 +129,4 @@
133129
</plugins>
134130
</build>
135131

136-
</project>
132+
</project>

‎build.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22

33
set -x
4+
set -e
45
mvn clean
5-
cd cloudstate-springboot-starter && mvn install -DskipTests && cd ..
6-
cd examples/cloudstate-springboot-example && mvn protobuf:compile && mvn install
7-
cd ../cloudstate-springboot-jsr330 && mvn protobuf:compile && mvn install
8-
cd ../../ && cd cloudstate-springboot-starter && mvn install
6+
mvn --projects cloudstate-springboot-support install -DskipTests
7+
mvn --projects examples/cloudstate-springboot-example protobuf:compile install
8+
mvn --projects examples/cloudstate-springboot-jsr330 protobuf:compile install
9+
mvn --projects cloudstate-springboot-support install

‎cloudstate-springboot-starter/pom.xml renamed to ‎cloudstate-springboot-support/pom.xml

Lines changed: 47 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,39 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
44
http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
6-
<artifactId>springboot-support</artifactId>
6+
<groupId>io.cloudstate</groupId>
7+
<artifactId>cloudstate-springboot-support</artifactId>
8+
<version>0</version>
79
<packaging>jar</packaging>
810

9-
<parent>
10-
<groupId>io.cloudstate</groupId>
11-
<artifactId>spring-boot-cloudstate-starter</artifactId>
12-
<version>0.5.1</version>
13-
</parent>
14-
11+
<name>Cloudstate Spring Boot</name>
12+
<description>Cloudstate Spring Boot support</description>
1513
<url>https://github.com/cloudstateio/springboot-support</url>
1614
<inceptionYear>2020</inceptionYear>
1715
<licenses>
1816
<license>
1917
<name>Apache 2.0</name>
20-
<url>https://opensource.org/licenses/Apache-2.0</url>
21-
<distribution>repo</distribution>
18+
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
2219
</license>
2320
</licenses>
2421

22+
<developers>
23+
<developer>
24+
<name>Cloudstate Contributors</name>
25+
<email>[email protected]</email>
26+
<organization>Cloudstate</organization>
27+
<organizationUrl>https://cloudstate.io</organizationUrl>
28+
</developer>
29+
</developers>
30+
2531
<scm>
2632
<connection>scm:git:[email protected]/cloudstateio/springboot-support</connection>
2733
<developerConnection>scm:git:[email protected]/cloudstateio/springboot-support.git</developerConnection>
2834
<url>https://github.com/cloudstateio/springboot-support</url>
2935
</scm>
3036

3137
<properties>
32-
<cloudstate.version>0.5.1</cloudstate.version>
38+
<cloudstate.version>0.5.1</cloudstate.version>
3339
<spring-boot.version>2.2.4.RELEASE</spring-boot.version>
3440
<maven.compiler.target>1.8</maven.compiler.target>
3541
<maven.compiler.source>1.8</maven.compiler.source>
@@ -78,7 +84,7 @@
7884
</dependencies>
7985

8086
<build>
81-
<finalName>springboot-support</finalName>
87+
<finalName>cloudstate-springboot-support</finalName>
8288
<plugins>
8389
<plugin>
8490
<groupId>org.apache.maven.plugins</groupId>
@@ -113,6 +119,34 @@
113119
</executions>
114120
</plugin>
115121

122+
<plugin>
123+
<groupId>org.apache.maven.plugins</groupId>
124+
<artifactId>maven-source-plugin</artifactId>
125+
<version>2.2.1</version>
126+
<executions>
127+
<execution>
128+
<id>attach-sources</id>
129+
<goals>
130+
<goal>jar-no-fork</goal>
131+
</goals>
132+
</execution>
133+
</executions>
134+
</plugin>
135+
136+
<plugin>
137+
<groupId>org.apache.maven.plugins</groupId>
138+
<artifactId>maven-javadoc-plugin</artifactId>
139+
<version>2.9.1</version>
140+
<executions>
141+
<execution>
142+
<id>attach-javadocs</id>
143+
<goals>
144+
<goal>jar</goal>
145+
</goals>
146+
</execution>
147+
</executions>
148+
</plugin>
149+
116150
<plugin>
117151
<artifactId>maven-deploy-plugin</artifactId>
118152
<version>2.8.2</version>
@@ -126,30 +160,13 @@
126160
</execution>
127161
</executions>
128162
</plugin>
129-
130-
<plugin>
131-
<groupId>org.sonatype.plugins</groupId>
132-
<artifactId>nexus-staging-maven-plugin</artifactId>
133-
<version>1.6.7</version>
134-
<extensions>true</extensions>
135-
<configuration>
136-
<serverId>io.cloudstate</serverId>
137-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
138-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
139-
</configuration>
140-
</plugin>
141163
</plugins>
142164
</build>
143165

144166
<distributionManagement>
145-
<snapshotRepository>
146-
<id>io.cloudstate</id>
147-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
148-
</snapshotRepository>
149-
150167
<repository>
151-
<id>io.cloudstate</id>
152-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
168+
<id>bintray-cloudstateio-releases</id>
169+
<url>https://api.bintray.com/maven/cloudstateio/releases/cloudstate-springboot-support/;publish=1</url>
153170
</repository>
154171
</distributionManagement>
155172
</project>

‎cloudstate-springboot-starter/src/main/java/io/cloudstate/springboot/starter/CloudstateContext.java renamed to ‎cloudstate-springboot-support/src/main/java/io/cloudstate/springboot/starter/CloudstateContext.java

File renamed without changes.

‎cloudstate-springboot-starter/src/main/java/io/cloudstate/springboot/starter/CloudstateEntityBean.java renamed to ‎cloudstate-springboot-support/src/main/java/io/cloudstate/springboot/starter/CloudstateEntityBean.java

File renamed without changes.

0 commit comments

Comments
 (0)