Skip to content

Commit e7290f5

Browse files
MichaelGHSegMichaelGHSeg
committed
Merge branch 'release/3.5.4' of ssh://github.com/segmentio/analytics-java into release/3.5.4
2 parents e3c57fe + 8db4c8c commit e7290f5

File tree

10 files changed

+248
-29
lines changed

10 files changed

+248
-29
lines changed

‎.buildscript/settings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<settings>
22
<servers>
33
<server>
4-
<id>ossrh</id>
4+
<id>central</id>
55
<username>${env.CI_DEPLOY_USERNAME}</username>
66
<password>${env.CI_DEPLOY_PASSWORD}</password>
77
</server>

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,4 +128,6 @@ atlassian-ide-plugin.xml
128128
.classpath
129129
.project
130130
.settings/
131-
.factorypath
131+
.factorypath
132+
133+
.vscode

‎RELEASING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ Releasing
55
2. Update the `CHANGELOG.md` for the impending release.
66
3. `mvn clean release:clean`
77
4. `mvn release:prepare release:perform`
8-
5. Visit [Sonatype Nexus](https://oss.sonatype.org/) and promote the artifact.
8+
4. Visit the [Maven Central Portal](https://central.sonatype.com/publishing/deployments) to review and publish the release.

‎analytics-cli/pom.xml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,42 @@
99
<version>3.5.4</version>
1010
</parent>
1111

12+
<groupId>com.segment.analytics.java</groupId>
1213
<artifactId>analytics-cli</artifactId>
14+
<version>3.5.5-SNAPSHOT</version>
1315
<name>Analytics Java CLI</name>
1416

17+
<description>Command-line interface for Segment Analytics for Java.</description>
18+
<url>https://github.com/segmentio/analytics-java</url>
19+
20+
<licenses>
21+
<license>
22+
<name>The MIT License (MIT)</name>
23+
<url>http://opensource.org/licenses/MIT</url>
24+
</license>
25+
</licenses>
26+
27+
<scm>
28+
<url>https://github.com/segmentio/analytics-java/</url>
29+
<connection>scm:git:https://github.com/segmentio/analytics-java.git</connection>
30+
<developerConnection>scm:git:[email protected]:segmentio/analytics-java.git</developerConnection>
31+
<tag>analytics-parent-3.5.4</tag>
32+
</scm>
33+
34+
<developers>
35+
<developer>
36+
<id>segment</id>
37+
<name>Segment</name>
38+
<organization>Segment</organization>
39+
<organizationUrl>https://segment.com</organizationUrl>
40+
</developer>
41+
</developers>
42+
1543
<dependencies>
1644
<dependency>
1745
<groupId>org.jetbrains.kotlin</groupId>
1846
<artifactId>kotlin-stdlib</artifactId>
47+
<version>${kotlin.version}</version>
1948
</dependency>
2049
<dependency>
2150
<groupId>com.segment.analytics.java</groupId>
@@ -25,6 +54,7 @@
2554
<dependency>
2655
<groupId>com.offbytwo</groupId>
2756
<artifactId>docopt</artifactId>
57+
<version>${docopt.version}</version>
2858
</dependency>
2959
</dependencies>
3060

‎analytics-cli/src/main/kotlin/cli/JavadocStub.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package cli;
2+
3+
/**
4+
* Placeholder class to generate a Javadoc JAR for the CLI artifact.
5+
*/
6+
public final class JavadocStub {
7+
private JavadocStub() {}
8+
}

‎analytics-core/pom.xml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,35 +9,69 @@
99
<version>3.5.4</version>
1010
</parent>
1111

12+
<groupId>com.segment.analytics.java</groupId>
1213
<artifactId>analytics-core</artifactId>
14+
<version>3.5.5-SNAPSHOT</version>
1315
<name>Analytics for Java (Core)</name>
1416

17+
<description>Core runtime for Segment Analytics for Java.</description>
18+
<url>https://github.com/segmentio/analytics-java</url>
19+
20+
<licenses>
21+
<license>
22+
<name>The MIT License (MIT)</name>
23+
<url>http://opensource.org/licenses/MIT</url>
24+
</license>
25+
</licenses>
26+
27+
<scm>
28+
<url>https://github.com/segmentio/analytics-java/</url>
29+
<connection>scm:git:https://github.com/segmentio/analytics-java.git</connection>
30+
<developerConnection>scm:git:[email protected]:segmentio/analytics-java.git</developerConnection>
31+
<tag>analytics-parent-3.5.4</tag>
32+
</scm>
33+
34+
<developers>
35+
<developer>
36+
<id>segment</id>
37+
<name>Segment</name>
38+
<organization>Segment</organization>
39+
<organizationUrl>https://segment.com</organizationUrl>
40+
</developer>
41+
</developers>
42+
1543
<dependencies>
1644
<dependency>
1745
<groupId>com.squareup.retrofit2</groupId>
1846
<artifactId>retrofit</artifactId>
47+
<version>${retrofit.version}</version>
1948
</dependency>
2049
<dependency>
2150
<groupId>com.google.code.gson</groupId>
2251
<artifactId>gson</artifactId>
52+
<version>${gson.version}</version>
2353
</dependency>
2454
<dependency>
2555
<groupId>com.google.code.findbugs</groupId>
2656
<artifactId>findbugs</artifactId>
57+
<version>${findbugs.version}</version>
2758
<scope>provided</scope>
2859
</dependency>
2960
<dependency>
3061
<groupId>com.google.auto.value</groupId>
3162
<artifactId>auto-value</artifactId>
63+
<version>${auto.version}</version>
3264
<scope>provided</scope>
3365
</dependency>
3466
<dependency>
3567
<groupId>com.google.auto.value</groupId>
3668
<artifactId>auto-value-annotations</artifactId>
69+
<version>${auto.version}</version>
3770
</dependency>
3871
<dependency>
3972
<groupId>com.google.guava</groupId>
4073
<artifactId>guava</artifactId>
74+
<version>${guava.version}</version>
4175
<scope>provided</scope>
4276
</dependency>
4377
<dependency>
@@ -51,29 +85,40 @@
5185
<version>1.3.2</version>
5286
</dependency>
5387

88+
<dependency>
89+
<groupId>javax.annotation</groupId>
90+
<artifactId>javax.annotation-api</artifactId>
91+
<version>1.3.2</version>
92+
</dependency>
93+
5494
<dependency>
5595
<groupId>junit</groupId>
5696
<artifactId>junit</artifactId>
97+
<version>${junit.version}</version>
5798
<scope>test</scope>
5899
</dependency>
59100
<dependency>
60101
<groupId>com.squareup.burst</groupId>
61102
<artifactId>burst-junit4</artifactId>
103+
<version>${burst.version}</version>
62104
<scope>test</scope>
63105
</dependency>
64106
<dependency>
65107
<groupId>com.squareup.burst</groupId>
66108
<artifactId>burst</artifactId>
109+
<version>${burst.version}</version>
67110
<scope>test</scope>
68111
</dependency>
69112
<dependency>
70113
<groupId>org.assertj</groupId>
71114
<artifactId>assertj-core</artifactId>
115+
<version>${assertj.version}</version>
72116
<scope>test</scope>
73117
</dependency>
74118
<dependency>
75119
<groupId>org.mockito</groupId>
76120
<artifactId>mockito-core</artifactId>
121+
<version>${mockito.version}</version>
77122
<scope>test</scope>
78123
</dependency>
79124
</dependencies>

‎analytics-sample/pom.xml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,37 @@
99
<version>3.5.4</version>
1010
</parent>
1111

12+
<groupId>com.segment.analytics.java</groupId>
1213
<artifactId>analytics-sample</artifactId>
14+
<version>3.5.5-SNAPSHOT</version>
1315
<name>Analytics Sample</name>
1416

17+
<description>Sample application demonstrating Segment Analytics for Java.</description>
18+
<url>https://github.com/segmentio/analytics-java</url>
19+
20+
<licenses>
21+
<license>
22+
<name>The MIT License (MIT)</name>
23+
<url>http://opensource.org/licenses/MIT</url>
24+
</license>
25+
</licenses>
26+
27+
<scm>
28+
<url>https://github.com/segmentio/analytics-java/</url>
29+
<connection>scm:git:https://github.com/segmentio/analytics-java.git</connection>
30+
<developerConnection>scm:git:[email protected]:segmentio/analytics-java.git</developerConnection>
31+
<tag>analytics-parent-3.5.4</tag>
32+
</scm>
33+
34+
<developers>
35+
<developer>
36+
<id>segment</id>
37+
<name>Segment</name>
38+
<organization>Segment</organization>
39+
<organizationUrl>https://segment.com</organizationUrl>
40+
</developer>
41+
</developers>
42+
1543
<dependencies>
1644
<dependency>
1745
<groupId>com.segment.analytics.java</groupId>

‎analytics-spring-boot-starter/pom.xml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,37 @@
99
<version>3.5.4</version>
1010
</parent>
1111

12+
<groupId>com.segment.analytics.java</groupId>
1213
<artifactId>analytics-spring-boot-starter</artifactId>
14+
<version>3.5.5-SNAPSHOT</version>
1315
<name>Spring Boot starter for Segment Analytics for Java</name>
1416

17+
<description>Spring Boot auto-configuration for Segment Analytics for Java.</description>
18+
<url>https://github.com/segmentio/analytics-java</url>
19+
20+
<licenses>
21+
<license>
22+
<name>The MIT License (MIT)</name>
23+
<url>http://opensource.org/licenses/MIT</url>
24+
</license>
25+
</licenses>
26+
27+
<scm>
28+
<url>https://github.com/segmentio/analytics-java/</url>
29+
<connection>scm:git:https://github.com/segmentio/analytics-java.git</connection>
30+
<developerConnection>scm:git:[email protected]:segmentio/analytics-java.git</developerConnection>
31+
<tag>analytics-parent-3.5.4</tag>
32+
</scm>
33+
34+
<developers>
35+
<developer>
36+
<id>segment</id>
37+
<name>Segment</name>
38+
<organization>Segment</organization>
39+
<organizationUrl>https://segment.com</organizationUrl>
40+
</developer>
41+
</developers>
42+
1543
<properties />
1644

1745
<dependencies>

‎analytics/pom.xml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,37 @@
99
<version>3.5.4</version>
1010
</parent>
1111

12+
<groupId>com.segment.analytics.java</groupId>
1213
<artifactId>analytics</artifactId>
14+
<version>3.5.5-SNAPSHOT</version>
1315
<name>Analytics for Java</name>
1416

17+
<description>The hassle-free way to add analytics to your Java app.</description>
18+
<url>https://github.com/segmentio/analytics-java</url>
19+
20+
<licenses>
21+
<license>
22+
<name>The MIT License (MIT)</name>
23+
<url>http://opensource.org/licenses/MIT</url>
24+
</license>
25+
</licenses>
26+
27+
<scm>
28+
<url>https://github.com/segmentio/analytics-java/</url>
29+
<connection>scm:git:https://github.com/segmentio/analytics-java.git</connection>
30+
<developerConnection>scm:git:[email protected]:segmentio/analytics-java.git</developerConnection>
31+
<tag>analytics-parent-3.5.4</tag>
32+
</scm>
33+
34+
<developers>
35+
<developer>
36+
<id>segment</id>
37+
<name>Segment</name>
38+
<organization>Segment</organization>
39+
<organizationUrl>https://segment.com</organizationUrl>
40+
</developer>
41+
</developers>
42+
1543
<dependencies>
1644
<dependency>
1745
<groupId>com.segment.analytics.java</groupId>
@@ -21,51 +49,62 @@
2149
<dependency>
2250
<groupId>com.squareup.okhttp3</groupId>
2351
<artifactId>okhttp</artifactId>
52+
<version>${okhttp.version}</version>
2453
</dependency>
2554
<dependency>
2655
<groupId>com.squareup.okhttp3</groupId>
2756
<artifactId>logging-interceptor</artifactId>
57+
<version>${logging.version}</version>
2858
</dependency>
2959
<dependency>
3060
<groupId>com.squareup.retrofit2</groupId>
3161
<artifactId>converter-gson</artifactId>
62+
<version>2.9.0</version>
3263
</dependency>
3364
<dependency>
3465
<groupId>com.squareup.retrofit2</groupId>
3566
<artifactId>retrofit-mock</artifactId>
67+
<version>${retrofit.version}</version>
3668
</dependency>
3769
<dependency>
3870
<groupId>com.google.code.findbugs</groupId>
3971
<artifactId>findbugs</artifactId>
72+
<version>${findbugs.version}</version>
4073
<scope>provided</scope>
4174
</dependency>
4275
<dependency>
4376
<groupId>com.segment.backo</groupId>
4477
<artifactId>backo</artifactId>
78+
<version>${backo.version}</version>
4579
</dependency>
4680
<dependency>
4781
<groupId>junit</groupId>
4882
<artifactId>junit</artifactId>
83+
<version>${junit.version}</version>
4984
<scope>test</scope>
5085
</dependency>
5186
<dependency>
5287
<groupId>com.squareup.burst</groupId>
5388
<artifactId>burst-junit4</artifactId>
89+
<version>${burst.version}</version>
5490
<scope>test</scope>
5591
</dependency>
5692
<dependency>
5793
<groupId>com.squareup.burst</groupId>
5894
<artifactId>burst</artifactId>
95+
<version>${burst.version}</version>
5996
<scope>test</scope>
6097
</dependency>
6198
<dependency>
6299
<groupId>org.assertj</groupId>
63100
<artifactId>assertj-core</artifactId>
101+
<version>${assertj.version}</version>
64102
<scope>test</scope>
65103
</dependency>
66104
<dependency>
67105
<groupId>org.mockito</groupId>
68106
<artifactId>mockito-core</artifactId>
107+
<version>${mockito.version}</version>
69108
<scope>test</scope>
70109
</dependency>
71110
<dependency>

0 commit comments

Comments
 (0)