From d34e4cb34f990595d6a84ce49b76ae474e24ca29 Mon Sep 17 00:00:00 2001 From: Thibaud Lepretre Date: Wed, 18 Mar 2020 16:49:29 +0100 Subject: [PATCH 1/4] Upgrade dependencies --- cas-security-spring-boot-sample/pom.xml | 2 +- pom.xml | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cas-security-spring-boot-sample/pom.xml b/cas-security-spring-boot-sample/pom.xml index 89227af..a5ba0c4 100644 --- a/cas-security-spring-boot-sample/pom.xml +++ b/cas-security-spring-boot-sample/pom.xml @@ -24,7 +24,7 @@ 1.8 1.8 - 2.9.9.3 + 2.10.3 diff --git a/pom.xml b/pom.xml index a358b03..fae5293 100644 --- a/pom.xml +++ b/pom.xml @@ -49,23 +49,23 @@ 1.8 - 2.10.2 - 2.10.2 + 2.10.3 + 2.10.3 - 2.2.4.RELEASE + 2.2.5.RELEASE - 1.18.10 + 1.18.12 3.15.0 - 3.2.4 + 3.3.3 - 0.8.4 + 0.8.5 3.2.1 - 3.1.1 + 3.2.0 1.6 1.6.8 From 2bec33fc50746529f25fe682b6706ecea5df3abb Mon Sep 17 00:00:00 2001 From: Thibaud Lepretre Date: Wed, 18 Mar 2020 17:31:13 +0100 Subject: [PATCH 2/4] Add basic release.sh script --- release.sh | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100755 release.sh diff --git a/release.sh b/release.sh new file mode 100755 index 0000000..a289c78 --- /dev/null +++ b/release.sh @@ -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>\)/\1'"${new_version}"'\2/g' README.md +fi From a7efa04162b8bc934d69d1e0a737f3fb5bc93932 Mon Sep 17 00:00:00 2001 From: Thibaud Lepretre Date: Wed, 18 Mar 2020 17:33:04 +0100 Subject: [PATCH 3/4] :bookmark: version 1.0.2 --- CHANGELOG.md | 8 ++++++-- README.md | 4 ++-- cas-security-spring-boot-autoconfigure/pom.xml | 2 +- cas-security-spring-boot-sample/Dockerfile | 4 ++-- cas-security-spring-boot-sample/docker-compose.yml | 2 +- cas-security-spring-boot-sample/pom.xml | 4 ++-- cas-security-spring-boot-starter/pom.xml | 2 +- pom.xml | 2 +- 8 files changed, 16 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61fb4d0..c26ef64 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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: @@ -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 diff --git a/README.md b/README.md index 03d8bc3..b47f815 100644 --- a/README.md +++ b/README.md @@ -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) @@ -26,7 +26,7 @@ Add the Spring boot starter to your project com.kakawait cas-security-spring-boot-starter - 1.0.1 + 1.0.2 ``` diff --git a/cas-security-spring-boot-autoconfigure/pom.xml b/cas-security-spring-boot-autoconfigure/pom.xml index e5523f4..d25db28 100644 --- a/cas-security-spring-boot-autoconfigure/pom.xml +++ b/cas-security-spring-boot-autoconfigure/pom.xml @@ -10,7 +10,7 @@ com.kakawait cas-security-spring-boot-parent - 1.0.1 + 1.0.2 Cas security spring boot autoconfigure diff --git a/cas-security-spring-boot-sample/Dockerfile b/cas-security-spring-boot-sample/Dockerfile index 642352c..c4bfca6 100644 --- a/cas-security-spring-boot-sample/Dockerfile +++ b/cas-security-spring-boot-sample/Dockerfile @@ -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" ] diff --git a/cas-security-spring-boot-sample/docker-compose.yml b/cas-security-spring-boot-sample/docker-compose.yml index 8fe0d6f..2290d86 100644 --- a/cas-security-spring-boot-sample/docker-compose.yml +++ b/cas-security-spring-boot-sample/docker-compose.yml @@ -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" diff --git a/cas-security-spring-boot-sample/pom.xml b/cas-security-spring-boot-sample/pom.xml index a5ba0c4..bdbd639 100644 --- a/cas-security-spring-boot-sample/pom.xml +++ b/cas-security-spring-boot-sample/pom.xml @@ -6,14 +6,14 @@ com.kakawait cas-security-spring-boot-sample - 1.0.1 + 1.0.2 Cas security spring boot sample org.springframework.boot spring-boot-starter-parent - 2.2.4.RELEASE + 2.2.5.RELEASE diff --git a/cas-security-spring-boot-starter/pom.xml b/cas-security-spring-boot-starter/pom.xml index ca68d2d..5097c45 100644 --- a/cas-security-spring-boot-starter/pom.xml +++ b/cas-security-spring-boot-starter/pom.xml @@ -10,7 +10,7 @@ com.kakawait cas-security-spring-boot-parent - 1.0.1 + 1.0.2 Cas security spring boot starter diff --git a/pom.xml b/pom.xml index fae5293..98456e9 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.kakawait cas-security-spring-boot-parent pom - 1.0.1 + 1.0.2 Cas security spring boot parent Spring boot starter for Apereo CAS client fully integrated with Spring security From 62f19c835a099aba519c1a3304e97443a35d364a Mon Sep 17 00:00:00 2001 From: Thibaud Lepretre Date: Wed, 18 Mar 2020 17:39:34 +0100 Subject: [PATCH 4/4] missing cas-extension ugrade --- spring-security-cas-extension/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-security-cas-extension/pom.xml b/spring-security-cas-extension/pom.xml index f865c29..df27260 100644 --- a/spring-security-cas-extension/pom.xml +++ b/spring-security-cas-extension/pom.xml @@ -10,7 +10,7 @@ com.kakawait cas-security-spring-boot-parent - 1.0.1 + 1.0.2 Spring security cas extension