diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..bd05060 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,34 @@ +root = true + +[*] +charset = utf-8 +indent_style = space +indent_size = 2 +tab_width = 2 +insert_final_newline = false + +[*.sh] +indent_size = 4 +tab_width = 4 +max_line_length = 120 +insert_final_newline = true + +[*.adoc] +max_line_length = 120 +insert_final_newline = true + +[*.xml] +indent_size = 4 +max_line_length = 4096 + +[*.{yml,yaml}] + +[*.json] + +[*.proto] +max_line_length = 80 + +[*.java] +indent_size = 4 +tab_width = 4 +max_line_length = 120 diff --git a/.gitignore b/.gitignore index 127319e..c9571b1 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,6 @@ target # IntelliJ .idea/ *.iml + +# Flattened POMs +**/.flattened-pom.xml diff --git a/jasypt-maven-plugin/pom.xml b/jasypt-maven-plugin/pom.xml index 43c2d1f..37b3bdf 100644 --- a/jasypt-maven-plugin/pom.xml +++ b/jasypt-maven-plugin/pom.xml @@ -3,20 +3,20 @@ 4.0.0 - jasypt-spring-boot-parent com.github.ulisesbocchio - 3.0.6-SNAPSHOT + jasypt-spring-boot-parent + ${revision} jasypt-maven-plugin - Jasypt Maven Plugin maven-plugin + Jasypt Maven Plugin - 3.8.6 - 2.2.1 - 3.3 - 3.7.0 + 3.9.6 + 3.11.0 + 3.11.0 + 3.9.6 @@ -28,21 +28,20 @@ org.springframework.boot spring-boot-starter - - - org.apache.maven - maven-plugin-api - provided - ${maven.api.version} - org.yaml snakeyaml org.apache.maven - maven-project - ${maven.project.version} + maven-core + ${maven-core.version} + provided + + + org.apache.maven + maven-plugin-api + ${maven.api.version} provided @@ -85,4 +84,4 @@ - \ No newline at end of file + diff --git a/jasypt-spring-boot-starter/pom.xml b/jasypt-spring-boot-starter/pom.xml index 91159e7..3d14fd5 100644 --- a/jasypt-spring-boot-starter/pom.xml +++ b/jasypt-spring-boot-starter/pom.xml @@ -1,10 +1,11 @@ + 4.0.0 com.github.ulisesbocchio jasypt-spring-boot-parent - 3.0.6-SNAPSHOT + ${revision} jasypt-spring-boot-starter @@ -17,19 +18,24 @@ com.github.ulisesbocchio jasypt-spring-boot + + org.projectlombok + lombok + provided + org.springframework.boot spring-boot-starter provided - org.springframework.cloud - spring-cloud-context + org.springframework.boot + spring-boot-starter-actuator test - org.springframework.security - spring-security-rsa + org.springframework.boot + spring-boot-starter-test test @@ -38,13 +44,13 @@ test - org.springframework.boot - spring-boot-starter-actuator + org.springframework.cloud + spring-cloud-context test - org.springframework.boot - spring-boot-starter-test + org.springframework.security + spring-security-rsa test @@ -53,10 +59,5 @@ 2.0.1 test - - org.projectlombok - lombok - provided - diff --git a/jasypt-spring-boot/pom.xml b/jasypt-spring-boot/pom.xml index 13d2bf5..5869683 100644 --- a/jasypt-spring-boot/pom.xml +++ b/jasypt-spring-boot/pom.xml @@ -5,7 +5,7 @@ com.github.ulisesbocchio jasypt-spring-boot-parent - 3.0.6-SNAPSHOT + ${revision} jasypt-spring-boot @@ -20,17 +20,22 @@ org.springframework.boot - spring-boot-starter + spring-boot-configuration-processor + true + + + org.projectlombok + lombok provided org.springframework.boot - spring-boot-starter-web + spring-boot-starter provided - org.projectlombok - lombok + org.springframework.boot + spring-boot-starter-web provided @@ -38,11 +43,6 @@ spring-boot-starter-test test - - org.springframework.boot - spring-boot-configuration-processor - true - @@ -61,18 +61,18 @@ clean - pre-site clean + pre-site cobertura - site cobertura + site @@ -85,7 +85,6 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.4.1 @@ -103,7 +102,7 @@ html xml - + @@ -116,4 +115,4 @@ - \ No newline at end of file + diff --git a/pom.xml b/pom.xml index 37be680..3e2674f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,33 +4,12 @@ com.github.ulisesbocchio jasypt-spring-boot-parent + ${revision} pom - 3.0.6-SNAPSHOT Jasypt Spring Boot Parent Jasypt Spring Boot Parent https://github.com/ulisesbocchio/jasypt-spring-boot - - UTF-8 - 1.8 - 2.7.6 - 2021.0.5 - 1.9.3 - 3.10.1 - 1.19.0 - - - - jasypt-spring-boot - jasypt-spring-boot-starter - jasypt-maven-plugin - - - - https://github.com/ulisesbocchio/jasypt-spring-boot/issues - GitHub Issues - - MIT License @@ -39,54 +18,181 @@ - - https://github.com/ulisesbocchio/jasypt-spring-boot - scm:git:git://github.com/ulisesbocchio/jasypt-spring-boot.git - scm:git:git@github.com:ulisesbocchio/jasypt-spring-boot.git - HEAD - - + ulisesbocchio Ulises Bocchio https://github.com/ulisesbocchio - ulisesbocchio + + jasypt-maven-plugin + jasypt-spring-boot + jasypt-spring-boot-starter + + + + scm:git:git://github.com/ulisesbocchio/jasypt-spring-boot.git + scm:git:git@github.com:ulisesbocchio/jasypt-spring-boot.git + HEAD + https://github.com/ulisesbocchio/jasypt-spring-boot + + + + GitHub Issues + https://github.com/ulisesbocchio/jasypt-spring-boot/issues + + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + ossrh https://oss.sonatype.org/content/repositories/snapshots + + + + 1.5.0 + 1.9.3 + 21 + UTF-8 + 4.0.0-SNAPSHOT + true + 3.3.0 + 3.2.2 + 2023.0.0 + 1.19.0 + + + + + + org.springframework.boot + spring-boot-dependencies + ${spring.boot.version} + pom + import + + + org.springframework.cloud + spring-cloud-dependencies + ${spring.cloud.version} + pom + import + + + com.github.stefanbirkner + system-rules + ${system.rules.version} + + + com.github.ulisesbocchio + jasypt-spring-boot + ${project.version} + + + com.github.ulisesbocchio + jasypt-spring-boot-starter + ${project.version} + + + org.jasypt + jasypt + ${jasypt.version} + + + + - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + false + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - + + + false + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + + + + + false + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + + + false + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + + + + + com.github.ekryd.sortpom + sortpom-maven-plugin + ${sortpom-maven-plugin.version} + + + org.apache.maven.plugins + maven-compiler-plugin + + ${java.version} + ${java.version} + + + + org.codehaus.mojo + flatten-maven-plugin + ${flatten-maven-plugin.version} + + + - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.13 - true + com.github.ekryd.sortpom + sortpom-maven-plugin - ossrh - https://oss.sonatype.org/ - true + false + scope,groupId,artifactId + groupId,artifactId + true + ${sort.sortModules} + false + true + 2 + true - - - org.apache.maven.plugins - maven-site-plugin - 4.0.0-M4 + + + + sort + + validate + + org.apache.maven.plugins maven-release-plugin - 3.0.0-M7 true false @@ -94,25 +200,46 @@ deploy + + org.apache.maven.plugins + maven-site-plugin + + + org.codehaus.mojo + flatten-maven-plugin + + true + resolveCiFriendliesOnly + + + + flatten + + flatten + + process-resources + + + flatten.clean + + clean + + clean + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.13 + true + + ossrh + https://oss.sonatype.org/ + true + + - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven.compiler.version} - - ${java.version} - ${java.version} - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.0.0-M7 - - - @@ -123,7 +250,6 @@ org.apache.maven.plugins maven-gpg-plugin - 3.0.1 true @@ -135,39 +261,37 @@ sign-artifacts - verify sign + verify org.apache.maven.plugins - maven-source-plugin - 3.2.1 + maven-javadoc-plugin - attach-sources + attach-javadocs - jar-no-fork + jar + + none + org.apache.maven.plugins - maven-javadoc-plugin - 3.4.1 + maven-source-plugin - attach-javadocs + attach-sources - jar + jar-no-fork - - none - @@ -175,79 +299,4 @@ - - - - - org.springframework.boot - spring-boot-dependencies - ${spring.boot.version} - pom - import - - - org.springframework.cloud - spring-cloud-dependencies - ${spring.cloud.version} - pom - import - - - org.jasypt - jasypt - ${jasypt.version} - - - com.github.ulisesbocchio - jasypt-spring-boot - ${project.version} - - - com.github.ulisesbocchio - jasypt-spring-boot-starter - ${project.version} - - - com.github.stefanbirkner - system-rules - ${system.rules.version} - - - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - false - - - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - false - - -