diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/build.gradle index b1de23afa1..45a7fdd073 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/build.gradle @@ -7,5 +7,6 @@ description = 'Spring Boot Actuator ActiveMQ smoke test' dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-activemq') + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } \ No newline at end of file diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/build.gradle index 02c2597511..bee2c5cae6 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/build.gradle @@ -10,8 +10,10 @@ dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-freemarker') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-security') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web') + runtimeOnly 'org.jolokia:jolokia-core' testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') + testRuntimeOnly 'org.apache.httpcomponents:httpclient' } \ No newline at end of file diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/build.gradle index d3257417d5..4641e7375e 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/build.gradle @@ -11,6 +11,7 @@ dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-security') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-validation') + runtimeOnly 'com.h2database:h2' testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/build.gradle index 5a661a3ddf..aa63b13cf0 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/build.gradle @@ -9,6 +9,7 @@ description = 'Spring Boot Atmosphere smoke test' dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web') implementation 'org.atmosphere:atmosphere-runtime:2.4.14' + runtimeOnly 'org.webjars:atmosphere-javascript:2.3.4' testImplementation enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/build.gradle index 8480164a8e..7db4cc845d 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/build.gradle @@ -7,6 +7,6 @@ description = 'Spring Boot Data Couchbase smoke test' dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-data-couchbase') - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/build.gradle index fa4759b310..713df23c88 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/build.gradle @@ -7,6 +7,6 @@ description = 'Spring Boot Data Elasticsearch smoke test' dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-data-elasticsearch') - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/build.gradle index b91d1d72fb..cb9880730f 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/build.gradle @@ -8,7 +8,8 @@ description = 'Spring Boot Data JDBC smoke test' dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-data-jdbc') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web') + runtimeOnly 'com.h2database:h2' - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/build.gradle index 01abdb2150..bc68dec3f3 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/build.gradle @@ -8,7 +8,8 @@ description = 'Spring Boot Data JPA smoke test' dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-data-jpa') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web') + runtimeOnly 'com.h2database:h2' - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-ldap/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-ldap/build.gradle index abcf5208e9..f1f7e3ea23 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-ldap/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-ldap/build.gradle @@ -7,7 +7,8 @@ description = 'Spring Boot Data LDAP smoke test' dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-data-ldap') + runtimeOnly 'com.unboundid:unboundid-ldapsdk' - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongodb/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongodb/build.gradle index 9d31618775..5c6cea9905 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongodb/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongodb/build.gradle @@ -7,7 +7,8 @@ description = 'Spring Boot Data MongoDB smoke test' dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-data-mongodb') + runtimeOnly 'de.flapdoodle.embed:de.flapdoodle.embed.mongo' - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-neo4j/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-neo4j/build.gradle index 0a5d557bdd..fb5be9f291 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-neo4j/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-neo4j/build.gradle @@ -7,6 +7,6 @@ description = 'Spring Boot Data Neo4j smoke test' dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-data-neo4j') - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/build.gradle index 9fb8091008..2e38ceb284 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/build.gradle @@ -7,6 +7,6 @@ description = 'Spring Boot Data Redis smoke test' dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-data-redis') - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/build.gradle index 5eb4857318..b9d3443469 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/build.gradle @@ -11,9 +11,10 @@ dependencies { exclude module: 'spring-boot-starter-tomcat' } implementation 'com.h2database:h2' - + runtimeOnly project(':spring-boot-project:spring-boot-starters:spring-boot-starter-jetty') - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') + testRuntimeOnly 'com.jayway.jsonpath:json-path' } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-solr/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-solr/build.gradle index 9575c1022e..458d73c5b6 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-solr/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-solr/build.gradle @@ -7,6 +7,6 @@ description = 'Spring Boot Data Solr smoke test' dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-data-solr') - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-devtools/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-devtools/build.gradle index f451df2412..99c21628ad 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-devtools/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-devtools/build.gradle @@ -15,6 +15,6 @@ dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-thymeleaf') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web') - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-flyway/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-flyway/build.gradle index 408d0ff3ea..2d632457d9 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-flyway/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-flyway/build.gradle @@ -9,9 +9,9 @@ dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-actuator') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-data-jpa') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web') - + runtimeOnly 'com.h2database:h2' runtimeOnly 'org.flywaydb:flyway-core' - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hateoas/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hateoas/build.gradle index 8b8163d150..c2f2aa8ae5 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hateoas/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hateoas/build.gradle @@ -7,6 +7,6 @@ description = 'Spring Boot HATEOAS smoke test' dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-hateoas') - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hibernate52/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hibernate52/build.gradle index 25972c05c1..5b5d9e7156 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hibernate52/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hibernate52/build.gradle @@ -6,17 +6,17 @@ plugins { description = 'Spring Boot Hibernate 5.2 smoke test' configurations.all { - resolutionStrategy { - force 'org.hibernate:hibernate-core:5.2.17.Final' - } + resolutionStrategy { + force 'org.hibernate:hibernate-core:5.2.17.Final' + } } dependencies { implementation(project(':spring-boot-project:spring-boot-starters:spring-boot-starter-data-jpa')) { exclude group: 'org.hibernate.javax.persistence', module: 'hibernate-jpa-2.1-api' } - + runtimeOnly 'com.h2database:h2' - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-integration/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-integration/build.gradle index 960f09ca56..4fa1a66b69 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-integration/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-integration/build.gradle @@ -7,10 +7,10 @@ description = 'Spring Boot Integration smoke test' dependencies { annotationProcessor project(':spring-boot-project:spring-boot-tools:spring-boot-configuration-processor') - + implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-integration') implementation 'org.springframework.integration:spring-integration-file' - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') testImplementation 'org.awaitility:awaitility' } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/build.gradle index 7a3b3c2a2e..a11aeee7a3 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/build.gradle @@ -9,10 +9,10 @@ dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-actuator') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-jersey') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-tomcat') - + if (JavaVersion.current().java9Compatible) { runtimeOnly 'jakarta.xml.bind:jakarta.xml.bind-api' } - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-ssl/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-ssl/build.gradle index 5c52b3e364..743fd79df0 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-ssl/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-ssl/build.gradle @@ -10,7 +10,8 @@ dependencies { implementation(project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web')) { exclude module: 'spring-boot-starter-tomcat' } - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') + testRuntimeOnly 'org.apache.httpcomponents:httpclient' } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty/build.gradle index ae3b1c1f49..1c30b424fd 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty/build.gradle @@ -9,8 +9,7 @@ dependencies { implementation(project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web')) { exclude module: 'spring-boot-starter-tomcat' } - implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-jetty') - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/build.gradle deleted file mode 100644 index 790d9fd6a2..0000000000 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/build.gradle +++ /dev/null @@ -1,43 +0,0 @@ -// plugins { -// id 'java' -// id 'nu.studer.jooq' version '3.0.3' -// id 'org.springframework.boot.conventions' -// } -// -// description = 'Spring Boot JOOQ smoke test' -// -// dependencies { -// implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-jooq') -// jooqRuntime enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) -// jooqRuntime 'com.h2database:h2' -// runtimeOnly 'com.h2database:h2' -// -// testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') -// } -// -// jooq { -// version = '3.12.3' -// smokeTest(sourceSets.main) { -// jdbc { -// driver = 'org.h2.Driver' -// url = 'jdbc:h2:~/springbootjooq' -// } -// generator { -// name = 'org.jooq.codegen.DefaultGenerator' -// database { -// name = 'org.jooq.meta.h2.H2Database' -// includes = '.*' -// inputSchema = 'PUBLIC' -// } -// strategy { -// // name = 'smoketest.jooq.util.TangleFreeGeneratorStrategy' -// } -// target { -// packageName = 'smoketest.jooq.domain' -// } -// generate { -// records = false -// } -// } -// } -// } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Author.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Author.java deleted file mode 100644 index 097ad5111e..0000000000 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Author.java +++ /dev/null @@ -1,157 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * This class is generated by jOOQ - */ -package smoketest.jooq.domain; - -import java.sql.Date; -import java.util.Arrays; -import java.util.List; - -import javax.annotation.Generated; - -import org.jooq.Field; -import org.jooq.Record; -import org.jooq.Schema; -import org.jooq.Table; -import org.jooq.TableField; -import org.jooq.UniqueKey; -import org.jooq.impl.TableImpl; - -/** - * This class is generated by jOOQ. - */ -@Generated(value = { "https://www.jooq.org", - "jOOQ version:3.8.2" }, comments = "This class is generated by jOOQ") -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class Author extends TableImpl { - - private static final long serialVersionUID = 1187406915; - - /** - * The reference instance of PUBLIC.AUTHOR - */ - public static final Author AUTHOR = new Author(); - - /** - * The class holding records for this type - */ - @Override - public Class getRecordType() { - return Record.class; - } - - /** - * The column PUBLIC.AUTHOR.ID. - */ - public final TableField ID = createField("ID", - org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); - - /** - * The column PUBLIC.AUTHOR.FIRST_NAME. - */ - public final TableField FIRST_NAME = createField("FIRST_NAME", - org.jooq.impl.SQLDataType.VARCHAR.length(50), this, ""); - - /** - * The column PUBLIC.AUTHOR.LAST_NAME. - */ - public final TableField LAST_NAME = createField("LAST_NAME", - org.jooq.impl.SQLDataType.VARCHAR.length(50).nullable(false), this, ""); - - /** - * The column PUBLIC.AUTHOR.DATE_OF_BIRTH. - */ - public final TableField DATE_OF_BIRTH = createField("DATE_OF_BIRTH", - org.jooq.impl.SQLDataType.DATE, this, ""); - - /** - * The column PUBLIC.AUTHOR.YEAR_OF_BIRTH. - */ - public final TableField YEAR_OF_BIRTH = createField("YEAR_OF_BIRTH", - org.jooq.impl.SQLDataType.INTEGER, this, ""); - - /** - * The column PUBLIC.AUTHOR.DISTINGUISHED. - */ - public final TableField DISTINGUISHED = createField("DISTINGUISHED", - org.jooq.impl.SQLDataType.TINYINT, this, ""); - - /** - * Create a PUBLIC.AUTHOR table reference - */ - public Author() { - this("AUTHOR", null); - } - - /** - * Create an aliased PUBLIC.AUTHOR table reference - */ - public Author(String alias) { - this(alias, AUTHOR); - } - - private Author(String alias, Table aliased) { - this(alias, aliased, null); - } - - private Author(String alias, Table aliased, Field[] parameters) { - super(alias, null, aliased, parameters, ""); - } - - /** - * {@inheritDoc} - */ - @Override - public Schema getSchema() { - return Public.PUBLIC; - } - - /** - * {@inheritDoc} - */ - @Override - public UniqueKey getPrimaryKey() { - return Keys.CONSTRAINT_7; - } - - /** - * {@inheritDoc} - */ - @Override - public List> getKeys() { - return Arrays.>asList(Keys.CONSTRAINT_7); - } - - /** - * {@inheritDoc} - */ - @Override - public Author as(String alias) { - return new Author(alias, this); - } - - /** - * Rename this table - */ - @Override - public Author rename(String name) { - return new Author(name, null); - } - -} diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Book.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Book.java deleted file mode 100644 index 4fb961ec94..0000000000 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Book.java +++ /dev/null @@ -1,160 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * This class is generated by jOOQ - */ -package smoketest.jooq.domain; - -import java.util.Arrays; -import java.util.List; - -import javax.annotation.Generated; - -import org.jooq.Field; -import org.jooq.ForeignKey; -import org.jooq.Record; -import org.jooq.Schema; -import org.jooq.Table; -import org.jooq.TableField; -import org.jooq.UniqueKey; -import org.jooq.impl.TableImpl; - -/** - * This class is generated by jOOQ. - */ -@Generated(value = { "https://www.jooq.org", - "jOOQ version:3.8.2" }, comments = "This class is generated by jOOQ") -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class Book extends TableImpl { - - private static final long serialVersionUID = 1176189796; - - /** - * The reference instance of PUBLIC.BOOK - */ - public static final Book BOOK = new Book(); - - /** - * The class holding records for this type - */ - @Override - public Class getRecordType() { - return Record.class; - } - - /** - * The column PUBLIC.BOOK.ID. - */ - public final TableField ID = createField("ID", - org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); - - /** - * The column PUBLIC.BOOK.AUTHOR_ID. - */ - public final TableField AUTHOR_ID = createField("AUTHOR_ID", - org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); - - /** - * The column PUBLIC.BOOK.TITLE. - */ - public final TableField TITLE = createField("TITLE", - org.jooq.impl.SQLDataType.VARCHAR.length(400).nullable(false), this, ""); - - /** - * The column PUBLIC.BOOK.PUBLISHED_IN. - */ - public final TableField PUBLISHED_IN = createField("PUBLISHED_IN", - org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); - - /** - * The column PUBLIC.BOOK.LANGUAGE_ID. - */ - public final TableField LANGUAGE_ID = createField("LANGUAGE_ID", - org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); - - /** - * Create a PUBLIC.BOOK table reference - */ - public Book() { - this("BOOK", null); - } - - /** - * Create an aliased PUBLIC.BOOK table reference - */ - public Book(String alias) { - this(alias, BOOK); - } - - private Book(String alias, Table aliased) { - this(alias, aliased, null); - } - - private Book(String alias, Table aliased, Field[] parameters) { - super(alias, null, aliased, parameters, ""); - } - - /** - * {@inheritDoc} - */ - @Override - public Schema getSchema() { - return Public.PUBLIC; - } - - /** - * {@inheritDoc} - */ - @Override - public UniqueKey getPrimaryKey() { - return Keys.CONSTRAINT_1; - } - - /** - * {@inheritDoc} - */ - @Override - public List> getKeys() { - return Arrays.>asList(Keys.CONSTRAINT_1); - } - - /** - * {@inheritDoc} - */ - @Override - public List> getReferences() { - return Arrays.>asList(Keys.FK_BOOK_AUTHOR, - Keys.FK_BOOK_LANGUAGE); - } - - /** - * {@inheritDoc} - */ - @Override - public Book as(String alias) { - return new Book(alias, this); - } - - /** - * Rename this table - */ - @Override - public Book rename(String name) { - return new Book(name, null); - } - -} diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/BookStore.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/BookStore.java deleted file mode 100644 index e630d62afe..0000000000 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/BookStore.java +++ /dev/null @@ -1,118 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * This class is generated by jOOQ - */ -package smoketest.jooq.domain; - -import java.util.Arrays; -import java.util.List; - -import javax.annotation.Generated; - -import org.jooq.Field; -import org.jooq.Record; -import org.jooq.Schema; -import org.jooq.Table; -import org.jooq.TableField; -import org.jooq.UniqueKey; -import org.jooq.impl.TableImpl; - -/** - * This class is generated by jOOQ. - */ -@Generated(value = { "https://www.jooq.org", - "jOOQ version:3.8.2" }, comments = "This class is generated by jOOQ") -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class BookStore extends TableImpl { - - private static final long serialVersionUID = -2132596210; - - /** - * The reference instance of PUBLIC.BOOK_STORE - */ - public static final BookStore BOOK_STORE = new BookStore(); - - /** - * The class holding records for this type - */ - @Override - public Class getRecordType() { - return Record.class; - } - - /** - * The column PUBLIC.BOOK_STORE.NAME. - */ - public final TableField NAME = createField("NAME", - org.jooq.impl.SQLDataType.VARCHAR.length(400).nullable(false), this, ""); - - /** - * Create a PUBLIC.BOOK_STORE table reference - */ - public BookStore() { - this("BOOK_STORE", null); - } - - /** - * Create an aliased PUBLIC.BOOK_STORE table reference - */ - public BookStore(String alias) { - this(alias, BOOK_STORE); - } - - private BookStore(String alias, Table aliased) { - this(alias, aliased, null); - } - - private BookStore(String alias, Table aliased, Field[] parameters) { - super(alias, null, aliased, parameters, ""); - } - - /** - * {@inheritDoc} - */ - @Override - public Schema getSchema() { - return Public.PUBLIC; - } - - /** - * {@inheritDoc} - */ - @Override - public List> getKeys() { - return Arrays.>asList(Keys.CONSTRAINT_F); - } - - /** - * {@inheritDoc} - */ - @Override - public BookStore as(String alias) { - return new BookStore(alias, this); - } - - /** - * Rename this table - */ - @Override - public BookStore rename(String name) { - return new BookStore(name, null); - } - -} diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/BookToBookStore.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/BookToBookStore.java deleted file mode 100644 index 7d56268f97..0000000000 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/BookToBookStore.java +++ /dev/null @@ -1,148 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * This class is generated by jOOQ - */ -package smoketest.jooq.domain; - -import java.util.Arrays; -import java.util.List; - -import javax.annotation.Generated; - -import org.jooq.Field; -import org.jooq.ForeignKey; -import org.jooq.Record; -import org.jooq.Schema; -import org.jooq.Table; -import org.jooq.TableField; -import org.jooq.UniqueKey; -import org.jooq.impl.TableImpl; - -/** - * This class is generated by jOOQ. - */ -@Generated(value = { "https://www.jooq.org", - "jOOQ version:3.8.2" }, comments = "This class is generated by jOOQ") -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class BookToBookStore extends TableImpl { - - private static final long serialVersionUID = -1360744633; - - /** - * The reference instance of PUBLIC.BOOK_TO_BOOK_STORE - */ - public static final BookToBookStore BOOK_TO_BOOK_STORE = new BookToBookStore(); - - /** - * The class holding records for this type - */ - @Override - public Class getRecordType() { - return Record.class; - } - - /** - * The column PUBLIC.BOOK_TO_BOOK_STORE.NAME. - */ - public final TableField NAME = createField("NAME", - org.jooq.impl.SQLDataType.VARCHAR.length(400).nullable(false), this, ""); - - /** - * The column PUBLIC.BOOK_TO_BOOK_STORE.BOOK_ID. - */ - public final TableField BOOK_ID = createField("BOOK_ID", - org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); - - /** - * The column PUBLIC.BOOK_TO_BOOK_STORE.STOCK. - */ - public final TableField STOCK = createField("STOCK", - org.jooq.impl.SQLDataType.INTEGER, this, ""); - - /** - * Create a PUBLIC.BOOK_TO_BOOK_STORE table reference - */ - public BookToBookStore() { - this("BOOK_TO_BOOK_STORE", null); - } - - /** - * Create an aliased PUBLIC.BOOK_TO_BOOK_STORE table reference - */ - public BookToBookStore(String alias) { - this(alias, BOOK_TO_BOOK_STORE); - } - - private BookToBookStore(String alias, Table aliased) { - this(alias, aliased, null); - } - - private BookToBookStore(String alias, Table aliased, Field[] parameters) { - super(alias, null, aliased, parameters, ""); - } - - /** - * {@inheritDoc} - */ - @Override - public Schema getSchema() { - return Public.PUBLIC; - } - - /** - * {@inheritDoc} - */ - @Override - public UniqueKey getPrimaryKey() { - return Keys.CONSTRAINT_2; - } - - /** - * {@inheritDoc} - */ - @Override - public List> getKeys() { - return Arrays.>asList(Keys.CONSTRAINT_2); - } - - /** - * {@inheritDoc} - */ - @Override - public List> getReferences() { - return Arrays.>asList(Keys.FK_B2BS_BOOK_STORE, - Keys.FK_B2BS_BOOK); - } - - /** - * {@inheritDoc} - */ - @Override - public BookToBookStore as(String alias) { - return new BookToBookStore(alias, this); - } - - /** - * Rename this table - */ - @Override - public BookToBookStore rename(String name) { - return new BookToBookStore(name, null); - } - -} diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/DefaultCatalog.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/DefaultCatalog.java deleted file mode 100644 index 5596bcb1ad..0000000000 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/DefaultCatalog.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * This class is generated by jOOQ - */ -package smoketest.jooq.domain; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import javax.annotation.Generated; - -import org.jooq.Schema; -import org.jooq.impl.CatalogImpl; - -/** - * This class is generated by jOOQ. - */ -@Generated(value = { "https://www.jooq.org", - "jOOQ version:3.8.2" }, comments = "This class is generated by jOOQ") -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class DefaultCatalog extends CatalogImpl { - - private static final long serialVersionUID = -1557925562; - - /** - * The reference instance of - */ - public static final DefaultCatalog DEFAULT_CATALOG = new DefaultCatalog(); - - /** - * The schema PUBLIC. - */ - public final Public PUBLIC = Public.PUBLIC; - - /** - * No further instances allowed - */ - private DefaultCatalog() { - super(""); - } - - @Override - public final List getSchemas() { - List result = new ArrayList(); - result.addAll(getSchemas0()); - return result; - } - - private final List getSchemas0() { - return Arrays.asList(Public.PUBLIC); - } - -} diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Keys.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Keys.java deleted file mode 100644 index c4fe748741..0000000000 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Keys.java +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * This class is generated by jOOQ - */ -package smoketest.jooq.domain; - -import javax.annotation.Generated; - -import org.jooq.ForeignKey; -import org.jooq.Record; -import org.jooq.UniqueKey; -import org.jooq.impl.AbstractKeys; - -/** - * A class modelling foreign key relationships between tables of the PUBLIC - * schema - */ -@Generated(value = { "https://www.jooq.org", - "jOOQ version:3.8.2" }, comments = "This class is generated by jOOQ") -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class Keys { - - // ------------------------------------------------------------------------- - // IDENTITY definitions - // ------------------------------------------------------------------------- - - // ------------------------------------------------------------------------- - // UNIQUE and PRIMARY KEY definitions - // ------------------------------------------------------------------------- - - public static final UniqueKey CONSTRAINT_C = UniqueKeys0.CONSTRAINT_C; - - public static final UniqueKey CONSTRAINT_7 = UniqueKeys0.CONSTRAINT_7; - - public static final UniqueKey CONSTRAINT_1 = UniqueKeys0.CONSTRAINT_1; - - public static final UniqueKey CONSTRAINT_F = UniqueKeys0.CONSTRAINT_F; - - public static final UniqueKey CONSTRAINT_2 = UniqueKeys0.CONSTRAINT_2; - - // ------------------------------------------------------------------------- - // FOREIGN KEY definitions - // ------------------------------------------------------------------------- - - public static final ForeignKey FK_BOOK_AUTHOR = ForeignKeys0.FK_BOOK_AUTHOR; - - public static final ForeignKey FK_BOOK_LANGUAGE = ForeignKeys0.FK_BOOK_LANGUAGE; - - public static final ForeignKey FK_B2BS_BOOK_STORE = ForeignKeys0.FK_B2BS_BOOK_STORE; - - public static final ForeignKey FK_B2BS_BOOK = ForeignKeys0.FK_B2BS_BOOK; - - // ------------------------------------------------------------------------- - // [#1459] distribute members to avoid static initialisers > 64kb - // ------------------------------------------------------------------------- - - private static class UniqueKeys0 extends AbstractKeys { - - public static final UniqueKey CONSTRAINT_C = createUniqueKey( - Language.LANGUAGE, "CONSTRAINT_C", Language.LANGUAGE.ID); - - public static final UniqueKey CONSTRAINT_7 = createUniqueKey( - Author.AUTHOR, "CONSTRAINT_7", Author.AUTHOR.ID); - - public static final UniqueKey CONSTRAINT_1 = createUniqueKey(Book.BOOK, - "CONSTRAINT_1", Book.BOOK.ID); - - public static final UniqueKey CONSTRAINT_F = createUniqueKey( - BookStore.BOOK_STORE, "CONSTRAINT_F", BookStore.BOOK_STORE.NAME); - - public static final UniqueKey CONSTRAINT_2 = createUniqueKey( - BookToBookStore.BOOK_TO_BOOK_STORE, "CONSTRAINT_2", - BookToBookStore.BOOK_TO_BOOK_STORE.NAME, - BookToBookStore.BOOK_TO_BOOK_STORE.BOOK_ID); - - } - - private static class ForeignKeys0 extends AbstractKeys { - - public static final ForeignKey FK_BOOK_AUTHOR = createForeignKey( - Keys.CONSTRAINT_7, Book.BOOK, "FK_BOOK_AUTHOR", - Book.BOOK.AUTHOR_ID); - - public static final ForeignKey FK_BOOK_LANGUAGE = createForeignKey( - Keys.CONSTRAINT_C, Book.BOOK, "FK_BOOK_LANGUAGE", - Book.BOOK.LANGUAGE_ID); - - public static final ForeignKey FK_B2BS_BOOK_STORE = createForeignKey( - Keys.CONSTRAINT_F, BookToBookStore.BOOK_TO_BOOK_STORE, - "FK_B2BS_BOOK_STORE", BookToBookStore.BOOK_TO_BOOK_STORE.NAME); - - public static final ForeignKey FK_B2BS_BOOK = createForeignKey( - Keys.CONSTRAINT_1, BookToBookStore.BOOK_TO_BOOK_STORE, - "FK_B2BS_BOOK", BookToBookStore.BOOK_TO_BOOK_STORE.BOOK_ID); - - } - -} diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Language.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Language.java deleted file mode 100644 index b6cd7522b4..0000000000 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Language.java +++ /dev/null @@ -1,138 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * This class is generated by jOOQ - */ -package smoketest.jooq.domain; - -import java.util.Arrays; -import java.util.List; - -import javax.annotation.Generated; - -import org.jooq.Field; -import org.jooq.Record; -import org.jooq.Schema; -import org.jooq.Table; -import org.jooq.TableField; -import org.jooq.UniqueKey; -import org.jooq.impl.TableImpl; - -/** - * This class is generated by jOOQ. - */ -@Generated(value = { "https://www.jooq.org", - "jOOQ version:3.8.2" }, comments = "This class is generated by jOOQ") -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class Language extends TableImpl { - - private static final long serialVersionUID = -1890716744; - - /** - * The reference instance of PUBLIC.LANGUAGE - */ - public static final Language LANGUAGE = new Language(); - - /** - * The class holding records for this type - */ - @Override - public Class getRecordType() { - return Record.class; - } - - /** - * The column PUBLIC.LANGUAGE.ID. - */ - public final TableField ID = createField("ID", - org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); - - /** - * The column PUBLIC.LANGUAGE.CD. - */ - public final TableField CD = createField("CD", - org.jooq.impl.SQLDataType.CHAR.length(2).nullable(false), this, ""); - - /** - * The column PUBLIC.LANGUAGE.DESCRIPTION. - */ - public final TableField DESCRIPTION = createField("DESCRIPTION", - org.jooq.impl.SQLDataType.VARCHAR.length(50), this, ""); - - /** - * Create a PUBLIC.LANGUAGE table reference - */ - public Language() { - this("LANGUAGE", null); - } - - /** - * Create an aliased PUBLIC.LANGUAGE table reference - */ - public Language(String alias) { - this(alias, LANGUAGE); - } - - private Language(String alias, Table aliased) { - this(alias, aliased, null); - } - - private Language(String alias, Table aliased, Field[] parameters) { - super(alias, null, aliased, parameters, ""); - } - - /** - * {@inheritDoc} - */ - @Override - public Schema getSchema() { - return Public.PUBLIC; - } - - /** - * {@inheritDoc} - */ - @Override - public UniqueKey getPrimaryKey() { - return Keys.CONSTRAINT_C; - } - - /** - * {@inheritDoc} - */ - @Override - public List> getKeys() { - return Arrays.>asList(Keys.CONSTRAINT_C); - } - - /** - * {@inheritDoc} - */ - @Override - public Language as(String alias) { - return new Language(alias, this); - } - - /** - * Rename this table - */ - @Override - public Language rename(String name) { - return new Language(name, null); - } - -} diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Public.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Public.java deleted file mode 100644 index 225404c00a..0000000000 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Public.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * This class is generated by jOOQ - */ -package smoketest.jooq.domain; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import javax.annotation.Generated; - -import org.jooq.Catalog; -import org.jooq.Table; -import org.jooq.impl.SchemaImpl; - -/** - * This class is generated by jOOQ. - */ -@Generated(value = { "https://www.jooq.org", - "jOOQ version:3.8.2" }, comments = "This class is generated by jOOQ") -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class Public extends SchemaImpl { - - private static final long serialVersionUID = 217498103; - - /** - * The reference instance of PUBLIC - */ - public static final Public PUBLIC = new Public(); - - /** - * The table PUBLIC.LANGUAGE. - */ - public final Language LANGUAGE = Language.LANGUAGE; - - /** - * The table PUBLIC.AUTHOR. - */ - public final Author AUTHOR = Author.AUTHOR; - - /** - * The table PUBLIC.BOOK. - */ - public final Book BOOK = Book.BOOK; - - /** - * The table PUBLIC.BOOK_STORE. - */ - public final BookStore BOOK_STORE = BookStore.BOOK_STORE; - - /** - * The table PUBLIC.BOOK_TO_BOOK_STORE. - */ - public final BookToBookStore BOOK_TO_BOOK_STORE = BookToBookStore.BOOK_TO_BOOK_STORE; - - /** - * No further instances allowed - */ - private Public() { - super("PUBLIC", null); - } - - /** - * {@inheritDoc} - */ - @Override - public Catalog getCatalog() { - return DefaultCatalog.DEFAULT_CATALOG; - } - - @Override - public final List> getTables() { - List result = new ArrayList(); - result.addAll(getTables0()); - return result; - } - - private final List> getTables0() { - return Arrays.>asList(Language.LANGUAGE, Author.AUTHOR, Book.BOOK, - BookStore.BOOK_STORE, BookToBookStore.BOOK_TO_BOOK_STORE); - } - -} diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Tables.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Tables.java deleted file mode 100644 index a7d25faa7c..0000000000 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Tables.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * This class is generated by jOOQ - */ -package smoketest.jooq.domain; - -import javax.annotation.Generated; - -/** - * Convenience access to all tables in PUBLIC - */ -@Generated(value = { "https://www.jooq.org", - "jOOQ version:3.8.2" }, comments = "This class is generated by jOOQ") -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class Tables { - - /** - * The table PUBLIC.LANGUAGE. - */ - public static final Language LANGUAGE = Language.LANGUAGE; - - /** - * The table PUBLIC.AUTHOR. - */ - public static final Author AUTHOR = Author.AUTHOR; - - /** - * The table PUBLIC.BOOK. - */ - public static final Book BOOK = Book.BOOK; - - /** - * The table PUBLIC.BOOK_STORE. - */ - public static final BookStore BOOK_STORE = BookStore.BOOK_STORE; - - /** - * The table PUBLIC.BOOK_TO_BOOK_STORE. - */ - public static final BookToBookStore BOOK_TO_BOOK_STORE = BookToBookStore.BOOK_TO_BOOK_STORE; - -} diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/java/smoketest/jooq/JooqExamples.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/java/smoketest/jooq/JooqExamples.java deleted file mode 100644 index 3c27309e16..0000000000 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/java/smoketest/jooq/JooqExamples.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package smoketest.jooq; - -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.List; - -import org.jooq.DSLContext; -import org.jooq.Query; -import org.jooq.Record; -import org.jooq.Result; - -import org.springframework.boot.CommandLineRunner; -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.jdbc.core.RowMapper; -import org.springframework.stereotype.Component; - -import static smoketest.jooq.domain.Author.AUTHOR; -import static smoketest.jooq.domain.Book.BOOK; - -@Component -public class JooqExamples implements CommandLineRunner { - - private final DSLContext dsl; - - private final JdbcTemplate jdbc; - - public JooqExamples(DSLContext dsl, JdbcTemplate jdbc) { - this.dsl = dsl; - this.jdbc = jdbc; - } - - @Override - public void run(String... args) throws Exception { - jooqFetch(); - jooqSql(); - } - - private void jooqFetch() { - Result results = this.dsl.select().from(AUTHOR).fetch(); - for (Record result : results) { - Integer id = result.getValue(AUTHOR.ID); - String firstName = result.getValue(AUTHOR.FIRST_NAME); - String lastName = result.getValue(AUTHOR.LAST_NAME); - System.out.println("jOOQ Fetch " + id + " " + firstName + " " + lastName); - } - } - - private void jooqSql() { - Query query = this.dsl.select(BOOK.TITLE, AUTHOR.FIRST_NAME, AUTHOR.LAST_NAME).from(BOOK).join(AUTHOR) - .on(BOOK.AUTHOR_ID.equal(AUTHOR.ID)).where(BOOK.PUBLISHED_IN.equal(2015)); - Object[] bind = query.getBindValues().toArray(new Object[0]); - List list = this.jdbc.query(query.getSQL(), bind, new RowMapper() { - @Override - public String mapRow(ResultSet rs, int rowNum) throws SQLException { - return rs.getString(1) + " : " + rs.getString(2) + " " + rs.getString(3); - } - }); - System.out.println("jOOQ SQL " + list); - } - -} diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/java/smoketest/jooq/SampleJooqApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/java/smoketest/jooq/SampleJooqApplication.java deleted file mode 100644 index 33770c0589..0000000000 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/java/smoketest/jooq/SampleJooqApplication.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package smoketest.jooq; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class SampleJooqApplication { - - public static void main(String[] args) { - SpringApplication.run(SampleJooqApplication.class, args); - } - -} diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/java/smoketest/jooq/util/TangleFreeGeneratorStrategy.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/java/smoketest/jooq/util/TangleFreeGeneratorStrategy.java deleted file mode 100644 index 6061a87471..0000000000 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/java/smoketest/jooq/util/TangleFreeGeneratorStrategy.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package smoketest.jooq.util; - -import org.jooq.codegen.DefaultGeneratorStrategy; -import org.jooq.meta.Definition; - -/** - * Custom {@link DefaultGeneratorStrategy} that doesn't produce tangled packages. Too - * simple for general use but solves false flags for our build. - */ -public class TangleFreeGeneratorStrategy extends DefaultGeneratorStrategy { - - @Override - public String getJavaPackageName(Definition definition, Mode mode) { - return getTargetPackage(); - } - -} diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/resources/data.sql b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/resources/data.sql deleted file mode 100644 index 8e8994e9d0..0000000000 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/resources/data.sql +++ /dev/null @@ -1,12 +0,0 @@ -INSERT INTO language VALUES (1, 'EN', 'English'); - -INSERT INTO author VALUES (1, 'Greg', 'Turnquest', '1804-09-17', 1804, 1); -INSERT INTO author VALUES (2, 'Craig', 'Walls', '1804-09-18', 1804, 1); - -INSERT INTO book VALUES (1, 1, 'Learning Spring Boot', 2015, 1); -INSERT INTO book VALUES (2, 2, 'Spring Boot in Action', 2015, 1); - -INSERT INTO book_store VALUES ('Barnes & Noble'); - -INSERT INTO book_to_book_store VALUES ('Barnes & Noble', 1, 10); -INSERT INTO book_to_book_store VALUES ('Barnes & Noble', 2, 3); diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/resources/reset.sql b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/resources/reset.sql deleted file mode 100644 index b1306d7359..0000000000 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/resources/reset.sql +++ /dev/null @@ -1 +0,0 @@ -DROP ALL OBJECTS; diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/resources/schema.sql b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/resources/schema.sql deleted file mode 100644 index 0cc7aee7e4..0000000000 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/resources/schema.sql +++ /dev/null @@ -1,39 +0,0 @@ -CREATE TABLE language ( - id NUMBER(7) NOT NULL PRIMARY KEY, - cd CHAR(2) NOT NULL, - description VARCHAR2(50) -); - -CREATE TABLE author ( - id NUMBER(7) NOT NULL PRIMARY KEY, - first_name VARCHAR2(50), - last_name VARCHAR2(50) NOT NULL, - date_of_birth DATE, - year_of_birth NUMBER(7), - distinguished NUMBER(1) -); - -CREATE TABLE book ( - id NUMBER(7) NOT NULL PRIMARY KEY, - author_id NUMBER(7) NOT NULL, - title VARCHAR2(400) NOT NULL, - published_in NUMBER(7) NOT NULL, - language_id NUMBER(7) NOT NULL, - - CONSTRAINT fk_book_author FOREIGN KEY (author_id) REFERENCES author(id), - CONSTRAINT fk_book_language FOREIGN KEY (language_id) REFERENCES language(id) -); - -CREATE TABLE book_store ( - name VARCHAR2(400) NOT NULL UNIQUE -); - -CREATE TABLE book_to_book_store ( - name VARCHAR2(400) NOT NULL, - book_id INTEGER NOT NULL, - stock INTEGER, - - PRIMARY KEY(name, book_id), - CONSTRAINT fk_b2bs_book_store FOREIGN KEY (name) REFERENCES book_store (name) ON DELETE CASCADE, - CONSTRAINT fk_b2bs_book FOREIGN KEY (book_id) REFERENCES book (id) ON DELETE CASCADE -); diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/test/java/smoketest/jooq/SampleJooqApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/test/java/smoketest/jooq/SampleJooqApplicationTests.java deleted file mode 100644 index 9b04eb509c..0000000000 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/test/java/smoketest/jooq/SampleJooqApplicationTests.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package smoketest.jooq; - -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; - -import org.springframework.boot.test.system.CapturedOutput; -import org.springframework.boot.test.system.OutputCaptureExtension; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * Integration tests for {@link SampleJooqApplication}. - */ -@ExtendWith(OutputCaptureExtension.class) -class SampleJooqApplicationTests { - - private static final String[] NO_ARGS = {}; - - @Test - void outputResults(CapturedOutput output) { - SampleJooqApplication.main(NO_ARGS); - assertThat(output).contains("jOOQ Fetch 1 Greg Turnquest").contains("jOOQ Fetch 2 Craig Walls") - .contains("jOOQ SQL [Learning Spring Boot : Greg Turnquest, Spring Boot in Action : Craig Walls]"); - } - -} diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/build.gradle index b6e319a8a8..e9dada3b04 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/build.gradle @@ -18,8 +18,8 @@ dependencies { exclude group: 'javax.xml.bind', module: 'jaxb-api' } implementation 'org.springframework:spring-orm' - + runtimeOnly 'com.h2database:h2' - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/build.gradle index 46979b6018..cea482b380 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/build.gradle @@ -13,11 +13,11 @@ dependencies { implementation 'jakarta.xml.bind:jakarta.xml.bind-api' } implementation 'org.springframework:spring-jms' - + runtimeOnly 'com.h2database:h2' runtimeOnly('org.apache.activemq:artemis-jms-server') { exclude group: 'org.apache.geronimo.specs', module: 'geronimo-jms_2.0_spec' } - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-bitronix/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-bitronix/build.gradle index c30bea68d4..e3c830277f 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-bitronix/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-bitronix/build.gradle @@ -13,11 +13,11 @@ dependencies { implementation 'jakarta.xml.bind:jakarta.xml.bind-api' } implementation 'org.springframework:spring-jms' - + runtimeOnly 'com.h2database:h2' runtimeOnly('org.apache.activemq:artemis-jms-server') { exclude group: 'org.apache.geronimo.specs', module: 'geronimo-jms_2.0_spec' } - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-junit-jupiter/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-junit-jupiter/build.gradle index d48beca8ba..36c6d7eed4 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-junit-jupiter/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-junit-jupiter/build.gradle @@ -7,7 +7,7 @@ description = 'Spring Boot JUnit Jupiter smoke test' dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web') - + testImplementation(project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test')) { exclude group: 'org.junit.vintage' } @@ -15,12 +15,12 @@ dependencies { test { testLogging { - afterSuite { description, result -> - if (!description.parent) { - if (!result.testCount) { - throw new GradleException('No tests were executed') - } - } + afterSuite { description, result -> + if (!description.parent) { + if (!result.testCount) { + throw new GradleException('No tests were executed') + } + } } } } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-junit-vintage/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-junit-vintage/build.gradle index 2ae43e941a..81f8da29b8 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-junit-vintage/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-junit-vintage/build.gradle @@ -7,18 +7,18 @@ description = 'Spring Boot JUnit Vintage smoke test' dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web') - + testImplementation(project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test')) } test { testLogging { - afterSuite { description, result -> - if (!description.parent) { - if (!result.testCount) { - throw new GradleException('No tests were executed') - } - } + afterSuite { description, result -> + if (!description.parent) { + if (!result.testCount) { + throw new GradleException('No tests were executed') + } + } } } } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/build.gradle index 2abfa04180..fb7337d392 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/build.gradle @@ -8,7 +8,7 @@ description = 'Spring Boot Kafka smoke test' dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-json') implementation 'org.springframework.kafka:spring-kafka' - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') testImplementation 'org.awaitility:awaitility' testImplementation 'org.springframework.kafka:spring-kafka-test' diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/build.gradle index 9ca130e1ee..4dbba1e55c 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/build.gradle @@ -12,6 +12,6 @@ dependencies { implementation 'org.liquibase:liquibase-core' runtimeOnly 'com.h2database:h2' - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-property-validation/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-property-validation/build.gradle index e430ee65d9..d2acc09ef1 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-property-validation/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-property-validation/build.gradle @@ -7,8 +7,8 @@ description = 'Spring Boot property validation smoke test' dependencies { annotationProcessor project(':spring-boot-project:spring-boot-tools:spring-boot-configuration-processor') - + implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter') - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-quartz/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-quartz/build.gradle index 792ce334e8..99a1a8c1c9 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-quartz/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-quartz/build.gradle @@ -8,9 +8,9 @@ description = 'Spring Boot Quartz smoke test' dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-jdbc') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-quartz') - + runtimeOnly 'com.h2database:h2' - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') testImplementation 'org.awaitility:awaitility' } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-client/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-client/build.gradle index 7415212766..465afc605f 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-client/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-client/build.gradle @@ -9,7 +9,7 @@ dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-actuator') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-oauth2-client') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-webflux') - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') testImplementation 'org.apache.httpcomponents:httpclient' } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-resource-server/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-resource-server/build.gradle index 0aee1a03c4..ef784b4ea2 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-resource-server/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-resource-server/build.gradle @@ -8,7 +8,7 @@ description = 'Spring Boot reactive OAuth 2 resource server smoke test' dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-oauth2-resource-server') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-webflux') - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') testImplementation 'com.squareup.okhttp3:mockwebserver:3.9.0' } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-rsocket/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-rsocket/build.gradle index 6176f9e03a..fda70b1cbb 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-rsocket/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-rsocket/build.gradle @@ -9,7 +9,7 @@ dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-rsocket') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-security') implementation 'org.springframework.security:spring-security-rsocket' - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') testImplementation 'io.projectreactor:reactor-test' } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-saml2-service-provider/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-saml2-service-provider/build.gradle index 9cf22b2ea3..ce655ef9aa 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-saml2-service-provider/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-saml2-service-provider/build.gradle @@ -9,6 +9,6 @@ dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web') implementation 'org.springframework.security:spring-security-config' implementation 'org.springframework.security:spring-security-saml2-service-provider' - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure-jersey/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure-jersey/build.gradle index c8d2548a58..241c59fca8 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure-jersey/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure-jersey/build.gradle @@ -10,6 +10,6 @@ dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-jersey') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-security') implementation 'org.jolokia:jolokia-core' - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/build.gradle index 66f73aedce..38e16dd945 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/build.gradle @@ -9,7 +9,7 @@ dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-actuator') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-security') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-webflux') - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') testImplementation 'io.projectreactor:reactor-test' } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure/build.gradle index e4bd622b0b..0c82239c9b 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure/build.gradle @@ -7,6 +7,6 @@ description = 'Spring Boot Security smoke test' dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-security') - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-servlet/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-servlet/build.gradle index 3cd180ab43..affd15aee4 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-servlet/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-servlet/build.gradle @@ -7,8 +7,10 @@ description = 'Spring Boot Servlet smoke test' dependencies { compileOnly project(':spring-boot-project:spring-boot-starters:spring-boot-starter-tomcat') + implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-security') - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') + testRuntimeOnly project(':spring-boot-project:spring-boot-starters:spring-boot-starter-tomcat') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux/build.gradle index 4fee4d429f..0694515682 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux/build.gradle @@ -9,19 +9,19 @@ def sessionStores = [ 'mongodb': [ project(':spring-boot-project:spring-boot-starters:spring-boot-starter-data-mongodb-reactive'), 'de.flapdoodle.embed:de.flapdoodle.embed.mongo', - 'org.springframework.session:spring-session-data-mongodb' + 'org.springframework.session:spring-session-data-mongodb' ], 'redis': [ project(':spring-boot-project:spring-boot-starters:spring-boot-starter-data-redis-reactive'), - 'org.springframework.session:spring-session-data-redis' + 'org.springframework.session:spring-session-data-redis' ] ] dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-security') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-webflux') - + sessionStores[project.findProperty('sessionStore') ?: 'mongodb'].each { runtimeOnly it } - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session/build.gradle index 46cc84d54a..c7ed7ecc67 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session/build.gradle @@ -8,7 +8,7 @@ description = 'Spring Boot Session smoke test' def sessionStores = [ 'hazelcast': [ 'com.hazelcast:hazelcast', - 'org.springframework.session:spring-session-hazelcast' + 'org.springframework.session:spring-session-hazelcast' ], 'jdbc': [ project(':spring-boot-project:spring-boot-starters:spring-boot-starter-jdbc'), @@ -17,11 +17,11 @@ def sessionStores = [ ], 'mongodb': [ project(':spring-boot-project:spring-boot-starters:spring-boot-starter-data-mongodb'), - 'org.springframework.session:spring-session-data-mongodb' + 'org.springframework.session:spring-session-data-mongodb' ], 'redis': [ project(':spring-boot-project:spring-boot-starters:spring-boot-starter-data-redis'), - 'org.springframework.session:spring-session-data-redis' + 'org.springframework.session:spring-session-data-redis' ] ] @@ -29,8 +29,8 @@ dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-actuator') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-security') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web') - + sessionStores[project.findProperty('sessionStore') ?: 'jdbc'].each { runtimeOnly it } - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-simple/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-simple/build.gradle index c038dfeb9a..418bd12a0d 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-simple/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-simple/build.gradle @@ -11,6 +11,6 @@ dependencies { implementation('org.hibernate.validator:hibernate-validator') { exclude group: 'javax.validation' } - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test-nomockito/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test-nomockito/build.gradle index 88d23d3fa8..2204596959 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test-nomockito/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test-nomockito/build.gradle @@ -8,9 +8,9 @@ description = 'Spring Boot Test no Mockito smoke test' dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web') - + runtimeOnly 'com.h2database:h2' - + testImplementation project(':spring-boot-project:spring-boot-test') testImplementation 'org.assertj:assertj-core' testImplementation 'org.junit.jupiter:junit-jupiter' diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/build.gradle index b4470ce126..09ac38c3f9 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/build.gradle @@ -8,9 +8,9 @@ description = 'Spring Boot Test smoke test' dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-data-jpa') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web') - + runtimeOnly 'com.h2database:h2' - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') testImplementation 'org.seleniumhq.selenium:selenium-api' testImplementation 'org.seleniumhq.selenium:htmlunit-driver' diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-testng/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-testng/build.gradle index 0bfa9d67c6..c36da00e79 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-testng/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-testng/build.gradle @@ -9,7 +9,7 @@ dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-tomcat') implementation 'org.springframework:spring-webmvc' - + testImplementation project(':spring-boot-project:spring-boot-test') testImplementation 'org.assertj:assertj-core' testImplementation 'org.springframework:spring-test' diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/build.gradle index e7b096cfcc..9f286a32d3 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/build.gradle @@ -9,8 +9,8 @@ dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web') providedRuntime project(':spring-boot-project:spring-boot-starters:spring-boot-starter-tomcat') - providedRuntime 'javax.servlet:jstl' + providedRuntime 'javax.servlet:jstl' providedRuntime 'org.apache.tomcat.embed:tomcat-embed-jasper' - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-multi-connectors/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-multi-connectors/build.gradle index 5079c8f8a0..89c31c864d 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-multi-connectors/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-multi-connectors/build.gradle @@ -7,7 +7,7 @@ description = 'Spring Boot Tomcat multi-connectors smoke test' dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web') - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') testImplementation 'org.apache.httpcomponents:httpclient' } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-ssl/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-ssl/build.gradle index 08d55bdb6c..126881b592 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-ssl/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-ssl/build.gradle @@ -7,7 +7,7 @@ description = 'Spring Boot Tomcat SSL smoke test' dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web') - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') testImplementation 'org.apache.httpcomponents:httpclient' } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat/build.gradle index befc755c95..7dd2a060e7 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat/build.gradle @@ -9,6 +9,6 @@ dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-tomcat') implementation 'org.springframework:spring-webmvc' - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-traditional/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-traditional/build.gradle index a526875314..d1ea405e90 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-traditional/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-traditional/build.gradle @@ -8,10 +8,10 @@ description = 'Spring Boot traditional deployment smoke test' dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter') implementation 'org.springframework:spring-webmvc' - + providedRuntime project(':spring-boot-project:spring-boot-starters:spring-boot-starter-tomcat') providedRuntime 'org.apache.tomcat.embed:tomcat-embed-jasper' - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') testImplementation 'org.apache.httpcomponents:httpclient' } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-undertow-ssl/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-undertow-ssl/build.gradle index 0af2b289b4..130becaa80 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-undertow-ssl/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-undertow-ssl/build.gradle @@ -10,7 +10,7 @@ dependencies { exclude module: 'spring-boot-starter-tomcat' } implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-undertow') - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') testImplementation 'org.apache.httpcomponents:httpclient' } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-undertow/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-undertow/build.gradle index 1296d950eb..247bbda9fc 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-undertow/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-undertow/build.gradle @@ -10,6 +10,6 @@ dependencies { exclude module: 'spring-boot-starter-tomcat' } implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-undertow') - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-war/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-war/build.gradle index b6f8bc2c3d..09d6aa952c 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-war/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-war/build.gradle @@ -9,6 +9,7 @@ dependencies { implementation(project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web')) { exclude module: 'spring-boot-starter-tomcat' } + providedCompile platform(project(':spring-boot-project:spring-boot-dependencies')) providedCompile 'jakarta.servlet:jakarta.servlet-api' diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-freemarker/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-freemarker/build.gradle index 5a509586ca..35dab300bb 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-freemarker/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-freemarker/build.gradle @@ -5,9 +5,9 @@ plugins { description = 'Spring Boot web FreeMarker smoke test' -dependencies { +dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-freemarker') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web') - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/build.gradle index 8eb68347db..8dbedd67ba 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/build.gradle @@ -5,12 +5,12 @@ plugins { description = 'Spring Boot web Groovy Templates smoke test' -dependencies { +dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-groovy-templates') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-validation') if (JavaVersion.current().java9Compatible) { implementation 'jakarta.xml.bind:jakarta.xml.bind-api' } - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-jsp/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-jsp/build.gradle index 259deb0cdd..54f3c4bccb 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-jsp/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-jsp/build.gradle @@ -9,8 +9,8 @@ dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web') providedRuntime project(':spring-boot-project:spring-boot-starters:spring-boot-starter-tomcat') - providedRuntime 'javax.servlet:jstl' + providedRuntime 'javax.servlet:jstl' providedRuntime 'org.apache.tomcat.embed:tomcat-embed-jasper' - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/build.gradle index 4aaafa2627..e0739c33a8 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/build.gradle @@ -5,11 +5,11 @@ plugins { description = 'Spring Boot web method security smoke test' -dependencies { +dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-actuator') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-security') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-thymeleaf') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web') - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/build.gradle index 6153f7d148..bb3ec75150 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/build.gradle @@ -5,9 +5,9 @@ plugins { description = 'Spring Boot web Mustache smoke test' -dependencies { +dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-mustache') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web') - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/build.gradle index 00bb73374d..4f413790cf 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/build.gradle @@ -5,11 +5,11 @@ plugins { description = 'Spring Boot web secure custom smoke test' -dependencies { +dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-security') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-thymeleaf') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web') - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') testImplementation 'org.apache.httpcomponents:httpclient' } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/build.gradle index 38a45ceeae..2af07901a8 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/build.gradle @@ -5,14 +5,14 @@ plugins { description = 'Spring Boot web secure JDBC smoke test' -dependencies { +dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-jdbc') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-security') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-thymeleaf') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web') - + runtimeOnly 'com.h2database:h2' - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') testImplementation 'org.apache.httpcomponents:httpclient' } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/build.gradle index 6c37b1940c..f0e8fcf7cf 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/build.gradle @@ -5,12 +5,12 @@ plugins { description = 'Spring Boot web secure smoke test' -dependencies { +dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-actuator') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-security') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-thymeleaf') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web') - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') testImplementation 'org.apache.httpcomponents:httpclient' } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-static/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-static/build.gradle index 36752d7f4b..c2153d8a41 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-static/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-static/build.gradle @@ -5,13 +5,13 @@ plugins { description = 'Spring Boot web static smoke test' -dependencies { +dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web') - + providedRuntime project(':spring-boot-project:spring-boot-starters:spring-boot-starter-tomcat') - + runtimeOnly 'org.webjars:bootstrap:3.0.3' runtimeOnly 'org.webjars:jquery:2.0.3-1' - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/build.gradle index 32198fe3b4..a112e2de28 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/build.gradle @@ -5,10 +5,10 @@ plugins { description = 'Spring Boot web UI smoke test' -dependencies { +dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-thymeleaf') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-validation') - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webflux/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webflux/build.gradle index 75a3810821..03e151f231 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webflux/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webflux/build.gradle @@ -5,10 +5,10 @@ plugins { description = 'Spring Boot WebFlux smoke test' -dependencies { +dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-actuator') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-webflux') - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') testImplementation 'io.projectreactor:reactor-test' } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/build.gradle index 3de88c8ed9..1ea4f4bcf5 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/build.gradle @@ -5,17 +5,16 @@ plugins { description = 'Spring Boot Web Services smoke test' -dependencies { +dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web-services') implementation 'org.jdom:jdom2' - + runtimeOnly 'jaxen:jaxen' runtimeOnly 'wsdl4j:wsdl4j' - if (JavaVersion.current().java11Compatible) { runtimeOnly 'jakarta.activation:jakarta.activation-api' runtimeOnly 'org.glassfish.jaxb:jaxb-runtime' } - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/build.gradle index 1adb130385..c48d1543ed 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/build.gradle @@ -5,11 +5,11 @@ plugins { description = 'Spring Boot WebSocket Jetty smoke test' -dependencies { +dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-jetty') implementation(project(':spring-boot-project:spring-boot-starters:spring-boot-starter-websocket')) { exclude module: 'spring-boot-starter-tomcat' } - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/build.gradle index 36f289fc46..86dfe1bb22 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/build.gradle @@ -5,8 +5,8 @@ plugins { description = 'Spring Boot WebSocket Tomcat smoke test' -dependencies { +dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-websocket') - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/build.gradle index 4d6e98bd4a..b967b679f9 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/build.gradle @@ -5,11 +5,11 @@ plugins { description = 'Spring Boot WebSocket Undertow smoke test' -dependencies { +dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-undertow') implementation(project(':spring-boot-project:spring-boot-starters:spring-boot-starter-websocket')) { exclude module: 'spring-boot-starter-tomcat' } - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-xml/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-xml/build.gradle index 86c2cc77cb..df98d5ac8c 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-xml/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-xml/build.gradle @@ -5,8 +5,8 @@ plugins { description = 'Spring Boot XML smoke test' -dependencies { +dependencies { implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter') - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') }