Skip to content

Commit d58d68e

Browse files
authored
Release v3.1.0
2 parents de40948 + 18ccf60 commit d58d68e

File tree

7 files changed

+123
-97
lines changed

7 files changed

+123
-97
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Changelog
22

3+
## 3.1.0 (2017-90-22)
4+
5+
### Enhancements
6+
7+
* Track difference between handled and unhandled exceptions
8+
[#59](https://github.com/bugsnag/bugsnag-java/pull/59)
9+
310
## 3.0.2 (04 Jan 2017)
411

512
### Bug Fixes

CONTRIBUTING.md

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,27 @@ Create a Sonatype account:
3333
1. Ask an existing contributor (likely Simon) to confirm in the ticket
3434
1. Wait for Sonatype them to confirm the approval
3535

36+
Create a [Bintray](https://bintray.com) account:
37+
38+
1. Create an account
39+
1. Request access to the Bugsnag organization
40+
3641
### 2. Configure the prerequisites
3742

3843
1. Create your [PGP Signatures](http://central.sonatype.org/pages/working-with-pgp-signatures.html)
3944
2. Configure your `~/.gradle/gradle.properties`:
4045

41-
```xml
42-
signing.keyId=your-gpg-key-id (8-character hex)
46+
```ini
47+
signing.keyId=your-gpg-key-id # (8-character hex)
4348
signing.password=your-gpg-password
4449
signing.secretKeyRingFile=/PATH/TO/HOME/.gnupg/secring.gpg
45-
46-
sonatypeUsername=your-sonatype-username
47-
sonatypePassword=your-sonatype-password
50+
51+
nexusUsername=your-sonatype-username
52+
nexusPassword=your-sonatype-password
53+
54+
# Your credentials for https://bintray.com
55+
bintray_user=your-bintray-username
56+
bintray_api_key=your-bintray-api-key
4857
```
4958

5059
### 3. Making a release
@@ -53,21 +62,14 @@ Create a Sonatype account:
5362
1. Bump the version number in `Notifier.java`
5463
1. Commit the changes
5564
1. Create a release build:
56-
* `./gradlew --console=plain clean release`
65+
* `./gradlew -Preleasing=true clean release`
5766
- enter the release version (e.g. `1.2.0`)
5867
- accept the default development version
5968
1. Create a release in GitHub
60-
1. Upload the archives to Sonatype Nexus:
61-
* `git checkout <TAG_NAME>`
62-
* `./gradlew clean uploadArchives`
63-
1. "Promote" the release build on Maven Central
64-
* Go to the [sonatype open source dashboard](https://oss.sonatype.org/index.html#stagingRepositories)
65-
* Click the search box at the top right, and type “com.bugsnag”
66-
* Select the com.bugsnag staging repository
67-
* Click the “Close” button in the toolbar to prompt the repository to be checked
68-
* Click the “Refresh” button
69-
* Select the com.bugsnag repository (should have a status of 'closed')
70-
* Click the “Release” button in the toolbar
69+
1. Upload the archives to Sonatype Nexus and Bintray:
70+
* `./gradlew -Preleasing=true uploadArchives bintrayUpload`
71+
1. "Promote" the build on Maven Central:
72+
* `./gradlew -Preleasing=true closeAndReleaseRepository`
7173
1. For a major version change, update the version numbers in the integration instructions in the website.
7274
1. Update docs.bugsnag.com with any new content, and bump major version
7375
numbers in installation instructions if changed.

build.gradle

Lines changed: 17 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,21 @@
1-
plugins {
2-
id "java"
3-
id "checkstyle"
4-
id 'net.researchgate.release' version '2.4.0'
5-
id 'maven'
6-
id 'signing'
1+
apply plugin: 'java'
2+
apply plugin: 'checkstyle'
3+
buildscript {
4+
repositories {
5+
jcenter()
6+
}
7+
dependencies {
8+
if (project.hasProperty('releasing')) {
9+
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
10+
classpath 'com.bmuschko:gradle-nexus-plugin:2.3.1'
11+
classpath 'io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.11.0'
12+
classpath 'net.researchgate:gradle-release:2.4.0'
13+
}
14+
}
15+
}
16+
if (project.hasProperty('releasing')) {
17+
apply from: "release.gradle"
718
}
8-
9-
archivesBaseName = 'bugsnag'
1019

1120
sourceCompatibility = 1.6
1221
targetCompatibility = 1.6
@@ -34,72 +43,3 @@ test {
3443
checkstyle {
3544
toolVersion = "6.16"
3645
}
37-
38-
task javadocJar(type: Jar, dependsOn: javadoc) {
39-
classifier = 'javadoc'
40-
from tasks.javadoc.destinationDir
41-
}
42-
43-
task sourcesJar(type: Jar) {
44-
classifier = 'sources'
45-
from sourceSets.main.allSource
46-
}
47-
48-
artifacts {
49-
archives jar
50-
archives javadocJar
51-
archives sourcesJar
52-
}
53-
54-
signing {
55-
required { gradle.taskGraph.hasTask("uploadArchives") }
56-
sign configurations.archives
57-
}
58-
59-
release {
60-
tagTemplate = 'v${version}'
61-
}
62-
63-
// Required to upload releases to Sonatype
64-
uploadArchives {
65-
repositories {
66-
mavenDeployer {
67-
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
68-
69-
repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
70-
authentication(userName: sonatypeUsername, password: sonatypePassword)
71-
}
72-
73-
pom.artifactId = 'bugsnag'
74-
pom.groupId = 'com.bugsnag'
75-
76-
pom.project {
77-
name 'bugsnag'
78-
packaging 'jar'
79-
description 'Official Bugsnag notifier for Java applications'
80-
url 'http://bugsnag.com/'
81-
82-
scm {
83-
url 'https://github.com/bugsnag/bugsnag-java'
84-
connection 'scm:git:[email protected]:bugsnag/bugsnag-java.git'
85-
developerConnection 'scm:git:[email protected]:bugsnag/bugsnag-java.git'
86-
}
87-
88-
licenses {
89-
license {
90-
name 'MIT'
91-
url 'http://opensource.org/licenses/MIT'
92-
distribution 'repo'
93-
}
94-
}
95-
96-
developers {
97-
developer {
98-
id 'james'
99-
name 'James Smith'
100-
}
101-
}
102-
}
103-
}
104-
}
105-
}

gradle.properties

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
version=3.0.3-SNAPSHOT
1+
version=3.1.0
22

33
# Default properties
44
sonatypeUsername=
55
sonatypePassword=
6+
bintray_user=
7+
bintray_password=
8+
bintray_api_key=

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip

release.gradle

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
apply plugin: 'com.jfrog.bintray'
2+
apply plugin: 'com.bmuschko.nexus'
3+
apply plugin: 'io.codearte.nexus-staging'
4+
apply plugin: 'net.researchgate.release'
5+
apply plugin: 'maven-publish'
6+
7+
archivesBaseName = 'bugsnag'
8+
9+
release {
10+
tagTemplate = 'v${version}'
11+
}
12+
13+
modifyPom {
14+
project {
15+
name 'Bugsnag'
16+
description 'Official Bugsnag notifier for Java applications'
17+
url 'https://github.com/bugsnag/bugsnag-java'
18+
19+
scm {
20+
url 'https://github.com/bugsnag/bugsnag-java'
21+
connection 'scm:git:git://github.com/bugsnag/bugsnag-java.git'
22+
developerConnection 'scm:git:ssh://[email protected]/bugsnag/bugsnag-java.git'
23+
}
24+
25+
licenses {
26+
license {
27+
name 'MIT'
28+
url 'http://opensource.org/licenses/MIT'
29+
distribution 'repo'
30+
}
31+
}
32+
33+
organization {
34+
name 'Bugsnag'
35+
url 'https://bugsnag.com'
36+
}
37+
38+
developers {
39+
developer {
40+
id 'loopj'
41+
name 'James Smith'
42+
43+
}
44+
}
45+
}
46+
}
47+
48+
publishing {
49+
publications {
50+
Publication(MavenPublication) {
51+
artifact jar
52+
groupId 'com.bugsnag'
53+
artifactId 'bugsnag'
54+
version project.version
55+
}
56+
}
57+
}
58+
// Bintray upload
59+
bintray {
60+
user = "$bintray_user"
61+
key = "$bintray_api_key"
62+
publications = ['Publication']
63+
pkg {
64+
repo = 'maven'
65+
name = 'bugsnag-java'
66+
userOrg = 'bugsnag'
67+
licenses = ['MIT']
68+
vcsUrl = 'https://github.com/bugsnag/bugsnag-java.git'
69+
version {
70+
name = project.version
71+
vcsTag = "v${project.version}"
72+
}
73+
}
74+
}

src/main/java/com/bugsnag/Notifier.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
class Notifier {
66
private static final String NOTIFIER_NAME = "Bugsnag Java";
7-
private static final String NOTIFIER_VERSION = "3.0.2";
7+
private static final String NOTIFIER_VERSION = "3.1.0";
88
private static final String NOTIFIER_URL = "https://github.com/bugsnag/bugsnag-java";
99

1010
@Expose

0 commit comments

Comments
 (0)