Skip to content

Commit db17742

Browse files
raLaaaaraLaaaa
committed
fixed encoding problem in javadoc
1 parent 2faa8e9 commit db17742

File tree

4 files changed

+218
-10
lines changed

4 files changed

+218
-10
lines changed

‎pom.xml‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
24

35
<modelVersion>4.0.0</modelVersion>
46

57
<groupId>io.taliox</groupId>
68
<artifactId>zulip-java-rest</artifactId>
7-
<version>0.0.2-SNAPSHOT</version>
9+
<version>0.0.2</version>
810
<inceptionYear>2016</inceptionYear>
911

1012
<parent>
@@ -38,6 +40,16 @@
3840
</execution>
3941
</executions>
4042
</plugin>
43+
<plugin>
44+
<groupId>org.apache.maven.plugins</groupId>
45+
<artifactId>maven-compiler-plugin</artifactId>
46+
<version>3.8.0</version>
47+
<configuration>
48+
<source>1.8</source>
49+
<target>1.8</target>
50+
<encoding>UTF-8</encoding>
51+
</configuration>
52+
</plugin>
4153
<plugin>
4254
<groupId>org.apache.maven.plugins</groupId>
4355
<artifactId>maven-javadoc-plugin</artifactId>
@@ -142,6 +154,7 @@
142154
<java.version>1.8</java.version>
143155
<maven.compiler.source>1.8</maven.compiler.source>
144156
<maven.compiler.target>1.8</maven.compiler.target>
157+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
145158
</properties>
146159

147160

@@ -159,7 +172,7 @@
159172
<url>https://github.com/taliox/zulip-java-rest</url>
160173
<connection>scm:git:git://github.com/taliox/zulip-java-rest.git</connection>
161174
<developerConnection>scm:git:git@github.com:taliox/taliox.git</developerConnection>
162-
<tag>zulip-java-rest-0.0.1</tag>
175+
<tag>0.0.02</tag>
163176
</scm>
164177

165178
<licenses>

‎pom.xml.releaseBackup‎

Lines changed: 184 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,184 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<groupId>io.taliox</groupId>
6+
<artifactId>zulip-java-rest</artifactId>
7+
<version>0.0.2-SNAPSHOT</version>
8+
<inceptionYear>2016</inceptionYear>
9+
10+
<parent>
11+
<groupId>org.sonatype.oss</groupId>
12+
<artifactId>oss-parent</artifactId>
13+
<version>9</version>
14+
</parent>
15+
16+
<distributionManagement>
17+
<snapshotRepository>
18+
<id>ossrh</id>
19+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
20+
</snapshotRepository>
21+
<repository>
22+
<id>ossrh</id>
23+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
24+
</repository>
25+
</distributionManagement>
26+
<build>
27+
<plugins>
28+
<plugin>
29+
<groupId>org.apache.maven.plugins</groupId>
30+
<artifactId>maven-source-plugin</artifactId>
31+
<version>2.2.1</version>
32+
<executions>
33+
<execution>
34+
<id>attach-sources</id>
35+
<goals>
36+
<goal>jar</goal>
37+
</goals>
38+
</execution>
39+
</executions>
40+
</plugin>
41+
<plugin>
42+
<groupId>org.apache.maven.plugins</groupId>
43+
<artifactId>maven-javadoc-plugin</artifactId>
44+
<version>2.9.1</version>
45+
<executions>
46+
<execution>
47+
<id>attach-javadocs</id>
48+
<goals>
49+
<goal>jar</goal>
50+
</goals>
51+
</execution>
52+
</executions>
53+
</plugin>
54+
<plugin>
55+
<groupId>org.apache.maven.plugins</groupId>
56+
<artifactId>maven-gpg-plugin</artifactId>
57+
<version>1.6</version>
58+
<executions>
59+
<execution>
60+
<id>sign-artifacts</id>
61+
<phase>verify</phase>
62+
<goals>
63+
<goal>sign</goal>
64+
</goals>
65+
<configuration>
66+
<keyname>${gpg.keyname}</keyname>
67+
<passphraseServerId>${gpg.keyname}</passphraseServerId>
68+
</configuration>
69+
</execution>
70+
</executions>
71+
</plugin>
72+
<plugin>
73+
<groupId>org.sonatype.plugins</groupId>
74+
<artifactId>nexus-staging-maven-plugin</artifactId>
75+
<version>1.6.7</version>
76+
<extensions>true</extensions>
77+
<configuration>
78+
<serverId>ossrh</serverId>
79+
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
80+
<autoReleaseAfterClose>true</autoReleaseAfterClose>
81+
</configuration>
82+
</plugin>
83+
<plugin>
84+
<artifactId>maven-deploy-plugin</artifactId>
85+
<version>2.8.2</version>
86+
<executions>
87+
<execution>
88+
<id>default-deploy</id>
89+
<phase>deploy</phase>
90+
<goals>
91+
<goal>deploy</goal>
92+
</goals>
93+
</execution>
94+
</executions>
95+
</plugin>
96+
97+
<plugin>
98+
<groupId>org.apache.maven.plugins</groupId>
99+
<artifactId>maven-release-plugin</artifactId>
100+
<version>2.5.3</version>
101+
<configuration>
102+
<localCheckout>true</localCheckout>
103+
<pushChanges>false</pushChanges>
104+
<mavenExecutorId>forked-path</mavenExecutorId>
105+
<arguments>-Dgpg.passphrase=${gpg.passphrase}</arguments>
106+
</configuration>
107+
<dependencies>
108+
<dependency>
109+
<groupId>org.apache.maven.scm</groupId>
110+
<artifactId>maven-scm-provider-gitexe</artifactId>
111+
<version>1.9.5</version>
112+
</dependency>
113+
</dependencies>
114+
</plugin>
115+
</plugins>
116+
</build>
117+
118+
<dependencies>
119+
<dependency>
120+
<groupId>org.apache.httpcomponents</groupId>
121+
<artifactId>httpclient</artifactId>
122+
<version>4.5.8</version>
123+
<scope>provided</scope>
124+
</dependency>
125+
126+
<!-- https://mvnrepository.com/artifact/commons-fileupload/commons-fileupload -->
127+
<dependency>
128+
<groupId>org.apache.httpcomponents</groupId>
129+
<artifactId>httpmime</artifactId>
130+
<version>4.4.1</version>
131+
</dependency>
132+
133+
<!-- https://mvnrepository.com/artifact/javax.activation/activation -->
134+
<dependency>
135+
<groupId>javax.activation</groupId>
136+
<artifactId>activation</artifactId>
137+
<version>1.1</version>
138+
</dependency>
139+
</dependencies>
140+
141+
<properties>
142+
<java.version>1.8</java.version>
143+
<maven.compiler.source>1.8</maven.compiler.source>
144+
<maven.compiler.target>1.8</maven.compiler.target>
145+
</properties>
146+
147+
148+
<organization>
149+
<name>taliox</name>
150+
<url>https:taliox.io</url>
151+
</organization>
152+
153+
<issueManagement>
154+
<system>GitHub</system>
155+
<url>https://github.com/taliox/zulip-java-rest/issues</url>
156+
</issueManagement>
157+
158+
<scm>
159+
<url>https://github.com/taliox/zulip-java-rest</url>
160+
<connection>scm:git:git://github.com/taliox/zulip-java-rest.git</connection>
161+
<developerConnection>scm:git:git@github.com:taliox/taliox.git</developerConnection>
162+
<tag>zulip-java-rest-0.0.1</tag>
163+
</scm>
164+
165+
<licenses>
166+
<license>
167+
<name>MIT License</name>
168+
<url>https://github.com/taliox/zulip-java-rest/blob/master/LICENSE</url>
169+
<distribution>repo</distribution>
170+
</license>
171+
</licenses>
172+
173+
174+
<name>Zulip Java REST API</name>
175+
<description>This project aims at providing a thin Java wrapper for the Zulip REST API.</description>
176+
<url>https://github.com/taliox/zulip-java-rest</url>
177+
178+
<developers>
179+
<developer>
180+
<name>raLaaa</name>
181+
</developer>
182+
</developers>
183+
184+
</project>

