Skip to content

Commit

Permalink
Prepare for 1.0.24 (#316)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
lesv authored Dec 2, 2021
1 parent 143f271 commit e4e8374
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ Please ensure that samples function without this parent definition.

## USAGE

### WARNING - CheckStyle currently requires Java 11

```bash
mvn -P lint clean verify
```
Expand Down
4 changes: 1 addition & 3 deletions RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,11 @@ From the root project folder, run the following command to release `checkstyle-c

cd checkstyle-config
mvn -P release clean verify deploy
mvn -P release deploy

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

cd ..
mvn -P release clean verify
mvn -P release deploy
mvn -P release clean verify deploy

That will open, upload, close, and release. The parent will need you to visit sonatype to close,
and verify manually.
Expand Down
2 changes: 1 addition & 1 deletion checkstyle-config/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ limitations under the License.

<groupId>com.google.cloud.samples</groupId>
<artifactId>checkstyle-configuration</artifactId>
<version>1.0.24-SNAPSHOT</version>
<version>1.0.24</version>
<packaging>jar</packaging>

<properties>
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ limitations under the License.

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

<name>${project.groupId}:${project.artifactId}</name>
Expand Down Expand Up @@ -216,7 +216,7 @@ limitations under the License.
<dependency>
<groupId>com.google.cloud.samples</groupId>
<artifactId>checkstyle-configuration</artifactId>
<version>1.0.24-SNAPSHOT</version>
<version>1.0.24</version>
</dependency>
</dependencies>
<configuration>
Expand Down Expand Up @@ -306,7 +306,7 @@ limitations under the License.
<dependency>
<groupId>com.google.cloud.samples</groupId>
<artifactId>checkstyle-configuration</artifactId>
<version>1.0.24-SNAPSHOT</version>
<version>1.0.24</version>
</dependency>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
Expand Down
2 changes: 1 addition & 1 deletion test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ limitations under the License.
<parent>
<artifactId>shared-configuration</artifactId>
<groupId>com.google.cloud.samples</groupId>
<version>1.1.1-SNAPSHOT</version><!-- {x-version-update:shared-configuration:current} -->
<version>1.0.24</version><!-- {x-version-update:shared-configuration:current} -->
<relativePath>..</relativePath>
</parent>

Expand Down
6 changes: 3 additions & 3 deletions test/src/test/java/com/google/cloud/samples/test/AppTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@
*/
@RunWith(JUnit4.class)
public class AppTest {
@Test public void main_printsHelloWorldIT() {
@Test public void main_printsHelloWorldIT() throws Exception {
ByteArrayOutputStream out = new ByteArrayOutputStream();
System.setOut(new PrintStream(out));
System.setOut(new PrintStream(out, true, "UTF-8"));

App.main(new String[0]);

String greeting = out.toString();
String greeting = out.toString("UTF-8");
assertThat(greeting).contains("Hello World!");
}
}

0 comments on commit e4e8374

Please sign in to comment.