Skip to content

Commit

Permalink
Merge pull request #140 from kakawait/develop
Browse files Browse the repository at this point in the history
Release 1.0.2
  • Loading branch information
kakawait authored Mar 18, 2020
2 parents f3afa3b + 62f19c8 commit 280c77f
Show file tree
Hide file tree
Showing 10 changed files with 58 additions and 21 deletions.
8 changes: 6 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

All notable changes to this project will be documented in this file.

## [1.0.2](https://github.com/kakawait/cas-security-spring-boot-starter/milestone/25) - 12 mar 2020

- Update dependencies for security fixes

## [1.0.1](https://github.com/kakawait/cas-security-spring-boot-starter/milestone/24) - 31 jan 2020

- Happy new year :tada:
Expand All @@ -16,10 +20,10 @@ All notable changes to this project will be documented in this file.
### Breaking changes

- Related to [#35 Remove cas-security-dynamic-service-resolver module](https://github.com/kakawait/cas-security-spring-boot-starter/issues/35), you must use [spring-security-cas-extension](https://github.com/kakawait/cas-security-spring-boot-starter/tree/master/spring-security-cas-extension) instead.
- Related to [#33
- Related to [#33
Rename package com.kakawait.spring.boot.security.cas to com.kakawait.spring.boot.security.cas.autoconfigure](https://github.com/kakawait/cas-security-spring-boot-starter/issues/33), you must rewrite your `import` statements to append `.autoconfigure.`.
- Property `security.cas.authorize-mode` has been renamed `security.cas.authorization.mode`
- `CasHttpSecurityConfigurer.cas().configure(http)` will no secure paths, only configure CAS authentication
- `CasHttpSecurityConfigurer.cas().configure(http)` will no secure paths, only configure CAS authentication
- Autoconfiguration java class package was moved from `com.kakawait.spring.boot.security.cas` to `com.kakawait.spring.boot.security.cas.autoconfigure`

#### Spring boot 2 support breaking changes
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Spring Security CAS starter

[![Travis](https://img.shields.io/travis/kakawait/cas-security-spring-boot-starter.svg)](https://travis-ci.org/kakawait/cas-security-spring-boot-starter)
[![Maven Central](https://img.shields.io/maven-central/v/com.kakawait/cas-security-spring-boot-starter.svg)](https://search.maven.org/#artifactdetails%7Ccom.kakawait%7Ccas-security-spring-boot-starter%7C1.0.1%7Cjar)
[![Maven Central](https://img.shields.io/maven-central/v/com.kakawait/cas-security-spring-boot-starter.svg)](https://search.maven.org/#artifactdetails%7Ccom.kakawait%7Ccas-security-spring-boot-starter%7C1.0.2%7Cjar)
[![License](https://img.shields.io/github/license/kakawait/cas-security-spring-boot-starter.svg)](https://github.com/kakawait/cas-security-spring-boot-starter/blob/master/LICENSE.md)
[![Codecov](https://img.shields.io/codecov/c/github/kakawait/cas-security-spring-boot-starter.svg)](https://codecov.io/gh/kakawait/cas-security-spring-boot-starter)
[![SonarQube Tech Debt](https://img.shields.io/sonar/https/sonarcloud.io/com.kakawait%3Acas-security-spring-boot-parent/tech_debt.svg)](https://sonarcloud.io/dashboard?id=com.kakawait%3Acas-security-spring-boot-parent)
Expand All @@ -26,7 +26,7 @@ Add the Spring boot starter to your project
<dependency>
<groupId>com.kakawait</groupId>
<artifactId>cas-security-spring-boot-starter</artifactId>
<version>1.0.1</version>
<version>1.0.2</version>
</dependency>
```

Expand Down
2 changes: 1 addition & 1 deletion cas-security-spring-boot-autoconfigure/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>com.kakawait</groupId>
<artifactId>cas-security-spring-boot-parent</artifactId>
<version>1.0.1</version>
<version>1.0.2</version>
</parent>

<name>Cas security spring boot autoconfigure</name>
Expand Down
4 changes: 2 additions & 2 deletions cas-security-spring-boot-sample/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ RUN mvn clean install && mvn -f cas-security-spring-boot-sample/pom.xml clean in

FROM openjdk:8-jre-alpine
WORKDIR /app
COPY --from=build /src/cas-security-spring-boot-sample/target/cas-security-spring-boot-sample-1.0.1.jar /app
COPY --from=build /src/cas-security-spring-boot-sample/target/cas-security-spring-boot-sample-1.0.2.jar /app
ENV JAVA_OPTS=""
CMD [ "sh", "-c", "java $JAVA_OPTS -jar /app/cas-security-spring-boot-sample-1.0.1.jar" ]
CMD [ "sh", "-c", "java $JAVA_OPTS -jar /app/cas-security-spring-boot-sample-1.0.2.jar" ]
2 changes: 1 addition & 1 deletion cas-security-spring-boot-sample/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ services:
build:
context: ../
dockerfile: cas-security-spring-boot-sample/Dockerfile
image: cas-security-spring-boot-sample:1.0.1
image: cas-security-spring-boot-sample:1.0.2
ports:
- "8081:8081"
- "5005"
Expand Down
6 changes: 3 additions & 3 deletions cas-security-spring-boot-sample/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@

<groupId>com.kakawait</groupId>
<artifactId>cas-security-spring-boot-sample</artifactId>
<version>1.0.1</version>
<version>1.0.2</version>

<name>Cas security spring boot sample</name>

<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.2.4.RELEASE</version>
<version>2.2.5.RELEASE</version>
</parent>

<properties>
Expand All @@ -24,7 +24,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>

<jackson-databind.version>2.9.9.3</jackson-databind.version>
<jackson-databind.version>2.10.3</jackson-databind.version>
</properties>

<dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion cas-security-spring-boot-starter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>com.kakawait</groupId>
<artifactId>cas-security-spring-boot-parent</artifactId>
<version>1.0.1</version>
<version>1.0.2</version>
</parent>

<name>Cas security spring boot starter</name>
Expand Down
16 changes: 8 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<groupId>com.kakawait</groupId>
<artifactId>cas-security-spring-boot-parent</artifactId>
<packaging>pom</packaging>
<version>1.0.1</version>
<version>1.0.2</version>

<name>Cas security spring boot parent</name>
<description>Spring boot starter for Apereo CAS client fully integrated with Spring security</description>
Expand Down Expand Up @@ -49,23 +49,23 @@
<maven.compiler.target>1.8</maven.compiler.target>

<!-- spring managed version -->
<jackson.version>2.10.2</jackson.version>
<jackson-databind.version>2.10.2</jackson-databind.version>
<jackson.version>2.10.3</jackson.version>
<jackson-databind.version>2.10.3</jackson-databind.version>

<!-- dependencies -->
<spring-boot-dependencies.version>2.2.4.RELEASE</spring-boot-dependencies.version>
<spring-boot-dependencies.version>2.2.5.RELEASE</spring-boot-dependencies.version>

<!-- provided dependencies -->
<lombok.version>1.18.10</lombok.version>
<lombok.version>1.18.12</lombok.version>

<!-- test dependencies -->
<assertj-core.version>3.15.0</assertj-core.version>
<mockito-core.version>3.2.4</mockito-core.version>
<mockito-core.version>3.3.3</mockito-core.version>

<!-- plugins -->
<jacoco-maven-plugin.version>0.8.4</jacoco-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version>
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
</properties>
Expand Down
33 changes: 33 additions & 0 deletions release.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#!/usr/bin/env bash

if [[ "$OSTYPE" == "darwin"* ]]; then
sed() {
gsed "$@"
}
date() {
gdate "$@"
}
fi

new_version="${1}"

if [[ -z "${new_version}" ]]; then
echo "Missing argument: version"
exit 1
fi

current_version="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)"
echo "Current version is: ${current_version}"
echo "New version will be: ${new_version}"
echo
read -p "Are you sure? " -r
if [[ $REPLY =~ ^[Yy]$ ]]; then
mvn versions:set "-DnewVersion=${new_version}" -DoldVersion=* -DgroupId=* -DartifactId=* -q -DforceStdout
mvn -f cas-security-spring-boot-sample/pom.xml versions:set "-DnewVersion=${new_version}" -DoldVersion=* -DgroupId=* -DartifactId=* -q -DforceStdout
mvn -f cas-security-spring-boot-sample/pom.xml versions:update-parent "-DparentVersion=${new_version}" -q -DforceStdout
mvn -f spring-security-cas-extension/pom.xml versions:update-parent "-DparentVersion=${new_version}" -q -DforceStdout
sed -i 's/\(cas-security-spring-boot-sample-\).*\.jar/\1'"${new_version}"'.jar/g' ./cas-security-spring-boot-sample/Dockerfile
sed -i 's/\(image: cas-security-spring-boot-sample:\).*/\1'"${new_version}"'/g' ./cas-security-spring-boot-sample/docker-compose.yml
sed -i 's/\(cas-security-spring-boot-starter%7C\).*%7Cjar/\1'"${new_version}"'%7Cjar/g' README.md
sed -i 's/\(<version>\).*\(<\/version>\)/\1'"${new_version}"'\2/g' README.md
fi
2 changes: 1 addition & 1 deletion spring-security-cas-extension/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>com.kakawait</groupId>
<artifactId>cas-security-spring-boot-parent</artifactId>
<version>1.0.1</version>
<version>1.0.2</version>
</parent>

<name>Spring security cas extension</name>
Expand Down

0 comments on commit 280c77f

Please sign in to comment.