‎release.properties‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
#release configuration
2-
#Fri Apr 26 12:30:49 CEST 2019
2+
#Fri Apr 26 12:32:02 CEST 2019
33
projectVersionPolicyId=default
4-
scm.tagNameFormat=@{project.artifactId}-@{project.version}
5-
exec.additionalArguments=-Dgpg.passphrase\=taliox.io\!
64
remoteTagging=true
5+
project.scm.io.taliox\:zulip-java-rest.connection=scm\:git\:git\://github.com/taliox/zulip-java-rest.git
76
scm.commentPrefix=[maven-release-plugin]
8-
pushChanges=false
9-
completedPhase=check-poms
7+
completedPhase=generate-release-poms
108
scm.url=scm\:git\:git@github.com\:taliox/taliox.git
9+
project.scm.io.taliox\:zulip-java-rest.url=https\://github.com/taliox/zulip-java-rest
10+
exec.additionalArguments=-Dgpg.passphrase\=taliox.io\!
11+
scm.tagNameFormat=@{project.artifactId}-@{project.version}
12+
pushChanges=false
13+
project.rel.io.taliox\:zulip-java-rest=0.0.2
14+
project.scm.io.taliox\:zulip-java-rest.developerConnection=scm\:git\:git@github.com\:taliox/taliox.git
15+
project.dev.io.taliox\:zulip-java-rest=0.0.3-SNAPSHOT
16+
scm.tag=0.0.02
17+
project.scm.io.taliox\:zulip-java-rest.tag=zulip-java-rest-0.0.1
1118
exec.snapshotReleasePluginAllowed=false
1219
preparationGoals=clean verify

‎src/main/java/io/taliox/zulip/calls/settings/GetServerSettings.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,12 @@
1010
* Fetch global settings for a Zulip server.
1111
*
1212
* <b>Note:</b> this endpoint does not require any authentication at all, and
13-
* you can use it to check: • If this is a Zulip server, and if so, what version
14-
* of Zulip it's running. • What a Zulip client (e.g. a mobile app or
13+
* you can use it to check:
14+
*
15+
* - If this is a Zulip server, and if so, what version
16+
* of Zulip it's running.
17+
*
18+
* - What a Zulip client (e.g. a mobile app or
1519
* zulip-terminal) needs to know in order to display a login prompt for the
1620
* server (e.g. what authentication methods are available).
1721
*

0 commit comments

Comments
 (0)