Skip to content

Commit e4e8374

Browse files
authored
Prepare for 1.0.24 (#316)
* fix 2 DM_DEFAULT_ENCODING problems in testing * update README to mention it's Java 11 only * update RELEASING to simplify * Normal striking the -SNAPSHOT before release
1 parent 143f271 commit e4e8374

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ Please ensure that samples function without this parent definition.
3636

3737
## USAGE
3838

39+
### WARNING - CheckStyle currently requires Java 11
40+
3941
```bash
4042
mvn -P lint clean verify
4143
```

RELEASING.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,11 @@ From the root project folder, run the following command to release `checkstyle-c
2020

2121
cd checkstyle-config
2222
mvn -P release clean verify deploy
23-
mvn -P release deploy
2423

2524
Next, use the following to release `shared-configuration`:
2625

2726
cd ..
28-
mvn -P release clean verify
29-
mvn -P release deploy
27+
mvn -P release clean verify deploy
3028

3129
That will open, upload, close, and release. The parent will need you to visit sonatype to close,
3230
and verify manually.

checkstyle-config/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ limitations under the License.
1818

1919
<groupId>com.google.cloud.samples</groupId>
2020
<artifactId>checkstyle-configuration</artifactId>
21-
<version>1.0.24-SNAPSHOT</version>
21+
<version>1.0.24</version>
2222
<packaging>jar</packaging>
2323

2424
<properties>

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ limitations under the License.
3434

3535
<groupId>com.google.cloud.samples</groupId>
3636
<artifactId>shared-configuration</artifactId>
37-
<version>1.1.1-SNAPSHOT</version><!-- {x-version-update:shared-configuration:current} -->
37+
<version>1.0.24</version><!-- {x-version-update:shared-configuration:current} -->
3838
<packaging>pom</packaging>
3939

4040
<name>${project.groupId}:${project.artifactId}</name>
@@ -216,7 +216,7 @@ limitations under the License.
216216
<dependency>
217217
<groupId>com.google.cloud.samples</groupId>
218218
<artifactId>checkstyle-configuration</artifactId>
219-
<version>1.0.24-SNAPSHOT</version>
219+
<version>1.0.24</version>
220220
</dependency>
221221
</dependencies>
222222
<configuration>
@@ -306,7 +306,7 @@ limitations under the License.
306306
<dependency>
307307
<groupId>com.google.cloud.samples</groupId>
308308
<artifactId>checkstyle-configuration</artifactId>
309-
<version>1.0.24-SNAPSHOT</version>
309+
<version>1.0.24</version>
310310
</dependency>
311311
<dependency>
312312
<groupId>com.puppycrawl.tools</groupId>

test/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ limitations under the License.
2626
<parent>
2727
<artifactId>shared-configuration</artifactId>
2828
<groupId>com.google.cloud.samples</groupId>
29-
<version>1.1.1-SNAPSHOT</version><!-- {x-version-update:shared-configuration:current} -->
29+
<version>1.0.24</version><!-- {x-version-update:shared-configuration:current} -->
3030
<relativePath>..</relativePath>
3131
</parent>
3232

test/src/test/java/com/google/cloud/samples/test/AppTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
*/
3131
@RunWith(JUnit4.class)
3232
public class AppTest {
33-
@Test public void main_printsHelloWorldIT() {
33+
@Test public void main_printsHelloWorldIT() throws Exception {
3434
ByteArrayOutputStream out = new ByteArrayOutputStream();
35-
System.setOut(new PrintStream(out));
35+
System.setOut(new PrintStream(out, true, "UTF-8"));
3636

3737
App.main(new String[0]);
3838

39-
String greeting = out.toString();
39+
String greeting = out.toString("UTF-8");
4040
assertThat(greeting).contains("Hello World!");
4141
}
4242
}

0 commit comments

Comments
 (0)