From 2771fe905d389b32ed7b0d5b9c457cebb8902965 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Mon, 17 Jan 2022 18:06:52 +0100 Subject: [PATCH 001/210] Cleanup version determination in CustomRuntimeEventLoop --- .../function/adapter/aws/CustomRuntimeEventLoop.java | 8 +++++++- .../function-sample-kotlin-web/pom.xml | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoop.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoop.java index 83d9f256d..42d6e2fce 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoop.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoop.java @@ -236,6 +236,12 @@ private static String extractVersion() { return "UNKNOWN-VERSION"; } int startIndex = path.lastIndexOf("/") + 1; - return path.substring(startIndex, endIndex).replace("spring-cloud-function-adapter-aws-", ""); + try { + return path.substring(startIndex, endIndex).replace("spring-cloud-function-adapter-aws-", ""); + } + catch (Throwable e) { + logger.info("Failed to deterimine framework version"); + return "UNKNOWN-VERSION"; + } } } diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index b80bfa41f..4c3587eff 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -38,7 +38,7 @@ org.springframework.cloud spring-cloud-function-kotlin - 3.2.1-SNAPSHOT + 3.2.2-SNAPSHOT org.springframework.cloud From 73c46c58775ff0b1af47784876bef4c114d9cf42 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Mon, 24 Jan 2022 15:36:24 +0100 Subject: [PATCH 002/210] GH-792 Fix Supplier streaming in s-c-function-web Resolves #792 --- .../function-sample/pom.xml | 10 ++--- .../src/main/java/com/example/Client.java | 44 +++++++++++++++++++ .../java/com/example/SampleApplication.java | 10 +++-- .../test/java/com/example/FunctionTests.java | 9 ---- .../function/web/flux/FunctionController.java | 19 ++++---- .../function/web/mvc/FunctionController.java | 11 ++--- .../FunctionWebRequestProcessingHelper.java | 6 +-- .../web/flux/HttpPostIntegrationTests.java | 2 + .../web/function/UserSubmittedTests.java | 12 +++++ .../web/mvc/HttpPostIntegrationTests.java | 24 ++++++++-- 10 files changed, 107 insertions(+), 40 deletions(-) create mode 100644 spring-cloud-function-samples/function-sample/src/main/java/com/example/Client.java diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index 8a89e86c0..90e855317 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -1,7 +1,7 @@ + xmlns="http://maven.apache.org/POM/4.0.0" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 io.spring.sample @@ -26,9 +26,9 @@ - org.springframework.boot - spring-boot-starter-actuator - + org.springframework.boot + spring-boot-starter-actuator + org.springframework.cloud spring-cloud-starter-function-webflux diff --git a/spring-cloud-function-samples/function-sample/src/main/java/com/example/Client.java b/spring-cloud-function-samples/function-sample/src/main/java/com/example/Client.java new file mode 100644 index 000000000..516fa3a1c --- /dev/null +++ b/spring-cloud-function-samples/function-sample/src/main/java/com/example/Client.java @@ -0,0 +1,44 @@ +/* + * 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 com.example; + +import org.springframework.web.reactive.function.client.WebClient; + +/** + * Sample client to test infinite stream from function. + * + * @author Oleg Zhurakousky + * + */ +public class Client { + + public static void main(String[] args) throws Exception { + WebClient client = WebClient.create(); + WebClient.ResponseSpec responseSpec = client.post() + .uri("http://localhost:8080/infinite") + .header("accept", "text/event-stream") + .retrieve(); + + responseSpec.bodyToFlux(String.class).subscribe(v -> { + System.out.println(v); + }); + + System.in.read(); + + } + +} diff --git a/spring-cloud-function-samples/function-sample/src/main/java/com/example/SampleApplication.java b/spring-cloud-function-samples/function-sample/src/main/java/com/example/SampleApplication.java index 4fb75cf8c..f26aec07f 100644 --- a/spring-cloud-function-samples/function-sample/src/main/java/com/example/SampleApplication.java +++ b/spring-cloud-function-samples/function-sample/src/main/java/com/example/SampleApplication.java @@ -16,10 +16,12 @@ package com.example; +import java.time.Duration; import java.util.function.Function; import java.util.function.Supplier; import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -55,9 +57,11 @@ public Supplier hello() { } @Bean - public Supplier> words() { - return () -> Flux.fromArray(new String[] {"foo", "bar"}); + public Supplier> infinite() { + return () -> Flux + .interval(Duration.ofSeconds(1)) + .log() + .map(counter -> String.format("Counter: %s", counter)); } } -// @checkstyle:on diff --git a/spring-cloud-function-samples/function-sample/src/test/java/com/example/FunctionTests.java b/spring-cloud-function-samples/function-sample/src/test/java/com/example/FunctionTests.java index 9248f1030..cae8e9187 100644 --- a/spring-cloud-function-samples/function-sample/src/test/java/com/example/FunctionTests.java +++ b/spring-cloud-function-samples/function-sample/src/test/java/com/example/FunctionTests.java @@ -51,15 +51,6 @@ public void testHello() { assertThat(output).isEqualTo("hello"); } - @Test - public void testWords() { - Flux output = this.functions.words().get(); - List results = output.collectList().block(); - assertThat(results.size()).isEqualTo(2); - assertThat(results.get(0)).isEqualTo("foo"); - assertThat(results.get(1)).isEqualTo("bar"); - } - @Test public void testGreeter() { assertThat(new Greeter().apply("World")).isEqualTo("Hello World"); diff --git a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/FunctionController.java b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/FunctionController.java index b04c95212..97b710ef7 100644 --- a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/FunctionController.java +++ b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/FunctionController.java @@ -16,6 +16,7 @@ package org.springframework.cloud.function.web.flux; +import org.reactivestreams.Publisher; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -74,27 +75,25 @@ public Mono> post(ServerWebExchange request, return (Mono>) FunctionWebRequestProcessingHelper.processRequest(wrapper(request), body, false); } - @SuppressWarnings("unchecked") @PostMapping(path = "/**", produces = MediaType.TEXT_EVENT_STREAM_VALUE) @ResponseBody - public Mono> postStream(ServerWebExchange request, @RequestBody(required = false) Flux body) { - return (Mono>) FunctionWebRequestProcessingHelper.processRequest(wrapper(request), body, false); + public Publisher postStream(ServerWebExchange request, @RequestBody(required = false) Flux body) { + return FunctionWebRequestProcessingHelper.processRequest(wrapper(request), body, true); } - @SuppressWarnings("unchecked") - @GetMapping(path = "/**") + @GetMapping(path = "/**", produces = MediaType.TEXT_EVENT_STREAM_VALUE) @ResponseBody - public Mono> get(ServerWebExchange request) { + public Publisher getStream(ServerWebExchange request) { FunctionWrapper wrapper = wrapper(request); - return (Mono>) FunctionWebRequestProcessingHelper.processRequest(wrapper, wrapper.getArgument(), false); + return FunctionWebRequestProcessingHelper.processRequest(wrapper, wrapper.getArgument(), true); } @SuppressWarnings("unchecked") - @GetMapping(path = "/**", produces = MediaType.TEXT_EVENT_STREAM_VALUE) + @GetMapping(path = "/**") @ResponseBody - public Mono> getStream(ServerWebExchange request) { + public Mono> get(ServerWebExchange request) { FunctionWrapper wrapper = wrapper(request); - return (Mono>) FunctionWebRequestProcessingHelper.processRequest(wrapper, wrapper.getArgument(), true); + return (Mono>) FunctionWebRequestProcessingHelper.processRequest(wrapper, wrapper.getArgument(), false); } private FunctionWrapper wrapper(ServerWebExchange request) { diff --git a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/mvc/FunctionController.java b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/mvc/FunctionController.java index 0d08f3e91..f8de9c1ca 100644 --- a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/mvc/FunctionController.java +++ b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/mvc/FunctionController.java @@ -94,21 +94,18 @@ public Mono>> postStream(WebRequest request, .headers(response.getHeaders()).body((Publisher) response.getBody())); } - @SuppressWarnings("unchecked") @GetMapping(path = "/**", produces = MediaType.TEXT_EVENT_STREAM_VALUE) @ResponseBody - public Mono>> getStream(WebRequest request) { + public Publisher getStream(WebRequest request) { FunctionWrapper wrapper = wrapper(request); - return ((Mono>) FunctionWebRequestProcessingHelper - .processRequest(wrapper, wrapper.getArgument(), true)).map(response -> ResponseEntity.ok() - .headers(response.getHeaders()).body((Publisher) response.getBody())); + return FunctionWebRequestProcessingHelper + .processRequest(wrapper, wrapper.getArgument(), true); } @PostMapping(path = "/**") @ResponseBody public Object post(WebRequest request, @RequestBody(required = false) String body) { - String argument = StringUtils.hasText(body) ? body : ""; - return FunctionWebRequestProcessingHelper.processRequest(wrapper(request), argument, false); + return FunctionWebRequestProcessingHelper.processRequest(wrapper(request), body, false); } @GetMapping(path = "/**") diff --git a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/FunctionWebRequestProcessingHelper.java b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/FunctionWebRequestProcessingHelper.java index b459a6954..c427fdc13 100644 --- a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/FunctionWebRequestProcessingHelper.java +++ b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/FunctionWebRequestProcessingHelper.java @@ -84,7 +84,7 @@ public static Object invokeFunction(FunctionInvocationWrapper function, Object i } @SuppressWarnings({ "rawtypes", "unchecked" }) - public static Object processRequest(FunctionWrapper wrapper, Object argument, boolean eventStream) { + public static Publisher processRequest(FunctionWrapper wrapper, Object argument, boolean eventStream) { FunctionInvocationWrapper function = wrapper.getFunction(); HttpHeaders headers = wrapper.getHeaders(); @@ -95,7 +95,7 @@ public static Object processRequest(FunctionWrapper wrapper, Object argument, bo function.setSkipOutputConversion(true); } - Object input = argument == null ? Flux.empty() : (argument instanceof Publisher ? Flux.from((Publisher) argument) : inputMessage); + Object input = argument == null ? "" : (argument instanceof Publisher ? Flux.from((Publisher) argument) : inputMessage); Object result = function.apply(input); if (function.isConsumer()) { @@ -111,7 +111,7 @@ public static Object processRequest(FunctionWrapper wrapper, Object argument, bo if (result instanceof Publisher) { pResult = (Publisher) result; if (eventStream) { - return Flux.from(pResult).then(Mono.fromSupplier(() -> responseOkBuilder.body(result))); + return Flux.from(pResult); } if (pResult instanceof Flux) { diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/flux/HttpPostIntegrationTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/flux/HttpPostIntegrationTests.java index 1cc7b8a0a..37d1680ad 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/flux/HttpPostIntegrationTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/flux/HttpPostIntegrationTests.java @@ -333,6 +333,8 @@ public void uppercaseJsonArray() throws Exception { @Test @DirtiesContext public void uppercaseSSE() throws Exception { + String s = this.rest.exchange(RequestEntity.post(new URI("/uppercase")).contentType(MediaType.APPLICATION_JSON) + .body("[\"foo\",\"bar\"]"), String.class).getBody(); assertThat(this.rest.exchange(RequestEntity.post(new URI("/uppercase")).contentType(MediaType.APPLICATION_JSON) .body("[\"foo\",\"bar\"]"), String.class).getBody()) .isEqualTo(sse("(FOO)", "(BAR)")); diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/UserSubmittedTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/UserSubmittedTests.java index ac30ea91c..f524ba30f 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/UserSubmittedTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/UserSubmittedTests.java @@ -64,6 +64,18 @@ public void testIssue274() throws Exception { assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); } + @Test + public void testIssue274WithData() throws Exception { + SpringApplication.run(Issue274Configuration.class); + TestRestTemplate testRestTemplate = new TestRestTemplate(); + String port = System.getProperty("server.port"); + Thread.sleep(200); + ResponseEntity response = testRestTemplate + .postForEntity(new URI("http://localhost:" + port + "/echo"), "hello", String.class); + assertThat(response.getBody()).isEqualTo("HELLO"); + assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); + } + @SpringBootApplication protected static class Issue274Configuration { diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/HttpPostIntegrationTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/HttpPostIntegrationTests.java index 2698bf70f..811d898da 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/HttpPostIntegrationTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/HttpPostIntegrationTests.java @@ -290,12 +290,29 @@ public void uppercaseJsonArray() throws Exception { @Test public void uppercaseSSE() throws Exception { - assertThat(this.rest.exchange(RequestEntity.post(new URI("/uppercase")) - .accept(EVENT_STREAM).contentType(MediaType.APPLICATION_JSON) + String s = this.rest.exchange(RequestEntity.post(new URI("/uppercase")).contentType(MediaType.APPLICATION_JSON) + .body("[\"foo\",\"bar\"]"), String.class).getBody(); + assertThat(this.rest.exchange(RequestEntity.post(new URI("/uppercase")).contentType(MediaType.APPLICATION_JSON) .body("[\"foo\",\"bar\"]"), String.class).getBody()) .isEqualTo(sse("(FOO)", "(BAR)")); } +// @Test +// public void uppercaseSSE() throws Exception { +// assertThat(this.rest.exchange(RequestEntity.post(new URI("/uppercase")) +// .accept(EVENT_STREAM).contentType(MediaType.APPLICATION_JSON) +// .body("[\"foo\",\"bar\"]"), String.class).getBody()) +// .isEqualTo(sse("(FOO)", "(BAR)")); +// +//// String body = this.rest.exchange(RequestEntity.post(new URI("/uppercase")).contentType(MediaType.APPLICATION_JSON) +//// .body("[\"foo\",\"bar\"]"), String.class).getBody(); +// +//// System.out.println(body); +// +//// assertThat(body) +//// .isEqualTo(sse("(FOO)", "(BAR)")); +// } + @Test public void sum() throws Exception { @@ -334,7 +351,8 @@ public void count() throws Exception { } private String sse(String... values) { - return "data:" + StringUtils.arrayToDelimitedString(values, "\n\ndata:") + "\n\n"; + //return "data:" + StringUtils.arrayToDelimitedString(values, "\n\ndata:") + "\n\n"; + return "[\"" + StringUtils.arrayToDelimitedString(values, "\",\"") + "\"]"; } @EnableAutoConfiguration From 68d425b39283772d4b570e64a6b10798ad8ab7b5 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Mon, 24 Jan 2022 16:19:26 +0100 Subject: [PATCH 003/210] Cleanup and additional test --- .../HybridFunctionalRegistrationTests.java | 39 ++++++++++++++++++- .../web/mvc/HttpPostIntegrationTests.java | 19 --------- 2 files changed, 37 insertions(+), 21 deletions(-) diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/HybridFunctionalRegistrationTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/HybridFunctionalRegistrationTests.java index f49d301be..fd8b3d843 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/HybridFunctionalRegistrationTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/HybridFunctionalRegistrationTests.java @@ -26,6 +26,8 @@ import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; import org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration; import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.messaging.Message; +import org.springframework.messaging.support.MessageBuilder; import static org.assertj.core.api.Assertions.assertThat; @@ -37,6 +39,7 @@ public class HybridFunctionalRegistrationTests { // see https://github.com/spring-cloud/spring-cloud-function/issues/258 + @SuppressWarnings("rawtypes") @Test public void testNoDoubleRegistrationInHybridMode() { ConfigurableApplicationContext context = FunctionalSpringApplication @@ -46,9 +49,26 @@ public void testNoDoubleRegistrationInHybridMode() { assertThat(context.containsBean("function")).isTrue(); assertThat(context.getBeansOfType(UppercaseFunction.class).size()).isEqualTo(1); - assertThat((Object) catalog.lookup(Function.class, "hybridFunctionalRegistrationTests.UppercaseFunction")).isNotNull(); + assertThat((Function) catalog.lookup("hybridFunctionalRegistrationTests.UppercaseFunction")).isNotNull(); } + @SuppressWarnings("rawtypes") + @Test + public void testMessageHeaderPropagationInFunctionalBeanRegistration() { + ConfigurableApplicationContext context = FunctionalSpringApplication + .run(UppercaseMessageFunction.class, "--spring.functional.enabled=false"); + + FunctionCatalog catalog = context.getBean(FunctionCatalog.class); + + assertThat(context.containsBean("function")).isTrue(); + assertThat(context.getBeansOfType(UppercaseMessageFunction.class).size()).isEqualTo(1); + Function f = catalog.lookup(Function.class, "hybridFunctionalRegistrationTests.UppercaseMessageFunction"); + assertThat(f).isNotNull(); + String result = (String) f.apply(MessageBuilder.withPayload("hello").setHeader("foo", "foo").setHeader("blah", "blah").build()); + assertThat(result).isEqualTo("HELLO"); + } + + @SuppressWarnings("rawtypes") @Test public void testNoDoubleRegistrationInHybridModeFluxedFunction() { ConfigurableApplicationContext context = FunctionalSpringApplication @@ -58,7 +78,7 @@ public void testNoDoubleRegistrationInHybridModeFluxedFunction() { assertThat(context.containsBean("function")).isTrue(); assertThat(context.getBeansOfType(UppercaseFluxFunction.class).size()).isEqualTo(1); - assertThat((Object) catalog.lookup(Function.class, "hybridFunctionalRegistrationTests.UppercaseFluxFunction")).isNotNull(); + assertThat((Function) catalog.lookup(Function.class, "hybridFunctionalRegistrationTests.UppercaseFluxFunction")).isNotNull(); } @SpringBootConfiguration @@ -74,6 +94,21 @@ public String apply(String t) { } } + @SpringBootConfiguration + @ImportAutoConfiguration({ + ContextFunctionCatalogAutoConfiguration.class, + JacksonAutoConfiguration.class } + ) + public static class UppercaseMessageFunction implements Function, String> { + + @Override + public String apply(Message message) { + assertThat(message.getHeaders().get("foo")).isEqualTo("foo"); + assertThat(message.getHeaders().get("blah")).isEqualTo("blah"); + return message.getPayload().toUpperCase(); + } + } + @SpringBootConfiguration @ImportAutoConfiguration({ ContextFunctionCatalogAutoConfiguration.class, diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/HttpPostIntegrationTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/HttpPostIntegrationTests.java index 811d898da..9115a5fb9 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/HttpPostIntegrationTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/HttpPostIntegrationTests.java @@ -290,29 +290,11 @@ public void uppercaseJsonArray() throws Exception { @Test public void uppercaseSSE() throws Exception { - String s = this.rest.exchange(RequestEntity.post(new URI("/uppercase")).contentType(MediaType.APPLICATION_JSON) - .body("[\"foo\",\"bar\"]"), String.class).getBody(); assertThat(this.rest.exchange(RequestEntity.post(new URI("/uppercase")).contentType(MediaType.APPLICATION_JSON) .body("[\"foo\",\"bar\"]"), String.class).getBody()) .isEqualTo(sse("(FOO)", "(BAR)")); } -// @Test -// public void uppercaseSSE() throws Exception { -// assertThat(this.rest.exchange(RequestEntity.post(new URI("/uppercase")) -// .accept(EVENT_STREAM).contentType(MediaType.APPLICATION_JSON) -// .body("[\"foo\",\"bar\"]"), String.class).getBody()) -// .isEqualTo(sse("(FOO)", "(BAR)")); -// -//// String body = this.rest.exchange(RequestEntity.post(new URI("/uppercase")).contentType(MediaType.APPLICATION_JSON) -//// .body("[\"foo\",\"bar\"]"), String.class).getBody(); -// -//// System.out.println(body); -// -//// assertThat(body) -//// .isEqualTo(sse("(FOO)", "(BAR)")); -// } - @Test public void sum() throws Exception { @@ -351,7 +333,6 @@ public void count() throws Exception { } private String sse(String... values) { - //return "data:" + StringUtils.arrayToDelimitedString(values, "\n\ndata:") + "\n\n"; return "[\"" + StringUtils.arrayToDelimitedString(values, "\",\"") + "\"]"; } From 9474ed1dfd9a440b27462f7fd5c2a299b00c7234 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 25 Jan 2022 13:56:26 +0100 Subject: [PATCH 004/210] GH-787 Fix 'body' format in JSON output for AWS responses Resolves #787 --- .../function/adapter/aws/AWSLambdaUtils.java | 2 +- .../adapter/aws/FunctionInvokerTests.java | 51 ++++++++++++++----- 2 files changed, 39 insertions(+), 14 deletions(-) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java index 72fb9181c..603701a74 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java @@ -193,7 +193,7 @@ public static byte[] generateOutput(Message requestMessage, Message resp } String body = responseMessage == null - ? "\"OK\"" : new String(responseMessage.getPayload(), StandardCharsets.UTF_8).replaceAll("\\\"", ""); + ? "\"OK\"" : new String(responseMessage.getPayload(), StandardCharsets.UTF_8); response.put("body", body); if (responseMessage != null) { diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java index 3b34e8b16..86aaf0d52 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java @@ -701,7 +701,7 @@ public void testApiGatewayStringEventBody() throws Exception { invoker.handleRequest(targetStream, output, null); Map result = mapper.readValue(output.toByteArray(), Map.class); - assertThat(result.get("body")).isEqualTo("HELLO"); + assertThat(result.get("body")).isEqualTo("\"HELLO\""); System.clearProperty("spring.cloud.function.definition"); System.setProperty("spring.cloud.function.routing-expression", "'uppercase'"); @@ -711,7 +711,23 @@ public void testApiGatewayStringEventBody() throws Exception { invoker.handleRequest(targetStream, output, null); result = this.mapper.readValue(output.toByteArray(), Map.class); - assertThat(result.get("body")).isEqualTo("HELLO"); + assertThat(result.get("body")).isEqualTo("\"HELLO\""); + } + + @SuppressWarnings("rawtypes") + @Test + public void testApiGatewayPojoReturninPojo() throws Exception { + System.setProperty("MAIN_CLASS", ApiGatewayConfiguration.class.getName()); + System.setProperty("spring.cloud.function.definition", "uppercasePojoReurnPojo"); + FunctionInvoker invoker = new FunctionInvoker(); + + InputStream targetStream = new ByteArrayInputStream(this.apiGatewayEventWithStructuredBody.getBytes()); + ByteArrayOutputStream output = new ByteArrayOutputStream(); + invoker.handleRequest(targetStream, output, null); + + Map response = mapper.readValue(output.toByteArray(), Map.class); + Person person = mapper.readValue((String) response.get("body"), Person.class); + assertThat(person.getName()).isEqualTo("JIM LAHEY"); } @SuppressWarnings("rawtypes") @@ -726,7 +742,7 @@ public void testApiGatewayPojoEventBody() throws Exception { invoker.handleRequest(targetStream, output, null); Map result = mapper.readValue(output.toByteArray(), Map.class); - assertThat(result.get("body")).isEqualTo("JIM LAHEY"); + assertThat(result.get("body")).isEqualTo("\"JIM LAHEY\""); System.clearProperty("spring.cloud.function.definition"); System.setProperty("spring.cloud.function.routing-expression", "'uppercasePojo'"); @@ -736,7 +752,7 @@ public void testApiGatewayPojoEventBody() throws Exception { invoker.handleRequest(targetStream, output, null); result = this.mapper.readValue(output.toByteArray(), Map.class); - assertThat(result.get("body")).isEqualTo("JIM LAHEY"); + assertThat(result.get("body")).isEqualTo("\"JIM LAHEY\""); } @SuppressWarnings("rawtypes") @@ -752,7 +768,7 @@ public void testApiGatewayEvent() throws Exception { Map result = mapper.readValue(output.toByteArray(), Map.class); System.out.println(result); - assertThat(result.get("body")).isEqualTo("hello"); + assertThat(result.get("body")).isEqualTo("\"hello\""); System.clearProperty("spring.cloud.function.definition"); System.setProperty("spring.cloud.function.routing-expression", "'inputApiEvent'"); @@ -762,7 +778,7 @@ public void testApiGatewayEvent() throws Exception { invoker.handleRequest(targetStream, output, null); result = this.mapper.readValue(output.toByteArray(), Map.class); - assertThat(result.get("body")).isEqualTo("hello"); + assertThat(result.get("body")).isEqualTo("\"hello\""); } @SuppressWarnings("rawtypes") @@ -778,7 +794,7 @@ public void testApiGatewayV2Event() throws Exception { Map result = mapper.readValue(output.toByteArray(), Map.class); System.out.println(result); - assertThat(result.get("body")).isEqualTo("Hello from Lambda"); + assertThat(result.get("body")).isEqualTo("\"Hello from Lambda\""); System.clearProperty("spring.cloud.function.definition"); System.setProperty("spring.cloud.function.routing-expression", "'inputApiV2Event'"); @@ -788,7 +804,7 @@ public void testApiGatewayV2Event() throws Exception { invoker.handleRequest(targetStream, output, null); result = this.mapper.readValue(output.toByteArray(), Map.class); - assertThat(result.get("body")).isEqualTo("Hello from Lambda"); + assertThat(result.get("body")).isEqualTo("\"Hello from Lambda\""); } @SuppressWarnings("rawtypes") @@ -804,7 +820,7 @@ public void testApiGatewayAsSupplier() throws Exception { Map result = mapper.readValue(output.toByteArray(), Map.class); System.out.println(result); - assertThat(result.get("body")).isEqualTo("boom"); + assertThat(result.get("body")).isEqualTo("\"boom\""); } @SuppressWarnings("rawtypes") @@ -874,7 +890,7 @@ public void testApiGatewayEventAsMessage() throws Exception { Map result = mapper.readValue(output.toByteArray(), Map.class); System.out.println(result); - assertThat(result.get("body")).isEqualTo("hello"); + assertThat(result.get("body")).isEqualTo("\"hello\""); } @SuppressWarnings("rawtypes") @@ -890,7 +906,7 @@ public void testApiGatewayEventAsMap() throws Exception { Map result = mapper.readValue(output.toByteArray(), Map.class); System.out.println(result); - assertThat(result.get("body")).isEqualTo("hello"); + assertThat(result.get("body")).isEqualTo("\"hello\""); } @SuppressWarnings("rawtypes") @@ -937,7 +953,7 @@ public void testWithDefaultRouting() throws Exception { invoker.handleRequest(targetStream, output, null); Map result = mapper.readValue(output.toByteArray(), Map.class); - assertThat(result.get("body")).isEqualTo("olleh"); + assertThat(result.get("body")).isEqualTo("\"olleh\""); } @SuppressWarnings("rawtypes") @@ -953,7 +969,7 @@ public void testWithDefinitionEnvVariable() throws Exception { invoker.handleRequest(targetStream, output, null); Map result = mapper.readValue(output.toByteArray(), Map.class); - assertThat(result.get("body")).isEqualTo("OLLEH"); + assertThat(result.get("body")).isEqualTo("\"OLLEH\""); } @SuppressWarnings("unchecked") @@ -1179,6 +1195,15 @@ public Function uppercasePojo() { }; } + @Bean + public Function uppercasePojoReurnPojo() { + return v -> { + Person p = new Person(); + p.setName(v.getName().toUpperCase()); + return p; + }; + } + @Bean public Function inputApiEvent() { return v -> { From 5d26534283c3352e62eb0da91e5a717b608f81dc Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 25 Jan 2022 18:47:17 +0100 Subject: [PATCH 005/210] GH-785 Ad initial support for ApplicationLoadBalancerRequestEvent in AWS Resolves #785 --- .../function/adapter/aws/AWSLambdaUtils.java | 3 +- .../adapter/aws/FunctionInvokerTests.java | 151 +++++++++++++++--- 2 files changed, 130 insertions(+), 24 deletions(-) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java index 603701a74..ff0de1f39 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java @@ -167,7 +167,8 @@ public static byte[] generateOutput(Message requestMessage, Message resp if (outputClass != null) { String outputClassName = outputClass.getName(); if (outputClassName.equals("com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPResponse") || - outputClassName.equals("com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent")) { + outputClassName.equals("com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent") || + outputClassName.equals("com.amazonaws.services.lambda.runtime.events.ApplicationLoadBalancerResponseEvent")) { return responseMessage.getPayload(); } } diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java index 86aaf0d52..f3ebec121 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java @@ -31,6 +31,8 @@ import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent; import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPEvent; import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPResponse; +import com.amazonaws.services.lambda.runtime.events.ApplicationLoadBalancerRequestEvent; +import com.amazonaws.services.lambda.runtime.events.ApplicationLoadBalancerResponseEvent; import com.amazonaws.services.lambda.runtime.events.KinesisEvent; import com.amazonaws.services.lambda.runtime.events.S3Event; import com.amazonaws.services.lambda.runtime.events.SNSEvent; @@ -62,29 +64,32 @@ public class FunctionInvokerTests { String jsonCollection = "[\"Ricky\",\"Julien\",\"Bubbles\"]"; - String sampleLBEvent = "{" + - " \"requestContext\": {" + - " \"elb\": {" + - " \"targetGroupArn\": \"arn:aws:elasticloadbalancing:region:123456789012:targetgroup/my-target-group/6d0ecf831eec9f09\"" + - " }" + - " }," + - " \"httpMethod\": \"GET\"," + - " \"path\": \"/\"," + - " \"headers\": {" + - " \"accept\": \"text/html,application/xhtml+xml\"," + - " \"accept-language\": \"en-US,en;q=0.8\"," + - " \"content-type\": \"text/plain\"," + - " \"cookie\": \"cookies\"," + - " \"host\": \"lambda-846800462-us-east-2.elb.amazonaws.com\"," + - " \"user-agent\": \"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6)\"," + - " \"x-amzn-trace-id\": \"Root=1-5bdb40ca-556d8b0c50dc66f0511bf520\"," + - " \"x-forwarded-for\": \"72.21.198.66\"," + - " \"x-forwarded-port\": \"443\"," + - " \"x-forwarded-proto\": \"https\"" + - " }," + - " \"isBase64Encoded\": false," + - " \"body\": \"request_body\"" + - "}"; + String sampleLBEvent = "{\n" + + " \"requestContext\": {\n" + + " \"elb\": {\n" + + " \"targetGroupArn\": \"arn:aws:elasticloadbalancing:us-east-1:XXXXXXXXXXX:targetgroup/sample/6d0ecf831eec9f09\"\n" + + " }\n" + + " },\n" + + " \"httpMethod\": \"GET\",\n" + + " \"path\": \"/\",\n" + + " \"queryStringParameters\": {},\n" + + " \"headers\": {\n" + + " \"accept\": \"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8\",\n" + + " \"accept-encoding\": \"gzip\",\n" + + " \"accept-language\": \"en-US,en;q=0.5\",\n" + + " \"connection\": \"keep-alive\",\n" + + " \"cookie\": \"name=value\",\n" + + " \"host\": \"lambda-YYYYYYYY.elb.amazonaws.com\",\n" + + " \"upgrade-insecure-requests\": \"1\",\n" + + " \"user-agent\": \"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:60.0) Gecko/20100101 Firefox/60.0\",\n" + + " \"x-amzn-trace-id\": \"Root=1-5bdb40ca-556d8b0c50dc66f0511bf520\",\n" + + " \"x-forwarded-for\": \"192.0.2.1\",\n" + + " \"x-forwarded-port\": \"80\",\n" + + " \"x-forwarded-proto\": \"http\"\n" + + " },\n" + + " \"body\": \"Hello from ELB\",\n" + + " \"isBase64Encoded\": false\n" + + "}"; String sampleSQSEvent = "{\n" + " \"Records\": [\n" + @@ -689,6 +694,64 @@ public void testS3EventAsMap() throws Exception { assertThat(result).contains("s3SchemaVersion"); } + + @Test + public void testLBEventStringInOut() throws Exception { + System.setProperty("MAIN_CLASS", LBConfiguration.class.getName()); + System.setProperty("spring.cloud.function.definition", "echoString"); + FunctionInvoker invoker = new FunctionInvoker(); + + InputStream targetStream = new ByteArrayInputStream(this.sampleLBEvent.getBytes()); + ByteArrayOutputStream output = new ByteArrayOutputStream(); + invoker.handleRequest(targetStream, output, null); + + Map result = mapper.readValue(output.toByteArray(), Map.class); + assertThat(result.get("body")).isEqualTo("\"Hello from ELB\""); + } + + @Test + public void testLBEvent() throws Exception { + System.setProperty("MAIN_CLASS", LBConfiguration.class.getName()); + System.setProperty("spring.cloud.function.definition", "inputLBEvent"); + FunctionInvoker invoker = new FunctionInvoker(); + + InputStream targetStream = new ByteArrayInputStream(this.sampleLBEvent.getBytes()); + ByteArrayOutputStream output = new ByteArrayOutputStream(); + invoker.handleRequest(targetStream, output, null); + + Map result = mapper.readValue(output.toByteArray(), Map.class); + assertThat(result.get("body")).isEqualTo("\"Hello from ELB\""); + } + + @Test + public void testLBEventAsMessage() throws Exception { + System.setProperty("MAIN_CLASS", LBConfiguration.class.getName()); + System.setProperty("spring.cloud.function.definition", "inputLBEventAsMessage"); + FunctionInvoker invoker = new FunctionInvoker(); + + InputStream targetStream = new ByteArrayInputStream(this.sampleLBEvent.getBytes()); + ByteArrayOutputStream output = new ByteArrayOutputStream(); + invoker.handleRequest(targetStream, output, null); + + Map result = mapper.readValue(output.toByteArray(), Map.class); + assertThat(result.get("body")).isEqualTo("\"Hello from ELB\""); + } + + @Test + public void testLBEventInOut() throws Exception { + System.setProperty("MAIN_CLASS", LBConfiguration.class.getName()); + System.setProperty("spring.cloud.function.definition", "inputOutputLBEvent"); + FunctionInvoker invoker = new FunctionInvoker(); + + InputStream targetStream = new ByteArrayInputStream(this.sampleLBEvent.getBytes()); + ByteArrayOutputStream output = new ByteArrayOutputStream(); + invoker.handleRequest(targetStream, output, null); + + Map result = mapper.readValue(output.toByteArray(), Map.class); + assertThat(result.get("body")).isEqualTo("Hello from ELB"); + } + + @SuppressWarnings("rawtypes") @Test public void testApiGatewayStringEventBody() throws Exception { @@ -1168,6 +1231,48 @@ public Function, String> inputS3EventAsMap() { } } + @EnableAutoConfiguration + @Configuration + public static class LBConfiguration { + @Bean + public Function echoString() { + return v -> v; + } + + @Bean + public Function inputLBEvent() { + return v -> { + System.out.println("Received: " + v); + return v.getBody(); + }; + } + + @Bean + public Function inputOutputLBEvent() { + return v -> { + ApplicationLoadBalancerResponseEvent response = new ApplicationLoadBalancerResponseEvent(); + response.setBody(v.getBody()); + return response; + }; + } + + @Bean + public Function, String> inputLBEventAsMessage(JsonMapper jsonMapper) { + return v -> { + System.out.println("Received: " + v); + return v.getPayload().getBody(); + }; + } + + @Bean + public Function, String> inputLBEventAsMap() { + return v -> { + System.out.println("Received: " + v); + return v.toString(); + }; + } + } + @EnableAutoConfiguration @Configuration public static class ApiGatewayConfiguration { From da4819640f5dcaf821c44469eb651e4e459a2da3 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 26 Jan 2022 12:48:51 +0100 Subject: [PATCH 006/210] GH-794 Address regression with input type conversion of Maps Resolves #794 --- .../context/catalog/SimpleFunctionRegistry.java | 2 +- .../BeanFactoryAwareFunctionRegistryTests.java | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java index dbfe13e49..ffef18541 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java @@ -1067,7 +1067,7 @@ else if (input instanceof Message) { } } else { - convertedInput = this.convertNonMessageInputIfNecessary(type, input, JsonMapper.isJsonString(input) || input instanceof Map); + convertedInput = this.convertNonMessageInputIfNecessary(type, input, JsonMapper.isJsonString(input)); if (convertedInput != null && logger.isDebugEnabled()) { logger.debug("Converted input: " + input + " to: " + convertedInput); } diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java index 47318beb8..74d93d7fa 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java @@ -24,6 +24,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -526,6 +527,18 @@ public void testRegisteringWithTypeThatDoesNotMatchDiscoveredType() { registry.register(e); } + @SuppressWarnings({ "unchecked", "rawtypes" }) + @Test + public void testNoConversionOnInputMapIfInputIsMap() { + FunctionCatalog catalog = this.configureCatalog(); + Function f = catalog.lookup("maptopojo"); + Person p = new Person("John", 123); + Map map = new HashMap<>(); + map.put("person", p); + map.put("foo", "foo"); + assertThat(f.apply(map)).isInstanceOf(Person.class); + } + @SuppressWarnings({ "unchecked", "rawtypes" }) @Test public void testValueWrappedInMessageIfNecessary() { @@ -930,7 +943,7 @@ public Supplier numberword() { @Bean public Function, Person> maptopojo() { return map -> { - Person person = new Person((String) map.get("name"), Integer.parseInt((String) map.get("id"))); + Person person = (Person) map.get("person"); return person; }; } From aa53f67b267c94ef1aaf41834b3a55ea131b51ae Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 26 Jan 2022 18:17:48 +0100 Subject: [PATCH 007/210] GH-784 Modified AWS example to NOT rely on web Resolves #784 --- .../function/adapter/aws/CustomRuntimeInitializer.java | 8 -------- .../function-functional-sample-aws/pom.xml | 5 ----- .../function-sample-aws/pom.xml | 9 --------- 3 files changed, 22 deletions(-) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeInitializer.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeInitializer.java index 60e8a48f8..174183d83 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeInitializer.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeInitializer.java @@ -20,8 +20,6 @@ import org.apache.commons.logging.LogFactory; import org.springframework.cloud.function.context.AbstractSpringFunctionAdapterInitializer; -import org.springframework.cloud.function.context.config.ContextFunctionCatalogInitializer; -import org.springframework.cloud.function.web.source.DestinationResolver; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.SmartLifecycle; import org.springframework.context.support.GenericApplicationContext; @@ -49,12 +47,6 @@ public void initialize(GenericApplicationContext context) { SmartLifecycle.class, () -> new CustomRuntimeEventLoop(context)); } } - else if (ContextFunctionCatalogInitializer.enabled - && context.getEnvironment().getProperty("spring.functional.enabled", Boolean.class, false)) { - if (context.getBeanFactory().getBeanNamesForType(DestinationResolver.class, false, false).length == 0) { - context.registerBean(LambdaDestinationResolver.class, () -> new LambdaDestinationResolver()); - } - } } private boolean isCustomRuntime(Environment environment) { diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index 858da0ed6..3c4ddd7da 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -33,11 +33,6 @@ org.springframework.cloud spring-cloud-function-adapter-aws - - org.springframework.cloud - spring-cloud-function-web - - com.amazonaws aws-lambda-java-events diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 4653b95c5..27393fa0c 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -33,15 +33,6 @@ org.springframework.cloud spring-cloud-function-adapter-aws - - org.springframework.cloud - spring-cloud-function-web - - - org.springframework.boot - spring-boot-starter-web - - com.amazonaws aws-lambda-java-events From 4a0f686b36c1015fd6fcf98c85307d3eee7ae510 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Mon, 7 Feb 2022 15:04:45 +0100 Subject: [PATCH 008/210] GH-802 Add exclusion filter to component scanning to ignore Spring annotated classes Resolves #802 --- .../ContextFunctionCatalogAutoConfiguration.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java index 4d3a7eddc..781acd984 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java @@ -64,6 +64,7 @@ import org.springframework.messaging.converter.CompositeMessageConverter; import org.springframework.messaging.converter.MessageConverter; import org.springframework.messaging.converter.StringMessageConverter; +import org.springframework.stereotype.Component; import org.springframework.util.ClassUtils; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; @@ -169,12 +170,11 @@ else if (!messageConverterName.startsWith("org.springframework.")) { return false; } + @ComponentScan(basePackages = "${spring.cloud.function.scan.packages:functions}", + includeFilters = @Filter(type = FilterType.ASSIGNABLE_TYPE, classes = { Supplier.class, Function.class, Consumer.class }), + excludeFilters = @Filter(type = FilterType.ANNOTATION, classes = { Configuration.class, Component.class})) @Configuration(proxyBeanMethods = false) - @ComponentScan(basePackages = "${spring.cloud.function.scan.packages:functions}", // - includeFilters = @Filter(type = FilterType.ASSIGNABLE_TYPE, - classes = {Supplier.class, Function.class, Consumer.class})) - @ConditionalOnProperty(prefix = "spring.cloud.function.scan", name = "enabled", havingValue = "true", - matchIfMissing = true) + @ConditionalOnProperty(prefix = "spring.cloud.function.scan", name = "enabled", havingValue = "true", matchIfMissing = true) protected static class PlainFunctionScanConfiguration { } From d4aa4f0e41cc796b6b6a6f69a801efef1ebacf54 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 2 Feb 2022 12:07:55 -0500 Subject: [PATCH 009/210] Remove skipConversion in FunctionAroundWrapper Currently, the `FunctionAroundWrapper` set `targetFunction.setSkipOutputConversion(true);` which is not what expected by the `TraceFunctionAroundWrapper`. This one has a logic based on the `Message` as an output from the target function and its headers to correlate tracing headers. * Remove the `setSkipOutputConversion(true)` from the `FunctionAroundWrapper` to satisfy `TraceFunctionAroundWrapper` expectation - we cannot enforce all the end-user function to always return a `Message` for us. * Some other refactoring in the `FunctionAroundWrapper` for cleaner code **Cherry-pick to `3.2.x`** --- .../catalog/FunctionAroundWrapper.java | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java index 49ff7454a..9fe1f4773 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2020 the original author or authors. + * Copyright 2020-2022 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. @@ -27,10 +27,11 @@ * If registered as bean it will be autowired into {@link FunctionInvocationWrapper}. * Keep in mind that it only affects imperative invocations where input is {@link Message} * - * NOTE: This API is experimental and and could change without notice. It is + * NOTE: This API is experimental and could change without notice. It is * intended for internal use only (e.g., spring-cloud-sleuth) * * @author Oleg Zhurakousky + * @author Artem Bilan * @since 3.1 */ public abstract class FunctionAroundWrapper implements BiFunction { @@ -38,17 +39,10 @@ public abstract class FunctionAroundWrapper implements BiFunction Date: Wed, 2 Feb 2022 14:16:16 -0500 Subject: [PATCH 010/210] * Simplify `functionalTracingEnabled` variable logic * Add `BeanFactoryAwareFunctionRegistryTests.testWrappedWithAroundAdviseNotMessageReturnConfiguration()` to verify that non-Message return from the target function is wrapped to the `Message` before return to the `FunctionAroundWrapper` --- .../catalog/FunctionAroundWrapper.java | 5 ++- ...BeanFactoryAwareFunctionRegistryTests.java | 36 +++++++++++++++++++ 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java index 9fe1f4773..bdb9410b8 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java @@ -38,9 +38,8 @@ public abstract class FunctionAroundWrapper implements BiFunction, String> uppercase() { + return v -> v.getPayload().toUpperCase(); + } + + @Bean + public FunctionAroundWrapper wrapper() { + return new FunctionAroundWrapper() { + + @Override + protected Object doApply(Object input, FunctionInvocationWrapper targetFunction) { + // in this test we know input is a Message + Message mInput = (Message) input; + Message advisedMessage = MessageBuilder.fromMessage(mInput).setHeader("advised", "true").build(); + Object result = targetFunction.apply(advisedMessage); + assertThat(result).isInstanceOf(Message.class); + return result; + } + }; + } + } + @EnableAutoConfiguration @Configuration protected static class SampleFunctionConfiguration { From 28e3b6cee2f9cb33817592e295d9ecca3da6e454 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Mon, 7 Feb 2022 15:19:58 +0100 Subject: [PATCH 011/210] fix checkstyle --- .../cloud/function/context/catalog/FunctionAroundWrapper.java | 1 - 1 file changed, 1 deletion(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java index bdb9410b8..6bf171824 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java @@ -20,7 +20,6 @@ import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry.FunctionInvocationWrapper; import org.springframework.messaging.Message; -import org.springframework.util.StringUtils; /** * Wrapper that acts as around advise over function invocation. From 2a7db056fb4a0fe6181bb1bb06a66d66b4e838b4 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Mon, 7 Feb 2022 18:56:18 +0100 Subject: [PATCH 012/210] GH-796 Fix error handling for reactive input/ouput conversion Resolves #796 --- .../catalog/SimpleFunctionRegistry.java | 40 +++++++++++++++---- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java index ffef18541..a4b8be79e 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java @@ -1377,10 +1377,22 @@ else if (FunctionTypeUtils.isFlux(type) && publisher instanceof Mono) { ? FunctionTypeUtils.getImmediateGenericType(type, 0) : type; return publisher instanceof Mono - ? Mono.from(publisher).map(v -> this.convertInputIfNecessary(v, actualType == null ? type : actualType)) - .doOnError(ex -> logger.error("Failed to convert input", (Throwable) ex)) - : Flux.from(publisher).map(v -> this.convertInputIfNecessary(v, actualType == null ? type : actualType)) - .doOnError(ex -> logger.error("Failed to convert input", (Throwable) ex)); + ? Mono.from(publisher).map(v -> { + try { + return this.convertInputIfNecessary(v, actualType == null ? type : actualType); + } + catch (Exception e) { + throw new IllegalStateException("Failed to convert input", e); + } + }) + : Flux.from(publisher).map(v -> { + try { + return this.convertInputIfNecessary(v, actualType == null ? type : actualType); + } + catch (Exception e) { + throw new IllegalStateException("Failed to convert input", e); + } + }); } /* @@ -1389,10 +1401,22 @@ else if (FunctionTypeUtils.isFlux(type) && publisher instanceof Mono) { @SuppressWarnings("unchecked") private Object convertOutputPublisherIfNecessary(Publisher publisher, Type type, String[] expectedOutputContentType) { return publisher instanceof Mono - ? Mono.from(publisher).map(v -> this.convertOutputIfNecessary(v, type, expectedOutputContentType)) - .doOnError(ex -> logger.error("Failed to convert output", (Throwable) ex)) - : Flux.from(publisher).map(v -> this.convertOutputIfNecessary(v, type, expectedOutputContentType)) - .doOnError(ex -> logger.error("Failed to convert output", (Throwable) ex)); + ? Mono.from(publisher).map(v -> { + try { + return this.convertOutputIfNecessary(v, type, expectedOutputContentType); + } + catch (Exception e) { + throw new IllegalStateException("Failed to convert output", e); + } + }) + : Flux.from(publisher).map(v -> { + try { + return this.convertOutputIfNecessary(v, type, expectedOutputContentType); + } + catch (Exception e) { + throw new IllegalStateException("Failed to convert output", e); + } + }); } } From 224b3a632529f53daf72b5de749d0fca83aa02c5 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Mon, 7 Feb 2022 18:58:41 +0100 Subject: [PATCH 013/210] GH-803 Remove Dynamic Compilatioin section from the docs Resolves #803 --- .../main/asciidoc/spring-cloud-function.adoc | 92 ------------------- 1 file changed, 92 deletions(-) diff --git a/docs/src/main/asciidoc/spring-cloud-function.adoc b/docs/src/main/asciidoc/spring-cloud-function.adoc index 12d7784f5..b6082d7c3 100644 --- a/docs/src/main/asciidoc/spring-cloud-function.adoc +++ b/docs/src/main/asciidoc/spring-cloud-function.adoc @@ -832,98 +832,6 @@ NOTE: This particular deployment option may or may not have Spring Cloud Functio include::functional.adoc[leveloffset=+1] -== Dynamic Compilation - -There is a sample app that uses the function compiler to create a -function from a configuration property. The vanilla "function-sample" -also has that feature. And there are some scripts that you can run to -see the compilation happening at run time. To run these examples, -change into the `scripts` directory: - ----- -cd scripts ----- - -Also, start a RabbitMQ server locally (e.g. execute `rabbitmq-server`). - -Start the Function Registry Service: - ----- -./function-registry.sh ----- - -Register a Function: - ----- -./registerFunction.sh -n uppercase -f "f->f.map(s->s.toString().toUpperCase())" ----- - -Run a REST Microservice using that Function: - ----- -./web.sh -f uppercase -p 9000 -curl -H "Content-Type: text/plain" -H "Accept: text/plain" localhost:9000/uppercase -d foo ----- - -Register a Supplier: - ----- -./registerSupplier.sh -n words -f "()->Flux.just(\"foo\",\"bar\")" ----- - -Run a REST Microservice using that Supplier: - ----- -./web.sh -s words -p 9001 -curl -H "Accept: application/json" localhost:9001/words ----- - -Register a Consumer: - ----- -./registerConsumer.sh -n print -t String -f "System.out::println" ----- - -Run a REST Microservice using that Consumer: - ----- -./web.sh -c print -p 9002 -curl -X POST -H "Content-Type: text/plain" -d foo localhost:9002/print ----- - -Run Stream Processing Microservices: - -First register a streaming words supplier: - ----- -./registerSupplier.sh -n wordstream -f "()->Flux.interval(Duration.ofMillis(1000)).map(i->\"message-\"+i)" ----- - -Then start the source (supplier), processor (function), and sink (consumer) apps -(in reverse order): - ----- -./stream.sh -p 9103 -i uppercaseWords -c print -./stream.sh -p 9102 -i words -f uppercase -o uppercaseWords -./stream.sh -p 9101 -s wordstream -o words ----- - -The output will appear in the console of the sink app (one message per second, converted to uppercase): - ----- -MESSAGE-0 -MESSAGE-1 -MESSAGE-2 -MESSAGE-3 -MESSAGE-4 -MESSAGE-5 -MESSAGE-6 -MESSAGE-7 -MESSAGE-8 -MESSAGE-9 -... ----- - == Serverless Platform Adapters As well as being able to run as a standalone process, a Spring Cloud From ad2da5cfc59e0ded275f1db55ef60dccabaae4f6 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 9 Feb 2022 13:58:01 +0100 Subject: [PATCH 014/210] GH-804 Add support for case-insensitive routing --- .../context/config/RoutingFunction.java | 26 +++++++++++++++++++ .../context/config/RoutingFunctionTests.java | 14 ++++++++++ 2 files changed, 40 insertions(+) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/RoutingFunction.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/RoutingFunction.java index dd6b965b3..564836968 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/RoutingFunction.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/RoutingFunction.java @@ -16,6 +16,8 @@ package org.springframework.cloud.function.context.config; +import java.util.Map; +import java.util.TreeMap; import java.util.function.Function; import org.apache.commons.logging.Log; @@ -193,6 +195,10 @@ private FunctionInvocationWrapper functionFromDefinition(String definition) { private FunctionInvocationWrapper functionFromExpression(String routingExpression, Object input) { Expression expression = spelParser.parseExpression(routingExpression); + if (input instanceof Message) { + input = new MessageStructureWithCaseInsensitiveHeaderKeys((Message) input); + } + String functionName = expression.getValue(this.evalContext, input, String.class); Assert.hasText(functionName, "Failed to resolve function name based on routing expression '" + functionProperties.getRoutingExpression() + "'"); FunctionInvocationWrapper function = functionCatalog.lookup(functionName); @@ -203,4 +209,24 @@ private FunctionInvocationWrapper functionFromExpression(String routingExpressio } return function; } + + @SuppressWarnings({"rawtypes", "unused"}) + private static class MessageStructureWithCaseInsensitiveHeaderKeys { + private final Object payload; + private final Map headers; + + @SuppressWarnings("unchecked") + MessageStructureWithCaseInsensitiveHeaderKeys(Message message) { + this.payload = message.getPayload(); + this.headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); + this.headers.putAll(message.getHeaders()); + } + public Object getPayload() { + return payload; + } + + public Map getHeaders() { + return headers; + } + } } diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/RoutingFunctionTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/RoutingFunctionTests.java index cb9267b91..d3ef8210c 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/RoutingFunctionTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/RoutingFunctionTests.java @@ -134,6 +134,20 @@ public void testInvocationWithMessageAndRoutingExpression() { assertThat(function.apply(message)).isEqualTo("olleh"); } + @SuppressWarnings({ "unchecked", "rawtypes" }) + @Test + public void testInvocationWithMessageAndRoutingExpressionCaseInsensitive() { + System.setProperty(FunctionProperties.PREFIX + ".routing-expression", "headers.function_Name"); + FunctionCatalog functionCatalog = this.configureCatalog(); + Function function = functionCatalog.lookup(RoutingFunction.FUNCTION_NAME); + assertThat(function).isNotNull(); + Message message = MessageBuilder.withPayload("hello").setHeader("function_name", "reverse").build(); + assertThat(function.apply(message)).isEqualTo("olleh"); + + System.setProperty(FunctionProperties.PREFIX + ".routing-expression", "headers.FunCtion_namE"); + assertThat(function.apply(message)).isEqualTo("olleh"); + } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Test public void testInvocationWithRoutingBeanExpression() { From 37e974d01951778f07ce5d1a485c2584c7120a88 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 9 Feb 2022 14:23:21 +0100 Subject: [PATCH 015/210] GH-804 Add support for case-insensitive Cloud Event determination Resolves #804 --- .../cloudevent/CloudEventMessageUtils.java | 26 +++++++------ .../context/config/RoutingFunction.java | 25 +------------ .../context/message/MessageUtils.java | 37 +++++++++++++++++++ ...CloudEventMessageUtilsAndBuilderTests.java | 13 +++++++ 4 files changed, 66 insertions(+), 35 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventMessageUtils.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventMessageUtils.java index 24826f5a9..0173a4a28 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventMessageUtils.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventMessageUtils.java @@ -24,6 +24,7 @@ import java.util.stream.Collectors; import org.springframework.cloud.function.context.message.MessageUtils; +import org.springframework.cloud.function.context.message.MessageUtils.MessageStructureWithCaseInsensitiveHeaderKeys; import org.springframework.lang.Nullable; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; @@ -331,21 +332,22 @@ else if (Protocols.HTTP.equals(targetProtocol)) { * @return true if this Message represents Cloud Event in binary-mode */ public static boolean isCloudEvent(Message message) { - return (message.getHeaders().containsKey(SPECVERSION) - && message.getHeaders().containsKey(TYPE) - && message.getHeaders().containsKey(SOURCE)) + MessageStructureWithCaseInsensitiveHeaderKeys _message = MessageUtils.toCaseInsensitiveHeadersStructure(message); + return (_message.getHeaders().containsKey(SPECVERSION) + && _message.getHeaders().containsKey(TYPE) + && _message.getHeaders().containsKey(SOURCE)) || - (message.getHeaders().containsKey(_SPECVERSION) - && message.getHeaders().containsKey(_TYPE) - && message.getHeaders().containsKey(_SOURCE)) + (_message.getHeaders().containsKey(_SPECVERSION) + && _message.getHeaders().containsKey(_TYPE) + && _message.getHeaders().containsKey(_SOURCE)) || - (message.getHeaders().containsKey(AMQP_ATTR_PREFIX + _SPECVERSION) - && message.getHeaders().containsKey(AMQP_ATTR_PREFIX + _TYPE) - && message.getHeaders().containsKey(AMQP_ATTR_PREFIX + _SOURCE)) + (_message.getHeaders().containsKey(AMQP_ATTR_PREFIX + _SPECVERSION) + && _message.getHeaders().containsKey(AMQP_ATTR_PREFIX + _TYPE) + && _message.getHeaders().containsKey(AMQP_ATTR_PREFIX + _SOURCE)) || - (message.getHeaders().containsKey(KAFKA_ATTR_PREFIX + _SPECVERSION) - && message.getHeaders().containsKey(KAFKA_ATTR_PREFIX + _TYPE) - && message.getHeaders().containsKey(KAFKA_ATTR_PREFIX + _SOURCE)); + (_message.getHeaders().containsKey(KAFKA_ATTR_PREFIX + _SPECVERSION) + && _message.getHeaders().containsKey(KAFKA_ATTR_PREFIX + _TYPE) + && _message.getHeaders().containsKey(KAFKA_ATTR_PREFIX + _SOURCE)); } private static boolean isAttribute(String key) { diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/RoutingFunction.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/RoutingFunction.java index 564836968..cbc5e4b92 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/RoutingFunction.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/RoutingFunction.java @@ -16,8 +16,6 @@ package org.springframework.cloud.function.context.config; -import java.util.Map; -import java.util.TreeMap; import java.util.function.Function; import org.apache.commons.logging.Log; @@ -31,6 +29,7 @@ import org.springframework.cloud.function.context.MessageRoutingCallback; import org.springframework.cloud.function.context.MessageRoutingCallback.FunctionRoutingResult; import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry.FunctionInvocationWrapper; +import org.springframework.cloud.function.context.message.MessageUtils; import org.springframework.context.expression.MapAccessor; import org.springframework.expression.BeanResolver; import org.springframework.expression.Expression; @@ -196,7 +195,7 @@ private FunctionInvocationWrapper functionFromDefinition(String definition) { private FunctionInvocationWrapper functionFromExpression(String routingExpression, Object input) { Expression expression = spelParser.parseExpression(routingExpression); if (input instanceof Message) { - input = new MessageStructureWithCaseInsensitiveHeaderKeys((Message) input); + input = MessageUtils.toCaseInsensitiveHeadersStructure((Message) input); } String functionName = expression.getValue(this.evalContext, input, String.class); @@ -209,24 +208,4 @@ private FunctionInvocationWrapper functionFromExpression(String routingExpressio } return function; } - - @SuppressWarnings({"rawtypes", "unused"}) - private static class MessageStructureWithCaseInsensitiveHeaderKeys { - private final Object payload; - private final Map headers; - - @SuppressWarnings("unchecked") - MessageStructureWithCaseInsensitiveHeaderKeys(Message message) { - this.payload = message.getPayload(); - this.headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); - this.headers.putAll(message.getHeaders()); - } - public Object getPayload() { - return payload; - } - - public Map getHeaders() { - return headers; - } - } } diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/message/MessageUtils.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/message/MessageUtils.java index 2c6b3c7bd..974504237 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/message/MessageUtils.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/message/MessageUtils.java @@ -16,6 +16,7 @@ package org.springframework.cloud.function.context.message; +<<<<<<< HEAD import java.lang.reflect.Method; import java.util.Collections; import java.util.HashMap; @@ -27,6 +28,12 @@ import org.springframework.messaging.support.MessageBuilder; import org.springframework.util.ClassUtils; import org.springframework.util.ReflectionUtils; +======= +import java.util.Map; +import java.util.TreeMap; + +import org.springframework.messaging.Message; +>>>>>>> 8f15b9ba... GH-804 Add support for case-insensitive Cloud Event determination /** * @author Dave Syer @@ -50,6 +57,7 @@ public abstract class MessageUtils { public static String SOURCE_TYPE = "source-type"; /** +<<<<<<< HEAD * Create a message for the handler. If the handler is a wrapper for a function in an * isolated class loader, then the message will be created with the target class * loader (therefore the {@link Message} class must be on the classpath of the target @@ -124,4 +132,33 @@ public static Message unpack(Object handler, Object message) { return MessageBuilder.withPayload(payload).copyHeaders(headers).build(); } + /** + * Returns (payload, headers) structure identical to `message` while substituting headers with case insensitive map. + */ + public static MessageStructureWithCaseInsensitiveHeaderKeys toCaseInsensitiveHeadersStructure(Message message) { + return new MessageStructureWithCaseInsensitiveHeaderKeys(message); + } + + /** + * !!! INTERNAL USE ONLY, MAY CHANGE OR REMOVED WITHOUT NOTICE!!! + */ + @SuppressWarnings({"rawtypes"}) + public static class MessageStructureWithCaseInsensitiveHeaderKeys { + private final Object payload; + private final Map headers; + + @SuppressWarnings("unchecked") + MessageStructureWithCaseInsensitiveHeaderKeys(Message message) { + this.payload = message.getPayload(); + this.headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); + this.headers.putAll(message.getHeaders()); + } + public Object getPayload() { + return payload; + } + + public Map getHeaders() { + return headers; + } + } } diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/cloudevent/CloudEventMessageUtilsAndBuilderTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/cloudevent/CloudEventMessageUtilsAndBuilderTests.java index 4745e2f2a..3bf9e313b 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/cloudevent/CloudEventMessageUtilsAndBuilderTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/cloudevent/CloudEventMessageUtilsAndBuilderTests.java @@ -31,6 +31,19 @@ */ public class CloudEventMessageUtilsAndBuilderTests { + @Test// see https://github.com/spring-cloud/spring-cloud-function/issues/805 + public void testHeaderKeyInsensitivity() { + Message httpMessage = MessageBuilder.withPayload("hello") + .setHeader("cE-SoUrCe", "https://foo.bar") + .setHeader("Ce-specVeRsion", "1.0") + .setHeader("Ce-Type", "blah") + .setHeader("x", "x") + .setHeader("zzz", "zzz") + .build(); + + assertThat(CloudEventMessageUtils.isCloudEvent(httpMessage)).isTrue(); + } + @Test// see https://github.com/spring-cloud/spring-cloud-function/issues/680 public void testProperAttributeExtractionRegardlessOfTargetProtocol() { Message ceMessage = CloudEventMessageBuilder.withData("foo").build(); From fc1e02022ec772697edefd1fd7e17fc94875cc18 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 9 Feb 2022 14:41:40 +0100 Subject: [PATCH 016/210] Merge cleanup --- .../cloud/function/context/message/MessageUtils.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/message/MessageUtils.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/message/MessageUtils.java index 974504237..b6652e4ee 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/message/MessageUtils.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/message/MessageUtils.java @@ -16,11 +16,11 @@ package org.springframework.cloud.function.context.message; -<<<<<<< HEAD import java.lang.reflect.Method; import java.util.Collections; import java.util.HashMap; import java.util.Map; +import java.util.TreeMap; import org.springframework.cloud.function.core.FluxWrapper; import org.springframework.cloud.function.core.Isolated; @@ -28,12 +28,7 @@ import org.springframework.messaging.support.MessageBuilder; import org.springframework.util.ClassUtils; import org.springframework.util.ReflectionUtils; -======= -import java.util.Map; -import java.util.TreeMap; -import org.springframework.messaging.Message; ->>>>>>> 8f15b9ba... GH-804 Add support for case-insensitive Cloud Event determination /** * @author Dave Syer @@ -132,8 +127,9 @@ public static Message unpack(Object handler, Object message) { return MessageBuilder.withPayload(payload).copyHeaders(headers).build(); } - /** - * Returns (payload, headers) structure identical to `message` while substituting headers with case insensitive map. + /** + * Returns (payload, headers) structure identical to `message` while + * substituting headers with case insensitive map. */ public static MessageStructureWithCaseInsensitiveHeaderKeys toCaseInsensitiveHeadersStructure(Message message) { return new MessageStructureWithCaseInsensitiveHeaderKeys(message); From 610d93c86012efba845e285de01a46e215f69d31 Mon Sep 17 00:00:00 2001 From: Soby Chacko Date: Fri, 11 Feb 2022 12:41:18 -0500 Subject: [PATCH 017/210] Revert "fix checkstyle" This reverts commit 28e3b6cee2f9cb33817592e295d9ecca3da6e454. --- .../cloud/function/context/catalog/FunctionAroundWrapper.java | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java index 6bf171824..bdb9410b8 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java @@ -20,6 +20,7 @@ import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry.FunctionInvocationWrapper; import org.springframework.messaging.Message; +import org.springframework.util.StringUtils; /** * Wrapper that acts as around advise over function invocation. From 5a024de1669b2cf52dc6c6d5101998f344d8d255 Mon Sep 17 00:00:00 2001 From: Soby Chacko Date: Fri, 11 Feb 2022 12:41:27 -0500 Subject: [PATCH 018/210] Revert "* Simplify `functionalTracingEnabled` variable logic" This reverts commit d37f603aa472da8906450247be20cb6a301dfde4. --- .../catalog/FunctionAroundWrapper.java | 5 +-- ...BeanFactoryAwareFunctionRegistryTests.java | 36 ------------------- 2 files changed, 3 insertions(+), 38 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java index bdb9410b8..9fe1f4773 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java @@ -38,8 +38,9 @@ public abstract class FunctionAroundWrapper implements BiFunction, String> uppercase() { - return v -> v.getPayload().toUpperCase(); - } - - @Bean - public FunctionAroundWrapper wrapper() { - return new FunctionAroundWrapper() { - - @Override - protected Object doApply(Object input, FunctionInvocationWrapper targetFunction) { - // in this test we know input is a Message - Message mInput = (Message) input; - Message advisedMessage = MessageBuilder.fromMessage(mInput).setHeader("advised", "true").build(); - Object result = targetFunction.apply(advisedMessage); - assertThat(result).isInstanceOf(Message.class); - return result; - } - }; - } - } - @EnableAutoConfiguration @Configuration protected static class SampleFunctionConfiguration { From fa11dcb6d89a0b3ff39a18ed2452b74969aef425 Mon Sep 17 00:00:00 2001 From: Soby Chacko Date: Fri, 11 Feb 2022 12:41:36 -0500 Subject: [PATCH 019/210] Revert "Remove skipConversion in FunctionAroundWrapper" This reverts commit d4aa4f0e41cc796b6b6a6f69a801efef1ebacf54. --- .../catalog/FunctionAroundWrapper.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java index 9fe1f4773..49ff7454a 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2022 the original author or authors. + * Copyright 2020-2020 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. @@ -27,11 +27,10 @@ * If registered as bean it will be autowired into {@link FunctionInvocationWrapper}. * Keep in mind that it only affects imperative invocations where input is {@link Message} * - * NOTE: This API is experimental and could change without notice. It is + * NOTE: This API is experimental and and could change without notice. It is * intended for internal use only (e.g., spring-cloud-sleuth) * * @author Oleg Zhurakousky - * @author Artem Bilan * @since 3.1 */ public abstract class FunctionAroundWrapper implements BiFunction { @@ -39,10 +38,17 @@ public abstract class FunctionAroundWrapper implements BiFunction Date: Sun, 13 Feb 2022 10:57:57 -0600 Subject: [PATCH 020/210] Update docs as follows: Resolves #811 * code examples reflect current versions and APIs being used * code examples use dynamic version numbers based on maven properties --- docs/pom.xml | 6 ++++++ docs/src/main/asciidoc/functional.adoc | 15 ++++----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 8ebe1c228..066a27092 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -42,6 +42,12 @@ org.asciidoctor asciidoctor-maven-plugin + + + ${project.version} + ${spring-boot.version} + + diff --git a/docs/src/main/asciidoc/functional.adoc b/docs/src/main/asciidoc/functional.adoc index 0bbe7e1c1..38100f4ae 100644 --- a/docs/src/main/asciidoc/functional.adoc +++ b/docs/src/main/asciidoc/functional.adoc @@ -265,19 +265,19 @@ like the `@Autowired` `TestRestTemplate`, are standard Spring Boot features. And to help with correct dependencies here is the excerpt from POM -[source, xml] +[source, xml, subs=attributes+] ---- org.springframework.boot spring-boot-starter-parent - 2.2.2.RELEASE + {spring-boot-version} . . . . org.springframework.cloud spring-cloud-function-web - 3.0.1.BUILD-SNAPSHOT + {project-version} org.springframework.boot @@ -292,12 +292,6 @@ And to help with correct dependencies here is the excerpt from POM org.springframework.boot spring-boot-starter-test test - - - org.junit.vintage - junit-vintage-engine - - ---- @@ -305,7 +299,6 @@ Or you could write a test for a non-HTTP app using just the `FunctionCatalog`. F [source, java] ---- -@RunWith(SpringRunner.class) @FunctionalSpringBootTest public class FunctionalTests { @@ -313,7 +306,7 @@ public class FunctionalTests { private FunctionCatalog catalog; @Test - public void words() throws Exception { + public void words() { Function function = catalog.lookup(Function.class, "uppercase"); assertThat(function.apply("hello")).isEqualTo("HELLO"); From a1eddbaf76bf4be979068a289f9d67c0668a02f0 Mon Sep 17 00:00:00 2001 From: onobc Date: Sun, 13 Feb 2022 10:20:02 -0600 Subject: [PATCH 021/210] Remove now unnecessary override of createClassLoader Resolves #810 --- .../cloud/function/deployer/FunctionArchiveDeployer.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionArchiveDeployer.java b/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionArchiveDeployer.java index 730c0b182..2c96fdd64 100644 --- a/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionArchiveDeployer.java +++ b/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionArchiveDeployer.java @@ -20,7 +20,6 @@ import java.lang.reflect.Method; import java.lang.reflect.Type; import java.net.URL; -import java.net.URLClassLoader; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -159,13 +158,6 @@ void undeploy() { } } - // TODO remove this method all together once https://github.com/spring-projects/spring-boot/pull/20851 is addressed - @Override - protected ClassLoader createClassLoader(Iterator archives) throws Exception { - URLClassLoader cl = (URLClassLoader) super.createClassLoader(archives); - return this.createClassLoader(cl.getURLs()); - } - @Override protected ClassLoader createClassLoader(URL[] urls) throws Exception { String classAsPath = DeployerContextUtils.class.getName().replace('.', '/') + ".class"; From b8856bf0e7c627ccd152186be3d42d0912b085ff Mon Sep 17 00:00:00 2001 From: Roman S Samarev Date: Sun, 13 Feb 2022 14:38:14 +0300 Subject: [PATCH 022/210] SimpleFunctionRegistry: Fixed: compose of supplier...consumer pipeline produces a supplier type. This fix allows testing of composed pipelines without input and output SimpleFunctionRegistry: added info. No functional changes Resolves #809 --- .../catalog/SimpleFunctionRegistry.java | 7 ++-- .../catalog/SimpleFunctionRegistryTests.java | 38 +++++++++++++++++++ 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java index a4b8be79e..2b6cc4ceb 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java @@ -80,6 +80,7 @@ * such as type conversion, composition, POJO etc. * * @author Oleg Zhurakousky + * @author Roman Samarev * */ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspector { @@ -625,9 +626,9 @@ public Function andThen(Function aft Type composedFunctionType; if (afterWrapper.outputType == null) { - composedFunctionType = ResolvableType.forClassWithGenerics(Consumer.class, this.inputType == null - ? null - : ResolvableType.forType(this.inputType)).getType(); + composedFunctionType = (this.inputType == null) ? + ResolvableType.forClassWithGenerics(Supplier.class, ResolvableType.forType(Object.class)).getType() : + ResolvableType.forClassWithGenerics(Consumer.class, ResolvableType.forType(this.inputType)).getType(); } else if (this.inputType == null && afterWrapper.outputType != null) { ResolvableType composedOutputType; diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistryTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistryTests.java index 062b2d7fa..9cdc5eb79 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistryTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistryTests.java @@ -23,10 +23,12 @@ import java.util.Map; import java.util.Map.Entry; import java.util.UUID; +import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Collectors; +import java.util.stream.IntStream; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.gson.Gson; @@ -527,6 +529,30 @@ public void testReactiveMonoSupplier() { assertThat(FunctionTypeUtils.isMono(function.getOutputType())); } + @Test + public void testFunctionCompositionWithReactiveSupplierAndConsumer() { + SimpleFunctionRegistry catalog = new SimpleFunctionRegistry(this.conversionService, this.messageConverter, + new JacksonMapper(new ObjectMapper())); + + Object reactiveFunc = reactiveFluxSupplier(); + FunctionRegistration functionRegistration = new FunctionRegistration(reactiveFunc, "reactiveFluxSupplier") + .type(ResolvableType.forClassWithGenerics( + Supplier.class, ResolvableType.forClassWithGenerics(Flux.class, String.class)).getType()); + catalog.register(functionRegistration); + + reactiveFunc = reactiveFluxConsumer(); + functionRegistration = new FunctionRegistration(reactiveFunc, "reactiveFluxConsumer") + .type(ResolvableType.forClassWithGenerics( + Consumer.class, ResolvableType.forClassWithGenerics(Flux.class, String.class)).getType()); + catalog.register(functionRegistration); + + FunctionInvocationWrapper lookedUpFunction = catalog + .lookup("reactiveFluxSupplier|reactiveFluxConsumer"); + + assertThat(lookedUpFunction).isNotNull(); + lookedUpFunction.apply(null); + assertThat(consumerDowncounter.get()).isZero(); + } public Function uppercase() { return v -> v.toUpperCase(); @@ -551,6 +577,18 @@ public Consumer> reactiveConsumer() { }); } + private final AtomicInteger consumerDowncounter = new AtomicInteger(10); + + public Supplier> reactiveFluxSupplier() { + return () -> Flux.fromStream( + IntStream.range(0, consumerDowncounter.get()).boxed().map(i -> Integer.toString(i)) + ); + } + + public Consumer> reactiveFluxConsumer() { + return flux -> flux.subscribe(v -> consumerDowncounter.decrementAndGet()); + } + private FunctionCatalog configureCatalog(Class... configClass) { ApplicationContext context = new SpringApplicationBuilder(configClass) .run("--logging.level.org.springframework.cloud.function=DEBUG", From 1896d1e474583606ddd8a083d9f8d00ccfb70e86 Mon Sep 17 00:00:00 2001 From: onobc Date: Fri, 11 Feb 2022 20:29:54 -0600 Subject: [PATCH 023/210] Remove spring-cloud-function-compiler module Fixes gh-805 --- README.adoc | 1 - docs/src/main/asciidoc/_intro.adoc | 1 - docs/src/main/asciidoc/sagan-index.adoc | 1 - scripts/function-registry.sh | 3 - scripts/registerConsumer.sh | 17 - scripts/registerFunction.sh | 21 - scripts/registerSupplier.sh | 17 - scripts/stream.sh | 56 -- scripts/task.sh | 18 - scripts/web.sh | 27 - spring-cloud-function-compiler/.jdk8 | 0 .../compiler/AbstractFunctionCompiler.java | 189 ----- .../compiler/CompilationResultFactory.java | 27 - .../compiler/CompiledFunctionFactory.java | 110 --- .../function/compiler/ConsumerCompiler.java | 45 - .../function/compiler/FunctionCompiler.java | 55 -- .../function/compiler/SupplierCompiler.java | 45 - .../app/CompiledFunctionRegistry.java | 112 --- .../compiler/app/CompilerApplication.java | 31 - .../compiler/app/CompilerController.java | 52 -- .../FunctionProxyApplicationListener.java | 183 ----- ...eableFilterableJavaFileObjectIterable.java | 124 --- .../java/CompilationFailedException.java | 42 - .../compiler/java/CompilationMessage.java | 137 ---- .../java/CompilationOutputCollector.java | 72 -- .../compiler/java/CompilationResult.java | 101 --- .../java/CompiledClassDefinition.java | 63 -- .../compiler/java/CompositeProxySelector.java | 50 -- .../compiler/java/DependencyResolver.java | 485 ----------- .../compiler/java/DirEntryJavaFileObject.java | 143 ---- .../compiler/java/DirEnumeration.java | 112 --- .../compiler/java/InMemoryJavaFileObject.java | 239 ------ .../compiler/java/IterableClasspath.java | 298 ------- .../compiler/java/IterableJrtModule.java | 114 --- .../compiler/java/JrtEntryJavaFileObject.java | 159 ---- .../compiler/java/JrtFsEnumeration.java | 140 ---- .../function/compiler/java/MavenSettings.java | 325 -------- .../compiler/java/MavenSettingsReader.java | 157 ---- .../java/MemoryBasedJavaFileManager.java | 769 ------------------ .../java/NestedZipEntryJavaFileObject.java | 187 ----- .../compiler/java/RuntimeJavaCompiler.java | 128 --- .../compiler/java/SimpleClassLoader.java | 59 -- .../compiler/java/ZipEntryJavaFileObject.java | 159 ---- .../proxy/AbstractByteCodeLoadingProxy.java | 88 -- .../proxy/AbstractLambdaCompilingProxy.java | 83 -- .../proxy/ByteCodeLoadingConsumer.java | 41 - .../proxy/ByteCodeLoadingFunction.java | 43 - .../proxy/ByteCodeLoadingSupplier.java | 41 - .../proxy/LambdaCompilingConsumer.java | 40 - .../proxy/LambdaCompilingFunction.java | 43 - .../proxy/LambdaCompilingSupplier.java | 41 - .../main/resources/META-INF/spring.factories | 2 - .../CompilerDependencyResolutionTests.java | 466 ----------- .../compiler/ConsumerCompilerTests.java | 50 -- .../compiler/FunctionCompilerTests.java | 53 -- .../compiler/SupplierCompilerTests.java | 63 -- .../java/RuntimeJavaCompilerTests.java | 174 ---- .../proxy/ByteCodeLoadingFunctionTests.java | 106 --- .../function/core/FunctionFactoryUtils.java | 146 ---- .../core/FunctionFactoryUtilsTests.java | 94 --- .../src/test/resources/logback.xml | 8 - .../function-sample-compiler/.jdk8 | 0 .../function-sample-compiler/build.gradle | 51 -- .../gradle/wrapper/gradle-wrapper.jar | Bin 53556 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 - .../function-sample-compiler/gradlew | 164 ---- .../function-sample-compiler/gradlew.bat | 90 -- .../java/com/example/SampleApplication.java | 31 - .../example/SampleCompiledConsumerTests.java | 58 -- .../example/SampleCompiledFunctionTests.java | 47 -- .../function-sample-pof/build.gradle | 1 - .../function-sample-pojo/build.gradle | 1 - .../function-sample-task/build.gradle | 1 - .../function-sample-task/pom.xml | 4 - .../function-sample/build.gradle | 1 - 75 files changed, 7110 deletions(-) delete mode 100755 scripts/function-registry.sh delete mode 100755 scripts/registerConsumer.sh delete mode 100755 scripts/registerFunction.sh delete mode 100755 scripts/registerSupplier.sh delete mode 100755 scripts/stream.sh delete mode 100755 scripts/task.sh delete mode 100755 scripts/web.sh delete mode 100644 spring-cloud-function-compiler/.jdk8 delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/AbstractFunctionCompiler.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/CompilationResultFactory.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/CompiledFunctionFactory.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/ConsumerCompiler.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/FunctionCompiler.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/SupplierCompiler.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/app/CompiledFunctionRegistry.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/app/CompilerApplication.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/app/CompilerController.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/config/FunctionProxyApplicationListener.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/CloseableFilterableJavaFileObjectIterable.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/CompilationFailedException.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/CompilationMessage.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/CompilationOutputCollector.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/CompilationResult.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/CompiledClassDefinition.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/CompositeProxySelector.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/DependencyResolver.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/DirEntryJavaFileObject.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/DirEnumeration.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/InMemoryJavaFileObject.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/IterableClasspath.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/IterableJrtModule.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/JrtEntryJavaFileObject.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/JrtFsEnumeration.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/MavenSettings.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/MavenSettingsReader.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/MemoryBasedJavaFileManager.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/NestedZipEntryJavaFileObject.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/RuntimeJavaCompiler.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/SimpleClassLoader.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/ZipEntryJavaFileObject.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/AbstractByteCodeLoadingProxy.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/AbstractLambdaCompilingProxy.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingConsumer.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingFunction.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingSupplier.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/LambdaCompilingConsumer.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/LambdaCompilingFunction.java delete mode 100644 spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/LambdaCompilingSupplier.java delete mode 100644 spring-cloud-function-compiler/src/main/resources/META-INF/spring.factories delete mode 100644 spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/CompilerDependencyResolutionTests.java delete mode 100644 spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/ConsumerCompilerTests.java delete mode 100644 spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/FunctionCompilerTests.java delete mode 100644 spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/SupplierCompilerTests.java delete mode 100644 spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/java/RuntimeJavaCompilerTests.java delete mode 100644 spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingFunctionTests.java delete mode 100644 spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/core/FunctionFactoryUtils.java delete mode 100644 spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/core/FunctionFactoryUtilsTests.java delete mode 100644 spring-cloud-function-compiler/src/test/resources/logback.xml delete mode 100644 spring-cloud-function-samples/function-sample-compiler/.jdk8 delete mode 100644 spring-cloud-function-samples/function-sample-compiler/build.gradle delete mode 100644 spring-cloud-function-samples/function-sample-compiler/gradle/wrapper/gradle-wrapper.jar delete mode 100644 spring-cloud-function-samples/function-sample-compiler/gradle/wrapper/gradle-wrapper.properties delete mode 100755 spring-cloud-function-samples/function-sample-compiler/gradlew delete mode 100644 spring-cloud-function-samples/function-sample-compiler/gradlew.bat delete mode 100644 spring-cloud-function-samples/function-sample-compiler/src/main/java/com/example/SampleApplication.java delete mode 100644 spring-cloud-function-samples/function-sample-compiler/src/test/java/com/example/SampleCompiledConsumerTests.java delete mode 100644 spring-cloud-function-samples/function-sample-compiler/src/test/java/com/example/SampleCompiledFunctionTests.java diff --git a/README.adoc b/README.adoc index 595bac1d8..a96231d59 100644 --- a/README.adoc +++ b/README.adoc @@ -62,7 +62,6 @@ endpoints and/or message stream listeners/publishers with RabbitMQ, Kafka etc. * _Packaging functions for deployments, specific to the target platform (e.g., Project Riff, AWS Lambda and more)_ * _Adapters to expose function to the outside world as HTTP endpoints etc._ * _Deploying a JAR file containing such an application context with an isolated classloader, so that you can pack them together in a single JVM._ -* _Compiling strings which are Java function bodies into bytecode, and then turning them into `@Beans` that can be wrapped as above._ * _Adapters for https://github.com/spring-cloud/spring-cloud-function/tree/master/spring-cloud-function-adapters/spring-cloud-function-adapter-aws[AWS Lambda], https://github.com/spring-cloud/spring-cloud-function/tree/master/spring-cloud-function-adapters/spring-cloud-function-adapter-azure[Azure], https://github.com/spring-cloud/spring-cloud-function/tree/master/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp[Google Cloud Functions], https://github.com/spring-cloud/spring-cloud-function/tree/master/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk[Apache OpenWhisk] and possibly other "serverless" service providers._ == Getting Started diff --git a/docs/src/main/asciidoc/_intro.adoc b/docs/src/main/asciidoc/_intro.adoc index 3812b572c..c1895c454 100644 --- a/docs/src/main/asciidoc/_intro.adoc +++ b/docs/src/main/asciidoc/_intro.adoc @@ -49,5 +49,4 @@ endpoints and/or message stream listeners/publishers with RabbitMQ, Kafka etc. * _Packaging functions for deployments, specific to the target platform (e.g., Project Riff, AWS Lambda and more)_ * _Adapters to expose function to the outside world as HTTP endpoints etc._ * _Deploying a JAR file containing such an application context with an isolated classloader, so that you can pack them together in a single JVM._ -* _Compiling strings which are Java function bodies into bytecode, and then turning them into `@Beans` that can be wrapped as above._ * _Adapters for https://github.com/spring-cloud/spring-cloud-function/tree/master/spring-cloud-function-adapters/spring-cloud-function-adapter-aws[AWS Lambda], https://github.com/spring-cloud/spring-cloud-function/tree/master/spring-cloud-function-adapters/spring-cloud-function-adapter-azure[Azure], https://github.com/spring-cloud/spring-cloud-function/tree/master/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp[Google Cloud Functions], https://github.com/spring-cloud/spring-cloud-function/tree/master/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk[Apache OpenWhisk] and possibly other "serverless" service providers._ diff --git a/docs/src/main/asciidoc/sagan-index.adoc b/docs/src/main/asciidoc/sagan-index.adoc index 5e4faf7e1..71e9b2113 100644 --- a/docs/src/main/asciidoc/sagan-index.adoc +++ b/docs/src/main/asciidoc/sagan-index.adoc @@ -18,7 +18,6 @@ Spring Cloud Function features: * _Packaging functions for deployments, specific to the target platform (e.g., Project Riff, AWS Lambda and more)_ * _Adapters to expose function to the outside world as HTTP endpoints etc._ * _Deploying a JAR file containing such an application context with an isolated classloader, so that you can pack them together in a single JVM._ -* _Compiling strings which are Java function bodies into bytecode, and then turning them into `@Beans` that can be wrapped as above._ * _Adapters for https://github.com/spring-cloud/spring-cloud-function/tree/master/spring-cloud-function-adapters/spring-cloud-function-adapter-aws[AWS Lambda], https://github.com/spring-cloud/spring-cloud-function/tree/master/spring-cloud-function-adapters/spring-cloud-function-adapter-azure[Microsoft Azure], https://github.com/spring-cloud/spring-cloud-function/tree/master/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp[Google Cloud Functions], https://github.com/spring-cloud/spring-cloud-function/tree/master/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk[Apache OpenWhisk] and possibly other "serverless" service providers._ Here's a complete, executable, testable Spring Boot application (implementing a simple string manipulation): diff --git a/scripts/function-registry.sh b/scripts/function-registry.sh deleted file mode 100755 index 2655daf11..000000000 --- a/scripts/function-registry.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -java -jar ../spring-cloud-function-compiler/target/spring-cloud-function-compiler-2.0.0.BUILD-SNAPSHOT.jar diff --git a/scripts/registerConsumer.sh b/scripts/registerConsumer.sh deleted file mode 100755 index 0cfbf985b..000000000 --- a/scripts/registerConsumer.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -while getopts ":n:f:t:" opt; do - case $opt in - n) - NAME=$OPTARG - ;; - f) - FUNC=$OPTARG - ;; - t) - TYPE=$OPTARG - ;; - esac -done - -curl -X POST -H "Content-Type: text/plain" -d $FUNC localhost:8080/consumer/$NAME?type=$TYPE diff --git a/scripts/registerFunction.sh b/scripts/registerFunction.sh deleted file mode 100755 index 5638f4db8..000000000 --- a/scripts/registerFunction.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -while getopts ":n:f:i:o:" opt; do - case $opt in - n) - NAME=$OPTARG - ;; - f) - FUNC=$OPTARG - ;; - i) - INTYPE=$OPTARG - ;; - o) - OUTTYPE=$OPTARG - ;; - esac -done - -curl -X POST -H "Content-Type: text/plain" -d $FUNC "localhost:8080/function/$NAME?inputType=$INTYPE&outputType=$OUTTYPE" - diff --git a/scripts/registerSupplier.sh b/scripts/registerSupplier.sh deleted file mode 100755 index df853198f..000000000 --- a/scripts/registerSupplier.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -while getopts ":n:f:t:" opt; do - case $opt in - n) - NAME=$OPTARG - ;; - f) - FUNC=$OPTARG - ;; - t) - TYPE=$OPTARG - ;; - esac -done - -curl -X POST -H "Content-Type: text/plain" -d $FUNC localhost:8080/supplier/$NAME?type=$TYPE diff --git a/scripts/stream.sh b/scripts/stream.sh deleted file mode 100755 index 0d22c78e4..000000000 --- a/scripts/stream.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash - -PREFIX="--spring.cloud.function.import" -DIR="file:///tmp/function-registry" - -tokenize() { - local IFS=, - local TOKENS=($1) - echo ${TOKENS[@]} -} - -DURATION=0 - -while getopts ":i:s:f:c:o:p:d:" opt; do - case $opt in - i) - IN=--spring.cloud.stream.bindings.input.destination=$OPTARG - ;; - s) - FUNC=$OPTARG - TYPE="$PREFIX.$FUNC.type=supplier" - RESOURCE="$PREFIX.$FUNC.location=$DIR/suppliers/$FUNC.fun" - ;; - f) - FUNC=$OPTARG - for i in `tokenize $OPTARG`; do - RESOURCE="$RESOURCE $PREFIX.${i}.location=$DIR/functions/${i}.fun" - TYPE="$TYPE $PREFIX.${i}.type=function" - done - ;; - c) - FUNC=$OPTARG - TYPE="$PREFIX.$FUNC.type=consumer" - RESOURCE="$PREFIX.$FUNC.location=$DIR/consumers/$FUNC.fun" - ;; - o) - OUT=--spring.cloud.stream.bindings.output.destination=$OPTARG - ;; - p) - PORT=$OPTARG - ;; - d) - DURATION=$OPTARG - ;; - esac -done - -java -jar ../spring-cloud-function-samples/function-sample-compiler/target/function-sample-compiler-2.0.0.BUILD-SNAPSHOT.jar\ - --management.security.enabled=false\ - --server.port=$PORT\ - --spring.cloud.function.stream.endpoint=$FUNC\ - --spring.cloud.function.stream.interval=$DURATION\ - $IN\ - $OUT\ - $RESOURCE\ - $TYPE diff --git a/scripts/task.sh b/scripts/task.sh deleted file mode 100755 index cc804d1e2..000000000 --- a/scripts/task.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -while getopts ":s:f:c:" opt; do - case $opt in - s) - SUPP=$OPTARG - ;; - f) - FUNC=$OPTARG - ;; - c) - CONS=$OPTARG - ;; - esac -done - -java -noverify -XX:TieredStopAtLevel=1 -Xss256K -Xms16M -Xmx256M -XX:MaxMetaspaceSize=128M -jar ../spring-cloud-function-task/target/spring-cloud-function-task-2.0.0.BUILD-SNAPSHOT.jar\ - --lambda.supplier=$SUPP --lambda.function=$FUNC --lambda.consumer=$CONS diff --git a/scripts/web.sh b/scripts/web.sh deleted file mode 100755 index 58b3d065c..000000000 --- a/scripts/web.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -while getopts ":s:f:c:p:" opt; do - case $opt in - s) - FUNC=$OPTARG - TYPE=supplier - ;; - f) - FUNC=$OPTARG - TYPE=function - ;; - c) - FUNC=$OPTARG - TYPE=consumer - ;; - p) - PORT=$OPTARG - ;; - esac -done - -java -jar ../spring-cloud-function-samples/function-sample-compiler/target/function-sample-compiler-2.0.0.BUILD-SNAPSHOT.jar\ - --spring.cloud.function.import.$FUNC.type=$TYPE\ - --spring.cloud.function.import.$FUNC.location=file:///tmp/function-registry/$TYPE's'/$FUNC.fun\ - --management.security.enabled=false\ - --server.port=$PORT diff --git a/spring-cloud-function-compiler/.jdk8 b/spring-cloud-function-compiler/.jdk8 deleted file mode 100644 index e69de29bb..000000000 diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/AbstractFunctionCompiler.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/AbstractFunctionCompiler.java deleted file mode 100644 index e9f1179be..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/AbstractFunctionCompiler.java +++ /dev/null @@ -1,189 +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 org.springframework.cloud.function.compiler; - -import java.util.List; -import java.util.regex.Matcher; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import org.springframework.cloud.function.compiler.java.CompilationFailedException; -import org.springframework.cloud.function.compiler.java.CompilationMessage; -import org.springframework.cloud.function.compiler.java.CompilationResult; -import org.springframework.cloud.function.compiler.java.RuntimeJavaCompiler; -import org.springframework.util.ObjectUtils; -import org.springframework.util.StringUtils; - -/** - * @param result type - * @author Andy Clement - * @author Mark Fisher - * @author Oleg Zhurakousky - */ -public abstract class AbstractFunctionCompiler { - - // Newlines in the property are escaped - private static final String NEWLINE_ESCAPE = Matcher.quoteReplacement("\\n"); - - // Individual double-quote characters are represented by two double quotes in the DSL - private static final String DOUBLE_DOUBLE_QUOTE = Matcher.quoteReplacement("\"\""); - - private static Logger logger = LoggerFactory - .getLogger(AbstractFunctionCompiler.class); - - /** - * The user supplied code snippet is inserted into the template and then the result is - * compiled. - */ - // @formatter:off - private static String SOURCE_CODE_TEMPLATE = "package " - + AbstractFunctionCompiler.class.getPackage().getName() + ";\n" - + "import java.util.*;\n" // Helpful to include this - + "import java.time.*;\n" // Helpful to include this - + "import java.util.function.*;\n" - + "import reactor.core.publisher.Flux;\n" - + "public class %s implements CompilationResultFactory<%s> {\n" - + " public %s<%s> getResult() {\n" - + " %s\n" - + " }\n" - + "}\n"; - // @formatter:on - private final ResultType resultType; - - private final String[] defaultResultTypeParameterizations; - - private final RuntimeJavaCompiler compiler = new RuntimeJavaCompiler(); - - AbstractFunctionCompiler(ResultType type, - String... defaultResultTypeParameterizations) { - this.resultType = type; - this.defaultResultTypeParameterizations = defaultResultTypeParameterizations; - } - - private static String decode(String input) { - return input.replaceAll(NEWLINE_ESCAPE, "\n").replaceAll(DOUBLE_DOUBLE_QUOTE, - "\""); - } - - /** - * Produce a factory instance by: - *
    - *
  • Decoding the code String to process any newlines/double-double-quotes - *
  • Insert the code into the source code template for a class - *
  • Compiling the class using the JDK provided Java Compiler - *
  • Loading the compiled class - *
  • Invoking a well known method on the factory class to produce a Consumer, - * Function, or Supplier instance - *
  • Returning that instance. - *
- * @param name - name of the function - * @param code - code of the function - * @param resultTypeParameterizations - result types - * @return a factory instance - */ - public final CompiledFunctionFactory compile(String name, String code, - String... resultTypeParameterizations) { - if (name == null || name.length() == 0) { - throw new IllegalArgumentException("name must not be empty"); - } - logger.info("Initial code property value :'{}'", code); - String[] parameterizedTypes = (!ObjectUtils.isEmpty(resultTypeParameterizations)) - ? resultTypeParameterizations : this.defaultResultTypeParameterizations; - code = decode(code); - if (code.startsWith("\"") && code.endsWith("\"")) { - code = code.substring(1, code.length() - 1); - } - if (!code.startsWith("return ") && !code.endsWith(";")) { - code = String.format("return (%s<%s> & java.io.Serializable) %s;", - this.resultType, - StringUtils.arrayToCommaDelimitedString(parameterizedTypes), code); - } - logger.info("Processed code property value :\n{}\n", code); - String firstLetter = name.substring(0, 1).toUpperCase(); - name = (name.length() > 1) ? firstLetter + name.substring(1) : firstLetter; - String className = String.format("%s.%s%sFactory", - this.getClass().getPackage().getName(), name, this.resultType); - CompilationResult compilationResult = buildAndCompileSourceCode(className, code, - parameterizedTypes); - if (compilationResult.wasSuccessful()) { - CompiledFunctionFactory factory = new CompiledFunctionFactory<>(className, - compilationResult); - return this.postProcessCompiledFunctionFactory(factory); - } - List compilationMessages = compilationResult - .getCompilationMessages(); - throw new CompilationFailedException(compilationMessages); - } - - /** - * Implementing subclasses may override this, e.g. to set the input and/or output - * types. - * @param factory the {@link CompiledFunctionFactory} produced by - * {@link #compile(String, String, String...)} - * @return the post-processed {@link CompiledFunctionFactory} - */ - protected CompiledFunctionFactory postProcessCompiledFunctionFactory( - CompiledFunctionFactory factory) { - return factory; - } - - /** - * Create the source for and then compile and load a class that embodies the supplied - * methodBody. The methodBody is inserted into a class template that returns the - * specified parameterized type. This method can return more than one class if the - * method body includes local class declarations. An example methodBody would be - * return input -> input.buffer(5).map(list->list.get(0));. - * @param className the name of the class - * @param methodBody the source code for a method - * @param parameterizedTypes the array of String representations for the parameterized - * input and/or output types, e.g.: <Flux<Object>> - * @return the list of Classes produced by compiling and then loading the snippet of - * code - */ - private CompilationResult buildAndCompileSourceCode(String className, - String methodBody, String[] parameterizedTypes) { - String sourceCode = makeSourceClassDefinition(className, methodBody, - parameterizedTypes); - return this.compiler.compile(className, sourceCode); - } - - /** - * Make a full source code definition for a class by applying the specified method - * body to the Reactive template. - * @param className the name of the class - * @param methodBody the code to insert into the Reactive source class template - * @param types the parameterized input and/or output types as Strings - * @return a complete Java Class definition - */ - private String makeSourceClassDefinition(String className, String methodBody, - String[] types) { - String shortClassName = className.substring(className.lastIndexOf('.') + 1); - String s = String.format(SOURCE_CODE_TEMPLATE, shortClassName, this.resultType, - this.resultType, StringUtils.arrayToCommaDelimitedString(types), - methodBody); - logger.info("\n" + s); - return s; - } - - enum ResultType { - - Consumer, Function, Supplier - - } - -} diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/CompilationResultFactory.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/CompilationResultFactory.java deleted file mode 100644 index 1f643b80b..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/CompilationResultFactory.java +++ /dev/null @@ -1,27 +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 org.springframework.cloud.function.compiler; - -/** - * @param result type - * @author Mark Fisher - */ -public interface CompilationResultFactory { - - T getResult(); - -} diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/CompiledFunctionFactory.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/CompiledFunctionFactory.java deleted file mode 100644 index 0083b2fdc..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/CompiledFunctionFactory.java +++ /dev/null @@ -1,110 +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 org.springframework.cloud.function.compiler; - -import java.lang.reflect.Method; -import java.util.List; -import java.util.concurrent.atomic.AtomicReference; - -import org.springframework.cloud.function.compiler.java.CompilationResult; -import org.springframework.util.ReflectionUtils; - -/** - * @param result type - * @author Mark Fisher - */ -public class CompiledFunctionFactory implements CompilationResultFactory { - - private final T result; - - private final byte[] generatedClassBytes; - - private String inputType; - - private String outputType; - - private Method method; - - public CompiledFunctionFactory(String className, - CompilationResult compilationResult) { - List> clazzes = compilationResult.getCompiledClasses(); - T result = null; - Method method = null; - for (Class clazz : clazzes) { - if (clazz.getName().equals(className)) { - try { - @SuppressWarnings("unchecked") - CompilationResultFactory factory = (CompilationResultFactory) clazz - .newInstance(); - result = factory.getResult(); - method = findFactoryMethod(clazz); - } - catch (Exception e) { - throw new IllegalArgumentException( - "Unexpected problem during retrieval of Function from compiled class", - e); - } - } - } - if (result == null) { - throw new IllegalArgumentException("Failed to extract compilation result."); - } - this.result = result; - this.method = method; - this.generatedClassBytes = compilationResult.getClassBytes(className); - } - - private Method findFactoryMethod(Class clazz) { - AtomicReference method = new AtomicReference<>(); - ReflectionUtils.doWithLocalMethods(clazz, m -> { - if (m.getName().equals("getResult") - && m.getReturnType().getName().startsWith("java.util.function")) { - method.set(m); - } - }); - return method.get(); - } - - public T getResult() { - return this.result; - } - - public Method getFactoryMethod() { - return this.method; - } - - public String getInputType() { - return this.inputType; - } - - public void setInputType(String inputType) { - this.inputType = inputType; - } - - public String getOutputType() { - return this.outputType; - } - - public void setOutputType(String outputType) { - this.outputType = outputType; - } - - public byte[] getGeneratedClassBytes() { - return this.generatedClassBytes; - } - -} diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/ConsumerCompiler.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/ConsumerCompiler.java deleted file mode 100644 index e098f9049..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/ConsumerCompiler.java +++ /dev/null @@ -1,45 +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 org.springframework.cloud.function.compiler; - -import java.util.function.Consumer; - -/** - * @param result type - * @author Mark Fisher - */ -public class ConsumerCompiler extends AbstractFunctionCompiler> { - - private final String inputType; - - public ConsumerCompiler() { - this("Flux"); - } - - public ConsumerCompiler(String inputType) { - super(ResultType.Consumer, inputType); - this.inputType = inputType; - } - - @Override - protected CompiledFunctionFactory> postProcessCompiledFunctionFactory( - CompiledFunctionFactory> factory) { - factory.setInputType(this.inputType); - return factory; - } - -} diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/FunctionCompiler.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/FunctionCompiler.java deleted file mode 100644 index ad3ce77dd..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/FunctionCompiler.java +++ /dev/null @@ -1,55 +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 org.springframework.cloud.function.compiler; - -import java.util.function.Function; - -/** - * @param function input type - * @param function output type - * @author Mark Fisher - */ -public class FunctionCompiler extends AbstractFunctionCompiler> { - - private final String inputType; - - private final String outputType; - - public FunctionCompiler() { - this("Flux"); - } - - public FunctionCompiler(String type) { - this(type, type); - } - - public FunctionCompiler(String inputType, String outputType) { - super(ResultType.Function, inputType, outputType); - this.inputType = inputType; - this.outputType = outputType; - } - - @Override - protected CompiledFunctionFactory> postProcessCompiledFunctionFactory( - CompiledFunctionFactory> factory) { - factory.setInputType(this.inputType); - factory.setOutputType(this.outputType); - - return factory; - } - -} diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/SupplierCompiler.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/SupplierCompiler.java deleted file mode 100644 index 57ab191bd..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/SupplierCompiler.java +++ /dev/null @@ -1,45 +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 org.springframework.cloud.function.compiler; - -import java.util.function.Supplier; - -/** - * @param input type - * @author Mark Fisher - */ -public class SupplierCompiler extends AbstractFunctionCompiler> { - - private final String outputType; - - public SupplierCompiler() { - this("Flux"); - } - - public SupplierCompiler(String outputType) { - super(ResultType.Supplier, outputType); - this.outputType = outputType; - } - - @Override - protected CompiledFunctionFactory> postProcessCompiledFunctionFactory( - CompiledFunctionFactory> factory) { - factory.setOutputType(this.outputType); - return factory; - } - -} diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/app/CompiledFunctionRegistry.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/app/CompiledFunctionRegistry.java deleted file mode 100644 index 3717514d5..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/app/CompiledFunctionRegistry.java +++ /dev/null @@ -1,112 +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 org.springframework.cloud.function.compiler.app; - -import java.io.File; -import java.io.IOException; -import java.util.function.Consumer; -import java.util.function.Function; -import java.util.function.Supplier; - -import reactor.core.publisher.Flux; - -import org.springframework.cloud.function.compiler.AbstractFunctionCompiler; -import org.springframework.cloud.function.compiler.CompiledFunctionFactory; -import org.springframework.cloud.function.compiler.ConsumerCompiler; -import org.springframework.cloud.function.compiler.FunctionCompiler; -import org.springframework.cloud.function.compiler.SupplierCompiler; -import org.springframework.util.Assert; -import org.springframework.util.FileCopyUtils; - -/** - * @author Mark Fisher - * @author Oleg Zhurakousky - */ -public class CompiledFunctionRegistry { - - private static final String SUPPLIER_DIRECTORY = "suppliers"; - - private static final String FUNCTION_DIRECTORY = "functions"; - - private static final String CONSUMER_DIRECTORY = "consumers"; - - private final File supplierDirectory; - - private final File functionDirectory; - - private final File consumerDirectory; - - private final AbstractFunctionCompiler>> supplierCompiler = new SupplierCompiler<>(); - - private final AbstractFunctionCompiler, Flux>> functionCompiler = new FunctionCompiler<>(); - - private final AbstractFunctionCompiler>> consumerCompiler = new ConsumerCompiler<>(); - - public CompiledFunctionRegistry() { - this(new File("/tmp/function-registry")); - } - - public CompiledFunctionRegistry(File directory) { - Assert.notNull(directory, "Directory must not be null"); - if (!directory.exists()) { - directory.mkdirs(); - } - else { - Assert.isTrue(directory.isDirectory(), - String.format("%s is not a directory.", directory.getAbsolutePath())); - } - this.supplierDirectory = new File(directory, SUPPLIER_DIRECTORY); - this.functionDirectory = new File(directory, FUNCTION_DIRECTORY); - this.consumerDirectory = new File(directory, CONSUMER_DIRECTORY); - this.supplierDirectory.mkdir(); - this.functionDirectory.mkdir(); - this.consumerDirectory.mkdir(); - } - - public void registerSupplier(String name, String lambda, String type) { - this.doRegister(this.supplierCompiler, this.supplierDirectory, name, lambda, - type); - } - - public void registerFunction(String name, String lambda, String... types) { - this.doRegister(this.functionCompiler, this.functionDirectory, name, lambda, - types); - } - - public void registerConsumer(String name, String lambda, String type) { - this.doRegister(this.consumerCompiler, this.consumerDirectory, name, lambda, - type); - } - - private void doRegister(AbstractFunctionCompiler compiler, File directory, - String name, String lambda, String... types) { - CompiledFunctionFactory factory = compiler.compile(name, lambda, types); - File file = new File(directory, fileName(name)); - try { - FileCopyUtils.copy(factory.getGeneratedClassBytes(), file); - } - catch (IOException e) { - throw new IllegalArgumentException( - String.format("failed to register '%s'", name), e); - } - } - - private String fileName(String functionName) { - return String.format("%s.%s", functionName, "fun"); - } - -} diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/app/CompilerApplication.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/app/CompilerApplication.java deleted file mode 100644 index 1997ad6d2..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/app/CompilerApplication.java +++ /dev/null @@ -1,31 +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 org.springframework.cloud.function.compiler.app; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -// @checkstyle:off -@SpringBootApplication -public class CompilerApplication { - - public static void main(String[] args) { - SpringApplication.run(CompilerApplication.class, args); - } - -} -// @checkstyle:on diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/app/CompilerController.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/app/CompilerController.java deleted file mode 100644 index ca949d66f..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/app/CompilerController.java +++ /dev/null @@ -1,52 +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 org.springframework.cloud.function.compiler.app; - -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -/** - * @author Mark Fisher - */ -@RestController -public class CompilerController { - - private final CompiledFunctionRegistry registry = new CompiledFunctionRegistry(); - - @PostMapping(path = "/supplier/{name}") - public void registerSupplier(@PathVariable String name, @RequestBody String lambda, - @RequestParam(defaultValue = "Flux") String type) { - this.registry.registerSupplier(name, lambda, type); - } - - @PostMapping(path = "/function/{name}") - public void registerFunction(@PathVariable String name, @RequestBody String lambda, - @RequestParam(defaultValue = "Flux") String inputType, - @RequestParam(defaultValue = "Flux") String outputType) { - this.registry.registerFunction(name, lambda, inputType, outputType); - } - - @PostMapping(path = "/consumer/{name}") - public void registerConsumer(@PathVariable String name, @RequestBody String lambda, - @RequestParam(defaultValue = "Flux") String type) { - this.registry.registerConsumer(name, lambda, type); - } - -} diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/config/FunctionProxyApplicationListener.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/config/FunctionProxyApplicationListener.java deleted file mode 100644 index 1d93c74b0..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/config/FunctionProxyApplicationListener.java +++ /dev/null @@ -1,183 +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 org.springframework.cloud.function.compiler.config; - -import java.util.HashMap; -import java.util.Map; - -import org.springframework.beans.MutablePropertyValues; -import org.springframework.beans.factory.config.ConstructorArgumentValues; -import org.springframework.beans.factory.support.DefaultListableBeanFactory; -import org.springframework.beans.factory.support.RootBeanDefinition; -import org.springframework.boot.context.event.ApplicationPreparedEvent; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.context.properties.bind.Bindable; -import org.springframework.boot.context.properties.bind.Binder; -import org.springframework.cloud.function.compiler.ConsumerCompiler; -import org.springframework.cloud.function.compiler.FunctionCompiler; -import org.springframework.cloud.function.compiler.SupplierCompiler; -import org.springframework.cloud.function.compiler.proxy.ByteCodeLoadingConsumer; -import org.springframework.cloud.function.compiler.proxy.ByteCodeLoadingFunction; -import org.springframework.cloud.function.compiler.proxy.ByteCodeLoadingSupplier; -import org.springframework.cloud.function.compiler.proxy.LambdaCompilingConsumer; -import org.springframework.cloud.function.compiler.proxy.LambdaCompilingFunction; -import org.springframework.cloud.function.compiler.proxy.LambdaCompilingSupplier; -import org.springframework.context.ApplicationListener; -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.core.io.ByteArrayResource; -import org.springframework.core.io.Resource; -import org.springframework.util.Assert; - -/** - * @author Mark Fisher - */ -@ConfigurationProperties("spring.cloud.function") -public class FunctionProxyApplicationListener - implements ApplicationListener { - - private final SupplierCompiler supplierCompiler = new SupplierCompiler<>(); - - private final FunctionCompiler functionCompiler = new FunctionCompiler<>(); - - private final ConsumerCompiler consumerCompiler = new ConsumerCompiler<>(); - - /** - * Configuration for function bodies, which will be compiled. The key in the map is - * the function name and the value is a map containing a key "lambda" which is the - * body to compile, and optionally a "type" (defaults to "function"). Can also contain - * "inputType" and "outputType" in case it is ambiguous. - */ - private final Map compile = new HashMap<>(); - - /** - * Configuration for a set of files containing function bodies, which will be imported - * and compiled. The key in the map is the function name and the value is another map, - * containing a "location" of the file to compile and (optionally) a "type" (defaults - * to "function"). - */ - private final Map imports = new HashMap<>(); - - public Map getCompile() { - return this.compile; - } - - public Map getImports() { - return this.imports; - } - - @Override - public void onApplicationEvent(ApplicationPreparedEvent event) { - ConfigurableApplicationContext context = event.getApplicationContext(); - DefaultListableBeanFactory beanFactory = (DefaultListableBeanFactory) context - .getBeanFactory(); - bind(context, beanFactory); - for (Map.Entry entry : this.compile.entrySet()) { - String name = entry.getKey(); - @SuppressWarnings("unchecked") - Map properties = (Map) entry.getValue(); - String type = (properties.get("type") != null) ? properties.get("type") - : "function"; - String lambda = properties.get("lambda"); - Assert.notNull(lambda, () -> String.format( - "The 'lambda' property is required for compiling Function: %s", - name)); - String inputType = properties.get("inputType"); - String outputType = properties.get("outputType"); - registerLambdaCompilingProxy(name, type, inputType, outputType, lambda, - beanFactory); - } - for (Map.Entry entry : this.imports.entrySet()) { - String name = entry.getKey(); - @SuppressWarnings("unchecked") - Map properties = (Map) entry.getValue(); - String type = (properties.get("type") != null) ? properties.get("type") - : "function"; - String location = properties.get("location"); - Assert.notNull(location, String.format( - "The 'location' property is required for importing Function: %s", - name)); - registerByteCodeLoadingProxy(name, type, context.getResource(location), - beanFactory); - } - } - - private void bind(ConfigurableApplicationContext application, - DefaultListableBeanFactory context) { - Binder.get(application.getEnvironment()).bind("spring.cloud.function", - Bindable.ofInstance(this)); - } - - private void registerByteCodeLoadingProxy(String name, String type, Resource resource, - DefaultListableBeanFactory beanFactory) { - Class proxyClass = null; - if ("supplier".equals(type.toLowerCase())) { - proxyClass = ByteCodeLoadingSupplier.class; - } - else if ("consumer".equals(type.toLowerCase())) { - proxyClass = ByteCodeLoadingConsumer.class; - } - else { - proxyClass = ByteCodeLoadingFunction.class; - } - RootBeanDefinition beanDefinition = new RootBeanDefinition(proxyClass); - ConstructorArgumentValues args = new ConstructorArgumentValues(); - args.addGenericArgumentValue(resource); - beanDefinition.setConstructorArgumentValues(args); - beanFactory.registerBeanDefinition(name, beanDefinition); - } - - private void registerLambdaCompilingProxy(String name, String type, String inputType, - String outputType, String lambda, DefaultListableBeanFactory beanFactory) { - Resource resource = new ByteArrayResource(lambda.getBytes()); - ConstructorArgumentValues args = new ConstructorArgumentValues(); - MutablePropertyValues props = new MutablePropertyValues(); - args.addGenericArgumentValue(resource); - Class proxyClass = null; - if ("supplier".equals(type.toLowerCase())) { - proxyClass = LambdaCompilingSupplier.class; - args.addGenericArgumentValue(this.supplierCompiler); - if (outputType != null) { - props.add("typeParameterizations", outputType); - } - } - else if ("consumer".equals(type.toLowerCase())) { - proxyClass = LambdaCompilingConsumer.class; - args.addGenericArgumentValue(this.consumerCompiler); - if (inputType != null) { - props.add("typeParameterizations", inputType); - } - } - else { - proxyClass = LambdaCompilingFunction.class; - args.addGenericArgumentValue(this.functionCompiler); - if ((inputType == null && outputType != null) - || (outputType == null && inputType != null)) { - throw new IllegalArgumentException( - "if either input or output type is set, the other is also required"); - } - if (inputType != null) { - props.add("typeParameterizations", - new String[] { inputType, outputType }); - } - } - RootBeanDefinition beanDefinition = new RootBeanDefinition(proxyClass); - beanDefinition.setConstructorArgumentValues(args); - beanDefinition.setPropertyValues(props); - beanFactory.registerBeanDefinition(name, beanDefinition); - } - -} diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/CloseableFilterableJavaFileObjectIterable.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/CloseableFilterableJavaFileObjectIterable.java deleted file mode 100644 index 80605e030..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/CloseableFilterableJavaFileObjectIterable.java +++ /dev/null @@ -1,124 +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 org.springframework.cloud.function.compiler.java; - -import java.io.File; - -import javax.tools.JavaFileObject; - -import org.springframework.cloud.function.compiler.java.MemoryBasedJavaFileManager.CompilationInfoCache; - -/** - * Common superclass for iterables that need to handle closing when finished with and that - * need to handle possible constraints on the values that are iterated over. - * - * @author Andy Clement - */ -public abstract class CloseableFilterableJavaFileObjectIterable - implements Iterable { - - // private final static Logger logger = - // LoggerFactory.getLogger(CloseableFilterableJavaFileObjectIterable.class); - - private final static boolean BOOT_PACKAGING_AWARE = true; - - private final static String BOOT_PACKAGING_PREFIX_FOR_CLASSES = "BOOT-INF/classes/"; - - // If set specifies the package the iterator consumer is interested in. Only - // return results in this package. Will have a trailing separator to speed - // matching. '/' on its own represents the default package - protected String packageNameFilter; - - // Indicates whether the consumer of the iterator wants to see classes - // that are in subpackages of those matching the filter. - protected boolean includeSubpackages; - - protected CompilationInfoCache compilationInfoCache; - - public CloseableFilterableJavaFileObjectIterable( - CompilationInfoCache compilationInfoCache, String packageNameFilter, - boolean includeSubpackages) { - if (packageNameFilter != null && packageNameFilter.contains(File.separator)) { - throw new IllegalArgumentException( - "Package name filters should use dots to separate components: " - + packageNameFilter); - } - this.compilationInfoCache = compilationInfoCache; - // Normalize filter to forward slashes - this.packageNameFilter = packageNameFilter == null ? null - : packageNameFilter.replace('.', '/') + '/'; - this.includeSubpackages = includeSubpackages; - } - - /** - * Used by subclasses to check values against any specified constraints. - * @param name the name to check against the criteria - * @return true if the name is a valid iterator result based on the specified criteria - */ - protected boolean accept(String name) { - // logger.debug("checking {} against constraints packageNameFilter={} - // includeSubpackages={}",name,packageNameFilter,includeSubpackages); - if (!name.endsWith(".class")) { - return false; - } - if (this.packageNameFilter == null) { - return true; - } - boolean accept; - // Normalize to forward slashes (some jars are producing paths with forward - // slashes, some with backward slashes) - name = name.replace('\\', '/'); - if (this.packageNameFilter.length() == 1 && this.packageNameFilter.equals("/")) { - // This is the 'default package' filter representation - if (name.indexOf('/') == -1) { - accept = true; - } - else if (BOOT_PACKAGING_AWARE) { - accept = name.startsWith(BOOT_PACKAGING_PREFIX_FOR_CLASSES) && name - .indexOf('/', BOOT_PACKAGING_PREFIX_FOR_CLASSES.length()) == -1; - } - return accept; - } - if (this.includeSubpackages) { - accept = name.startsWith(this.packageNameFilter); - if (!accept && BOOT_PACKAGING_AWARE) { - accept = name.startsWith(BOOT_PACKAGING_PREFIX_FOR_CLASSES) - && name.indexOf( - this.packageNameFilter) == BOOT_PACKAGING_PREFIX_FOR_CLASSES - .length(); - } - } - else { - accept = name.startsWith(this.packageNameFilter) - && name.indexOf("/", this.packageNameFilter.length()) == -1; - if (!accept && BOOT_PACKAGING_AWARE) { - accept = name.startsWith(BOOT_PACKAGING_PREFIX_FOR_CLASSES) - && name.indexOf( - this.packageNameFilter) == BOOT_PACKAGING_PREFIX_FOR_CLASSES - .length() - && name.indexOf("/", BOOT_PACKAGING_PREFIX_FOR_CLASSES.length() - + this.packageNameFilter.length()) == -1; - } - } - return accept; - } - - abstract void close(); - - abstract void reset(); - -} diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/CompilationFailedException.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/CompilationFailedException.java deleted file mode 100644 index 503e7a0c6..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/CompilationFailedException.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 org.springframework.cloud.function.compiler.java; - -import java.util.List; - -/** - * @author Mark Fisher - */ -@SuppressWarnings("serial") -public class CompilationFailedException extends RuntimeException { - - public CompilationFailedException(List messages) { - super(consolidateMessages(messages)); - } - - private static String consolidateMessages(List messages) { - if (messages == null || messages.isEmpty()) { - return ""; - } - StringBuilder sb = new StringBuilder(); - for (CompilationMessage message : messages) { - sb.append(message.toString()); - } - return sb.toString(); - } - -} diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/CompilationMessage.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/CompilationMessage.java deleted file mode 100644 index bd3bcc933..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/CompilationMessage.java +++ /dev/null @@ -1,137 +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 org.springframework.cloud.function.compiler.java; - -/** - * Encapsulate information produced during compilation. A message may be an error or - * something less serious (warning/informational). The toString() method will - * produce a formatted error include source context indicating the precise location of the - * problem. - * - * @author Andy Clement - */ -public class CompilationMessage { - - private Kind kind; - - private String message; - - private String sourceCode; - - private int startPosition; - - private int endPosition; - - public CompilationMessage(Kind kind, String message, String sourceCode, - int startPosition, int endPosition) { - this.kind = kind; - this.message = message; - this.sourceCode = sourceCode; - this.startPosition = startPosition; - this.endPosition = endPosition; - } - - /** - * @return the type of message - */ - public Kind getKind() { - return this.kind; - } - - /** - * @return the message text - */ - public String getMessage() { - return this.message; - } - - /** - * @return the source code for the file associated with the message - */ - public String getSourceCode() { - return this.sourceCode; - } - - /** - * @return offset from start of source file where the error begins - */ - public int getStartPosition() { - return this.startPosition; - } - - /** - * @return offset from start of source file where the error ends - */ - public int getEndPosition() { - return this.endPosition; - } - - public String toString() { - StringBuilder s = new StringBuilder(); - s.append("==========\n"); - if (this.sourceCode != null) { // Cannot include source context if no source - // available - int[] lineStartEnd = getLineStartEnd(this.startPosition); - s.append(this.sourceCode.substring(lineStartEnd[0], lineStartEnd[1])) - .append("\n"); - int col = lineStartEnd[0]; - // When inserting the whitespace, ensure tabs in the source line are respected - while ((col) < this.startPosition) { - s.append(this.sourceCode.charAt(col++) == '\t' ? "\t" : " "); - } - // Want at least one ^ - s.append("^"); - col++; - while ((col++) < this.endPosition) { - s.append("^"); - } - s.append("\n"); - } - s.append(this.kind).append(":").append(this.message).append("\n"); - s.append("==========\n"); - return s.toString(); - } - - /** - * For a given position in the source code this method returns a pair of int that - * indicate the start and end of the line within the source code that contain the - * position. - * @param searchPos the position of interest in the source code - * @return an int array of length 2 containing the start and end positions of the line - */ - private int[] getLineStartEnd(int searchPos) { - int previousPos = -1; - int pos = 0; - do { - pos = this.sourceCode.indexOf('\n', previousPos + 1); - if (searchPos < pos) { - return new int[] { previousPos + 1, pos }; - } - previousPos = pos; - } - while (pos != -1); - return new int[] { previousPos + 1, this.sourceCode.length() }; - } - - enum Kind { - - ERROR, OTHER - - } - // TODO test coverage for first line/last line situations - -} diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/CompilationOutputCollector.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/CompilationOutputCollector.java deleted file mode 100644 index 2dfe424b6..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/CompilationOutputCollector.java +++ /dev/null @@ -1,72 +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 org.springframework.cloud.function.compiler.java; - -import java.util.ArrayList; -import java.util.List; - -import javax.tools.FileObject; -import javax.tools.JavaFileManager.Location; -import javax.tools.JavaFileObject.Kind; - -/** - * During compilation instances of this class will collect up the output files from the - * compilation process. Any kind of file is collected upon but access is only currently - * provided to retrieve classes produced during compilation. Annotation processors that - * run may create other kinds of artifact. - * - * @author Andy Clement - */ -public class CompilationOutputCollector { - - private List outputFiles = new ArrayList<>(); - - /** - * Retrieve compiled classes that have been collected since this collector was built. - * Due to annotation processing it is possible other source files or metadata files - * may be produced during compilation - those are not included in the returned list. - * @return list of compiled classes - */ - public List getCompiledClasses() { - List compiledClassDefinitions = new ArrayList<>(); - for (InMemoryJavaFileObject outputFile : this.outputFiles) { - if (outputFile.getKind() == Kind.CLASS) { - CompiledClassDefinition compiledClassDefinition = new CompiledClassDefinition( - outputFile.getName(), outputFile.getBytes()); - compiledClassDefinitions.add(compiledClassDefinition); - } - } - return compiledClassDefinitions; - } - - public InMemoryJavaFileObject getJavaFileForOutput(Location location, - String className, Kind kind, FileObject sibling) { - InMemoryJavaFileObject jfo = InMemoryJavaFileObject.getJavaFileObject(location, - className, kind, sibling); - this.outputFiles.add(jfo); - return jfo; - } - - public InMemoryJavaFileObject getFileForOutput(Location location, String packageName, - String relativeName, FileObject sibling) { - InMemoryJavaFileObject ojfo = InMemoryJavaFileObject.getFileObject(location, - packageName, relativeName, sibling); - this.outputFiles.add(ojfo); - return ojfo; - } - -} diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/CompilationResult.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/CompilationResult.java deleted file mode 100644 index 373ecb80c..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/CompilationResult.java +++ /dev/null @@ -1,101 +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 org.springframework.cloud.function.compiler.java; - -import java.io.File; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Holder for the results of compilation. If compilation was successful the set of classes - * that resulted from compilation will be available. If compilation was not successful the - * error messages should provide information about why. Note that compilation may succeed - * and yet there will still be informational or warning messages collected. - * - * @author Andy Clement - * @author Mark Fisher - */ -public class CompilationResult { - - List compilationMessages = new ArrayList<>(); - - List> compiledClasses = new ArrayList<>(); - - private boolean successfulCompilation; - - private Map classBytes = new HashMap<>(); - - private List resolvedAdditionalDependencies = new ArrayList<>(); - - public CompilationResult(boolean successfulCompilation) { - this.successfulCompilation = successfulCompilation; - } - - public void addClassBytes(String name, byte[] bytes) { - this.classBytes.put(name, bytes); - } - - public List getResolvedAdditionalDependencies() { - return this.resolvedAdditionalDependencies; - } - - public void setResolvedAdditionalDependencies( - List resolvedAdditionalDependencies) { - this.resolvedAdditionalDependencies = resolvedAdditionalDependencies; - } - - public byte[] getClassBytes(String classname) { - return this.classBytes.get(classname); - } - - public boolean wasSuccessful() { - return this.successfulCompilation; - } - - public List> getCompiledClasses() { - return this.compiledClasses; - } - - public void setCompiledClasses(List> compiledClasses) { - this.compiledClasses = compiledClasses; - } - - public List getCompilationMessages() { - return Collections.unmodifiableList(this.compilationMessages); - } - - public void recordCompilationMessage(CompilationMessage message) { - this.compilationMessages.add(message); - } - - public void recordCompilationMessages(List messages) { - this.compilationMessages.addAll(messages); - } - - public String toString() { - StringBuilder s = new StringBuilder(); - s.append("Compilation result: #classes=" + this.compiledClasses.size() - + " #messages=" + this.compilationMessages.size() + "\n"); - s.append("Compiled classes:\n").append(this.compiledClasses).append("\n"); - s.append("Compilation messages:\n").append(this.compilationMessages).append("\n"); - return s.toString(); - } - -} diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/CompiledClassDefinition.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/CompiledClassDefinition.java deleted file mode 100644 index 9502f5ff9..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/CompiledClassDefinition.java +++ /dev/null @@ -1,63 +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 org.springframework.cloud.function.compiler.java; - -/** - * Encapsulates a name with the bytes for its class definition. - * - * @author Andy Clement - */ -public class CompiledClassDefinition { - - private byte[] bytes; - - private String filename; - - private String classname; - - public CompiledClassDefinition(String filename, byte[] bytes) { - this.filename = filename; - this.bytes = bytes; - this.classname = filename; - if (this.classname.startsWith("/")) { - this.classname = this.classname.substring(1); - } - this.classname = this.classname.replace('/', '.').substring(0, - this.classname.length() - 6); // strip - // off - // .class - } - - public String getName() { - return this.filename; - } - - public byte[] getBytes() { - return this.bytes; - } - - @Override - public String toString() { - return "CompiledClassDefinition(name=" + getName() + ",#bytes=" - + getBytes().length + ")"; - } - - public String getClassName() { - return this.classname; - } - -} diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/CompositeProxySelector.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/CompositeProxySelector.java deleted file mode 100644 index 0e3cc7f4d..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/CompositeProxySelector.java +++ /dev/null @@ -1,50 +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 org.springframework.cloud.function.compiler.java; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.aether.repository.Proxy; -import org.eclipse.aether.repository.ProxySelector; -import org.eclipse.aether.repository.RemoteRepository; - -/** - * Composite {@link ProxySelector}. - * - * @author Dave Syer - */ -public class CompositeProxySelector implements ProxySelector { - - private List selectors = new ArrayList(); - - public CompositeProxySelector(List selectors) { - this.selectors = selectors; - } - - @Override - public Proxy getProxy(RemoteRepository repository) { - for (ProxySelector selector : this.selectors) { - Proxy proxy = selector.getProxy(repository); - if (proxy != null) { - return proxy; - } - } - return null; - } - -} diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/DependencyResolver.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/DependencyResolver.java deleted file mode 100644 index a7ee52c50..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/DependencyResolver.java +++ /dev/null @@ -1,485 +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 org.springframework.cloud.function.compiler.java; - -import java.io.BufferedInputStream; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Date; -import java.util.HashSet; -import java.util.List; -import java.util.Properties; -import java.util.Set; - -import javax.inject.Singleton; - -import com.google.inject.AbstractModule; -import com.google.inject.Provides; -import com.google.inject.name.Named; -import com.google.inject.name.Names; -import org.apache.maven.artifact.repository.ArtifactRepository; -import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy; -import org.apache.maven.artifact.repository.MavenArtifactRepository; -import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout; -import org.apache.maven.model.Model; -import org.apache.maven.model.io.DefaultModelReader; -import org.apache.maven.model.io.ModelReader; -import org.apache.maven.model.locator.DefaultModelLocator; -import org.apache.maven.model.locator.ModelLocator; -import org.apache.maven.model.validation.DefaultModelValidator; -import org.apache.maven.model.validation.ModelValidator; -import org.apache.maven.project.DefaultProjectBuildingRequest; -import org.apache.maven.project.DependencyResolutionResult; -import org.apache.maven.project.ProjectBuilder; -import org.apache.maven.project.ProjectBuildingException; -import org.apache.maven.project.ProjectBuildingRequest; -import org.apache.maven.project.ProjectBuildingRequest.RepositoryMerging; -import org.apache.maven.project.ProjectBuildingResult; -import org.apache.maven.repository.internal.DefaultArtifactDescriptorReader; -import org.apache.maven.repository.internal.DefaultVersionRangeResolver; -import org.apache.maven.repository.internal.DefaultVersionResolver; -import org.apache.maven.repository.internal.MavenRepositorySystemUtils; -import org.apache.maven.repository.internal.SnapshotMetadataGeneratorFactory; -import org.apache.maven.repository.internal.VersionsMetadataGeneratorFactory; -import org.apache.maven.settings.Profile; -import org.apache.maven.settings.Repository; -import org.codehaus.plexus.ContainerConfiguration; -import org.codehaus.plexus.DefaultContainerConfiguration; -import org.codehaus.plexus.DefaultPlexusContainer; -import org.codehaus.plexus.MutablePlexusContainer; -import org.codehaus.plexus.PlexusConstants; -import org.codehaus.plexus.PlexusContainer; -import org.codehaus.plexus.classworlds.ClassWorld; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.impl.ArtifactDescriptorReader; -import org.eclipse.aether.impl.MetadataGeneratorFactory; -import org.eclipse.aether.impl.VersionRangeResolver; -import org.eclipse.aether.impl.VersionResolver; -import org.eclipse.aether.impl.guice.AetherModule; -import org.eclipse.aether.repository.LocalRepository; -import org.eclipse.aether.repository.NoLocalRepositoryManagerException; -import org.eclipse.aether.repository.ProxySelector; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.repository.RepositoryPolicy; -import org.eclipse.aether.resolution.ArtifactRequest; -import org.eclipse.aether.resolution.ArtifactResult; -import org.eclipse.aether.spi.connector.RepositoryConnectorFactory; -import org.eclipse.aether.spi.connector.transport.TransporterFactory; -import org.eclipse.aether.spi.localrepo.LocalRepositoryManagerFactory; -import org.eclipse.aether.transport.file.FileTransporterFactory; -import org.eclipse.aether.transport.http.HttpTransporterFactory; -import org.eclipse.aether.util.repository.JreProxySelector; -import org.eclipse.sisu.inject.DefaultBeanLocator; -import org.eclipse.sisu.plexus.ClassRealmManager; - -import org.springframework.core.io.Resource; -import org.springframework.util.StringUtils; - -/** - * Dependency resolver utility class. - * - * @author Andy Clement - */ -public final class DependencyResolver { - - private static DependencyResolver instance = new DependencyResolver(); - - private static Properties globals; - - private final Object lock = new Object(); - - private LocalRepositoryManagerFactory localRepositoryManagerFactory; - - private PlexusContainer container; - - private ProjectBuilder projectBuilder; - - private RepositorySystem repositorySystem; - - private MavenSettings settings; - - private DependencyResolver() { - } - - public static DependencyResolver instance() { - return instance; - } - - public static void close() { - instance = new DependencyResolver(); - } - - static Properties getGlobals() { - return globals; - } - - private void initialize() { - if (this.container == null) { - synchronized (this.lock) { - if (this.container == null) { - ClassWorld classWorld = new ClassWorld("plexus.core", - Thread.currentThread().getContextClassLoader()); - ContainerConfiguration config = new DefaultContainerConfiguration() - .setClassWorld(classWorld) - .setRealm(classWorld.getClassRealm("plexus.core")) - .setClassPathScanning(PlexusConstants.SCANNING_INDEX) - .setAutoWiring(true).setName("maven"); - PlexusContainer container; - try { - container = new DefaultPlexusContainer(config, new AetherModule(), - new DependencyResolutionModule()); - this.localRepositoryManagerFactory = container - .lookup(LocalRepositoryManagerFactory.class); - container.addComponent( - new ClassRealmManager((MutablePlexusContainer) container, - new DefaultBeanLocator()), - ClassRealmManager.class.getName()); - this.projectBuilder = container.lookup(ProjectBuilder.class); - this.repositorySystem = container.lookup(RepositorySystem.class); - } - catch (Exception e) { - throw new IllegalStateException("Cannot create container", e); - } - this.container = container; - this.settings = new MavenSettingsReader().readSettings(); - } - } - } - } - - public List dependencies(Resource resource) { - return dependencies(resource, new Properties()); - } - - public List dependencies(final Resource resource, - final Properties properties) { - initialize(); - try { - ProjectBuildingRequest request = getProjectBuildingRequest(properties); - request.setResolveDependencies(true); - synchronized (DependencyResolver.class) { - ProjectBuildingResult result = this.projectBuilder - .build(new PropertiesModelSource(properties, resource), request); - DependencyResolver.globals = null; - DependencyResolutionResult dependencies = result - .getDependencyResolutionResult(); - if (!dependencies.getUnresolvedDependencies().isEmpty()) { - StringBuilder builder = new StringBuilder(); - for (Dependency dependency : dependencies - .getUnresolvedDependencies()) { - List errors = dependencies - .getResolutionErrors(dependency); - for (Exception exception : errors) { - if (builder.length() > 0) { - builder.append("\n"); - } - builder.append(exception.getMessage()); - } - } - throw new RuntimeException(builder.toString()); - } - return runtime(dependencies.getDependencies()); - } - } - catch (ProjectBuildingException | NoLocalRepositoryManagerException e) { - throw new IllegalStateException("Cannot build model", e); - } - } - - public File resolve(Dependency dependency) { - initialize(); - return collectNonTransitive(Arrays.asList(dependency)).iterator().next() - .getArtifact().getFile(); - } - - private List runtime(List dependencies) { - List list = new ArrayList<>(); - for (Dependency dependency : dependencies) { - if (!"test".equals(dependency.getScope()) - && !"provided".equals(dependency.getScope())) { - list.add(dependency); - } - } - return list; - } - - private ProjectBuildingRequest getProjectBuildingRequest(Properties properties) - throws NoLocalRepositoryManagerException { - DefaultProjectBuildingRequest projectBuildingRequest = new DefaultProjectBuildingRequest(); - DefaultRepositorySystemSession session = createSession(properties); - projectBuildingRequest.setRepositoryMerging(RepositoryMerging.REQUEST_DOMINANT); - projectBuildingRequest.setRemoteRepositories(mavenRepositories(properties)); - projectBuildingRequest.getRemoteRepositories() - .addAll(mavenRepositories(this.settings)); - projectBuildingRequest.setRepositorySession(session); - projectBuildingRequest.setProcessPlugins(false); - projectBuildingRequest.setBuildStartTime(new Date()); - projectBuildingRequest.setUserProperties(properties); - projectBuildingRequest.setSystemProperties(System.getProperties()); - return projectBuildingRequest; - } - - private Collection mavenRepositories( - MavenSettings settings) { - List list = new ArrayList<>(); - for (Profile profile : settings.getActiveProfiles()) { - for (Repository repository : profile.getRepositories()) { - addRepositoryIfMissing(list, repository.getId(), repository.getUrl(), - repository.getReleases() != null - ? repository.getReleases().isEnabled() : true, - repository.getSnapshots() != null - ? repository.getSnapshots().isEnabled() : false); - } - } - return list; - } - - private List mavenRepositories(Properties properties) { - List list = new ArrayList<>(); - addRepositoryIfMissing(list, "spring-snapshots", - "https://repo.spring.io/libs-snapshot", true, true); - addRepositoryIfMissing(list, "central", "https://repo1.maven.org/maven2", true, - false); - return list; - } - - private List aetherRepositories(Properties properties) { - List list = new ArrayList<>(); - for (ArtifactRepository input : mavenRepositories(properties)) { - list.add(remote(input)); - } - return list; - } - - private RemoteRepository remote(ArtifactRepository input) { - return new RemoteRepository.Builder(input.getId(), input.getLayout().getId(), - input.getUrl()).setSnapshotPolicy(policy(input.getSnapshots())) - .setReleasePolicy(policy(input.getReleases())).build(); - } - - private RepositoryPolicy policy(ArtifactRepositoryPolicy input) { - RepositoryPolicy policy = new RepositoryPolicy(input.isEnabled(), - RepositoryPolicy.UPDATE_POLICY_DAILY, - RepositoryPolicy.CHECKSUM_POLICY_WARN); - return policy; - } - - private void addRepositoryIfMissing(List list, String id, - String url, boolean releases, boolean snapshots) { - for (ArtifactRepository repo : list) { - if (url.equals(repo.getUrl())) { - return; - } - if (id.equals(repo.getId())) { - return; - } - } - list.add(repo(id, url, releases, snapshots)); - } - - private ArtifactRepository repo(String id, String url, boolean releases, - boolean snapshots) { - MavenArtifactRepository repository = new MavenArtifactRepository(); - repository.setLayout(new DefaultRepositoryLayout()); - repository.setId(id); - repository.setUrl(url); - ArtifactRepositoryPolicy enabled = new ArtifactRepositoryPolicy(); - enabled.setEnabled(true); - ArtifactRepositoryPolicy disabled = new ArtifactRepositoryPolicy(); - disabled.setEnabled(false); - repository.setReleaseUpdatePolicy(releases ? enabled : disabled); - repository.setSnapshotUpdatePolicy(snapshots ? enabled : disabled); - return repository; - } - - private DefaultRepositorySystemSession createSession(Properties properties) - throws NoLocalRepositoryManagerException { - DefaultRepositorySystemSession session = MavenRepositorySystemUtils.newSession(); - LocalRepository repository = localRepository(properties); - session.setLocalRepositoryManager( - this.localRepositoryManagerFactory.newInstance(session, repository)); - applySettings(session); - ProxySelector existing = session.getProxySelector(); - if (existing == null || !(existing instanceof CompositeProxySelector)) { - JreProxySelector fallback = new JreProxySelector(); - ProxySelector selector = existing == null ? fallback - : new CompositeProxySelector(Arrays.asList(existing, fallback)); - session.setProxySelector(selector); - } - return session; - } - - private void applySettings(DefaultRepositorySystemSession session) { - MavenSettingsReader.applySettings(this.settings, session); - } - - private LocalRepository localRepository(Properties properties) { - return new LocalRepository(getM2RepoDirectory()); - } - - public Model readModel(Resource resource) { - return readModel(resource, new Properties()); - } - - public Model readModel(final Resource resource, final Properties properties) { - initialize(); - try { - ProjectBuildingRequest request = getProjectBuildingRequest(properties); - request.setResolveDependencies(false); - ProjectBuildingResult result = this.projectBuilder - .build(new PropertiesModelSource(properties, resource), request); - return result.getProject().getModel(); - } - catch (Exception e) { - throw new IllegalStateException("Failed to build model from effective pom", - e); - } - } - - private File getM2RepoDirectory() { - return new File(getDefaultM2HomeDirectory(), "repository"); - } - - private File getDefaultM2HomeDirectory() { - String mavenRoot = System.getProperty("maven.home"); - if (StringUtils.hasLength(mavenRoot)) { - return new File(mavenRoot); - } - return new File(System.getProperty("user.home"), ".m2"); - } - - private List collectNonTransitive(List dependencies) { - try { - List artifactRequests = getArtifactRequests(dependencies); - List result = this.repositorySystem - .resolveArtifacts(createSession(new Properties()), artifactRequests); - return result; - } - catch (Exception ex) { - throw new IllegalStateException(ex); - } - } - - private List getArtifactRequests(List dependencies) { - List list = new ArrayList<>(); - for (Dependency dependency : dependencies) { - ArtifactRequest request = new ArtifactRequest(dependency.getArtifact(), null, - null); - request.setRepositories(aetherRepositories(new Properties())); - list.add(request); - } - return list; - } - - @SuppressWarnings("deprecation") - private static final class PropertiesModelSource - implements org.apache.maven.model.building.ModelSource { - - private final Properties properties; - - private final Resource resource; - - private PropertiesModelSource(Properties properties, Resource resource) { - this.properties = properties; - this.resource = resource; - } - - @Override - public InputStream getInputStream() throws IOException { - DependencyResolver.globals = this.properties; - return new BufferedInputStream(this.resource.getInputStream()) { - @Override - public void close() throws IOException { - DependencyResolver.globals = null; - super.close(); - } - }; - } - - @Override - public String getLocation() { - return this.resource.getDescription(); - } - - } - -} - -class DependencyResolutionModule extends AbstractModule { - - @Override - protected void configure() { - bind(ModelLocator.class).to(DefaultModelLocator.class).in(Singleton.class); - bind(ModelReader.class).to(DefaultModelReader.class).in(Singleton.class); - bind(ModelValidator.class).to(DefaultModelValidator.class).in(Singleton.class); - bind(RepositoryConnectorFactory.class).to(BasicRepositoryConnectorFactory.class) - .in(Singleton.class); - bind(ArtifactDescriptorReader.class) // - .to(DefaultArtifactDescriptorReader.class).in(Singleton.class); - bind(VersionResolver.class) // - .to(DefaultVersionResolver.class).in(Singleton.class); - bind(VersionRangeResolver.class) // - .to(DefaultVersionRangeResolver.class).in(Singleton.class); - bind(MetadataGeneratorFactory.class).annotatedWith(Names.named("snapshot")) // - .to(SnapshotMetadataGeneratorFactory.class).in(Singleton.class); - bind(MetadataGeneratorFactory.class).annotatedWith(Names.named("versions")) // - .to(VersionsMetadataGeneratorFactory.class).in(Singleton.class); - bind(TransporterFactory.class).annotatedWith(Names.named("http")) - .to(HttpTransporterFactory.class).in(Singleton.class); - bind(TransporterFactory.class).annotatedWith(Names.named("file")) - .to(FileTransporterFactory.class).in(Singleton.class); - } - - @Provides - @Singleton - Set provideMetadataGeneratorFactories( - @Named("snapshot") MetadataGeneratorFactory snapshot, - @Named("versions") MetadataGeneratorFactory versions) { - Set factories = new HashSet<>(); - factories.add(snapshot); - factories.add(versions); - return Collections.unmodifiableSet(factories); - } - - @Provides - @Singleton - Set provideRepositoryConnectorFactories( - RepositoryConnectorFactory factory) { - return Collections.singleton(factory); - } - - @Provides - @Singleton - Set provideTransporterFactories( - @Named("file") TransporterFactory file, - @Named("http") TransporterFactory http) { - // Order is decided elsewhere (by priority) - Set factories = new HashSet(); - factories.add(file); - factories.add(http); - return Collections.unmodifiableSet(factories); - } - -} diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/DirEntryJavaFileObject.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/DirEntryJavaFileObject.java deleted file mode 100644 index c4557ddff..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/DirEntryJavaFileObject.java +++ /dev/null @@ -1,143 +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 org.springframework.cloud.function.compiler.java; - -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.Reader; -import java.io.Writer; -import java.net.URI; - -import javax.lang.model.element.Modifier; -import javax.lang.model.element.NestingKind; -import javax.tools.JavaFileObject; - -/** - * A JavaFileObject that represents a file in a directory. - * - * @author Andy Clement - */ -public class DirEntryJavaFileObject implements JavaFileObject { - - private File file; - - private File basedir; - - public DirEntryJavaFileObject(File basedir, File file) { - this.basedir = basedir; - this.file = file; - } - - @Override - public URI toUri() { - return this.file.toURI(); - } - - /** - * @return the path of the file relative to the base directory, for example: - * a/b/c/D.class - */ - @Override - public String getName() { - String basedirPath = this.basedir.getPath(); - String filePath = this.file.getPath(); - return filePath.substring(basedirPath.length() + 1); - } - - @Override - public InputStream openInputStream() throws IOException { - return new FileInputStream(this.file); - } - - @Override - public OutputStream openOutputStream() throws IOException { - throw new IllegalStateException("Only expected to be used for input"); - } - - @Override - public Reader openReader(boolean ignoreEncodingErrors) throws IOException { - // It is bytecode - throw new UnsupportedOperationException( - "openReader() not supported on class file: " + getName()); - } - - @Override - public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException { - // It is bytecode - throw new UnsupportedOperationException( - "getCharContent() not supported on class file: " + getName()); - } - - @Override - public Writer openWriter() throws IOException { - throw new IllegalStateException("only expected to be used for input"); - } - - @Override - public long getLastModified() { - return this.file.lastModified(); - } - - @Override - public boolean delete() { - return false; // This object is for read only access to a class - } - - @Override - public Kind getKind() { - return Kind.CLASS; - } - - @Override - public boolean isNameCompatible(String simpleName, Kind kind) { - if (kind != Kind.CLASS) { - return false; - } - String name = getName(); - int lastSlash = name.lastIndexOf('/'); - return name.substring(lastSlash + 1).equals(simpleName + ".class"); - } - - @Override - public NestingKind getNestingKind() { - return null; - } - - @Override - public Modifier getAccessLevel() { - return null; - } - - @Override - public int hashCode() { - return this.file.getName().hashCode() * 37 + this.basedir.getName().hashCode(); - } - - @Override - public boolean equals(Object obj) { - if (!(obj instanceof DirEntryJavaFileObject)) { - return false; - } - DirEntryJavaFileObject that = (DirEntryJavaFileObject) obj; - return (this.basedir.getName().equals(that.basedir.getName())) - && (this.file.getName().equals(that.file.getName())); - } - -} diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/DirEnumeration.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/DirEnumeration.java deleted file mode 100644 index 48017ea84..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/DirEnumeration.java +++ /dev/null @@ -1,112 +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 org.springframework.cloud.function.compiler.java; - -import java.io.File; -import java.util.ArrayList; -import java.util.Enumeration; -import java.util.List; -import java.util.NoSuchElementException; - -/** - * Walks a directory hierarchy from some base directory discovering files. - * - * @author Andy Clement - */ -public class DirEnumeration implements Enumeration { - - // The starting point - private File basedir; - - // Candidates collected so far - private List filesToReturn; - - // Places still to explore for candidates - private List directoriesToExplore; - - public DirEnumeration(File basedir) { - this.basedir = basedir; - } - - private void computeValue() { - if (this.filesToReturn == null) { // Indicates we haven't started yet - this.filesToReturn = new ArrayList<>(); - this.directoriesToExplore = new ArrayList<>(); - visitDirectory(this.basedir); - } - if (this.filesToReturn.size() == 0) { - while (this.filesToReturn.size() == 0 - && this.directoriesToExplore.size() != 0) { - File nextDir = this.directoriesToExplore.get(0); - this.directoriesToExplore.remove(0); - visitDirectory(nextDir); - } - } - } - - @Override - public boolean hasMoreElements() { - computeValue(); - return this.filesToReturn.size() != 0; - } - - @Override - public File nextElement() { - computeValue(); - if (this.filesToReturn.size() == 0) { - throw new NoSuchElementException(); - } - File toReturn = this.filesToReturn.get(0); - this.filesToReturn.remove(0); - return toReturn; - } - - private void visitDirectory(File dir) { - File[] files = dir.listFiles(); - if (files != null) { - for (File file : files) { - if (file.isDirectory()) { - this.directoriesToExplore.add(file); - } - else { - this.filesToReturn.add(file); - } - } - } - } - - public File getDirectory() { - return this.basedir; - } - - /** - * Return the relative path of this file to the base directory that the directory - * enumeration was started for. - * @param file a file discovered returned by this enumeration - * @return the relative path of the file (for example: a/b/c/D.class) - */ - public String getName(File file) { - String basedirPath = this.basedir.getPath(); - String filePath = file.getPath(); - if (!filePath.startsWith(basedirPath)) { - throw new IllegalStateException("The file '" + filePath - + "' is not nested below the base directory '" + basedirPath + "'"); - } - return filePath.substring(basedirPath.length() + 1); - } - -} diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/InMemoryJavaFileObject.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/InMemoryJavaFileObject.java deleted file mode 100644 index 5203fb374..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/InMemoryJavaFileObject.java +++ /dev/null @@ -1,239 +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 org.springframework.cloud.function.compiler.java; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.CharArrayWriter; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.io.Reader; -import java.io.Writer; -import java.net.URI; -import java.net.URISyntaxException; -import java.nio.charset.Charset; - -import javax.lang.model.element.Modifier; -import javax.lang.model.element.NestingKind; -import javax.tools.FileObject; -import javax.tools.JavaFileManager.Location; -import javax.tools.JavaFileObject; -import javax.tools.StandardLocation; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * A JavaFileObject that represents a source artifact created for compilation or an output - * artifact producing during compilation (a .class file or some other thing if an - * annotation processor has run). In order to be clear what it is being used for there are - * static factory methods that ask for specific types of file. - * - * @author Andy Clement - */ -public final class InMemoryJavaFileObject implements JavaFileObject { - - private final static Logger logger = LoggerFactory - .getLogger(InMemoryJavaFileObject.class); - - private Location location; - - private String packageName; - - private String relativeName; - - private FileObject sibling; - - private String className; - - private Kind kind; - - private byte[] content = null; - - private long lastModifiedTime = 0; - - private URI uri = null; - - private InMemoryJavaFileObject() { - } - - public static InMemoryJavaFileObject getFileObject(Location location, - String packageName, String relativeName, FileObject sibling) { - InMemoryJavaFileObject retval = new InMemoryJavaFileObject(); - retval.kind = Kind.OTHER; - retval.location = location; - retval.packageName = packageName; - retval.relativeName = relativeName; - retval.sibling = sibling; - return retval; - } - - public static InMemoryJavaFileObject getJavaFileObject(Location location, - String className, Kind kind, FileObject sibling) { - InMemoryJavaFileObject retval = new InMemoryJavaFileObject(); - retval.location = location; - retval.className = className; - retval.kind = kind; - retval.sibling = sibling; - return retval; - } - - public static InMemoryJavaFileObject getSourceJavaFileObject(String className, - String content) { - InMemoryJavaFileObject retval = new InMemoryJavaFileObject(); - retval.location = StandardLocation.SOURCE_PATH; - retval.className = className; - retval.kind = Kind.SOURCE; - retval.content = content.getBytes(); - return retval; - } - - public byte[] getBytes() { - return this.content; - } - - public String toString() { - return "OutputJavaFileObject: Location=" + this.location + ",className=" - + this.className + ",kind=" + this.kind + ",relativeName=" - + this.relativeName + ",sibling=" + this.sibling + ",packageName=" - + this.packageName; - } - - @Override - public URI toUri() { - // These memory based output files 'pretend' to be relative to the file system - // root - if (this.uri == null) { - String name = null; - if (this.className != null) { - name = this.className.replace('.', '/'); - } - else if (this.packageName != null && this.packageName.length() != 0) { - name = this.packageName.replace('.', '/') + '/' + this.relativeName; - } - else { - name = this.relativeName; - } - - String uriString = null; - try { - uriString = "file:/" + name + this.kind.extension; - this.uri = new URI(uriString); - } - catch (URISyntaxException e) { - throw new IllegalStateException( - "Unexpected URISyntaxException for string '" + uriString + "'", - e); - } - } - return this.uri; - } - - @Override - public String getName() { - return toUri().getPath(); - } - - @Override - public InputStream openInputStream() throws IOException { - if (this.content == null) { - throw new FileNotFoundException(); - } - logger.debug("opening input stream for {}", getName()); - return new ByteArrayInputStream(this.content); - } - - @Override - public OutputStream openOutputStream() throws IOException { - logger.debug("opening output stream for {}", getName()); - return new ByteArrayOutputStream() { - @Override - public void close() throws IOException { - super.close(); - InMemoryJavaFileObject.this.lastModifiedTime = System.currentTimeMillis(); - InMemoryJavaFileObject.this.content = this.toByteArray(); - } - }; - } - - @Override - public Reader openReader(boolean ignoreEncodingErrors) throws IOException { - return new InputStreamReader(openInputStream(), Charset.defaultCharset()); - } - - @Override - public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException { - if (this.kind != Kind.SOURCE) { - throw new UnsupportedOperationException( - "getCharContent() not supported on file object: " + getName()); - } - // Not yet supporting encodings - return (this.content == null ? null : new String(this.content)); - } - - @Override - public Writer openWriter() throws IOException { - // Let's not enforce this restriction right now - // if (kind == Kind.CLASS) { - // throw new UnsupportedOperationException("openWriter() not supported on file - // object: " + getName()); - // } - return new CharArrayWriter() { - @Override - public void close() { - InMemoryJavaFileObject.this.lastModifiedTime = System.currentTimeMillis(); - InMemoryJavaFileObject.this.content = new String(toCharArray()) - .getBytes(); // Ignoring encoding... - } - }; - } - - @Override - public long getLastModified() { - return this.lastModifiedTime; - } - - @Override - public boolean delete() { - return false; - } - - @Override - public Kind getKind() { - return this.kind; - } - - public boolean isNameCompatible(String simpleName, Kind kind) { - String baseName = simpleName + kind.extension; - return kind.equals(getKind()) && (baseName.equals(toUri().getPath()) - || toUri().getPath().endsWith("/" + baseName)); - } - - @Override - public NestingKind getNestingKind() { - return null; - } - - @Override - public Modifier getAccessLevel() { - return null; - } - -} diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/IterableClasspath.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/IterableClasspath.java deleted file mode 100644 index b10e7e0fa..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/IterableClasspath.java +++ /dev/null @@ -1,298 +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 org.springframework.cloud.function.compiler.java; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Enumeration; -import java.util.Iterator; -import java.util.List; -import java.util.NoSuchElementException; -import java.util.Stack; -import java.util.StringTokenizer; -import java.util.zip.ZipEntry; -import java.util.zip.ZipFile; -import java.util.zip.ZipInputStream; - -import javax.tools.JavaFileObject; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import org.springframework.cloud.function.compiler.java.MemoryBasedJavaFileManager.CompilationInfoCache; -import org.springframework.cloud.function.compiler.java.MemoryBasedJavaFileManager.CompilationInfoCache.ArchiveInfo; - -/** - * Iterable that will produce an iterator that returns classes found on a specified - * classpath that meet specified criteria. For jars it finds, the iterator will go into - * nested jars - this handles the situation with a spring boot uberjar. - * - * @author Andy Clement - */ -public class IterableClasspath extends CloseableFilterableJavaFileObjectIterable { - - private static Logger logger = LoggerFactory.getLogger(IterableClasspath.class); - - private List classpathEntries = new ArrayList<>(); - - private List openArchives = new ArrayList<>(); - - /** - * @param compilationInfoCache cache of info that may help accelerate compilation - * @param classpath a classpath of jars/directories - * @param packageNameFilter an optional package name if choosing to filter (e.g. - * com.example) - * @param includeSubpackages if true, include results in subpackages of the specified - * package filter - */ - IterableClasspath(CompilationInfoCache compilationInfoCache, String classpath, - String packageNameFilter, boolean includeSubpackages) { - super(compilationInfoCache, packageNameFilter, includeSubpackages); - StringTokenizer tokenizer = new StringTokenizer(classpath, File.pathSeparator); - while (tokenizer.hasMoreElements()) { - String nextEntry = tokenizer.nextToken(); - File f = new File(nextEntry); - if (f.exists()) { - // Skip iterating over archives that cannot possibly match the filter - if (this.packageNameFilter != null - && this.packageNameFilter.length() > 0) { - ArchiveInfo archiveInfo = compilationInfoCache.getArchiveInfoFor(f); - if (archiveInfo != null - && !archiveInfo.containsPackage(this.packageNameFilter, - this.includeSubpackages)) { - continue; - } - } - this.classpathEntries.add(f); - } - else { - logger.debug("path element does not exist {}", f); - } - } - } - - public void close() { - for (ZipFile openArchive : this.openArchives) { - try { - openArchive.close(); - } - catch (IOException ioe) { - logger.debug("Unexpected error closing archive {}", openArchive, ioe); - } - } - this.openArchives.clear(); - } - - public Iterator iterator() { - return new ClasspathEntriesIterator(); - } - - public void reset() { - close(); - } - - static class ZipEnumerator implements Enumeration { - - private ZipInputStream zis; - - private ZipEntry nextEntry = null; - - ZipEnumerator(ZipInputStream zis) { - this.zis = zis; - } - - @Override - public boolean hasMoreElements() { - try { - this.nextEntry = this.zis.getNextEntry(); - } - catch (IOException ioe) { - this.nextEntry = null; - } - return this.nextEntry != null; - } - - @Override - public ZipEntry nextElement() { - ZipEntry retval = this.nextEntry; - this.nextEntry = null; - return retval; - } - - } - - class ClasspathEntriesIterator implements Iterator { - - private int currentClasspathEntriesIndex = 0; - - // Walking one of three possible things: directory tree, zip, or Java runtime - // packaged in JDK9+ form - private File openDirectory = null; - - private DirEnumeration openDirectoryEnumeration = null; - - private ZipFile openArchive = null; - - private File openFile = null; - - private ZipEntry nestedZip = null; - - private Stack> openArchiveEnumeration = null; - - private File openJrt; - - private JrtFsEnumeration openJrtEnumeration = null; - - private JavaFileObject nextEntry = null; - - private void findNext() { - if (this.nextEntry == null) { - try { - while (this.openArchive != null || this.openDirectory != null - || this.openJrt != null - || this.currentClasspathEntriesIndex < IterableClasspath.this.classpathEntries - .size()) { - if (this.openArchive == null && this.openDirectory == null - && this.openJrt == null) { - // Open the next item - File nextFile = IterableClasspath.this.classpathEntries - .get(this.currentClasspathEntriesIndex); - if (nextFile.isDirectory()) { - this.openDirectory = nextFile; - this.openDirectoryEnumeration = new DirEnumeration( - nextFile); - } - else if (nextFile.getName().endsWith("jrt-fs.jar")) { - this.openJrt = nextFile; - this.openJrtEnumeration = new JrtFsEnumeration(nextFile, - null); - } - else { - this.openFile = nextFile; - this.openArchive = new ZipFile(nextFile); - IterableClasspath.this.openArchives.add(this.openArchive); - this.openArchiveEnumeration = new Stack>(); - this.openArchiveEnumeration - .push(this.openArchive.entries()); - } - this.currentClasspathEntriesIndex++; - } - if (this.openArchiveEnumeration != null) { - while (!this.openArchiveEnumeration.isEmpty()) { - while (this.openArchiveEnumeration.peek() - .hasMoreElements()) { - ZipEntry entry = this.openArchiveEnumeration.peek() - .nextElement(); - String entryName = entry.getName(); - if (accept(entryName)) { - if (this.nestedZip != null) { - this.nextEntry = new NestedZipEntryJavaFileObject( - this.openFile, this.openArchive, - this.nestedZip, entry); - } - else { - this.nextEntry = new ZipEntryJavaFileObject( - this.openFile, this.openArchive, - entry); - } - return; - } - else if (this.nestedZip == null - && entryName.startsWith( - MemoryBasedJavaFileManager.BOOT_PACKAGING_PREFIX_FOR_LIBRARIES) - && entryName.endsWith(".jar")) { - // nested jar in uber jar - logger.debug("opening nested archive {}", - entry.getName()); - ZipInputStream zis = new ZipInputStream( - this.openArchive.getInputStream(entry)); - Enumeration nestedZipEnumerator = new ZipEnumerator( - zis); - this.nestedZip = entry; - this.openArchiveEnumeration - .push(nestedZipEnumerator); - } - } - this.openArchiveEnumeration.pop(); - if (this.nestedZip == null) { - this.openArchive = null; - this.openFile = null; - } - else { - this.nestedZip = null; - } - } - this.openArchiveEnumeration = null; - this.openArchive = null; - this.openFile = null; - } - else if (this.openDirectoryEnumeration != null) { - while (this.openDirectoryEnumeration.hasMoreElements()) { - File entry = this.openDirectoryEnumeration.nextElement(); - String name = this.openDirectoryEnumeration - .getName(entry); - if (accept(name)) { - this.nextEntry = new DirEntryJavaFileObject( - this.openDirectoryEnumeration.getDirectory(), - entry); - return; - } - } - this.openDirectoryEnumeration = null; - this.openDirectory = null; - } - else if (this.openJrtEnumeration != null) { - while (this.openJrtEnumeration.hasMoreElements()) { - JrtEntryJavaFileObject jrtEntry = this.openJrtEnumeration - .nextElement(); - String name = this.openJrtEnumeration.getName(jrtEntry); - if (accept(name)) { - this.nextEntry = jrtEntry; - return; - } - } - this.openJrtEnumeration = null; - this.openJrt = null; - } - } - } - catch (IOException ioe) { - logger.debug("Unexpected error whilst processing classpath entries", - ioe); - } - } - } - - public boolean hasNext() { - findNext(); - return this.nextEntry != null; - } - - public JavaFileObject next() { - findNext(); - if (this.nextEntry == null) { - throw new NoSuchElementException(); - } - JavaFileObject retval = this.nextEntry; - this.nextEntry = null; - return retval; - } - - } - -} diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/IterableJrtModule.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/IterableJrtModule.java deleted file mode 100644 index 50d5c9266..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/IterableJrtModule.java +++ /dev/null @@ -1,114 +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 org.springframework.cloud.function.compiler.java; - -import java.nio.file.Path; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.NoSuchElementException; - -import javax.tools.JavaFileObject; - -import org.springframework.cloud.function.compiler.java.MemoryBasedJavaFileManager.CompilationInfoCache; - -/** - * Iterable that will produce an iterator that returns classes found in a specific module - * tree within the Java runtime image that exists in Java 9 and later. - * - * @author Andy Clement - */ -public class IterableJrtModule extends CloseableFilterableJavaFileObjectIterable { - - // private static Logger logger = LoggerFactory.getLogger(IterableJrtModule.class); - - Map walkers = new HashMap<>(); - - private Path moduleRootPath; - - /** - * @param compilationInfoCache cache of info that may help accelerate compilation - * @param moduleRootPath path to the base of the relevant module within the JRT image - * @param packageNameFilter an optional package name if choosing to filter (e.g. - * com.example) - * @param includeSubpackages if true, include results in subpackages of the specified - * package filter - */ - public IterableJrtModule(CompilationInfoCache compilationInfoCache, - Path moduleRootPath, String packageNameFilter, boolean includeSubpackages) { - super(compilationInfoCache, packageNameFilter, includeSubpackages); - this.moduleRootPath = moduleRootPath; - } - - public Iterator iterator() { - JrtFsEnumeration jrtFsWalker = this.walkers.get(this.moduleRootPath.toString()); - if (jrtFsWalker == null) { - jrtFsWalker = new JrtFsEnumeration(null, this.moduleRootPath); - this.walkers.put(this.moduleRootPath.toString(), jrtFsWalker); - } - jrtFsWalker.reset(); - return new IteratorOverJrtFsEnumeration(jrtFsWalker); - } - - public void close() { - } - - public void reset() { - close(); - } - - class IteratorOverJrtFsEnumeration implements Iterator { - - private JavaFileObject nextEntry = null; - - private JrtFsEnumeration jrtEnumeration; - - IteratorOverJrtFsEnumeration(JrtFsEnumeration jrtFsWalker) { - this.jrtEnumeration = jrtFsWalker; - } - - private void findNext() { - if (this.nextEntry == null) { - while (this.jrtEnumeration.hasMoreElements()) { - JrtEntryJavaFileObject jrtEntry = this.jrtEnumeration.nextElement(); - String name = this.jrtEnumeration.getName(jrtEntry); - if (accept(name)) { - this.nextEntry = jrtEntry; - return; - } - } - } - } - - public boolean hasNext() { - findNext(); - return this.nextEntry != null; - } - - public JavaFileObject next() { - findNext(); - if (this.nextEntry == null) { - throw new NoSuchElementException(); - } - JavaFileObject retval = this.nextEntry; - this.nextEntry = null; - return retval; - } - - } - -} diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/JrtEntryJavaFileObject.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/JrtEntryJavaFileObject.java deleted file mode 100644 index 385d0577d..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/JrtEntryJavaFileObject.java +++ /dev/null @@ -1,159 +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 org.springframework.cloud.function.compiler.java; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.Reader; -import java.io.Writer; -import java.net.URI; -import java.nio.file.Files; -import java.nio.file.Path; - -import javax.lang.model.element.Modifier; -import javax.lang.model.element.NestingKind; -import javax.tools.JavaFileObject; - -/** - * A JavaFileObject that represents a class from the Java runtime as packaged in Java 9 - * and later. - * - * @author Andy Clement - */ -public class JrtEntryJavaFileObject implements JavaFileObject { - - private String pathToClassString; - - private Path path; - - /** - * @param path entry in the Java runtime filesystem, for example - * '/modules/java.base/java/lang/Object.class' - */ - public JrtEntryJavaFileObject(Path path) { - this.pathToClassString = path.subpath(2, path.getNameCount()).toString(); // e.g. - // java/lang/Object.class - this.path = path; - } - - @Override - public URI toUri() { - return this.path.toUri(); - } - - /** - * @return the path of the file relative to the base directory, for example: - * a/b/c/D.class - */ - @Override - public String getName() { - return this.pathToClassString; - } - - @Override - public InputStream openInputStream() throws IOException { - byte[] bytes = Files.readAllBytes(this.path); - return new ByteArrayInputStream(bytes); - } - - @Override - public OutputStream openOutputStream() throws IOException { - throw new IllegalStateException("Only expected to be used for input"); - } - - @Override - public Reader openReader(boolean ignoreEncodingErrors) throws IOException { - // It is bytecode - throw new UnsupportedOperationException( - "openReader() not supported on class file: " + getName()); - } - - @Override - public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException { - // It is bytecode - throw new UnsupportedOperationException( - "getCharContent() not supported on class file: " + getName()); - } - - @Override - public Writer openWriter() throws IOException { - throw new IllegalStateException("only expected to be used for input"); - } - - @Override - public long getLastModified() { - try { - return Files.getLastModifiedTime(this.path).toMillis(); - } - catch (IOException ioe) { - throw new RuntimeException( - "Unable to determine last modified time of " + this.pathToClassString, - ioe); - } - } - - @Override - public boolean delete() { - return false; // This object is for read only access to a class - } - - @Override - public Kind getKind() { - return Kind.CLASS; - } - - @Override - public boolean isNameCompatible(String simpleName, Kind kind) { - if (kind != Kind.CLASS) { - return false; - } - String name = getName(); - int lastSlash = name.lastIndexOf('/'); - return name.substring(lastSlash + 1).equals(simpleName + ".class"); - } - - @Override - public NestingKind getNestingKind() { - return null; - } - - @Override - public Modifier getAccessLevel() { - return null; - } - - @Override - public int hashCode() { - return getName().hashCode(); - } - - @Override - public boolean equals(Object obj) { - if (!(obj instanceof JrtEntryJavaFileObject)) { - return false; - } - JrtEntryJavaFileObject that = (JrtEntryJavaFileObject) obj; - return (getName().equals(that.getName())); - } - - public String getPathToClassString() { - return this.pathToClassString; - } - -} diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/JrtFsEnumeration.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/JrtFsEnumeration.java deleted file mode 100644 index ed9b1eb93..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/JrtFsEnumeration.java +++ /dev/null @@ -1,140 +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 org.springframework.cloud.function.compiler.java; - -import java.io.File; -import java.io.IOException; -import java.net.URI; -import java.nio.file.FileSystem; -import java.nio.file.FileSystems; -import java.nio.file.FileVisitResult; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.SimpleFileVisitor; -import java.nio.file.attribute.BasicFileAttributes; -import java.util.ArrayList; -import java.util.Enumeration; -import java.util.List; -import java.util.NoSuchElementException; - -/** - * Walks a JrtFS treating it like a directory (to avoid overcomplicating the walking logic - * in IterableClasspath). - * - * @author Andy Clement - */ -public class JrtFsEnumeration implements Enumeration { - - // private final static Logger logger = - // LoggerFactory.getLogger(JrtFsEnumeration.class); - - private static URI JRT_URI = URI.create("jrt:/"); //$NON-NLS-1$ - - private final static FileSystem fs = FileSystems.getFileSystem(JRT_URI); - - private Path pathWithinJrt; - - private List jfos = new ArrayList<>(); - - private Integer counter = 0; - - private Boolean initialized = false; - - public JrtFsEnumeration(File jrtFsFile, Path pathWithinJrt) { - this.pathWithinJrt = pathWithinJrt; - ensureInitialized(); - } - - private void ensureInitialized() { - synchronized (this.initialized) { - if (this.initialized) { - return; - } - FileCacheBuilderVisitor visitor = new FileCacheBuilderVisitor(); - if (this.pathWithinJrt != null) { - try { - Files.walkFileTree(this.pathWithinJrt, visitor); - // System.out.println("JrtFs enumeration for '"+pathWithinJrt+"' with - // #"+jfos.size()+" entries"); - } - catch (IOException e) { - throw new RuntimeException(e); - } - } - else { - Iterable roots = fs.getRootDirectories(); - try { - for (java.nio.file.Path path : roots) { - Files.walkFileTree(path, visitor); - } - // System.out.println("JrtFs enumeration initialized with - // #"+jfos.size()+" entries"); - } - catch (IOException e) { - throw new RuntimeException(e); - } - } - this.initialized = true; - } - } - - @Override - public boolean hasMoreElements() { - return this.counter < this.jfos.size(); - } - - @Override - public JrtEntryJavaFileObject nextElement() { - if (this.counter >= this.jfos.size()) { - throw new NoSuchElementException(); - } - JrtEntryJavaFileObject toReturn = this.jfos.get(this.counter++); - return toReturn; - } - - /** - * Return the relative path of this file to the base directory that the directory - * enumeration was started for. - * @param file a file discovered returned by this enumeration - * @return the relative path of the file (for example: a/b/c/D.class) - */ - public String getName(JrtEntryJavaFileObject file) { - return file.getPathToClassString(); - } - - public void reset() { - this.counter = 0; - } - - class FileCacheBuilderVisitor extends SimpleFileVisitor { - - @Override - public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) - throws IOException { - int fnc = file.getNameCount(); - if (fnc >= 3 && file.toString().endsWith(".class")) { // There is a preceeding - // module name - e.g. - // /modules/java.base/java/lang/Object.class - // file.subpath(2, fnc); // e.g. java/lang/Object.class - JrtFsEnumeration.this.jfos.add(new JrtEntryJavaFileObject(file)); - } - return FileVisitResult.CONTINUE; - } - - } - -} diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/MavenSettings.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/MavenSettings.java deleted file mode 100644 index da210daf4..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/MavenSettings.java +++ /dev/null @@ -1,325 +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 org.springframework.cloud.function.compiler.java; - -import java.io.BufferedReader; -import java.io.File; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringReader; -import java.io.StringWriter; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; - -import org.apache.maven.model.ActivationFile; -import org.apache.maven.model.ActivationOS; -import org.apache.maven.model.ActivationProperty; -import org.apache.maven.model.building.ModelProblemCollector; -import org.apache.maven.model.building.ModelProblemCollectorRequest; -import org.apache.maven.model.path.DefaultPathTranslator; -import org.apache.maven.model.profile.DefaultProfileSelector; -import org.apache.maven.model.profile.ProfileActivationContext; -import org.apache.maven.model.profile.activation.FileProfileActivator; -import org.apache.maven.model.profile.activation.JdkVersionProfileActivator; -import org.apache.maven.model.profile.activation.OperatingSystemProfileActivator; -import org.apache.maven.model.profile.activation.PropertyProfileActivator; -import org.apache.maven.settings.Activation; -import org.apache.maven.settings.Mirror; -import org.apache.maven.settings.Profile; -import org.apache.maven.settings.Proxy; -import org.apache.maven.settings.Server; -import org.apache.maven.settings.Settings; -import org.apache.maven.settings.crypto.SettingsDecryptionResult; -import org.eclipse.aether.repository.Authentication; -import org.eclipse.aether.repository.AuthenticationSelector; -import org.eclipse.aether.repository.MirrorSelector; -import org.eclipse.aether.repository.ProxySelector; -import org.eclipse.aether.util.repository.AuthenticationBuilder; -import org.eclipse.aether.util.repository.ConservativeAuthenticationSelector; -import org.eclipse.aether.util.repository.DefaultAuthenticationSelector; -import org.eclipse.aether.util.repository.DefaultMirrorSelector; -import org.eclipse.aether.util.repository.DefaultProxySelector; - -/** - * An encapsulation of settings read from a user's Maven settings.xml. - * - * @author Andy Wilkinson - * @see MavenSettingsReader - */ -public class MavenSettings { - - private final boolean offline; - - private final MirrorSelector mirrorSelector; - - private final AuthenticationSelector authenticationSelector; - - private final ProxySelector proxySelector; - - private final String localRepository; - - private final List activeProfiles; - - /** - * Create a new {@link MavenSettings} instance. - * @param settings the source settings - * @param decryptedSettings the decrypted settings - */ - public MavenSettings(Settings settings, SettingsDecryptionResult decryptedSettings) { - this.offline = settings.isOffline(); - this.mirrorSelector = createMirrorSelector(settings); - this.authenticationSelector = createAuthenticationSelector(decryptedSettings); - this.proxySelector = createProxySelector(decryptedSettings); - this.localRepository = settings.getLocalRepository(); - this.activeProfiles = determineActiveProfiles(settings); - } - - private MirrorSelector createMirrorSelector(Settings settings) { - DefaultMirrorSelector selector = new DefaultMirrorSelector(); - for (Mirror mirror : settings.getMirrors()) { - selector.add(mirror.getId(), mirror.getUrl(), mirror.getLayout(), false, - mirror.getMirrorOf(), mirror.getMirrorOfLayouts()); - } - return selector; - } - - private AuthenticationSelector createAuthenticationSelector( - SettingsDecryptionResult decryptedSettings) { - DefaultAuthenticationSelector selector = new DefaultAuthenticationSelector(); - for (Server server : decryptedSettings.getServers()) { - AuthenticationBuilder auth = new AuthenticationBuilder(); - auth.addUsername(server.getUsername()).addPassword(server.getPassword()); - auth.addPrivateKey(server.getPrivateKey(), server.getPassphrase()); - selector.add(server.getId(), auth.build()); - } - return new ConservativeAuthenticationSelector(selector); - } - - private ProxySelector createProxySelector( - SettingsDecryptionResult decryptedSettings) { - DefaultProxySelector selector = new DefaultProxySelector(); - for (Proxy proxy : decryptedSettings.getProxies()) { - Authentication authentication = new AuthenticationBuilder() - .addUsername(proxy.getUsername()).addPassword(proxy.getPassword()) - .build(); - selector.add( - new org.eclipse.aether.repository.Proxy(proxy.getProtocol(), - proxy.getHost(), proxy.getPort(), authentication), - proxy.getNonProxyHosts()); - } - return selector; - } - - private List determineActiveProfiles(Settings settings) { - SpringBootCliModelProblemCollector problemCollector = new SpringBootCliModelProblemCollector(); - List activeModelProfiles = createProfileSelector() - .getActiveProfiles(createModelProfiles(settings.getProfiles()), - new SpringBootCliProfileActivationContext( - settings.getActiveProfiles()), - problemCollector); - if (!problemCollector.getProblems().isEmpty()) { - throw new IllegalStateException(createFailureMessage(problemCollector)); - } - List activeProfiles = new ArrayList(); - Map profiles = settings.getProfilesAsMap(); - for (org.apache.maven.model.Profile modelProfile : activeModelProfiles) { - activeProfiles.add(profiles.get(modelProfile.getId())); - } - return activeProfiles; - } - - private String createFailureMessage( - SpringBootCliModelProblemCollector problemCollector) { - StringWriter message = new StringWriter(); - PrintWriter printer = new PrintWriter(message); - printer.println("Failed to determine active profiles:"); - for (ModelProblemCollectorRequest problem : problemCollector.getProblems()) { - printer.println(" " + problem.getMessage() + (problem.getLocation() != null - ? " at " + problem.getLocation() : "")); - if (problem.getException() != null) { - printer.println(indentStackTrace(problem.getException(), " ")); - } - } - return message.toString(); - } - - private String indentStackTrace(Exception ex, String indent) { - return indentLines(printStackTrace(ex), indent); - } - - private String printStackTrace(Exception ex) { - StringWriter stackTrace = new StringWriter(); - PrintWriter printer = new PrintWriter(stackTrace); - ex.printStackTrace(printer); - return stackTrace.toString(); - } - - private String indentLines(String input, String indent) { - StringWriter indented = new StringWriter(); - PrintWriter writer = new PrintWriter(indented); - String line; - BufferedReader reader = new BufferedReader(new StringReader(input)); - try { - while ((line = reader.readLine()) != null) { - writer.println(indent + line); - } - } - catch (IOException ex) { - return input; - } - return indented.toString(); - } - - private DefaultProfileSelector createProfileSelector() { - DefaultProfileSelector selector = new DefaultProfileSelector(); - - selector.addProfileActivator(new FileProfileActivator() - .setPathTranslator(new DefaultPathTranslator())); - selector.addProfileActivator(new JdkVersionProfileActivator()); - selector.addProfileActivator(new PropertyProfileActivator()); - selector.addProfileActivator(new OperatingSystemProfileActivator()); - return selector; - } - - private List createModelProfiles( - List profiles) { - List modelProfiles = new ArrayList(); - for (Profile profile : profiles) { - org.apache.maven.model.Profile modelProfile = new org.apache.maven.model.Profile(); - modelProfile.setId(profile.getId()); - if (profile.getActivation() != null) { - modelProfile - .setActivation(createModelActivation(profile.getActivation())); - } - modelProfiles.add(modelProfile); - } - return modelProfiles; - } - - private org.apache.maven.model.Activation createModelActivation( - Activation activation) { - org.apache.maven.model.Activation modelActivation = new org.apache.maven.model.Activation(); - modelActivation.setActiveByDefault(activation.isActiveByDefault()); - if (activation.getFile() != null) { - ActivationFile activationFile = new ActivationFile(); - activationFile.setExists(activation.getFile().getExists()); - activationFile.setMissing(activation.getFile().getMissing()); - modelActivation.setFile(activationFile); - } - modelActivation.setJdk(activation.getJdk()); - if (activation.getOs() != null) { - ActivationOS os = new ActivationOS(); - os.setArch(activation.getOs().getArch()); - os.setFamily(activation.getOs().getFamily()); - os.setName(activation.getOs().getName()); - os.setVersion(activation.getOs().getVersion()); - modelActivation.setOs(os); - } - if (activation.getProperty() != null) { - ActivationProperty property = new ActivationProperty(); - property.setName(activation.getProperty().getName()); - property.setValue(activation.getProperty().getValue()); - modelActivation.setProperty(property); - } - return modelActivation; - } - - public boolean getOffline() { - return this.offline; - } - - public MirrorSelector getMirrorSelector() { - return this.mirrorSelector; - } - - public AuthenticationSelector getAuthenticationSelector() { - return this.authenticationSelector; - } - - public ProxySelector getProxySelector() { - return this.proxySelector; - } - - public String getLocalRepository() { - return this.localRepository; - } - - public List getActiveProfiles() { - return this.activeProfiles; - } - - private static final class SpringBootCliProfileActivationContext - implements ProfileActivationContext { - - private final List activeProfiles; - - SpringBootCliProfileActivationContext(List activeProfiles) { - this.activeProfiles = activeProfiles; - } - - @Override - public List getActiveProfileIds() { - return this.activeProfiles; - } - - @Override - public List getInactiveProfileIds() { - return Collections.emptyList(); - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - public Map getSystemProperties() { - return (Map) System.getProperties(); - } - - @Override - public Map getUserProperties() { - return Collections.emptyMap(); - } - - @Override - public File getProjectDirectory() { - return new File("."); - } - - @Override - public Map getProjectProperties() { - return Collections.emptyMap(); - } - - } - - private static final class SpringBootCliModelProblemCollector - implements ModelProblemCollector { - - private final List problems = new ArrayList(); - - @Override - public void add(ModelProblemCollectorRequest req) { - this.problems.add(req); - } - - List getProblems() { - return this.problems; - } - - } - -} diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/MavenSettingsReader.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/MavenSettingsReader.java deleted file mode 100644 index a2292f982..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/MavenSettingsReader.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. - */ - -package org.springframework.cloud.function.compiler.java; - -import java.io.File; -import java.lang.reflect.Field; - -import org.apache.maven.settings.Settings; -import org.apache.maven.settings.building.DefaultSettingsBuilderFactory; -import org.apache.maven.settings.building.DefaultSettingsBuildingRequest; -import org.apache.maven.settings.building.SettingsBuildingException; -import org.apache.maven.settings.building.SettingsBuildingRequest; -import org.apache.maven.settings.crypto.DefaultSettingsDecrypter; -import org.apache.maven.settings.crypto.DefaultSettingsDecryptionRequest; -import org.apache.maven.settings.crypto.SettingsDecrypter; -import org.apache.maven.settings.crypto.SettingsDecryptionResult; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory; -import org.eclipse.aether.repository.LocalRepository; -import org.eclipse.aether.repository.NoLocalRepositoryManagerException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.sonatype.plexus.components.cipher.DefaultPlexusCipher; -import org.sonatype.plexus.components.cipher.PlexusCipherException; -import org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher; - -/** - * {@code MavenSettingsReader} reads settings from a user's Maven settings.xml file, - * decrypting them if necessary using settings-security.xml. - * - * @author Andy Wilkinson - */ -public class MavenSettingsReader { - - private static final Logger log = LoggerFactory.getLogger(MavenSettingsReader.class); - - private final String homeDir; - - public MavenSettingsReader() { - this(System.getProperty("user.home")); - } - - public MavenSettingsReader(String homeDir) { - this.homeDir = homeDir; - } - - public static void applySettings(MavenSettings settings, - DefaultRepositorySystemSession session) { - if (settings.getLocalRepository() != null) { - try { - session.setLocalRepositoryManager( - new SimpleLocalRepositoryManagerFactory().newInstance(session, - new LocalRepository(settings.getLocalRepository()))); - } - catch (NoLocalRepositoryManagerException e) { - throw new IllegalStateException( - "Cannot set local repository to " + settings.getLocalRepository(), - e); - } - } - session.setOffline(settings.getOffline()); - session.setMirrorSelector(settings.getMirrorSelector()); - session.setAuthenticationSelector(settings.getAuthenticationSelector()); - session.setProxySelector(settings.getProxySelector()); - } - - public MavenSettings readSettings() { - Settings settings = loadSettings(); - SettingsDecryptionResult decrypted = decryptSettings(settings); - if (!decrypted.getProblems().isEmpty()) { - log.error( - "Maven settings decryption failed. Some Maven repositories may be inaccessible"); - // Continue - the encrypted credentials may not be used - } - return new MavenSettings(settings, decrypted); - } - - private Settings loadSettings() { - File settingsFile = new File(this.homeDir, ".m2/settings.xml"); - if (settingsFile.exists()) { - log.info("Reading settings from: " + settingsFile); - } - else { - log.info("No settings found at: " + settingsFile); - } - SettingsBuildingRequest request = new DefaultSettingsBuildingRequest(); - request.setUserSettingsFile(settingsFile); - request.setSystemProperties(System.getProperties()); - try { - return new DefaultSettingsBuilderFactory().newInstance().build(request) - .getEffectiveSettings(); - } - catch (SettingsBuildingException ex) { - throw new IllegalStateException( - "Failed to build settings from " + settingsFile, ex); - } - } - - private SettingsDecryptionResult decryptSettings(Settings settings) { - DefaultSettingsDecryptionRequest request = new DefaultSettingsDecryptionRequest( - settings); - - return createSettingsDecrypter().decrypt(request); - } - - private SettingsDecrypter createSettingsDecrypter() { - SettingsDecrypter settingsDecrypter = new DefaultSettingsDecrypter(); - setField(DefaultSettingsDecrypter.class, "securityDispatcher", settingsDecrypter, - new SpringBootSecDispatcher()); - return settingsDecrypter; - } - - private void setField(Class sourceClass, String fieldName, Object target, - Object value) { - try { - Field field = sourceClass.getDeclaredField(fieldName); - field.setAccessible(true); - field.set(target, value); - } - catch (Exception ex) { - throw new IllegalStateException( - "Failed to set field '" + fieldName + "' on '" + target + "'", ex); - } - } - - private class SpringBootSecDispatcher extends DefaultSecDispatcher { - - private static final String SECURITY_XML = ".m2/settings-security.xml"; - - SpringBootSecDispatcher() { - File file = new File(MavenSettingsReader.this.homeDir, SECURITY_XML); - this._configurationFile = file.getAbsolutePath(); - try { - this._cipher = new DefaultPlexusCipher(); - } - catch (PlexusCipherException e) { - throw new IllegalStateException(e); - } - } - - } - -} diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/MemoryBasedJavaFileManager.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/MemoryBasedJavaFileManager.java deleted file mode 100644 index 2b20695cf..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/MemoryBasedJavaFileManager.java +++ /dev/null @@ -1,769 +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 org.springframework.cloud.function.compiler.java; - -import java.io.File; -import java.io.IOException; -import java.net.URI; -import java.net.URL; -import java.net.URLClassLoader; -import java.nio.file.FileSystem; -import java.nio.file.FileSystems; -import java.nio.file.FileVisitResult; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.SimpleFileVisitor; -import java.nio.file.attribute.BasicFileAttributes; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.StringTokenizer; -import java.util.zip.ZipEntry; -import java.util.zip.ZipFile; -import java.util.zip.ZipInputStream; - -import javax.tools.FileObject; -import javax.tools.JavaFileManager; -import javax.tools.JavaFileObject; -import javax.tools.JavaFileObject.Kind; -import javax.tools.StandardLocation; - -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.graph.Dependency; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import org.springframework.cloud.function.compiler.java.IterableClasspath.ZipEnumerator; - -/** - * A file manager that serves source code from in memory and ensures output results are - * kept in memory rather than being flushed out to disk. The JavaFileManager is also used - * as a lookup mechanism for resolving types. - * - * @author Andy Clement - * @author Oleg Zhurakousky - */ -public class MemoryBasedJavaFileManager implements JavaFileManager { - - final static String BOOT_PACKAGING_PREFIX_FOR_CLASSES = "BOOT-INF/classes/"; - - final static String BOOT_PACKAGING_PREFIX_FOR_LIBRARIES = "BOOT-INF/lib/"; - - private static Logger logger = LoggerFactory - .getLogger(MemoryBasedJavaFileManager.class); - - private static URI JRT_URI = URI.create("jrt:/"); - - private static FileSystem fs; - - private CompilationOutputCollector outputCollector; - - private Map resolvedAdditionalDependencies = new LinkedHashMap<>(); - - private String platformClasspath; - - private String classpath; - - private CompilationInfoCache compilationInfoCache; - - private Map iterables = new HashMap<>(); - - private String jrtFsFilePath = null; - - private boolean checkedForJrtFsPath = false; - - public MemoryBasedJavaFileManager() { - this.outputCollector = new CompilationOutputCollector(); - this.compilationInfoCache = new CompilationInfoCache(); - } - - private static FileSystem getJrtFs() { - if (fs == null) { - fs = FileSystems.getFileSystem(JRT_URI); - } - return fs; - } - - @Override - public int isSupportedOption(String option) { - logger.debug("isSupportedOption({})", option); - return -1; // Not yet supporting options - } - - @Override - public ClassLoader getClassLoader(Location location) { - // Do not simply return the context classloader as it may get closed and then - // be unusable for loading any further classes - logger.debug("getClassLoader({})", location); - return null; // Do not currently need to load plugins - } - - private String getPlatformClassPath() { - if (this.platformClasspath == null) { - this.platformClasspath = System.getProperty("sun.boot.class.path"); - } - if (this.platformClasspath == null) { - this.platformClasspath = ""; - } - return this.platformClasspath; - } - - @Override - public Iterable list(Location location, String packageName, - Set kinds, boolean recurse) throws IOException { - logger.debug("list({},{},{},{})", location, packageName, kinds, recurse); - String classpath = ""; - Path moduleRootPath = null; - if (location instanceof JDKModuleLocation - && (kinds == null || kinds.contains(Kind.CLASS))) { - // list(org.springframework.cloud.function.compiler.java.MemoryBasedJavaFileManager$JDKModuleLocation@550a1967, - // java.lang,[SOURCE, CLASS, HTML, OTHER],false) - moduleRootPath = ((JDKModuleLocation) location).getModuleRootPath(); - logger.debug("For JDKModuleLocation " + location.toString() + " root path is " - + moduleRootPath); - } - else if (location == StandardLocation.PLATFORM_CLASS_PATH - && (kinds == null || kinds.contains(Kind.CLASS))) { - classpath = getPlatformClassPath(); - // if (classpath.length() == 0) { - // if (hasJrtFsPath()) { - // classpath = getJrtFsPath(); - // } - // } - logger.debug("Creating iterable for boot class path: {}", classpath); - } - else if (location == StandardLocation.CLASS_PATH - && (kinds == null || kinds.contains(Kind.CLASS))) { - String javaClassPath = getClassPath(); - if (!this.resolvedAdditionalDependencies.isEmpty()) { - for (File resolvedAdditionalDependency : this.resolvedAdditionalDependencies - .values()) { - javaClassPath += File.pathSeparatorChar + resolvedAdditionalDependency - .toURI().toString().substring("file:".length()); - } - } - classpath = javaClassPath; - logger.debug("Creating iterable for class path: {}", classpath); - } - Key k = new Key(location, classpath, packageName, kinds, recurse); - CloseableFilterableJavaFileObjectIterable resultIterable = this.iterables.get(k); - if (resultIterable == null) { - if (moduleRootPath != null) { - resultIterable = new IterableJrtModule(this.compilationInfoCache, - moduleRootPath, packageName, recurse); - } - else { - resultIterable = new IterableClasspath(this.compilationInfoCache, - classpath, packageName, recurse); - } - this.iterables.put(k, resultIterable); - } - resultIterable.reset(); - return resultIterable; - } - - private String getClassPath() { - if (this.classpath == null) { - ClassLoader loader = InMemoryJavaFileObject.class.getClassLoader(); - String cp = null; - if (loader instanceof URLClassLoader) { - cp = classPath((URLClassLoader) loader, cp); - } - if (cp == null) { - cp = System.getProperty("java.class.path"); - } - if (hasJrtFsPath()) { - cp = cp + File.pathSeparator + getJrtFsPath(); - } - this.classpath = pathWithPlatformClassPathRemoved(cp); - } - return this.classpath; - } - - private String classPath(URLClassLoader loader, String cp) { - URL[] urls = loader.getURLs(); - if (urls.length > 1) { // heuristic that catches Maven surefire tests - if (!urls[0].toString().startsWith("jar:file:")) { // heuristic for - // Spring Boot fat - // jar - StringBuilder builder = new StringBuilder(); - for (URL url : urls) { - if (builder.length() > 0) { - builder.append(File.pathSeparator); - } - String path = url.toString(); - if (path.startsWith("file:")) { - path = path.substring("file:".length()); - } - builder.append(path); - } - cp = builder.toString(); - } - } - return cp; - } - - // remove the platform classpath entries, they will be search separately (and earlier) - private String pathWithPlatformClassPathRemoved(String classpath) { - Set pcps = toList(getPlatformClassPath()); - Set cps = toList(classpath); - cps.removeAll(pcps); - StringBuilder builder = new StringBuilder(); - for (String cpe : cps) { - if (builder.length() > 0) { - builder.append(File.pathSeparator); - } - builder.append(cpe); - } - return builder.toString(); - } - - private Set toList(String path) { - Set result = new LinkedHashSet<>(); - StringTokenizer tokenizer = new StringTokenizer(path, File.pathSeparator); - while (tokenizer.hasMoreTokens()) { - result.add(tokenizer.nextToken()); - } - return result; - } - - @Override - public boolean hasLocation(Location location) { - logger.debug("hasLocation({})", location); - return (location == StandardLocation.SOURCE_PATH - || location == StandardLocation.CLASS_PATH - || location == StandardLocation.PLATFORM_CLASS_PATH); - } - - @Override - public String inferBinaryName(Location location, JavaFileObject file) { - if (location == StandardLocation.SOURCE_PATH) { - return null; - } - // Kind of ignoring location here... assuming we want basically the FQ type name - // Example value from getName(): javax/validation/bootstrap/GenericBootstrap.class - String classname = file.getName().replace('/', '.').replace('\\', '.'); - return classname.substring(0, classname.lastIndexOf(".class")); - } - - @Override - public boolean isSameFile(FileObject a, FileObject b) { - logger.debug("isSameFile({},{})", a, b); - return a.equals(b); - } - - @Override - public boolean handleOption(String current, Iterator remaining) { - logger.debug("handleOption({},{})", current, remaining); - return false; // This file manager does not manage any options - } - - @Override - public JavaFileObject getJavaFileForInput(Location location, String className, - Kind kind) throws IOException { - logger.debug("getJavaFileForInput({},{},{})", location, className, kind); - // getJavaFileForInput(SOURCE_PATH,module-info,SOURCE) - if (className.equals("module-info")) { - return null; - } - throw new IllegalStateException("Not expected to be used in this context"); - } - - @Override - public JavaFileObject getJavaFileForOutput(Location location, String className, - Kind kind, FileObject sibling) throws IOException { - logger.debug("getJavaFileForOutput({},{},{},{})", location, className, kind, - sibling); - // Example parameters: CLASS_OUTPUT, Foo, CLASS, - // StringBasedJavaSourceFileObject[string:///a/b/c/Foo.java] - return this.outputCollector.getJavaFileForOutput(location, className, kind, - sibling); - } - - @Override - public FileObject getFileForInput(Location location, String packageName, - String relativeName) throws IOException { - logger.debug("getFileForInput({},{},{})", location, packageName, relativeName); - throw new IllegalStateException("Not expected to be used in this context"); - } - - @Override - public FileObject getFileForOutput(Location location, String packageName, - String relativeName, FileObject sibling) throws IOException { - logger.debug("getFileForOutput({},{},{},{})", location, packageName, relativeName, - sibling); - // This can be called when the annotation config processor runs - // Example parameters: CLASS_OUTPUT, , - // META-INF/spring-configuration-metadata.json, null - return this.outputCollector.getFileForOutput(location, packageName, relativeName, - sibling); - } - - @Override - public void flush() throws IOException { - } - - @Override - public void close() throws IOException { - Collection toClose = this.iterables - .values(); - for (CloseableFilterableJavaFileObjectIterable icp : toClose) { - icp.close(); - } - } - - public List getCompiledClasses() { - return this.outputCollector.getCompiledClasses(); - } - - public List addAndResolveDependencies(String[] dependencies) { - List resolutionMessages = new ArrayList<>(); - for (String dependency : dependencies) { - if (dependency.startsWith("maven:")) { - // Resolving an explicit external archive - String coordinates = dependency.replaceFirst("maven:\\/*", ""); - DependencyResolver engine = DependencyResolver.instance(); - try { - File resolved = engine.resolve( - new Dependency(new DefaultArtifact(coordinates), "runtime")); - // Example: - // dependency = - // maven://org.springframework:spring-expression:4.3.9.RELEASE - // resolved.toURI() = - // file:/Users/aclement/.m2/repository/ - // org/springframework/spring-expression/4.3.9.RELEASE/spring-expression-4.3.9.RELEASE.jar - this.resolvedAdditionalDependencies.put(dependency, resolved); - } - catch (RuntimeException re) { - CompilationMessage compilationMessage = new CompilationMessage( - CompilationMessage.Kind.ERROR, re.getMessage(), null, 0, 0); - resolutionMessages.add(compilationMessage); - } - } - else if (dependency.startsWith("file:")) { - this.resolvedAdditionalDependencies.put(dependency, - new File(URI.create(dependency))); - } - else { - resolutionMessages.add(new CompilationMessage( - CompilationMessage.Kind.ERROR, - "Unrecognized dependency: " + dependency - + " (expected something of the form: maven://groupId:artifactId:version)", - null, 0, 0)); - } - } - return resolutionMessages; - } - - public Map getResolvedAdditionalDependencies() { - return this.resolvedAdditionalDependencies; - } - - public String inferModuleName(Location location) throws IOException { - if (location instanceof JDKModuleLocation) { - JDKModuleLocation m = (JDKModuleLocation) location; - return m.getModuleName(); - } - throw new IllegalStateException( - "Asked to inferModuleName from a " + location.getClass().getName()); - } - - private boolean hasJrtFsPath() { - return getJrtFsPath() != null; - } - - private String getJrtFsPath() { - if (!this.checkedForJrtFsPath) { - String javaHome = System.getProperty("java.home"); - String jrtFsFilePath = javaHome + File.separator + "lib" + File.separator - + "jrt-fs.jar"; - File jrtFsFile = new File(jrtFsFilePath); - if (jrtFsFile.exists()) { - this.jrtFsFilePath = jrtFsFilePath; - } - this.checkedForJrtFsPath = true; - } - return this.jrtFsFilePath; - } - - public Iterable> listLocationsForModules(Location location) - throws IOException { - if (getJrtFsPath() != null - && location == StandardLocation.valueOf("SYSTEM_MODULES")) { - Set> ss = new HashSet<>(); - HashSet moduleLocations = new HashSet<>(); - ModuleIdentifierVisitor visitor = new ModuleIdentifierVisitor(); - Iterable roots = getJrtFs().getRootDirectories(); - try { - for (Path path : roots) { - Files.walkFileTree(path, visitor); - } - moduleLocations.addAll(visitor.getModuleLocations()); - } - catch (IOException ioe) { - throw new RuntimeException(ioe); - } - ss.add(moduleLocations); - return ss; - } - else { - return Collections.emptySet(); - } - } - - // Holds information that may help speed up compilation - static class CompilationInfoCache { - - private Map archivePackageCache; - - private boolean packageCacheInitialized = false; - - private Map packageCache = new HashMap(); - - private ArchiveInfo moduleArchiveInfo; - - ArchiveInfo getArchiveInfoFor(File archive) { - if (!archive.isFile() || !(archive.getName().endsWith(".zip") - || archive.getName().endsWith(".jar"))) { - // it is not an archive - return null; - } - if (this.archivePackageCache == null) { - this.archivePackageCache = new HashMap<>(); - } - try { - ArchiveInfo result = this.archivePackageCache.get(archive); - if (result == null) { - result = buildArchiveInfo(archive); - this.archivePackageCache.put(archive, result); - } - return result; - } - catch (Exception e) { - throw new IllegalStateException( - "Unexpected problem caching entries from " + archive.getName(), - e); - } - } - - private synchronized ArchiveInfo buildPackageMap() { - if (!this.packageCacheInitialized) { - this.packageCacheInitialized = true; - Iterable roots = getJrtFs().getRootDirectories(); - PackageCacheBuilderVisitor visitor = new PackageCacheBuilderVisitor(); - try { - for (java.nio.file.Path path : roots) { - Files.walkFileTree(path, visitor); - } - } - catch (IOException e) { - throw new RuntimeException(e); - } - List ls = new ArrayList<>(); - ls.addAll(this.packageCache.keySet()); - Collections.sort(ls); - this.moduleArchiveInfo = new ArchiveInfo(ls, false); - } - return this.moduleArchiveInfo; - } - - /** - * Walk the specified archive and collect up the package names of any .class files - * encountered. If the archive contains nested jars packaged in a BOOT style way - * (under a BOOT-INF/lib folder) then walk those too and include relevant - * packages. - * @param file archive file to discover packages from - * @return an ArchiveInfo encapsulating package info from the archive - */ - private ArchiveInfo buildArchiveInfo(File file) { - if (file.toString().endsWith("jrt-fs.jar")) { - // Special treatment for >=JDK9 - treat this as intention to use modules - return buildPackageMap(); - } - List packageNames = new ArrayList<>(); - boolean isBootJar = false; - try (ZipFile openArchive = new ZipFile(file)) { - Enumeration entries = openArchive.entries(); - while (entries.hasMoreElements()) { - ZipEntry entry = entries.nextElement(); - String name = entry.getName(); - if (name.endsWith(".class")) { - if (name.startsWith(BOOT_PACKAGING_PREFIX_FOR_CLASSES)) { - isBootJar = true; - int idx = name.lastIndexOf('/') + 1; - if (idx != 0) { - if (idx == BOOT_PACKAGING_PREFIX_FOR_CLASSES.length()) { - // default package - packageNames.add("/"); - } - else { - // Normalize to forward slashes - name = name.substring( - BOOT_PACKAGING_PREFIX_FOR_CLASSES.length(), - idx); - name = name.replace('\\', '/'); - packageNames.add(name); - } - } - } - else { - int idx = name.lastIndexOf('/') + 1; - if (idx != 0) { - // Normalize to forward slashes - name = name.replace('\\', '/'); - name = name.substring(0, idx); - packageNames.add(name); - } - else if (idx == 0) { - // default package entries in here - packageNames.add("/"); - } - } - } - else if (name.startsWith(BOOT_PACKAGING_PREFIX_FOR_LIBRARIES) - && name.endsWith(".jar")) { - isBootJar = true; - try (ZipInputStream zis = new ZipInputStream( - openArchive.getInputStream(entry))) { - Enumeration nestedZipEnumerator = new ZipEnumerator( - zis); - while (nestedZipEnumerator.hasMoreElements()) { - ZipEntry innerEntry = nestedZipEnumerator.nextElement(); - String innerEntryName = innerEntry.getName(); - if (innerEntryName.endsWith(".class")) { - int idx = innerEntryName.lastIndexOf('/') + 1; - if (idx != 0) { - // Normalize to forward slashes - innerEntryName = innerEntryName.replace('\\', - '/'); - innerEntryName = innerEntryName.substring(0, idx); - packageNames.add(innerEntryName); - } - else if (idx == 0) { - // default package entries in here - packageNames.add("/"); - } - } - } - } - } - } - } - catch (IOException ioe) { - throw new IllegalStateException( - "Unexpected problem determining packages in " + file, ioe); - } - return new ArchiveInfo(packageNames, isBootJar); - } - - static class ArchiveInfo { - - // The packages identified in a particular archive - private List packageNames; - - private boolean isBootJar = false; - - ArchiveInfo(List packageNames, boolean isBootJar) { - this.packageNames = packageNames; - Collections.sort(this.packageNames); - this.isBootJar = isBootJar; - } - - public List getPackageNames() { - return this.packageNames; - } - - public boolean isBootJar() { - return this.isBootJar; - } - - public boolean containsPackage(String packageName, - boolean subpackageMatchesAllowed) { - if (subpackageMatchesAllowed) { - for (String candidatePackageName : this.packageNames) { - if (candidatePackageName.startsWith(packageName)) { - return true; - } - } - return false; - } - else { - // Must be an exact match, fast binary search: - int pos = Collections.binarySearch(this.packageNames, packageName); - return (pos >= 0); - } - } - - } - - private class PackageCacheBuilderVisitor extends SimpleFileVisitor { - - @Override - public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) - throws IOException { - if (file.getNameCount() > 3 && file.toString().endsWith(".class")) { - int fnc = file.getNameCount(); - if (fnc > 3) { // There is a package name - e.g. - // /modules/java.base/java/lang/Object.class - Path packagePath = file.subpath(2, fnc - 1); // e.g. java/lang - String packagePathString = packagePath.toString() + "/"; - CompilationInfoCache.this.packageCache.put(packagePathString, - file.subpath(0, fnc - 1)); // java/lang - // -> - // /modules/java.base/java/lang - } - } - return FileVisitResult.CONTINUE; - } - - } - - } - - static class Key { - - private Location location; - - private String classpath; - - private String packageName; - - private Set kinds; - - private boolean recurse; - - Key(Location location, String classpath, String packageName, Set kinds, - boolean recurse) { - this.location = location; - this.classpath = classpath; - this.packageName = packageName; - this.kinds = kinds; - this.recurse = recurse; - } - - @Override - public int hashCode() { - return (((this.location.hashCode() * 37) + this.classpath.hashCode() * 37 - + (this.packageName == null ? 0 : this.packageName.hashCode())) * 37 - + this.kinds.hashCode()) * 37 + (this.recurse ? 1 : 0); - } - - @Override - public boolean equals(Object obj) { - if (!(obj instanceof Key)) { - return false; - } - Key that = (Key) obj; - return this.location.equals(that.location) - && this.classpath.equals(that.classpath) - && this.kinds.equals(that.kinds) && (this.recurse == that.recurse) - && (this.packageName == null ? (that.packageName == null) - : this.packageName.equals(that.packageName)); - } - - } - - static class JDKModuleLocation implements Location { - - private String moduleName; - - private Path moduleRootPath; - - JDKModuleLocation(String moduleName, Path moduleRootPath) { - this.moduleName = moduleName; - this.moduleRootPath = moduleRootPath; - } - - @Override - public String getName() { - return "MODULE"; - } - - @Override - public boolean isOutputLocation() { - return false; - } - - public String getModuleName() { - return this.moduleName; - } - - public Path getModuleRootPath() { - return this.moduleRootPath; - } - - public String toString() { - return "JDKModuleLocation(" + this.moduleName + ")"; - } - - public int hashCode() { - return this.moduleName.hashCode(); - } - - public boolean equals(Object other) { - if (!(other instanceof JDKModuleLocation)) { - return false; - } - return this.hashCode() == ((JDKModuleLocation) other).hashCode(); - } - - } - - static class ModuleIdentifierVisitor extends SimpleFileVisitor { - - private Map modules = new HashMap<>(); - - @Override - public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) - throws IOException { - if (file.getNameCount() > 2 && file.toString().endsWith(".class")) { - // /modules/jdk.rmic/sun/tools/tree/CaseStatement.class - String moduleName = file.getName(1).toString(); // jdk.rmic - Path moduleRootPath = file.subpath(0, 2); // /modules/jdk.rmic - if (!this.modules.containsKey(moduleName)) { - this.modules.put(moduleName, moduleRootPath); - } - } - return FileVisitResult.CONTINUE; - } - - public Set getModuleLocations() { - if (this.modules.size() == 0) { - return Collections.emptySet(); - } - else { - Set locations = new HashSet<>(); - for (Map.Entry moduleEntry : this.modules.entrySet()) { - locations.add(new JDKModuleLocation(moduleEntry.getKey(), - moduleEntry.getValue())); - } - return locations; - } - } - - } - -} diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/NestedZipEntryJavaFileObject.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/NestedZipEntryJavaFileObject.java deleted file mode 100644 index b78889dec..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/NestedZipEntryJavaFileObject.java +++ /dev/null @@ -1,187 +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 org.springframework.cloud.function.compiler.java; - -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.Reader; -import java.io.Writer; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.zip.ZipEntry; -import java.util.zip.ZipFile; -import java.util.zip.ZipInputStream; - -import javax.lang.model.element.Modifier; -import javax.lang.model.element.NestingKind; -import javax.tools.JavaFileObject; - -/** - * Represents an element inside in zip which is itself inside a zip. These objects are not - * initially created with the content of the file they represent, only enough information - * to find that content because many will typically be created but only few will be - * opened. - * - * @author Andy Clement - */ -public class NestedZipEntryJavaFileObject implements JavaFileObject { - - private File outerFile; - - private ZipFile outerZipFile; - - private ZipEntry innerZipFile; - - private ZipEntry innerZipFileEntry; - - private URI uri; - - public NestedZipEntryJavaFileObject(File outerFile, ZipFile outerZipFile, - ZipEntry innerZipFile, ZipEntry innerZipFileEntry) { - this.outerFile = outerFile; - this.outerZipFile = outerZipFile; - this.innerZipFile = innerZipFile; - this.innerZipFileEntry = innerZipFileEntry; - } - - @Override - public String getName() { - return this.innerZipFileEntry.getName(); // Example: a/b/C.class - } - - @Override - public URI toUri() { - if (this.uri == null) { - String uriString = null; - try { - uriString = "zip:" + this.outerFile.getAbsolutePath() + "!" - + this.innerZipFile.getName() + "!" - + this.innerZipFileEntry.getName(); - this.uri = new URI(uriString); - } - catch (URISyntaxException e) { - throw new IllegalStateException( - "Unexpected URISyntaxException for string '" + uriString + "'", - e); - } - } - return this.uri; - } - - @Override - public InputStream openInputStream() throws IOException { - // Find the inner zip file inside the outer zip file, then - // find the relevant entry, then return the stream. - InputStream innerZipFileInputStream = this.outerZipFile - .getInputStream(this.innerZipFile); - ZipInputStream innerZipInputStream = new ZipInputStream(innerZipFileInputStream); - ZipEntry nextEntry = innerZipInputStream.getNextEntry(); - while (nextEntry != null) { - if (nextEntry.getName().equals(this.innerZipFileEntry.getName())) { - return innerZipInputStream; - } - nextEntry = innerZipInputStream.getNextEntry(); - } - throw new IllegalStateException( - "Unable to locate nested zip entry " + this.innerZipFileEntry.getName() - + " in zip " + this.innerZipFile.getName() + " inside zip " - + this.outerZipFile.getName()); - } - - @Override - public Reader openReader(boolean ignoreEncodingErrors) throws IOException { - // It is bytecode - throw new UnsupportedOperationException( - "getCharContent() not supported on class file: " + getName()); - } - - @Override - public long getLastModified() { - return this.innerZipFileEntry.getTime(); - } - - @Override - public Kind getKind() { - // The filtering before this object was created ensure it is only used for classes - return Kind.CLASS; - } - - @Override - public boolean delete() { - return false; // Cannot delete entries inside nested zips - } - - @Override - public OutputStream openOutputStream() throws IOException { - throw new IllegalStateException("cannot write to nested zip entry: " + toUri()); - } - - @Override - public Writer openWriter() throws IOException { - throw new IllegalStateException("cannot write to nested zip entry: " + toUri()); - } - - @Override - public boolean isNameCompatible(String simpleName, Kind kind) { - if (kind != Kind.CLASS) { - return false; - } - String name = getName(); - int lastSlash = name.lastIndexOf('/'); - return name.substring(lastSlash + 1).equals(simpleName + ".class"); - } - - @Override - public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException { - // It is bytecode - throw new UnsupportedOperationException( - "getCharContent() not supported on class file: " + getName()); - } - - @Override - public NestingKind getNestingKind() { - return null; // nesting level not known - } - - @Override - public Modifier getAccessLevel() { - return null; // access level not known - } - - @Override - public int hashCode() { - int hc = this.outerFile.getName().hashCode(); - hc = hc * 37 + this.innerZipFile.getName().hashCode(); - hc = hc * 37 + this.innerZipFileEntry.getName().hashCode(); - return hc; - } - - @Override - public boolean equals(Object obj) { - if (!(obj instanceof NestedZipEntryJavaFileObject)) { - return false; - } - NestedZipEntryJavaFileObject that = (NestedZipEntryJavaFileObject) obj; - return (this.outerFile.getName().equals(that.outerFile.getName())) - && (this.innerZipFile.getName().equals(that.innerZipFile.getName())) - && (this.innerZipFileEntry.getName() - .equals(that.innerZipFileEntry.getName())); - } - -} diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/RuntimeJavaCompiler.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/RuntimeJavaCompiler.java deleted file mode 100644 index 699dda570..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/RuntimeJavaCompiler.java +++ /dev/null @@ -1,128 +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 org.springframework.cloud.function.compiler.java; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import javax.tools.Diagnostic; -import javax.tools.Diagnostic.Kind; -import javax.tools.DiagnosticCollector; -import javax.tools.JavaCompiler; -import javax.tools.JavaCompiler.CompilationTask; -import javax.tools.JavaFileObject; -import javax.tools.ToolProvider; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Compile Java source at runtime and load it. - * - * @author Andy Clement - */ -public class RuntimeJavaCompiler { - - private static Logger logger = LoggerFactory.getLogger(RuntimeJavaCompiler.class); - - private JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); - - /** - * Compile the named class consisting of the supplied source code. If successful load - * the class and return it. Multiple classes may get loaded if the source code - * included anonymous/inner/local classes. - * @param className the name of the class (dotted form, e.g. com.foo.bar.Goo) - * @param classSourceCode the full source code for the class - * @param dependencies optional coordinates for dependencies, maven - * 'maven://groupId:artifactId:version', or 'file:' URIs for local files - * @return a CompilationResult that encapsulates what happened during compilation - * (classes/messages produced) - */ - public CompilationResult compile(String className, String classSourceCode, - String... dependencies) { - logger.info("Compiling source for class {} using compiler {}", className, - this.compiler.getClass().getName()); - - DiagnosticCollector diagnosticCollector = new DiagnosticCollector(); - MemoryBasedJavaFileManager fileManager = new MemoryBasedJavaFileManager(); - List resolutionMessages = fileManager - .addAndResolveDependencies(dependencies); - JavaFileObject sourceFile = InMemoryJavaFileObject - .getSourceJavaFileObject(className, classSourceCode); - - Iterable compilationUnits = Arrays.asList(sourceFile); - List options = new ArrayList<>(); - options.add("-source"); - options.add("1.8"); - CompilationTask task = this.compiler.getTask(null, fileManager, - diagnosticCollector, options, null, compilationUnits); - - boolean success = task.call(); - CompilationResult compilationResult = new CompilationResult(success); - compilationResult.recordCompilationMessages(resolutionMessages); - compilationResult.setResolvedAdditionalDependencies(new ArrayList<>( - fileManager.getResolvedAdditionalDependencies().values())); - - // If successful there may be no errors but there might be info/warnings - for (Diagnostic diagnostic : diagnosticCollector - .getDiagnostics()) { - CompilationMessage.Kind kind = (diagnostic.getKind() == Kind.ERROR - ? CompilationMessage.Kind.ERROR : CompilationMessage.Kind.OTHER); - // String sourceCode = - // ((StringBasedJavaSourceFileObject)diagnostic.getSource()).getSourceCode(); - String sourceCode = null; - try { - sourceCode = (String) diagnostic.getSource().getCharContent(true); - } - catch (IOException ioe) { - // Unexpected, but leave sourceCode null to indicate it was not - // retrievable - } - catch (NullPointerException npe) { - // TODO: should we skip warning diagnostics in the loop altogether? - } - int startPosition = (int) diagnostic.getPosition(); - if (startPosition == Diagnostic.NOPOS) { - startPosition = (int) diagnostic.getStartPosition(); - } - CompilationMessage compilationMessage = new CompilationMessage(kind, - diagnostic.getMessage(null), sourceCode, startPosition, - (int) diagnostic.getEndPosition()); - compilationResult.recordCompilationMessage(compilationMessage); - } - if (success) { - List ccds = fileManager.getCompiledClasses(); - List> classes = new ArrayList<>(); - try (SimpleClassLoader ccl = new SimpleClassLoader( - this.getClass().getClassLoader())) { - for (CompiledClassDefinition ccd : ccds) { - Class clazz = ccl.defineClass(ccd.getClassName(), ccd.getBytes()); - classes.add(clazz); - compilationResult.addClassBytes(ccd.getClassName(), ccd.getBytes()); - } - } - catch (IOException ioe) { - logger.debug("Unexpected exception defining classes", ioe); - } - compilationResult.setCompiledClasses(classes); - } - return compilationResult; - } - -} diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/SimpleClassLoader.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/SimpleClassLoader.java deleted file mode 100644 index 797e55538..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/SimpleClassLoader.java +++ /dev/null @@ -1,59 +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 org.springframework.cloud.function.compiler.java; - -import java.io.File; -import java.net.URL; -import java.net.URLClassLoader; -import java.util.List; - -/** - * Very simple classloader that can be used to load the compiled types. - * - * @author Andy Clement - */ -public class SimpleClassLoader extends URLClassLoader { - - private static final URL[] NO_URLS = new URL[0]; - - public SimpleClassLoader(ClassLoader classLoader) { - super(NO_URLS, classLoader); - } - - public SimpleClassLoader(List resolvedAdditionalDependencies, - ClassLoader classLoader) { - super(toUrls(resolvedAdditionalDependencies), classLoader); - } - - private static URL[] toUrls(List resolvedAdditionalDependencies) { - URL[] urls = new URL[resolvedAdditionalDependencies.size()]; - for (int i = 0, max = resolvedAdditionalDependencies.size(); i < max; i++) { - try { - urls[i] = resolvedAdditionalDependencies.get(i).toURI().toURL(); - } - catch (Exception e) { - throw new IllegalStateException(e); - } - } - return urls; - } - - public Class defineClass(String name, byte[] bytes) { - return super.defineClass(name, bytes, 0, bytes.length); - } - -} diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/ZipEntryJavaFileObject.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/ZipEntryJavaFileObject.java deleted file mode 100644 index 306300aec..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/java/ZipEntryJavaFileObject.java +++ /dev/null @@ -1,159 +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 org.springframework.cloud.function.compiler.java; - -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.Reader; -import java.io.Writer; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.zip.ZipEntry; -import java.util.zip.ZipFile; - -import javax.lang.model.element.Modifier; -import javax.lang.model.element.NestingKind; -import javax.tools.JavaFileObject; - -/** - * A {@link JavaFileObject} that works on a ZIP entry. - * - * @author Mark Fisher - */ -public class ZipEntryJavaFileObject implements JavaFileObject { - - private File containingFile; - - private ZipFile zf; - - private ZipEntry ze; - - private URI uri; - - public ZipEntryJavaFileObject(File containingFile, ZipFile zipFile, ZipEntry entry) { - this.containingFile = containingFile; - this.zf = zipFile; - this.ze = entry; - } - - @Override - public URI toUri() { - if (this.uri == null) { - String uriString = null; - try { - uriString = "zip:" + this.containingFile.getAbsolutePath() + "!" - + this.ze.getName(); - this.uri = new URI(uriString); - } - catch (URISyntaxException e) { - throw new IllegalStateException( - "Unexpected URISyntaxException for string '" + uriString + "'", - e); - } - } - return this.uri; - } - - @Override - public String getName() { - return this.ze.getName(); // a/b/C.class - } - - @Override - public InputStream openInputStream() throws IOException { - return this.zf.getInputStream(this.ze); - } - - @Override - public OutputStream openOutputStream() throws IOException { - throw new IllegalStateException("only expected to be used for input"); - } - - @Override - public Reader openReader(boolean ignoreEncodingErrors) throws IOException { - // It is bytecode - throw new UnsupportedOperationException( - "openReader() not supported on class file: " + getName()); - } - - @Override - public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException { - // It is bytecode - throw new UnsupportedOperationException( - "getCharContent() not supported on class file: " + getName()); - } - - @Override - public Writer openWriter() throws IOException { - throw new IllegalStateException("only expected to be used for input"); - } - - @Override - public long getLastModified() { - return this.ze.getTime(); - } - - @Override - public boolean delete() { - return false; // Cannot delete entries inside zips - } - - @Override - public Kind getKind() { - return Kind.CLASS; - } - - @Override - public boolean isNameCompatible(String simpleName, Kind kind) { - if (kind != Kind.CLASS) { - return false; - } - String name = getName(); - int lastSlash = name.lastIndexOf('/'); - return name.substring(lastSlash + 1).equals(simpleName + ".class"); - } - - @Override - public NestingKind getNestingKind() { - return null; - } - - @Override - public Modifier getAccessLevel() { - return null; - } - - @Override - public int hashCode() { - int hc = this.containingFile.getName().hashCode(); - hc = hc * 37 + this.ze.getName().hashCode(); - return hc; - } - - @Override - public boolean equals(Object obj) { - if (!(obj instanceof ZipEntryJavaFileObject)) { - return false; - } - ZipEntryJavaFileObject that = (ZipEntryJavaFileObject) obj; - return (this.containingFile.getName().equals(that.containingFile.getName())) - && (this.ze.getName().equals(that.ze.getName())); - } - -} diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/AbstractByteCodeLoadingProxy.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/AbstractByteCodeLoadingProxy.java deleted file mode 100644 index 0d1b2f472..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/AbstractByteCodeLoadingProxy.java +++ /dev/null @@ -1,88 +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 org.springframework.cloud.function.compiler.proxy; - -import java.lang.reflect.Method; -import java.util.concurrent.atomic.AtomicReference; - -import org.springframework.asm.ClassReader; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.cloud.function.compiler.CompilationResultFactory; -import org.springframework.cloud.function.compiler.java.SimpleClassLoader; -import org.springframework.cloud.function.core.FunctionFactoryMetadata; -import org.springframework.core.io.Resource; -import org.springframework.util.FileCopyUtils; -import org.springframework.util.ReflectionUtils; - -/** - * @author Mark Fisher - * @author Oleg Zhurakousky - */ -abstract class AbstractByteCodeLoadingProxy - implements InitializingBean, FunctionFactoryMetadata { - - private final Resource resource; - - private final SimpleClassLoader classLoader = new SimpleClassLoader( - AbstractByteCodeLoadingProxy.class.getClassLoader()); - - private T target; - - private Method method; - - AbstractByteCodeLoadingProxy(Resource resource) { - this.resource = resource; - } - - @Override - @SuppressWarnings("unchecked") - public void afterPropertiesSet() throws Exception { - byte[] bytes = FileCopyUtils.copyToByteArray(this.resource.getInputStream()); - String className = new ClassReader(bytes).getClassName().replace("/", "."); - Class factoryClass = this.classLoader.defineClass(className, bytes); - try { - this.target = ((CompilationResultFactory) factoryClass.newInstance()) - .getResult(); - this.method = findFactoryMethod(factoryClass); - } - catch (InstantiationException | IllegalAccessException e) { - throw new IllegalArgumentException("failed to load Function byte code", e); - } - } - - @Override - public final T getTarget() { - return this.target; - } - - @Override - public Method getFactoryMethod() { - return this.method; - } - - private Method findFactoryMethod(Class clazz) { - AtomicReference method = new AtomicReference<>(); - ReflectionUtils.doWithLocalMethods(clazz, m -> { - if (m.getName().equals("getResult") - && m.getReturnType().getName().startsWith("java.util.function")) { - method.set(m); - } - }); - return method.get(); - } - -} diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/AbstractLambdaCompilingProxy.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/AbstractLambdaCompilingProxy.java deleted file mode 100644 index 235501bc9..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/AbstractLambdaCompilingProxy.java +++ /dev/null @@ -1,83 +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 org.springframework.cloud.function.compiler.proxy; - -import java.io.InputStreamReader; -import java.lang.reflect.Method; - -import org.springframework.beans.factory.BeanNameAware; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.cloud.function.compiler.AbstractFunctionCompiler; -import org.springframework.cloud.function.compiler.CompiledFunctionFactory; -import org.springframework.cloud.function.core.FunctionFactoryMetadata; -import org.springframework.core.io.Resource; -import org.springframework.util.Assert; -import org.springframework.util.FileCopyUtils; - -/** - * @param target type - * @author Mark Fisher - */ -public class AbstractLambdaCompilingProxy - implements InitializingBean, BeanNameAware, FunctionFactoryMetadata { - - private final Resource resource; - - private final AbstractFunctionCompiler compiler; - - private String beanName; - - private CompiledFunctionFactory factory; - - private String[] typeParameterizations; - - public AbstractLambdaCompilingProxy(Resource resource, - AbstractFunctionCompiler compiler) { - Assert.notNull(resource, "Resource must not be null"); - Assert.notNull(compiler, "Compiler must not be null"); - this.resource = resource; - this.compiler = compiler; - } - - @Override - public void setBeanName(String beanName) { - this.beanName = beanName; - } - - public void setTypeParameterizations(String... typeParameterizations) { - this.typeParameterizations = typeParameterizations; - } - - @Override - public void afterPropertiesSet() throws Exception { - String lambda = FileCopyUtils - .copyToString(new InputStreamReader(this.resource.getInputStream())); - this.factory = this.compiler.compile(this.beanName, lambda, - this.typeParameterizations); - } - - @Override - public final T getTarget() { - return this.factory.getResult(); - } - - @Override - public Method getFactoryMethod() { - return this.factory.getFactoryMethod(); - } - -} diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingConsumer.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingConsumer.java deleted file mode 100644 index da45e2e47..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingConsumer.java +++ /dev/null @@ -1,41 +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 org.springframework.cloud.function.compiler.proxy; - -import java.util.function.Consumer; - -import org.springframework.cloud.function.core.FunctionFactoryMetadata; -import org.springframework.core.io.Resource; - -/** - * @param type - * @author Mark Fisher - * @author Oleg Zhurakousky - */ -public class ByteCodeLoadingConsumer extends AbstractByteCodeLoadingProxy> - implements FunctionFactoryMetadata>, Consumer { - - public ByteCodeLoadingConsumer(Resource resource) { - super(resource); - } - - @Override - public void accept(T t) { - this.getTarget().accept(t); - } - -} diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingFunction.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingFunction.java deleted file mode 100644 index 19e921c8c..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingFunction.java +++ /dev/null @@ -1,43 +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 org.springframework.cloud.function.compiler.proxy; - -import java.util.function.Function; - -import org.springframework.cloud.function.core.FunctionFactoryMetadata; -import org.springframework.core.io.Resource; - -/** - * @param Function input type - * @param Function result type - * @author Mark Fisher - * @author Oleg Zhurakousky - */ -public class ByteCodeLoadingFunction - extends AbstractByteCodeLoadingProxy> - implements FunctionFactoryMetadata>, Function { - - public ByteCodeLoadingFunction(Resource resource) { - super(resource); - } - - @Override - public R apply(T input) { - return this.getTarget().apply(input); - } - -} diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingSupplier.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingSupplier.java deleted file mode 100644 index 257fab96b..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingSupplier.java +++ /dev/null @@ -1,41 +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 org.springframework.cloud.function.compiler.proxy; - -import java.util.function.Supplier; - -import org.springframework.cloud.function.core.FunctionFactoryMetadata; -import org.springframework.core.io.Resource; - -/** - * @param type - * @author Mark Fisher - * @author Oleg Zhurakousky - */ -public class ByteCodeLoadingSupplier extends AbstractByteCodeLoadingProxy> - implements FunctionFactoryMetadata>, Supplier { - - public ByteCodeLoadingSupplier(Resource resource) { - super(resource); - } - - @Override - public T get() { - return this.getTarget().get(); - } - -} diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/LambdaCompilingConsumer.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/LambdaCompilingConsumer.java deleted file mode 100644 index bd8c5e16b..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/LambdaCompilingConsumer.java +++ /dev/null @@ -1,40 +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 org.springframework.cloud.function.compiler.proxy; - -import java.util.function.Consumer; - -import org.springframework.cloud.function.compiler.ConsumerCompiler; -import org.springframework.core.io.Resource; - -/** - * @param input argument type - * @author Mark Fisher - */ -public class LambdaCompilingConsumer extends AbstractLambdaCompilingProxy> - implements Consumer { - - public LambdaCompilingConsumer(Resource resource, ConsumerCompiler compiler) { - super(resource, compiler); - } - - @Override - public void accept(T input) { - this.getTarget().accept(input); - } - -} diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/LambdaCompilingFunction.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/LambdaCompilingFunction.java deleted file mode 100644 index 92a01d21a..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/LambdaCompilingFunction.java +++ /dev/null @@ -1,43 +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 org.springframework.cloud.function.compiler.proxy; - -import java.util.function.Function; - -import org.springframework.cloud.function.compiler.FunctionCompiler; -import org.springframework.cloud.function.core.FunctionFactoryMetadata; -import org.springframework.core.io.Resource; - -/** - * @param input argument type - * @param output argument type - * @author Mark Fisher - */ -public class LambdaCompilingFunction - extends AbstractLambdaCompilingProxy> - implements FunctionFactoryMetadata>, Function { - - public LambdaCompilingFunction(Resource resource, FunctionCompiler compiler) { - super(resource, compiler); - } - - @Override - public R apply(T input) { - return this.getTarget().apply(input); - } - -} diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/LambdaCompilingSupplier.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/LambdaCompilingSupplier.java deleted file mode 100644 index cb2db39d9..000000000 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/LambdaCompilingSupplier.java +++ /dev/null @@ -1,41 +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 org.springframework.cloud.function.compiler.proxy; - -import java.util.function.Supplier; - -import org.springframework.cloud.function.compiler.SupplierCompiler; -import org.springframework.cloud.function.core.FunctionFactoryMetadata; -import org.springframework.core.io.Resource; - -/** - * @param target type - * @author Mark Fisher - */ -public class LambdaCompilingSupplier extends AbstractLambdaCompilingProxy> - implements FunctionFactoryMetadata>, Supplier { - - public LambdaCompilingSupplier(Resource resource, SupplierCompiler compiler) { - super(resource, compiler); - } - - @Override - public T get() { - return this.getTarget().get(); - } - -} diff --git a/spring-cloud-function-compiler/src/main/resources/META-INF/spring.factories b/spring-cloud-function-compiler/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 0f7f11139..000000000 --- a/spring-cloud-function-compiler/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.context.ApplicationListener=\ -org.springframework.cloud.function.compiler.config.FunctionProxyApplicationListener diff --git a/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/CompilerDependencyResolutionTests.java b/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/CompilerDependencyResolutionTests.java deleted file mode 100644 index 5480e8a9c..000000000 --- a/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/CompilerDependencyResolutionTests.java +++ /dev/null @@ -1,466 +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 org.springframework.cloud.function.compiler; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; -import java.net.URLClassLoader; -import java.util.ArrayList; -import java.util.List; -import java.util.function.Consumer; -import java.util.function.Function; -import java.util.jar.JarEntry; -import java.util.jar.JarInputStream; -import java.util.jar.JarOutputStream; -import java.util.zip.ZipEntry; - -import ch.qos.logback.classic.Level; -import ch.qos.logback.classic.Logger; -import ch.qos.logback.classic.LoggerContext; -import org.junit.jupiter.api.Test; -import org.slf4j.LoggerFactory; - -import org.springframework.cloud.function.compiler.java.CompilationResult; -import org.springframework.cloud.function.compiler.java.RuntimeJavaCompiler; -import org.springframework.cloud.function.core.FunctionFactoryUtils; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * Tests that verify dependency resolution. Dependencies can be resolved against simple - * classpath entries or against classes under BOOT-INF/classes or in a nested jar under - * under BOOT-INF/lib. Finding classes in those locations enables compilation against a - * packaged boot jar. - * - * @author Andy Clement - */ -public class CompilerDependencyResolutionTests { - - @Test - public void compilingTestClass() throws Exception { - ClassDescriptor t1 = compile("Test1", - "package com.test;\npublic class Test1 { public static String doit() { return \"T1\";}}\n"); - String result = (String) t1.clazz.getDeclaredMethod("doit").invoke(null); - assertThat(result).isEqualTo("T1"); - } - - @Test - public void packagingClassesIntoJar() { - ClassDescriptor t1 = getTestClass("1"); - ClassDescriptor t2 = getTestClass("2"); - File jar = JarBuilder.create().addEntries(t1, t2).getJar(); - assertJarContents(jar, t1, t2); - } - - /** - * Doesn't actually verify the caching helps but can be useful to run to see current - * numbers. - */ - @Test - public void speedtest() { - LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory(); - Logger rootLogger = loggerContext - .getLogger("org.springframework.cloud.function.compiler"); - rootLogger.setLevel(Level.ERROR); - - // 10 uses of a single function compiler: - long stime = System.currentTimeMillis(); - FunctionCompiler fc = new FunctionCompiler( - String.class.getName()); - for (int i = 0; i < 5; i++) { - stime = System.currentTimeMillis(); - CompiledFunctionFactory> result = fc.compile("foos", - "flux -> flux.map(v -> v.toUpperCase())", "Flux", - "Flux"); - assertThat(FunctionFactoryUtils.isFluxFunction(result.getFactoryMethod())) - .isTrue(); - System.out.println("Reusing FunctionCompiler: #" + (i + 1) + " = " - + (System.currentTimeMillis() - stime) + "ms"); - } - - // 3 separate FunctionCompilers: - stime = System.currentTimeMillis(); - CompiledFunctionFactory> compiled = new FunctionCompiler( - String.class.getName()).compile("foos", - "flux -> flux.map(v -> v.toUpperCase())", "Flux", - "Flux"); - assertThat(FunctionFactoryUtils.isFluxFunction(compiled.getFactoryMethod())) - .isTrue(); - long etime = System.currentTimeMillis(); - long time1 = (etime - stime); - System.out.println("New FunctionCompiler: " + time1 + "ms"); - - stime = System.currentTimeMillis(); - compiled = new FunctionCompiler(String.class.getName()).compile( - "foos", "flux -> flux.map(v -> v.toUpperCase())", "Flux", - "Flux"); - assertThat(FunctionFactoryUtils.isFluxFunction(compiled.getFactoryMethod())) - .isTrue(); - etime = System.currentTimeMillis(); - long time2 = (etime - stime); - System.out.println("New FunctionCompiler: " + time2 + "ms"); - - stime = System.currentTimeMillis(); - compiled = new FunctionCompiler(String.class.getName()).compile( - "foos", "flux -> flux.map(v -> v.toUpperCase())", "Flux", - "Flux"); - assertThat(FunctionFactoryUtils.isFluxFunction(compiled.getFactoryMethod())) - .isTrue(); - etime = System.currentTimeMillis(); - long time3 = (etime - stime); - System.out.println("New FunctionCompiler: " + time3 + "ms"); - } - - @Test - public void usingJarNoPackageDecl() throws Exception { - ClassDescriptor tx = compile("TestX", - "public class TestX { public static String doit() { return \"TX\";}}\n"); - File jar = JarBuilder.create().addEntry(tx).getJar(); - assertJarContents(jar, tx); - CompilationResult result = new RuntimeJavaCompiler().compile("A", - "public class A {\n" + " public static Object run() {\n" - + " return new TestX();\n" + " }\n" + "}", - jar.toURI().toString()); - assertThat(result.getCompilationMessages().isEmpty()) - .as("Should be no problems: " + result.getCompilationMessages()).isTrue(); - try (URLClassLoader cl = new TestClassLoader(tx, descriptorFromResult(result))) { - Class class1 = cl.loadClass("A"); - Object invoke = class1.getDeclaredMethod("run").invoke(null); - assertThat(invoke.getClass().getName()).isEqualTo(tx.name); - } - } - - // A class with no package declaration is placed under BOOT-INF/classes/ in a jar that - // is then used for resolution - @Test - public void usingJarNoPackageDeclBootInfClasses() throws Exception { - ClassDescriptor t1 = compile("TestX", - "public class TestX { public static String doit() { return \"TX\";}}\n"); - File jar = JarBuilder.create().addEntryWithPrefix("BOOT-INF/classes/", t1) - .getJar(); - assertJarContents(jar, "BOOT-INF/classes/", t1); - CompilationResult result = new RuntimeJavaCompiler().compile("A", - "public class A {\n" + " public static Object run() {\n" - + " return new TestX();\n" + " }\n" + "}", - jar.toURI().toString()); - assertThat(result.getCompilationMessages().isEmpty()) - .as("Should be no problems: " + result.getCompilationMessages()).isTrue(); - try (URLClassLoader cl = new TestClassLoader(t1, descriptorFromResult(result))) { - Class class1 = cl.loadClass("A"); - Object invoke = class1.getDeclaredMethod("run").invoke(null); - assertThat(invoke.getClass().getName()).isEqualTo(t1.name); - } - } - - // A class with no package declaration is placed in a jar which is then placed under - // under BOOT-INF/lib/ in a jar that is then used for resolution - @Test - public void usingJarNoPackageDeclNestedBootInfLib() throws Exception { - ClassDescriptor t1 = compile("TestX", - "public class TestX { public static String doit() { return \"TX\";}}\n"); - File jar = JarBuilder.create().addEntry(t1).getJar(); - assertJarContents(jar, t1); - // Now stick that jar in another jar! - File jar2 = JarBuilder.create().addEntry("BOOT-INF/lib/inner.jar", jar).getJar(); - CompilationResult result = new RuntimeJavaCompiler().compile("A", - "public class A {\n" + " public static Object run() {\n" - + " return new TestX();\n" + " }\n" + "}", - jar2.toURI().toString()); - assertThat(result.getCompilationMessages().isEmpty()) - .as("Should be no problems: " + result.getCompilationMessages()).isTrue(); - try (URLClassLoader cl = new TestClassLoader(t1, descriptorFromResult(result))) { - Class class1 = cl.loadClass("A"); - Object invoke = class1.getDeclaredMethod("run").invoke(null); - assertThat(invoke.getClass().getName()).isEqualTo(t1.name); - } - } - - // Build a jar containing a type with a package declaration and building against it - @Test - public void usingJarWithPackageDecl() throws Exception { - ClassDescriptor t1 = getTestClass("1"); - File jar = JarBuilder.create().addEntry(t1).getJar(); - assertJarContents(jar, t1); - CompilationResult result = new RuntimeJavaCompiler().compile("A", - "import " + t1.name.replace('$', '.') + ";\n" + "public class A {\n" - + " public static Object run() {\n" + " return new Test1();\n" - + " }\n" + "}", - jar.toURI().toString()); - assertThat(result.getCompilationMessages().isEmpty()) - .as("Should be no problems: " + result.getCompilationMessages()).isTrue(); - try (URLClassLoader cl = new TestClassLoader(t1, descriptorFromResult(result))) { - Class class1 = cl.loadClass("A"); - Object invoke = class1.getDeclaredMethod("run").invoke(null); - assertThat(invoke.getClass().getName()).isEqualTo(t1.name); - } - } - - @Test - public void usingJarWithPackageDeclBootInfClasses() throws Exception { - // Here the dependencies are under BOOT-INF/classes in the jar - ClassDescriptor t1 = getTestClass("1"); - File jar = JarBuilder.create().addEntryWithPrefix("BOOT-INF/classes/", t1) - .getJar(); - assertJarContents(jar, "BOOT-INF/classes/", t1); - CompilationResult result = new RuntimeJavaCompiler().compile("A", - "import " + t1.name.replace('$', '.') + ";\n" + "public class A {\n" - + " public static Object run() {\n" + " return new Test1();\n" - + " }\n" + "}", - jar.toURI().toString()); - assertThat(result.getCompilationMessages().isEmpty()) - .as("Should be no problems: " + result.getCompilationMessages()).isTrue(); - try (URLClassLoader cl = new TestClassLoader(t1, descriptorFromResult(result))) { - Class class1 = cl.loadClass("A"); - Object invoke = class1.getDeclaredMethod("run").invoke(null); - assertThat(invoke.getClass().getName()).isEqualTo(t1.name); - } - } - - @Test - public void usingJarWithPackageDeclNestedBootInfLib() throws Exception { - // Here the dependencies are under BOOT-INF/lib/nested.jar - ClassDescriptor t1 = getTestClass("1"); - File jar = JarBuilder.create().addEntry(t1).getJar(); - assertJarContents(jar, t1); - // Now stick that jar in another jar! - File jar2 = JarBuilder.create().addEntry("BOOT-INF/lib/inner.jar", jar).getJar(); - CompilationResult result = new RuntimeJavaCompiler().compile("A", - "import " + t1.name.replace('$', '.') + ";\n" + "public class A {\n" - + " public static Object run() {\n" + " return new Test1();\n" - + " }\n" + "}", - jar2.toURI().toString()); - assertThat(result.getCompilationMessages().isEmpty()) - .as("Should be no problems: " + result.getCompilationMessages()).isTrue(); - try (URLClassLoader cl = new TestClassLoader(t1, descriptorFromResult(result))) { - Class class1 = cl.loadClass("A"); - Object invoke = class1.getDeclaredMethod("run").invoke(null); - assertThat(invoke.getClass().getName()).isEqualTo(t1.name); - } - } - - // --- - - private ClassDescriptor descriptorFromResult(CompilationResult result) { - Class clazz = result.getCompiledClasses().get(0); - return new ClassDescriptor(clazz.getName(), result.getClassBytes(clazz.getName()), - clazz); - } - - private ClassDescriptor compile(String className, String classSourceCode) { - CompilationResult compile = new RuntimeJavaCompiler().compile(className, - classSourceCode); - assertThat(compile.getCompilationMessages().isEmpty()) - .as("Should be empty: \n" + compile.getCompilationMessages()).isTrue(); - Class clazz = compile.getCompiledClasses().get(0); - return new ClassDescriptor(clazz.getName(), - compile.getClassBytes(clazz.getName()), - compile.getCompiledClasses().get(0)); - } - - private ClassDescriptor getTestClass(String suffix) { - try { - return compile("Test" + suffix, - "package com.test;\npublic class Test" + suffix - + " { public static String doit() { return \"T" + suffix - + "\";}}\n"); - } - catch (Exception e) { - throw new IllegalStateException(e); - } - } - - private void assertJarContents(File jar, ClassDescriptor... classdescriptors) { - assertJarContents(jar, "", classdescriptors); - } - - private void assertJarContents(File jar, String prefix, - ClassDescriptor... classDescriptors) { - List clazzes = new ArrayList<>(); - for (ClassDescriptor classDescriptor : classDescriptors) { - clazzes.add(prefix + classDescriptor.name.replace('.', '/') + ".class"); - } - walkJar(jar, (entry) -> clazzes.remove(entry.getName())); - assertThat(clazzes.isEmpty()).as("Should be empty: " + clazzes).isTrue(); - } - - private void walkJar(File jar, Consumer fn) { - try { - JarInputStream jarInputStream = new JarInputStream(new FileInputStream(jar)); - while (true) { - JarEntry nextJarEntry = jarInputStream.getNextJarEntry(); - if (nextJarEntry == null) { - break; - } - fn.accept(nextJarEntry); - } - jarInputStream.close(); - } - catch (IOException ioe) { - ioe.printStackTrace(); - } - } - - @SuppressWarnings("unused") - private void printJar(File jar) { - System.out.println("Contents of jar: " + jar); - walkJar(jar, (entry) -> { - System.out.println("- " + entry.getName()); - }); - } - - // Simple holder for the result of compilation - static class ClassDescriptor { - - final String name; - - final byte[] bytes; - - final Class clazz; - - ClassDescriptor(String name, byte[] bytes, Class clazz) { - this.name = name; - this.bytes = bytes; - this.clazz = clazz; - } - - } - - static final class JarBuilder { - - File jarFile; - - JarOutputStream jos; - - private JarBuilder() { - try { - File newJar = File.createTempFile("test", ".jar"); - this.jarFile = newJar.getAbsoluteFile(); - newJar.delete(); - this.jos = new JarOutputStream(new FileOutputStream(this.jarFile)); - this.jarFile.deleteOnExit(); - } - catch (IOException e) { - throw new IllegalStateException("Unexpected problem creating file", e); - } - } - - public static JarBuilder create() { - return new JarBuilder(); - } - - public JarBuilder addEntry(String entryName, File entryContentFile) { - try { - ZipEntry ze = new ZipEntry(entryName); - this.jos.putNextEntry(ze); - this.jos.write(loadBytes(entryContentFile)); - this.jos.closeEntry(); - return this; - } - catch (IOException e) { - throw new IllegalStateException(e); - } - } - - private byte[] loadBytes(File f) { - try (InputStream is = new FileInputStream(f)) { - byte[] bs = null; - byte[] buf = new byte[10000]; - int readCount; - while ((readCount = is.read(buf)) != -1) { - if (bs == null) { - bs = new byte[readCount]; - System.arraycopy(buf, 0, bs, 0, readCount); - } - else { - byte[] newbs = new byte[bs.length + readCount]; - System.arraycopy(bs, 0, newbs, 0, bs.length); - System.arraycopy(buf, 0, newbs, bs.length, readCount); - bs = newbs; - } - } - return bs; - } - catch (IOException ioe) { - throw new IllegalStateException(ioe); - } - } - - public JarBuilder addEntries(ClassDescriptor... classes) { - for (ClassDescriptor clazz : classes) { - addEntry(clazz); - } - return this; - } - - public JarBuilder addEntry(ClassDescriptor clazz) { - return addEntryWithPrefix("", clazz); - } - - public JarBuilder addEntryWithPrefix(String prefix, ClassDescriptor holder) { - try { - String n = holder.name.replace('.', '/') + ".class"; - ZipEntry ze = new ZipEntry(prefix + n); - this.jos.putNextEntry(ze); - this.jos.write(holder.bytes); - this.jos.closeEntry(); - return this; - } - catch (IOException e) { - throw new IllegalStateException(e); - } - } - - private File getJar() { - try { - this.jos.close(); - } - catch (IOException e) { - throw new IllegalStateException("Unable to close jar", e); - } - return this.jarFile; - } - - } - - // Simple classloader that can load from descriptors - class TestClassLoader extends URLClassLoader { - - ClassDescriptor[] descriptors; - - TestClassLoader(ClassDescriptor... descriptors) { - super(new URL[0], TestClassLoader.class.getClassLoader()); - this.descriptors = descriptors; - } - - @Override - protected Class findClass(String name) throws ClassNotFoundException { - for (ClassDescriptor descriptor : this.descriptors) { - if (descriptor.name.equals(name)) { - return defineClass(descriptor.name, descriptor.bytes, 0, - descriptor.bytes.length); - } - } - return super.findClass(name); - } - - } - -} diff --git a/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/ConsumerCompilerTests.java b/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/ConsumerCompilerTests.java deleted file mode 100644 index 962823b13..000000000 --- a/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/ConsumerCompilerTests.java +++ /dev/null @@ -1,50 +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 org.springframework.cloud.function.compiler; - -import java.util.function.Consumer; - -import org.junit.jupiter.api.Test; - -import org.springframework.cloud.function.core.FunctionFactoryUtils; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * @author Dave Syer - * - */ -public class ConsumerCompilerTests { - - @Test - public void consumesFluxString() { - CompiledFunctionFactory> compiled = new ConsumerCompiler( - String.class.getName()).compile("foos", - "flux -> flux.subscribe(System.out::println)", "Flux"); - assertThat(FunctionFactoryUtils.isFluxConsumer(compiled.getFactoryMethod())) - .isTrue(); - } - - @Test - public void consumesString() { - CompiledFunctionFactory> compiled = new ConsumerCompiler( - String.class.getName()).compile("foos", "System.out::println", "String"); - assertThat(FunctionFactoryUtils.isFluxConsumer(compiled.getFactoryMethod())) - .isFalse(); - } - -} diff --git a/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/FunctionCompilerTests.java b/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/FunctionCompilerTests.java deleted file mode 100644 index 0a00deffc..000000000 --- a/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/FunctionCompilerTests.java +++ /dev/null @@ -1,53 +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 org.springframework.cloud.function.compiler; - -import java.util.function.Function; - -import org.junit.jupiter.api.Test; - -import org.springframework.cloud.function.core.FunctionFactoryUtils; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * @author Dave Syer - * - */ -public class FunctionCompilerTests { - - @Test - public void transformsFluxString() { - CompiledFunctionFactory> compiled = new FunctionCompiler( - String.class.getName()).compile("foos", - "flux -> flux.map(v -> v.toUpperCase())", "Flux", - "Flux"); - assertThat(FunctionFactoryUtils.isFluxFunction(compiled.getFactoryMethod())) - .isTrue(); - } - - @Test - public void transformsString() { - CompiledFunctionFactory> compiled = new FunctionCompiler( - String.class.getName()).compile("foos", "v -> v.toUpperCase()", "String", - "String"); - assertThat(FunctionFactoryUtils.isFluxFunction(compiled.getFactoryMethod())) - .isFalse(); - assertThat(compiled.getResult().apply("hello")).isEqualTo("HELLO"); - } - -} diff --git a/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/SupplierCompilerTests.java b/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/SupplierCompilerTests.java deleted file mode 100644 index fa2a0a225..000000000 --- a/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/SupplierCompilerTests.java +++ /dev/null @@ -1,63 +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 org.springframework.cloud.function.compiler; - -import java.util.function.Supplier; - -import org.junit.jupiter.api.Test; -import reactor.core.publisher.Flux; - -import org.springframework.cloud.function.core.FunctionFactoryUtils; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * @author Dave Syer - * - */ -public class SupplierCompilerTests { - - @Test - public void supppliesFluxString() { - CompiledFunctionFactory> compiled = new SupplierCompiler( - String.class.getName()).compile("foos", - "() -> Flux.just(\"foo\", \"bar\")", "Flux"); - assertThat(FunctionFactoryUtils.isFluxSupplier(compiled.getFactoryMethod())) - .isTrue(); - } - - @Test - public void supppliesString() { - CompiledFunctionFactory> compiled = new SupplierCompiler( - String.class.getName()).compile("foos", "() -> \"foo\"", "String"); - assertThat(FunctionFactoryUtils.isFluxSupplier(compiled.getFactoryMethod())) - .isFalse(); - assertThat(compiled.getResult().get()).isEqualTo("foo"); - } - - @Test - public void supppliesFluxStreamString() { - CompiledFunctionFactory>> compiled = new SupplierCompiler>( - String.class.getName()).compile("foos", - "() -> Flux.interval(Duration.ofMillis(1000)).map(Object::toString)", - "Flux"); - assertThat(FunctionFactoryUtils.isFluxSupplier(compiled.getFactoryMethod())) - .isTrue(); - assertThat(compiled.getResult().get().blockFirst()).isEqualTo("0"); - } - -} diff --git a/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/java/RuntimeJavaCompilerTests.java b/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/java/RuntimeJavaCompilerTests.java deleted file mode 100644 index 10ec123eb..000000000 --- a/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/java/RuntimeJavaCompilerTests.java +++ /dev/null @@ -1,174 +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 org.springframework.cloud.function.compiler.java; - -import java.io.File; -import java.util.List; -import java.util.Locale; -import java.util.function.Supplier; - -import org.junit.jupiter.api.Test; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * @author Andy Clement - */ -@SuppressWarnings("unchecked") -public class RuntimeJavaCompilerTests { - - @Test - public void basicCompilation() { - RuntimeJavaCompiler rjc = new RuntimeJavaCompiler(); - CompilationResult cr = rjc.compile("A", "public class A {}"); - List compilationMessages = cr.getCompilationMessages(); - assertThat(compilationMessages.isEmpty()).isTrue(); - } - - @Test - public void missingType() throws Exception { - Locale.setDefault(Locale.ENGLISH); - RuntimeJavaCompiler rjc = new RuntimeJavaCompiler(); - CompilationResult cr = rjc.compile("A", - "public class A implements java.util.function.Supplier { " - + " public String get() {\n" - + " ExpressionParser parser = new SpelExpressionParser();\n" - + " Expression exp = parser.parseExpression(\"'Hello World'\");\n" - + " String message = (String) exp.getValue();" - + " return message;\n" + " }\n" + "}"); - List compilationMessages = cr.getCompilationMessages(); - assertThat(compilationMessages.size()).isEqualTo(3); - assertThat(compilationMessages.get(0).getMessage().contains("cannot find symbol")) - .isTrue(); - assertThat(compilationMessages.get(0).getMessage() - .contains("class ExpressionParser")).isTrue(); - assertThat(compilationMessages.get(1).getMessage().contains("cannot find symbol")) - .isTrue(); - assertThat(compilationMessages.get(1).getMessage() - .contains("class SpelExpressionParser")).isTrue(); - assertThat(compilationMessages.get(2).getMessage().contains("cannot find symbol")) - .isTrue(); - assertThat(compilationMessages.get(2).getMessage().contains("class Expression")) - .isTrue(); - } - - @Test - public void okWithImportedDependencies() throws Exception { - RuntimeJavaCompiler rjc = new RuntimeJavaCompiler(); - CompilationResult cr = rjc.compile("A", - "import org.springframework.expression.*;\n" - + "import org.springframework.expression.spel.standard.*;\n" - + "public class A implements java.util.function.Supplier {\n" - + " public String get() {\n" - + " ExpressionParser parser = new SpelExpressionParser();\n" - + " Expression exp = parser.parseExpression(\"'Hello World'\");\n" - + " String message = (String) exp.getValue();\n" - + " return message;\n" + " }\n" + "}", - "maven://org.springframework:spring-expression:4.3.9.RELEASE"); - List compilationMessages = cr.getCompilationMessages(); - assertThat(compilationMessages.isEmpty()).isTrue(); - try (SimpleClassLoader cl = new SimpleClassLoader( - this.getClass().getClassLoader())) { - Class clazz = cl.defineClass("A", cr.getClassBytes("A")); - Supplier supplier = (Supplier) clazz.newInstance(); - assertThat(supplier.get()).isEqualTo("Hello World"); - } - } - - @Test - public void okWithImportedDependencies2() throws Exception { - RuntimeJavaCompiler rjc = new RuntimeJavaCompiler(); - String source = "import org.joda.time.*;\n" - + "public class A implements java.util.function.Supplier {\n" - + " public String get() {\n" + " DateTime dt = new DateTime();\n" - + " int month = dt.getMonthOfYear();\n" - + " return String.valueOf(month>0);\n" + " }\n" + "}"; - CompilationResult cr = rjc.compile("A", source, - "maven://joda-time:joda-time:2.9.9"); - List compilationMessages = cr.getCompilationMessages(); - assertThat(compilationMessages.isEmpty()).isTrue(); - List resolvedAdditionalDependencies = cr - .getResolvedAdditionalDependencies(); - try (SimpleClassLoader cl = new SimpleClassLoader(resolvedAdditionalDependencies, - this.getClass().getClassLoader())) { - Class clazz = cl.defineClass("A", cr.getClassBytes("A")); - Supplier supplier = (Supplier) clazz.newInstance(); - assertThat(supplier.get()).isEqualTo("true"); - } - - cr = rjc.compile("A", source, - "maven://org.springframework:spring-expression:4.3.9.RELEASE", - "maven://joda-time:joda-time:2.9.9"); - compilationMessages = cr.getCompilationMessages(); - assertThat(compilationMessages.isEmpty()).isTrue(); - resolvedAdditionalDependencies = cr.getResolvedAdditionalDependencies(); - try (SimpleClassLoader cl = new SimpleClassLoader(resolvedAdditionalDependencies, - this.getClass().getClassLoader())) { - Class clazz = cl.defineClass("A", cr.getClassBytes("A")); - Supplier supplier = (Supplier) clazz.newInstance(); - assertThat(supplier.get()).isEqualTo("true"); - } - } - - @Test - public void dependencyResolution() throws Exception { - // Failure: - RuntimeJavaCompiler rjc = new RuntimeJavaCompiler(); - CompilationResult cr = rjc.compile("A", "public class A {}", - "maven://org.springframework:spring-expression2:4.3.9.RELEASE"); // extra - // '2' - // in - // there - List compilationMessages = cr.getCompilationMessages(); - assertThat(compilationMessages.size()).isEqualTo(1); - // ERROR:org.eclipse.aether.resolution.ArtifactResolutionException: Could not find - // artifact org.springframework:spring-expression2:jar:4.3.9.RELEASE in - // spring-snapshots (https://repo.spring.io/libs-snapshot) - assertThat(compilationMessages.get(0).getMessage().contains( - "Could not find artifact org.springframework:spring-expression2:jar:4.3.9.RELEASE")) - .isTrue(); - - // Failure: - rjc = new RuntimeJavaCompiler(); - cr = rjc.compile("A", "public class A {}", - "trouble://org.springframework:spring-expression:4.3.9.RELEASE"); // rogue - // prefix - // (should - // be - // "maven:") - compilationMessages = cr.getCompilationMessages(); - assertThat(compilationMessages.size()).isEqualTo(1); - assertThat(compilationMessages.get(0).getMessage() - .contains("Unrecognized dependency: ")) - .as(compilationMessages.get(0).toString()).isTrue(); - - // Success - rjc = new RuntimeJavaCompiler(); - cr = rjc.compile("A", "public class A {}", "maven://joda-time:joda-time:2.9.9"); - compilationMessages = cr.getCompilationMessages(); - assertThat(compilationMessages.size()).isEqualTo(0); - List resolvedAdditionalDependencies = cr - .getResolvedAdditionalDependencies(); - assertThat(resolvedAdditionalDependencies.size()).isEqualTo(1); - assertThat(resolvedAdditionalDependencies.get(0).toString() - .endsWith("joda-time-2.9.9.jar")) - .as("Expected this to end with 'joda-time-2.9.9.jar': " - + resolvedAdditionalDependencies.get(0).toString()) - .isTrue(); - } - -} diff --git a/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingFunctionTests.java b/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingFunctionTests.java deleted file mode 100644 index 47d86b89f..000000000 --- a/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingFunctionTests.java +++ /dev/null @@ -1,106 +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 org.springframework.cloud.function.compiler.proxy; - -import java.util.function.Consumer; -import java.util.function.Function; -import java.util.function.Supplier; - -import org.junit.jupiter.api.Test; -import reactor.core.publisher.Flux; - -import org.springframework.cloud.function.compiler.CompiledFunctionFactory; -import org.springframework.cloud.function.compiler.ConsumerCompiler; -import org.springframework.cloud.function.compiler.FunctionCompiler; -import org.springframework.cloud.function.compiler.SupplierCompiler; -import org.springframework.cloud.function.core.FunctionFactoryMetadata; -import org.springframework.cloud.function.core.FunctionFactoryUtils; -import org.springframework.core.io.ByteArrayResource; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * @author Dave Syer - * @author Oleg Zhurakousky - */ -public class ByteCodeLoadingFunctionTests { - - @Test - public void compileConsumer() throws Exception { - CompiledFunctionFactory> compiled = new ConsumerCompiler( - String.class.getName()).compile("foos", "System.out::println", "String"); - ByteArrayResource resource = new ByteArrayResource( - compiled.getGeneratedClassBytes(), "foos"); - ByteCodeLoadingConsumer consumer = new ByteCodeLoadingConsumer<>( - resource); - consumer.afterPropertiesSet(); - assertThat(consumer instanceof FunctionFactoryMetadata); - assertThat(FunctionFactoryUtils.isFluxConsumer(consumer.getFactoryMethod())) - .isFalse(); - consumer.accept("foo"); - } - - @Test - public void compileSupplier() throws Exception { - CompiledFunctionFactory> compiled = new SupplierCompiler( - String.class.getName()).compile("foos", "() -> \"foo\"", "String"); - ByteArrayResource resource = new ByteArrayResource( - compiled.getGeneratedClassBytes(), "foos"); - ByteCodeLoadingSupplier supplier = new ByteCodeLoadingSupplier<>( - resource); - supplier.afterPropertiesSet(); - assertThat(supplier instanceof FunctionFactoryMetadata); - assertThat(FunctionFactoryUtils.isFluxSupplier(supplier.getFactoryMethod())) - .isFalse(); - assertThat(supplier.get()).isEqualTo("foo"); - } - - @Test - public void compileFunction() throws Exception { - CompiledFunctionFactory> compiled = new FunctionCompiler( - String.class.getName()).compile("foos", "v -> v.toUpperCase()", "String", - "String"); - ByteArrayResource resource = new ByteArrayResource( - compiled.getGeneratedClassBytes(), "foos"); - ByteCodeLoadingFunction function = new ByteCodeLoadingFunction<>( - resource); - function.afterPropertiesSet(); - assertThat(function instanceof FunctionFactoryMetadata); - assertThat(FunctionFactoryUtils.isFluxFunction(function.getFactoryMethod())) - .isFalse(); - assertThat(function.apply("foo")).isEqualTo("FOO"); - } - - @Test - public void compileFluxFunction() throws Exception { - CompiledFunctionFactory, Flux>> compiled = null; - compiled = new FunctionCompiler, Flux>( - String.class.getName()).compile("foos", - "flux -> flux.map(v -> v.toUpperCase())", "Flux", - "Flux"); - ByteArrayResource resource = new ByteArrayResource( - compiled.getGeneratedClassBytes(), "foos"); - ByteCodeLoadingFunction, Flux> function = new ByteCodeLoadingFunction<>( - resource); - function.afterPropertiesSet(); - assertThat(function instanceof FunctionFactoryMetadata); - assertThat(FunctionFactoryUtils.isFluxFunction(function.getFactoryMethod())) - .isTrue(); - assertThat(function.apply(Flux.just("foo")).blockFirst()).isEqualTo("FOO"); - } - -} diff --git a/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/core/FunctionFactoryUtils.java b/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/core/FunctionFactoryUtils.java deleted file mode 100644 index 41465e4a1..000000000 --- a/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/core/FunctionFactoryUtils.java +++ /dev/null @@ -1,146 +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 org.springframework.cloud.function.core; - -import java.lang.invoke.SerializedLambda; -import java.lang.reflect.Method; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; -import java.util.List; -import java.util.function.Consumer; -import java.util.function.Function; -import java.util.function.Supplier; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import org.reactivestreams.Publisher; -import reactor.core.publisher.Flux; - -import org.springframework.util.ObjectUtils; -import org.springframework.util.ReflectionUtils; - -/** - *

- * Miscellaneous utility operations to interrogate functional components (beans) - * configured in BeanFactory. - *

- *

- * It is important to understand that it is not a general purpose utility to interrogate - * "any" functional component. Certain operations may/will not work as expected due to - * java type erasure. While BeanFactory is not the requirement, this utility is targeting - * only the components defined in such way where they could be configured beans within - * BeanFactory. - *

- * It is primarily used internally by the framework. - * - * @author Mark Fisher - * @author Oleg Zhurakousky - */ -public abstract class FunctionFactoryUtils { - - private static final String FLUX_CLASS_NAME = Flux.class.getName(); - - private static final String PUBLISHER_CLASS_NAME = Publisher.class.getName(); - - private FunctionFactoryUtils() { - } - - public static boolean isFluxConsumer(Consumer consumer) { - return consumer instanceof FunctionFactoryMetadata - ? isFluxConsumer( - ((FunctionFactoryMetadata) consumer).getFactoryMethod()) - : isFlux(1, getParameterizedTypeNames(consumer, Consumer.class)); - } - - public static boolean isFluxConsumer(Method method) { - return isFlux(1, getParameterizedTypeNamesForMethod(method, Consumer.class)); - } - - public static boolean isFluxSupplier(Supplier supplier) { - return supplier instanceof FunctionFactoryMetadata - ? isFluxSupplier( - ((FunctionFactoryMetadata) supplier).getFactoryMethod()) - : isFlux(1, getParameterizedTypeNames(supplier, Supplier.class)); - } - - public static boolean isFluxSupplier(Method method) { - return isFlux(1, getParameterizedTypeNamesForMethod(method, Supplier.class)); - } - - public static boolean isFluxFunction(Function function) { - return function instanceof FunctionFactoryMetadata - ? isFluxFunction( - ((FunctionFactoryMetadata) function).getFactoryMethod()) - : isFlux(1, getParameterizedTypeNames(function, Function.class)); - } - - public static boolean isFluxFunction(Method method) { - return isFlux(2, getParameterizedTypeNamesForMethod(method, Function.class)); - } - - private static String[] getParameterizedTypeNamesForMethod(Method method, - Class interfaceClass) { - String[] types = retrieveTypes(method.getGenericReturnType(), interfaceClass); - return types == null ? new String[0] : types; - } - - private static String[] getParameterizedTypeNames(Object source, - Class interfaceClass) { - return Stream.of(source.getClass().getGenericInterfaces()) - .map(gi -> retrieveTypes(gi, interfaceClass)).filter(s -> s != null) - .findFirst().orElse(getSerializedLambdaParameterizedTypeNames(source)); - } - - private static String[] retrieveTypes(Type genericInterface, - Class interfaceClass) { - if ((genericInterface instanceof ParameterizedType) && interfaceClass - .getTypeName().equals(((ParameterizedType) genericInterface).getRawType() - .getTypeName())) { - ParameterizedType type = (ParameterizedType) genericInterface; - Type[] args = type.getActualTypeArguments(); - if (args != null) { - return Stream.of(args).map(arg -> arg.getTypeName()) - .toArray(String[]::new); - } - } - return null; - } - - private static String[] getSerializedLambdaParameterizedTypeNames(Object source) { - Method method = ReflectionUtils.findMethod(source.getClass(), "writeReplace"); - if (method == null) { - return null; - } - ReflectionUtils.makeAccessible(method); - SerializedLambda serializedLambda = (SerializedLambda) ReflectionUtils - .invokeMethod(method, source); - String signature = serializedLambda.getImplMethodSignature().replaceAll("[()]", - ""); - - List typeNames = Stream.of(signature.split(";")) - .map(t -> t.substring(1).replace('/', '.')).collect(Collectors.toList()); - - return typeNames.toArray(new String[typeNames.size()]); - } - - private static boolean isFlux(int length, String... types) { - return !ObjectUtils.isEmpty(types) && types.length == length - && Stream.of(types).allMatch(type -> type.startsWith(FLUX_CLASS_NAME) - || type.startsWith(PUBLISHER_CLASS_NAME)); - } - -} diff --git a/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/core/FunctionFactoryUtilsTests.java b/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/core/FunctionFactoryUtilsTests.java deleted file mode 100644 index 2331285f8..000000000 --- a/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/core/FunctionFactoryUtilsTests.java +++ /dev/null @@ -1,94 +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 org.springframework.cloud.function.core; - -import java.lang.reflect.Method; -import java.util.function.Consumer; -import java.util.function.Function; -import java.util.function.Supplier; - -import org.junit.jupiter.api.Test; -import org.reactivestreams.Publisher; -import reactor.core.publisher.Flux; - -import org.springframework.util.ReflectionUtils; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * @author Dave Syer - * - */ -public class FunctionFactoryUtilsTests { - - @Test - public void isFluxConsumer() { - Method method = ReflectionUtils.findMethod(FunctionFactoryUtilsTests.class, - "fluxConsumer"); - assertThat(FunctionFactoryUtils.isFluxConsumer(method)).isTrue(); - assertThat(FunctionFactoryUtils.isFluxSupplier(method)).isFalse(); - assertThat(FunctionFactoryUtils.isFluxFunction(method)).isFalse(); - } - - @Test - public void isFluxSupplier() { - Method method = ReflectionUtils.findMethod(FunctionFactoryUtilsTests.class, - "fluxSupplier"); - assertThat(FunctionFactoryUtils.isFluxSupplier(method)).isTrue(); - assertThat(FunctionFactoryUtils.isFluxConsumer(method)).isFalse(); - assertThat(FunctionFactoryUtils.isFluxFunction(method)).isFalse(); - } - - @Test - public void isFluxFunction() { - Method method = ReflectionUtils.findMethod(FunctionFactoryUtilsTests.class, - "fluxFunction"); - assertThat(FunctionFactoryUtils.isFluxFunction(method)).isTrue(); - assertThat(FunctionFactoryUtils.isFluxSupplier(method)).isFalse(); - assertThat(FunctionFactoryUtils.isFluxConsumer(method)).isFalse(); - } - - @Test - public void isReactiveFunction() { - Method method = ReflectionUtils.findMethod(FunctionFactoryUtilsTests.class, - "reactiveFunction"); - assertThat(FunctionFactoryUtils.isFluxFunction(method)).isTrue(); - assertThat(FunctionFactoryUtils.isFluxSupplier(method)).isFalse(); - assertThat(FunctionFactoryUtils.isFluxConsumer(method)).isFalse(); - } - - public Function, Flux> fluxFunction() { - return foos -> foos.map(foo -> new Foo()); - } - - public Function, Publisher> reactiveFunction() { - return foos -> Flux.from(foos).map(foo -> new Foo()); - } - - public Supplier> fluxSupplier() { - return () -> Flux.just(new Foo()); - } - - public Consumer> fluxConsumer() { - return flux -> flux.subscribe(System.out::println); - } - - class Foo { - - } - -} diff --git a/spring-cloud-function-compiler/src/test/resources/logback.xml b/spring-cloud-function-compiler/src/test/resources/logback.xml deleted file mode 100644 index 7d0a9651e..000000000 --- a/spring-cloud-function-compiler/src/test/resources/logback.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/spring-cloud-function-samples/function-sample-compiler/.jdk8 b/spring-cloud-function-samples/function-sample-compiler/.jdk8 deleted file mode 100644 index e69de29bb..000000000 diff --git a/spring-cloud-function-samples/function-sample-compiler/build.gradle b/spring-cloud-function-samples/function-sample-compiler/build.gradle deleted file mode 100644 index ee3becec8..000000000 --- a/spring-cloud-function-samples/function-sample-compiler/build.gradle +++ /dev/null @@ -1,51 +0,0 @@ -buildscript { - ext { - springBootVersion = '1.5.12.RELEASE' - wrapperVersion = '1.0.11.RELEASE' - } - repositories { - mavenLocal() - mavenCentral() - maven { url "https://repo.spring.io/plugins-snapshot" } - maven { url "https://repo.spring.io/plugins-milestone" } - } - dependencies { - classpath("org.springframework.boot.experimental:spring-boot-thin-gradle-plugin:${wrapperVersion}") - classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}") - } -} - -apply plugin: 'java' -apply plugin: 'maven' -apply plugin: 'eclipse' -apply plugin: 'spring-boot' -apply plugin: 'org.springframework.boot.experimental.thin-launcher' - -group = 'io.spring.sample' -version = '2.0.0.RELEASE' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 - -repositories { - mavenLocal() - mavenCentral() - maven { url "https://repo.spring.io/snapshot" } - maven { url "https://repo.spring.io/milestone" } -} - -ext { - springCloudFunctionVersion = "2.0.0.BUILD-SNAPSHOT" -} -ext['reactor.version'] = "3.1.7.RELEASE" - -dependencyManagement { - imports { - mavenBom "org.springframework.cloud:spring-cloud-function-dependencies:${springCloudFunctionVersion}" - } -} - -dependencies { - compile('org.springframework.cloud:spring-cloud-starter-function-web') - compile('org.springframework.cloud:spring-cloud-function-compiler') - testCompile('org.springframework.boot:spring-boot-starter-test') -} diff --git a/spring-cloud-function-samples/function-sample-compiler/gradle/wrapper/gradle-wrapper.jar b/spring-cloud-function-samples/function-sample-compiler/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index ca78035ef0501d802d4fc55381ef2d5c3ce0ec6e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53556 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�H$uJM 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 \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn ( ) { - echo "$*" -} - -die ( ) { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" - -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/spring-cloud-function-samples/function-sample-compiler/gradlew.bat b/spring-cloud-function-samples/function-sample-compiler/gradlew.bat deleted file mode 100644 index f6d5974e7..000000000 --- a/spring-cloud-function-samples/function-sample-compiler/gradlew.bat +++ /dev/null @@ -1,90 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/spring-cloud-function-samples/function-sample-compiler/src/main/java/com/example/SampleApplication.java b/spring-cloud-function-samples/function-sample-compiler/src/main/java/com/example/SampleApplication.java deleted file mode 100644 index d66601624..000000000 --- a/spring-cloud-function-samples/function-sample-compiler/src/main/java/com/example/SampleApplication.java +++ /dev/null @@ -1,31 +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 com.example; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -// @checkstyle:off -@SpringBootApplication -public class SampleApplication { - - public static void main(String[] args) throws Exception { - SpringApplication.run(SampleApplication.class, args); - } - -} -// @checkstyle:on diff --git a/spring-cloud-function-samples/function-sample-compiler/src/test/java/com/example/SampleCompiledConsumerTests.java b/spring-cloud-function-samples/function-sample-compiler/src/test/java/com/example/SampleCompiledConsumerTests.java deleted file mode 100644 index 7b007aa79..000000000 --- a/spring-cloud-function-samples/function-sample-compiler/src/test/java/com/example/SampleCompiledConsumerTests.java +++ /dev/null @@ -1,58 +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 com.example; - -import org.junit.jupiter.api.Test; - -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; -import org.springframework.boot.test.web.client.TestRestTemplate; -import org.springframework.boot.web.server.LocalServerPort; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * @author Mark Fisher - */ -@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = { - "spring.cloud.function.compile.test.lambda=com.example.SampleCompiledConsumerTests.Reference::set", - "spring.cloud.function.compile.test.inputType=String", - "spring.cloud.function.compile.test.type=consumer"}) -public class SampleCompiledConsumerTests { - - @LocalServerPort - private int port; - - @Test - public void print() { - assertThat(new TestRestTemplate().postForObject( - "http://localhost:" + this.port + "/test", "it works", String.class)) - .isNull(); - assertThat(Reference.instance).isEqualTo("it works"); - } - - public static class Reference { - - private static Object instance; - - public static void set(Object o) { - instance = o; - } - - } - -} diff --git a/spring-cloud-function-samples/function-sample-compiler/src/test/java/com/example/SampleCompiledFunctionTests.java b/spring-cloud-function-samples/function-sample-compiler/src/test/java/com/example/SampleCompiledFunctionTests.java deleted file mode 100644 index 9f702be13..000000000 --- a/spring-cloud-function-samples/function-sample-compiler/src/test/java/com/example/SampleCompiledFunctionTests.java +++ /dev/null @@ -1,47 +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 com.example; - -import org.junit.jupiter.api.Test; - -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; -import org.springframework.boot.test.web.client.TestRestTemplate; -import org.springframework.boot.web.server.LocalServerPort; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * @author Mark Fisher - */ -@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = { - "spring.cloud.function.compile.test.lambda=f->f.map(s->s+\"!!!\")", - "spring.cloud.function.compile.test.inputType=Flux", - "spring.cloud.function.compile.test.outputType=Flux"}) -public class SampleCompiledFunctionTests { - - @LocalServerPort - private int port; - - @Test - public void lowercase() { - assertThat(new TestRestTemplate().postForObject( - "http://localhost:" + this.port + "/test", "it works", String.class)) - .contains("it works!!!"); - } - -} diff --git a/spring-cloud-function-samples/function-sample-pof/build.gradle b/spring-cloud-function-samples/function-sample-pof/build.gradle index ee3becec8..d62d81852 100644 --- a/spring-cloud-function-samples/function-sample-pof/build.gradle +++ b/spring-cloud-function-samples/function-sample-pof/build.gradle @@ -46,6 +46,5 @@ dependencyManagement { dependencies { compile('org.springframework.cloud:spring-cloud-starter-function-web') - compile('org.springframework.cloud:spring-cloud-function-compiler') testCompile('org.springframework.boot:spring-boot-starter-test') } diff --git a/spring-cloud-function-samples/function-sample-pojo/build.gradle b/spring-cloud-function-samples/function-sample-pojo/build.gradle index 47409b0e9..d033c4a27 100644 --- a/spring-cloud-function-samples/function-sample-pojo/build.gradle +++ b/spring-cloud-function-samples/function-sample-pojo/build.gradle @@ -46,6 +46,5 @@ dependencyManagement { dependencies { compile('org.springframework.cloud:spring-cloud-starter-function-web') - compile('org.springframework.cloud:spring-cloud-function-compiler') testCompile('org.springframework.boot:spring-boot-starter-test') } diff --git a/spring-cloud-function-samples/function-sample-task/build.gradle b/spring-cloud-function-samples/function-sample-task/build.gradle index 639b41f75..91518d022 100644 --- a/spring-cloud-function-samples/function-sample-task/build.gradle +++ b/spring-cloud-function-samples/function-sample-task/build.gradle @@ -46,6 +46,5 @@ dependencyManagement { dependencies { compile('org.springframework.cloud:spring-cloud-function-task') - compile('org.springframework.cloud:spring-cloud-function-compiler') testCompile('org.springframework.boot:spring-boot-starter-test') } diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index bfa512c92..729b722d6 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -34,10 +34,6 @@ org.springframework.cloud spring-cloud-starter-function-web - - org.springframework.cloud - spring-cloud-function-compiler - org.springframework.boot spring-boot-starter-test diff --git a/spring-cloud-function-samples/function-sample/build.gradle b/spring-cloud-function-samples/function-sample/build.gradle index 76eb4efff..f2976cab9 100644 --- a/spring-cloud-function-samples/function-sample/build.gradle +++ b/spring-cloud-function-samples/function-sample/build.gradle @@ -45,6 +45,5 @@ dependencyManagement { dependencies { compile('org.springframework.cloud:spring-cloud-starter-function-web') - compile('org.springframework.cloud:spring-cloud-function-compiler') testCompile('org.springframework.boot:spring-boot-starter-test') } From d3b30f5ad62a98ec156f162e48707f79fa0812f1 Mon Sep 17 00:00:00 2001 From: onobc Date: Sat, 12 Feb 2022 10:24:22 -0600 Subject: [PATCH 024/210] Remove FunctionType from docs and AWS sample Resolves #808 --- docs/src/main/asciidoc/adapters/aws.adoc | 2 +- docs/src/main/asciidoc/functional.adoc | 2 +- .../src/main/java/example/FunctionConfiguration.java | 9 +++------ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/docs/src/main/asciidoc/adapters/aws.adoc b/docs/src/main/asciidoc/adapters/aws.adoc index 39d4bc9f2..fb0c51131 100644 --- a/docs/src/main/asciidoc/adapters/aws.adoc +++ b/docs/src/main/asciidoc/adapters/aws.adoc @@ -31,7 +31,7 @@ public class FuncApplication implements ApplicationContextInitializer new FunctionRegistration>(function()) - .type(FunctionType.from(Foo.class).to(Bar.class).getType())); + .type(FunctionTypeUtils.functionType(Foo.class, Bar.class))); } } diff --git a/docs/src/main/asciidoc/functional.adoc b/docs/src/main/asciidoc/functional.adoc index 38100f4ae..a12f520ac 100644 --- a/docs/src/main/asciidoc/functional.adoc +++ b/docs/src/main/asciidoc/functional.adoc @@ -40,7 +40,7 @@ public class DemoApplication implements ApplicationContextInitializer new FunctionRegistration<>(uppercase()) - .type(FunctionType.from(String.class).to(String.class))); + .type(FunctionTypeUtils.functionType(String.class, String.class))); } } diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/src/main/java/example/FunctionConfiguration.java b/spring-cloud-function-samples/function-sample-functional-aws-routing/src/main/java/example/FunctionConfiguration.java index 9aa1eea0c..554133da0 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/src/main/java/example/FunctionConfiguration.java +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/src/main/java/example/FunctionConfiguration.java @@ -5,12 +5,9 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.function.context.FunctionRegistration; -import org.springframework.cloud.function.context.FunctionType; import org.springframework.cloud.function.context.MessageRoutingCallback; -import org.springframework.cloud.function.context.MessageRoutingCallback.FunctionRoutingResult; -import org.springframework.cloud.function.json.JsonMapper; +import org.springframework.cloud.function.context.catalog.FunctionTypeUtils; import org.springframework.context.ApplicationContextInitializer; -import org.springframework.context.annotation.Bean; import org.springframework.context.support.GenericApplicationContext; import org.springframework.messaging.Message; @@ -51,9 +48,9 @@ public void initialize(GenericApplicationContext applicationContext) { () -> new RoutingCallback()); applicationContext.registerBean("uppercase", FunctionRegistration.class, () -> new FunctionRegistration<>(uppercase()).type( - FunctionType.from(String.class).to(String.class))); + FunctionTypeUtils.functionType(String.class, String.class))); applicationContext.registerBean("reverse", FunctionRegistration.class, () -> new FunctionRegistration<>(reverse()).type( - FunctionType.from(String.class).to(String.class))); + FunctionTypeUtils.functionType(String.class, String.class))); } } From e85ecd4050aafe746db1822de8648385619682f0 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 16 Feb 2022 17:02:08 +0100 Subject: [PATCH 025/210] Update s-c-build --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ce54fa4ca..67e30c838 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-build - 3.1.1-SNAPSHOT + 3.1.1 From d5c2c0d6630f1add6784c7ae574010525d6391fd Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 16 Feb 2022 16:14:16 +0000 Subject: [PATCH 026/210] Update SNAPSHOT to 3.2.2 --- README.adoc | 2 +- docs/pom.xml | 2 +- pom.xml | 2 +- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 50 files changed, 76 insertions(+), 76 deletions(-) diff --git a/README.adoc b/README.adoc index a96231d59..1f3c627b1 100644 --- a/README.adoc +++ b/README.adoc @@ -102,7 +102,7 @@ string like that.) == Building -:jdkversion: 1.8 +:jdkversion: 17 === Basic Compile and Test diff --git a/docs/pom.xml b/docs/pom.xml index 066a27092..2341c2f05 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2-SNAPSHOT + 3.2.2 pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index 67e30c838..f48292425 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.2-SNAPSHOT + 3.2.2 pom diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index 092a20be6..8f2eea473 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2-SNAPSHOT + 3.2.2 spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index df68a3f43..b09ba267b 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.2-SNAPSHOT + 3.2.2 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index 0b0ed1eab..718568b3e 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.2-SNAPSHOT + 3.2.2 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index f348aac6a..1450ebb75 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.2-SNAPSHOT + 3.2.2 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index a7fbb0e60..62409f7dc 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.2-SNAPSHOT + 3.2.2 diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 3e38496f9..689858d0f 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.2-SNAPSHOT + 3.2.2 spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index 2dbdff528..2cede9176 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.2-SNAPSHOT + 3.2.2 diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index 602f0449d..94c8de199 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2-SNAPSHOT + 3.2.2 diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 2e8642d69..f4bce5ca9 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2-SNAPSHOT + 3.2.2 diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index fb4a3e1c4..7607254e8 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2-SNAPSHOT + 3.2.2 diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 04275c8e8..db378c430 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.1-SNAPSHOT + 3.1.1 spring-cloud-function-dependencies - 3.2.2-SNAPSHOT + 3.2.2 pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 1bbf34116..b6ea5d52e 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2-SNAPSHOT + 3.2.2 diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index a4178e8aa..dce33a523 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 1.8 - 3.2.2-SNAPSHOT + 3.2.2 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index 8191dd508..cdea5e1b7 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 1.8 - 3.2.2-SNAPSHOT + 3.2.2 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 32125d020..f85efe3ce 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 1.8 - 3.2.2-SNAPSHOT + 3.2.2 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index feb5311a8..165355458 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 1.8 - 3.2.2-SNAPSHOT + 3.2.2 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index ead66cdf4..9626419c0 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 1.8 - 3.2.2-SNAPSHOT + 3.2.2 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index d20298893..87d90d279 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 1.8 - 3.2.2-SNAPSHOT + 3.2.2 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 882b60a13..87c8e235f 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 1.8 - 3.2.2-SNAPSHOT + 3.2.2 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index a197f87dc..d66bad1d1 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2-SNAPSHOT + 3.2.2 diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 60cc3ea56..46bab84af 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2-SNAPSHOT + 3.2.2 diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index 3c4ddd7da..f821e760c 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.2-SNAPSHOT + 3.2.2 diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 7f15c554d..3a933a145 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.2-SNAPSHOT + 3.2.2 diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index fc70937b9..5c0de66d9 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.2-SNAPSHOT + 3.2.2 diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 3e0304a30..fe3634eda 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.2-SNAPSHOT + 3.2.2 diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 27393fa0c..bcdc03878 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.2-SNAPSHOT + 3.2.2 diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index fa3844956..1014b0656 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index e81cb2cfd..6f4b8a9d9 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 1.8 - 3.2.2-SNAPSHOT + 3.2.2 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index 3d6289177..d7884a8d8 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 1.8 - 3.2.2-SNAPSHOT + 3.2.2 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 8e9675a83..ef495e056 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 1.8 - 3.2.2-SNAPSHOT + 3.2.2 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index b8958a7b2..52452f00e 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 1.8 - 3.2.2-SNAPSHOT + 3.2.2 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index a148ca0f0..a7c550281 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.2-SNAPSHOT + 3.2.2 diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index 29568d01b..bb428ff20 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index 01a5e6403..8c910a819 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 - 3.2.1-SNAPSHOT + 3.2.2 diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index eade0e637..dadf55ea0 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.2-SNAPSHOT + 3.2.2 diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index 4c3587eff..d11a7410f 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index 45b53f715..ce882009c 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.2-SNAPSHOT + 3.2.2 diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index fd25c5a77..c0e974cd9 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 1.8 - 3.2.2-SNAPSHOT + 3.2.2 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 6c0ea20e9..f7f6fd351 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.2-SNAPSHOT + 3.2.2 diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index 38aafb06d..f2e709230 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 1.8 - 3.2.2-SNAPSHOT + 3.2.2 diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 729b722d6..a4aef5160 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 1.8 - 3.2.2-SNAPSHOT + 3.2.2 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index 90e855317..d300dd3c3 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 1.8 - 3.2.2-SNAPSHOT + 3.2.2 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 69fdcc2c5..fdf8968e3 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2-SNAPSHOT + 3.2.2 diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index fef2cfda4..cb09740b7 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2-SNAPSHOT + 3.2.2 diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index 6ae02e9f2..44c5e1c82 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2-SNAPSHOT + 3.2.2 diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index 169661b40..bb6050c48 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2-SNAPSHOT + 3.2.2 .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index 69b8e3e57..e6d46bf64 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2-SNAPSHOT + 3.2.2 spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From 9cb9f169e1c02b482877bc968a8b05eee7d4caaf Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 16 Feb 2022 16:18:25 +0000 Subject: [PATCH 027/210] Going back to snapshots --- README.adoc | 2 +- docs/pom.xml | 2 +- pom.xml | 2 +- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 50 files changed, 76 insertions(+), 76 deletions(-) diff --git a/README.adoc b/README.adoc index 1f3c627b1..a96231d59 100644 --- a/README.adoc +++ b/README.adoc @@ -102,7 +102,7 @@ string like that.) == Building -:jdkversion: 17 +:jdkversion: 1.8 === Basic Compile and Test diff --git a/docs/pom.xml b/docs/pom.xml index 2341c2f05..066a27092 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2 + 3.2.2-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index f48292425..67e30c838 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.2 + 3.2.2-SNAPSHOT pom diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index 8f2eea473..092a20be6 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2 + 3.2.2-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index b09ba267b..df68a3f43 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.2 + 3.2.2-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index 718568b3e..0b0ed1eab 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.2 + 3.2.2-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index 1450ebb75..f348aac6a 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.2 + 3.2.2-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 62409f7dc..a7fbb0e60 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.2 + 3.2.2-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 689858d0f..3e38496f9 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.2 + 3.2.2-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index 2cede9176..2dbdff528 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.2 + 3.2.2-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index 94c8de199..602f0449d 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2 + 3.2.2-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index f4bce5ca9..2e8642d69 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2 + 3.2.2-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 7607254e8..fb4a3e1c4 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2 + 3.2.2-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index db378c430..04275c8e8 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.1 + 3.1.1-SNAPSHOT spring-cloud-function-dependencies - 3.2.2 + 3.2.2-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index b6ea5d52e..1bbf34116 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2 + 3.2.2-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index dce33a523..a4178e8aa 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.1 1.8 - 3.2.2 + 3.2.2-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index cdea5e1b7..8191dd508 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.1 1.8 - 3.2.2 + 3.2.2-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index f85efe3ce..32125d020 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.1 1.8 - 3.2.2 + 3.2.2-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index 165355458..feb5311a8 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.1 1.8 - 3.2.2 + 3.2.2-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index 9626419c0..ead66cdf4 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.1 1.8 - 3.2.2 + 3.2.2-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 87d90d279..d20298893 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.1 1.8 - 3.2.2 + 3.2.2-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 87c8e235f..882b60a13 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.1 1.8 - 3.2.2 + 3.2.2-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index d66bad1d1..a197f87dc 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2 + 3.2.2-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 46bab84af..60cc3ea56 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2 + 3.2.2-SNAPSHOT diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index f821e760c..3c4ddd7da 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.1 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.2 + 3.2.2-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 3a933a145..7f15c554d 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.1 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.2 + 3.2.2-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index 5c0de66d9..fc70937b9 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.1 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.2 + 3.2.2-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index fe3634eda..3e0304a30 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.1 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.2 + 3.2.2-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index bcdc03878..27393fa0c 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.1 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.2 + 3.2.2-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index 1014b0656..fa3844956 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.1 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 6f4b8a9d9..e81cb2cfd 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.1 1.8 - 3.2.2 + 3.2.2-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index d7884a8d8..3d6289177 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.1 1.8 - 3.2.2 + 3.2.2-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index ef495e056..8e9675a83 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.1 1.8 - 3.2.2 + 3.2.2-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index 52452f00e..b8958a7b2 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.1 1.8 - 3.2.2 + 3.2.2-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index a7c550281..a148ca0f0 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.1 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.2 + 3.2.2-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index bb428ff20..29568d01b 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.1 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index 8c910a819..01a5e6403 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.1 - 3.2.2 + 3.2.1-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index dadf55ea0..eade0e637 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.1 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.2 + 3.2.2-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index d11a7410f..4c3587eff 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.1 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index ce882009c..45b53f715 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.1 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.2 + 3.2.2-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index c0e974cd9..fd25c5a77 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.1 1.8 - 3.2.2 + 3.2.2-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index f7f6fd351..6c0ea20e9 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.1 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.2 + 3.2.2-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index f2e709230..38aafb06d 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.1 1.8 - 3.2.2 + 3.2.2-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index a4aef5160..729b722d6 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.1 1.8 - 3.2.2 + 3.2.2-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index d300dd3c3..90e855317 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.1 1.8 - 3.2.2 + 3.2.2-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index fdf8968e3..69fdcc2c5 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2 + 3.2.2-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index cb09740b7..fef2cfda4 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2 + 3.2.2-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index 44c5e1c82..6ae02e9f2 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2 + 3.2.2-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index bb6050c48..169661b40 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2 + 3.2.2-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index e6d46bf64..69b8e3e57 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2 + 3.2.2-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From 78ee2fc4371e5ccec8065f156bc4cd264e3f5c07 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 16 Feb 2022 16:18:26 +0000 Subject: [PATCH 028/210] Bumping versions to 3.2.3-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 49 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 066a27092..1d8e69162 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index 67e30c838..9856582a2 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 3.1.1 + 3.1.2-SNAPSHOT diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index 092a20be6..c8bba056d 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index df68a3f43..de1874b93 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index 0b0ed1eab..149e0fdc6 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index f348aac6a..16c4fb461 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index a7fbb0e60..bfbffaf0d 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 3e38496f9..6b4097536 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index 2dbdff528..247345323 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index 602f0449d..ba955c425 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 2e8642d69..c56b8268f 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index fb4a3e1c4..1f2c10f81 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 04275c8e8..165065faa 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT spring-cloud-function-dependencies - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 1bbf34116..23820f457 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index a4178e8aa..5dc574b05 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 1.8 - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index 8191dd508..aa7c96841 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 1.8 - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 32125d020..38fc86a45 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 1.8 - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index feb5311a8..c531f2a9d 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 1.8 - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index ead66cdf4..12d63b6e2 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 1.8 - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index d20298893..a46e84a01 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 1.8 - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 882b60a13..d2090e0ad 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 1.8 - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index a197f87dc..ae5a7b507 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 60cc3ea56..808bb37b7 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index 3c4ddd7da..5a0a32265 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 7f15c554d..4bde23861 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index fc70937b9..f8fc5b2c0 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 3e0304a30..425f7ddd4 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 27393fa0c..5a151abfa 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index fa3844956..1014b0656 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index e81cb2cfd..85ca6ebf8 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 1.8 - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index 3d6289177..44d70d1ea 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 1.8 - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 8e9675a83..7cc41b75f 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 1.8 - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index b8958a7b2..16d691552 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 1.8 - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index a148ca0f0..be3326a0c 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index 29568d01b..bb428ff20 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index 01a5e6403..1dad7ab47 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 - 3.2.1-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index eade0e637..45e42aa19 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index 4c3587eff..d11a7410f 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index 45b53f715..51ee9e08f 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index fd25c5a77..a5f941652 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 1.8 - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 6c0ea20e9..2af969d25 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index 38aafb06d..3a96aa6f1 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 1.8 - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 729b722d6..36d1eaf1b 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 1.8 - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index 90e855317..126590704 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 1.8 - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 69fdcc2c5..a9c507af9 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index fef2cfda4..19de1082e 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index 6ae02e9f2..b3f13a377 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index 169661b40..f9c94deca 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index 69b8e3e57..d186c55c8 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.2-SNAPSHOT + 3.2.3-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From 3f3652834164ec4193f3c7fba6f92d2fbd4be218 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Mon, 21 Feb 2022 14:50:29 +0100 Subject: [PATCH 029/210] GH-816 Fix support for function that returns Iterable with target-protocol set Resolves #816 --- .../function/context/catalog/FunctionTypeUtils.java | 2 +- .../context/catalog/SimpleFunctionRegistry.java | 9 ++++++++- .../BeanFactoryAwareFunctionRegistryTests.java | 13 +++++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtils.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtils.java index be0b9264e..c92187779 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtils.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtils.java @@ -82,7 +82,7 @@ public static boolean isTypeCollection(Type type) { } type = getGenericType(type); Class rawType = type instanceof ParameterizedType ? getRawType(type) : (Class) type; - return Collection.class.isAssignableFrom(rawType); + return Iterable.class.isAssignableFrom(rawType); } public static boolean isTypeArray(Type type) { diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java index 2b6cc4ceb..89c9fc595 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java @@ -53,6 +53,7 @@ import org.springframework.cloud.function.context.FunctionRegistration; import org.springframework.cloud.function.context.FunctionRegistry; import org.springframework.cloud.function.context.config.RoutingFunction; +import org.springframework.cloud.function.context.message.MessageUtils; import org.springframework.cloud.function.core.FunctionInvocationHelper; import org.springframework.cloud.function.json.JsonMapper; import org.springframework.context.expression.BeanFactoryResolver; @@ -1149,7 +1150,13 @@ else if (output instanceof Publisher) { convertedOutput = this.convertOutputPublisherIfNecessary((Publisher) output, type, contentType); } else if (output instanceof Message) { - convertedOutput = this.convertOutputMessageIfNecessary(output, ObjectUtils.isEmpty(contentType) ? null : contentType[0]); + Message m = (Message) output; + if (m.getHeaders().containsKey(MessageUtils.TARGET_PROTOCOL) && FunctionTypeUtils.isTypeCollection(this.outputType)) { + convertedOutput = this.convertMultipleOutputValuesIfNecessary(m.getPayload(), ObjectUtils.isEmpty(contentType) ? null : contentType); + } + else { + convertedOutput = this.convertOutputMessageIfNecessary(output, ObjectUtils.isEmpty(contentType) ? null : contentType[0]); + } } else if (output instanceof Collection && this.isOutputTypeMessage()) { convertedOutput = this.convertMultipleOutputValuesIfNecessary(output, ObjectUtils.isEmpty(contentType) ? null : contentType); diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java index 74d93d7fa..7b92cc1fb 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java @@ -56,6 +56,7 @@ import org.springframework.cloud.function.context.FunctionRegistry; import org.springframework.cloud.function.context.FunctionType; import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry.FunctionInvocationWrapper; +import org.springframework.cloud.function.context.message.MessageUtils; import org.springframework.cloud.function.json.JsonMapper; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; @@ -432,6 +433,18 @@ public void testMultipleValuesInOutputHandling() throws Exception { assertThat(result instanceof Message).isFalse(); } + @Test + public void testMultipleValuesInOutputHandlingWithTargetProtocol() throws Exception { + FunctionCatalog catalog = this.configureCatalog(CollectionOutConfiguration.class); + FunctionInvocationWrapper function = catalog.lookup("parseToList", "application/json"); + assertThat(function).isNotNull(); + Object result = function.apply(MessageBuilder.withPayload("1, 2, 3".getBytes()) + .setHeader(MessageHeaders.CONTENT_TYPE, "text/plain") + .setHeader(MessageUtils.TARGET_PROTOCOL, "integration") + .build()); + assertThat(result instanceof List).isTrue(); + } + /** * The following two tests test the fallback mechanism when an accept header has several values. * The function produces Integer, which cannot be serialized by the default converter supporting text/plain From 3785a7c0b067f42379ab3edfb1e1bfc866a0d006 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 23 Feb 2022 15:16:55 +0100 Subject: [PATCH 030/210] Revert "GH-816 Fix support for function that returns Iterable with target-protocol set" This reverts commit 3f3652834164ec4193f3c7fba6f92d2fbd4be218. --- .../function/context/catalog/FunctionTypeUtils.java | 2 +- .../context/catalog/SimpleFunctionRegistry.java | 9 +-------- .../BeanFactoryAwareFunctionRegistryTests.java | 13 ------------- 3 files changed, 2 insertions(+), 22 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtils.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtils.java index c92187779..be0b9264e 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtils.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtils.java @@ -82,7 +82,7 @@ public static boolean isTypeCollection(Type type) { } type = getGenericType(type); Class rawType = type instanceof ParameterizedType ? getRawType(type) : (Class) type; - return Iterable.class.isAssignableFrom(rawType); + return Collection.class.isAssignableFrom(rawType); } public static boolean isTypeArray(Type type) { diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java index 89c9fc595..2b6cc4ceb 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java @@ -53,7 +53,6 @@ import org.springframework.cloud.function.context.FunctionRegistration; import org.springframework.cloud.function.context.FunctionRegistry; import org.springframework.cloud.function.context.config.RoutingFunction; -import org.springframework.cloud.function.context.message.MessageUtils; import org.springframework.cloud.function.core.FunctionInvocationHelper; import org.springframework.cloud.function.json.JsonMapper; import org.springframework.context.expression.BeanFactoryResolver; @@ -1150,13 +1149,7 @@ else if (output instanceof Publisher) { convertedOutput = this.convertOutputPublisherIfNecessary((Publisher) output, type, contentType); } else if (output instanceof Message) { - Message m = (Message) output; - if (m.getHeaders().containsKey(MessageUtils.TARGET_PROTOCOL) && FunctionTypeUtils.isTypeCollection(this.outputType)) { - convertedOutput = this.convertMultipleOutputValuesIfNecessary(m.getPayload(), ObjectUtils.isEmpty(contentType) ? null : contentType); - } - else { - convertedOutput = this.convertOutputMessageIfNecessary(output, ObjectUtils.isEmpty(contentType) ? null : contentType[0]); - } + convertedOutput = this.convertOutputMessageIfNecessary(output, ObjectUtils.isEmpty(contentType) ? null : contentType[0]); } else if (output instanceof Collection && this.isOutputTypeMessage()) { convertedOutput = this.convertMultipleOutputValuesIfNecessary(output, ObjectUtils.isEmpty(contentType) ? null : contentType); diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java index 7b92cc1fb..74d93d7fa 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java @@ -56,7 +56,6 @@ import org.springframework.cloud.function.context.FunctionRegistry; import org.springframework.cloud.function.context.FunctionType; import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry.FunctionInvocationWrapper; -import org.springframework.cloud.function.context.message.MessageUtils; import org.springframework.cloud.function.json.JsonMapper; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; @@ -433,18 +432,6 @@ public void testMultipleValuesInOutputHandling() throws Exception { assertThat(result instanceof Message).isFalse(); } - @Test - public void testMultipleValuesInOutputHandlingWithTargetProtocol() throws Exception { - FunctionCatalog catalog = this.configureCatalog(CollectionOutConfiguration.class); - FunctionInvocationWrapper function = catalog.lookup("parseToList", "application/json"); - assertThat(function).isNotNull(); - Object result = function.apply(MessageBuilder.withPayload("1, 2, 3".getBytes()) - .setHeader(MessageHeaders.CONTENT_TYPE, "text/plain") - .setHeader(MessageUtils.TARGET_PROTOCOL, "integration") - .build()); - assertThat(result instanceof List).isTrue(); - } - /** * The following two tests test the fallback mechanism when an accept header has several values. * The function produces Integer, which cannot be serialized by the default converter supporting text/plain From e347e20e80f2fd70de351d0468cc35e73e13116a Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 23 Feb 2022 15:08:18 +0100 Subject: [PATCH 031/210] GH-816 Enhance test validating collection output --- .../BeanFactoryAwareFunctionRegistryTests.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java index 74d93d7fa..45925c37c 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java @@ -418,18 +418,25 @@ public void byteArrayNoSpecialHandling() throws Exception { assertThat(result.getPayload()).isEqualTo("\"b2xsZWg=\"".getBytes()); } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Test public void testMultipleValuesInOutputHandling() throws Exception { FunctionCatalog catalog = this.configureCatalog(CollectionOutConfiguration.class); FunctionInvocationWrapper function = catalog.lookup("parseToList", "application/json"); assertThat(function).isNotNull(); - Object result = function.apply(MessageBuilder.withPayload("1, 2, 3".getBytes()).setHeader(MessageHeaders.CONTENT_TYPE, "text/plain").build()); + Object result = function.apply(MessageBuilder.withPayload("1,2,3".getBytes()).setHeader(MessageHeaders.CONTENT_TYPE, "text/plain").build()); assertThat(result instanceof Message).isTrue(); + byte[] payload = ((Message) result).getPayload(); + JsonMapper mapper = this.context.getBean(JsonMapper.class); + List resultList = mapper.fromJson(payload, List.class); + assertThat(resultList.size()).isEqualTo(3); + assertThat(resultList.get(0)).isEqualTo("1"); + assertThat(resultList.get(1)).isEqualTo("2"); function = catalog.lookup("parseToListOfMessages", "application/json"); assertThat(function).isNotNull(); - result = function.apply(MessageBuilder.withPayload("1, 2, 3".getBytes()).setHeader(MessageHeaders.CONTENT_TYPE, "text/plain").build()); - assertThat(result instanceof Message).isFalse(); + result = function.apply(MessageBuilder.withPayload("1,2,3".getBytes()).setHeader(MessageHeaders.CONTENT_TYPE, "text/plain").build()); + assertThat(result instanceof List).isTrue(); } /** From fc8ffa607c51fa5d9b6db426fb436912227c8501 Mon Sep 17 00:00:00 2001 From: onobc Date: Sat, 19 Feb 2022 00:37:33 -0600 Subject: [PATCH 032/210] Improve ContextFunctionCatalogAutoConfiguration conditional loading - Allow custom AvroSchemaServiceManager to be used - Make AvroSchemaMessageConverter bean method specifically typed - Make CloudEventsMessageConverter bean method specifically typed - Add tests focusing on the conditional loading aspects of the auto configuration Fixes gh-797 Resolves #814 --- ...ntextFunctionCatalogAutoConfiguration.java | 55 ++++--- .../avro/AvroSchemaServiceManager.java | 3 +- ...oConfigurationConditionalLoadingTests.java | 136 ++++++++++++++++++ 3 files changed, 170 insertions(+), 24 deletions(-) create mode 100644 spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfigurationConditionalLoadingTests.java diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java index 781acd984..62eb8ac9d 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2021 the original author or authors. + * Copyright 2016-2022 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. @@ -41,6 +41,7 @@ import org.springframework.cloud.function.context.MessageRoutingCallback; import org.springframework.cloud.function.context.catalog.BeanFactoryAwareFunctionRegistry; import org.springframework.cloud.function.context.converter.avro.AvroSchemaMessageConverter; +import org.springframework.cloud.function.context.converter.avro.AvroSchemaServiceManager; import org.springframework.cloud.function.context.converter.avro.AvroSchemaServiceManagerImpl; import org.springframework.cloud.function.core.FunctionInvocationHelper; import org.springframework.cloud.function.json.GsonMapper; @@ -69,7 +70,6 @@ import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; - /** * @author Dave Syer * @author Mark Fisher @@ -77,6 +77,7 @@ * @author Artem Bilan * @author Anshul Mehra * @author Soby Chacko + * @author Chris Bono */ @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(FunctionCatalog.class) @@ -110,8 +111,7 @@ public FunctionRegistry functionCatalog(List messageConverters if (!CollectionUtils.isEmpty(messageConverters)) { for (MessageConverter mc : messageConverters) { if (mc instanceof CompositeMessageConverter) { - List conv = ((CompositeMessageConverter) mc).getConverters().stream() - .collect(Collectors.toList()); + List conv = ((CompositeMessageConverter) mc).getConverters().stream().toList(); mcList.addAll(conv); } else { @@ -121,7 +121,7 @@ public FunctionRegistry functionCatalog(List messageConverters } mcList = mcList.stream() - .filter(c -> isConverterEligible(c)) + .filter(this::isConverterEligible) .collect(Collectors.toList()); mcList.add(new JsonMessageConverter(jsonMapper)); @@ -139,20 +139,6 @@ public FunctionRegistry functionCatalog(List messageConverters return new BeanFactoryAwareFunctionRegistry(conversionService, messageConverter, jsonMapper, functionProperties, functionInvocationHelper); } - @Bean - @ConditionalOnMissingBean - @ConditionalOnClass(name = "org.apache.avro.Schema") - public MessageConverter avroSchemaMessageConverter() { - return new AvroSchemaMessageConverter(new AvroSchemaServiceManagerImpl()); - } - - @Bean - @ConditionalOnMissingBean - @ConditionalOnClass(name = "io.cloudevents.spring.messaging.CloudEventMessageConverter") - public MessageConverter cloudEventMessageConverter() { - return new CloudEventMessageConverter(); - } - @Bean(RoutingFunction.FUNCTION_NAME) RoutingFunction functionRouter(FunctionCatalog functionCatalog, FunctionProperties functionProperties, BeanFactory beanFactory, @Nullable MessageRoutingCallback routingCallback) { @@ -164,10 +150,35 @@ private boolean isConverterEligible(Object messageConverter) { if (messageConverterName.startsWith("org.springframework.cloud.")) { return true; } - else if (!messageConverterName.startsWith("org.springframework.")) { - return true; + return !messageConverterName.startsWith("org.springframework."); + } + + @Configuration(proxyBeanMethods = false) + @ConditionalOnClass(name = "io.cloudevents.spring.messaging.CloudEventMessageConverter") + static class CloudEventsMessageConverterConfiguration { + + @Bean + @ConditionalOnMissingBean + public CloudEventMessageConverter cloudEventMessageConverter() { + return new CloudEventMessageConverter(); + } + } + + @Configuration(proxyBeanMethods = false) + @ConditionalOnClass(name = "org.apache.avro.Schema") + static class AvroSchemaMessageConverterConfiguration { + + @Bean + @ConditionalOnMissingBean + public AvroSchemaServiceManager avroSchemaServiceManager() { + return new AvroSchemaServiceManagerImpl(); + } + + @Bean + @ConditionalOnMissingBean + public AvroSchemaMessageConverter avroSchemaMessageConverter(AvroSchemaServiceManager avroSchemaServiceManager) { + return new AvroSchemaMessageConverter(avroSchemaServiceManager); } - return false; } @ComponentScan(basePackages = "${spring.cloud.function.scan.packages:functions}", diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/converter/avro/AvroSchemaServiceManager.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/converter/avro/AvroSchemaServiceManager.java index 9152df071..eed921215 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/converter/avro/AvroSchemaServiceManager.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/converter/avro/AvroSchemaServiceManager.java @@ -28,8 +28,7 @@ * Helps to substitute the default implementation of {@link org.apache.avro.Schema} * Generation using Custom Avro schema generator * - * Provide a custom bean definition of {@link AvroSchemaServiceManager} and mark - * it as @Primary to override the default implementation + * Provide a custom bean definition of {@link AvroSchemaServiceManager} to override the default implementation. * * Migrating this interface from the original Spring Cloud Schema Registry project. * diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfigurationConditionalLoadingTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfigurationConditionalLoadingTests.java new file mode 100644 index 000000000..768ef643d --- /dev/null +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfigurationConditionalLoadingTests.java @@ -0,0 +1,136 @@ +/* + * Copyright 2022-2022 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 org.springframework.cloud.function.context.config; + +import io.cloudevents.spring.messaging.CloudEventMessageConverter; +import org.apache.avro.Schema; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; + +import org.springframework.boot.autoconfigure.AutoConfigurations; +import org.springframework.boot.test.context.FilteredClassLoader; +import org.springframework.boot.test.context.runner.ApplicationContextRunner; +import org.springframework.cloud.function.context.FunctionCatalog; +import org.springframework.cloud.function.context.FunctionRegistry; +import org.springframework.cloud.function.context.converter.avro.AvroSchemaMessageConverter; +import org.springframework.cloud.function.context.converter.avro.AvroSchemaServiceManager; +import org.springframework.cloud.function.context.scan.TestFunction; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + +/** + * Tests the conditional loading aspects of the {@link ContextFunctionCatalogAutoConfiguration}. + * + * @author Chris Bono + */ +public class ContextFunctionCatalogAutoConfigurationConditionalLoadingTests { + + protected final ApplicationContextRunner contextRunner = new ApplicationContextRunner() + .withConfiguration(AutoConfigurations.of(ContextFunctionCatalogAutoConfiguration.class)); + + @Test + void autoConfigDisabledWhenCustomFunctionCatalogExists() { + contextRunner.withBean(FunctionCatalog.class, () -> mock(FunctionCatalog.class)) + .run((context) -> assertThat(context).doesNotHaveBean(FunctionRegistry.class)); + } + + @Nested + class AvroSchemaMessageConverterConfig { + + @Test + void avroSchemaMessageConverterBeansLoadedWhenAvroOnClasspath() { + contextRunner.run((context) -> assertThat(context).hasSingleBean(AvroSchemaServiceManager.class) + .hasSingleBean(AvroSchemaMessageConverter.class)); + } + + @Test + void avroSchemaMessageConverterBeansNotLoadedWhenAvroNotOnClasspath() { + contextRunner.withClassLoader(new FilteredClassLoader(Schema.class)).run((context) -> + assertThat(context).doesNotHaveBean(AvroSchemaServiceManager.class) + .doesNotHaveBean(AvroSchemaMessageConverter.class)); + } + + @Test + void customAvroSchemaServiceManagerIsRespected() { + AvroSchemaServiceManager customManager = mock(AvroSchemaServiceManager.class); + contextRunner.withBean(AvroSchemaServiceManager.class, () -> customManager) + .run((context) -> assertThat(context).getBean(AvroSchemaServiceManager.class).isSameAs(customManager)); + } + + @Test + void customAvroSchemaMessageConverterIsRespected() { + AvroSchemaMessageConverter customConverter = mock(AvroSchemaMessageConverter.class); + contextRunner.withBean(AvroSchemaMessageConverter.class, () -> customConverter) + .run((context) -> assertThat(context).getBean(AvroSchemaMessageConverter.class).isSameAs(customConverter)); + } + } + + @Nested + class CloudEventsMessageConverterConfig { + + @Test + void cloudEventsMessageConverterBeanLoadedWhenCloudEventsOnClasspath() { + contextRunner.run((context) -> assertThat(context).hasSingleBean(CloudEventMessageConverter.class)); + } + + @Test + void cloudEventsMessageConverterBeanNotLoadedWhenCloudEventsNotOnClasspath() { + contextRunner.withClassLoader(new FilteredClassLoader(CloudEventMessageConverter.class)).run((context) -> + assertThat(context).doesNotHaveBean(CloudEventMessageConverter.class)); + } + + @Test + void customCloudEventsMessageConverterIsRespected() { + CloudEventMessageConverter customConverter = mock(CloudEventMessageConverter.class); + contextRunner.withBean(CloudEventMessageConverter.class, () -> customConverter) + .run((context) -> assertThat(context).getBean(CloudEventMessageConverter.class).isSameAs(customConverter)); + } + } + + @Nested + class PlainFunctionScanConfig { + + @Test + void functionScanConfigEnabledByDefault() { + contextRunner.withPropertyValues("spring.cloud.function.scan.packages:" + TestFunction.class.getPackageName()) + .run((context) -> assertThat(context).hasSingleBean(TestFunction.class)); + } + + @Test + void functionScanConfigEnabledWhenEnabledPropertySetToTrue() { + contextRunner.withPropertyValues("spring.cloud.function.scan.packages:" + TestFunction.class.getPackageName(), + "spring.cloud.function.scan.enabled:true") + .run((context) -> assertThat(context).hasSingleBean(TestFunction.class)); + } + + @Test + void functionScanConfigEnabledWithScanPackagesPointingToNoFunctions() { + contextRunner.withPropertyValues("spring.cloud.function.scan.packages:" + TestFunction.class.getPackageName() + ".faux", + "spring.cloud.function.scan.enabled:true") + .run((context) -> assertThat(context).doesNotHaveBean(TestFunction.class)); + } + + @Test + void functionScanConfigDisabledWhenEnabledPropertySetToFalse() { + contextRunner.withPropertyValues("spring.cloud.function.scan.packages:" + TestFunction.class.getPackageName(), + "spring.cloud.function.scan.enabled:false") + .run((context) -> assertThat(context).doesNotHaveBean(TestFunction.class)); + } + + } +} From 2cda32ebc657c0752acacd7474baf6bd50aa5277 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 8 Mar 2022 14:38:34 +0100 Subject: [PATCH 033/210] Clean up code --- .../config/ContextFunctionCatalogAutoConfiguration.java | 2 +- ...onCatalogAutoConfigurationConditionalLoadingTests.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java index 62eb8ac9d..9487a85b5 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java @@ -111,7 +111,7 @@ public FunctionRegistry functionCatalog(List messageConverters if (!CollectionUtils.isEmpty(messageConverters)) { for (MessageConverter mc : messageConverters) { if (mc instanceof CompositeMessageConverter) { - List conv = ((CompositeMessageConverter) mc).getConverters().stream().toList(); + List conv = ((CompositeMessageConverter) mc).getConverters().stream().collect(Collectors.toList()); mcList.addAll(conv); } else { diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfigurationConditionalLoadingTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfigurationConditionalLoadingTests.java index 768ef643d..ab94f742c 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfigurationConditionalLoadingTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfigurationConditionalLoadingTests.java @@ -107,27 +107,27 @@ class PlainFunctionScanConfig { @Test void functionScanConfigEnabledByDefault() { - contextRunner.withPropertyValues("spring.cloud.function.scan.packages:" + TestFunction.class.getPackageName()) + contextRunner.withPropertyValues("spring.cloud.function.scan.packages:" + TestFunction.class.getPackage().getName()) .run((context) -> assertThat(context).hasSingleBean(TestFunction.class)); } @Test void functionScanConfigEnabledWhenEnabledPropertySetToTrue() { - contextRunner.withPropertyValues("spring.cloud.function.scan.packages:" + TestFunction.class.getPackageName(), + contextRunner.withPropertyValues("spring.cloud.function.scan.packages:" + TestFunction.class.getPackage().getName(), "spring.cloud.function.scan.enabled:true") .run((context) -> assertThat(context).hasSingleBean(TestFunction.class)); } @Test void functionScanConfigEnabledWithScanPackagesPointingToNoFunctions() { - contextRunner.withPropertyValues("spring.cloud.function.scan.packages:" + TestFunction.class.getPackageName() + ".faux", + contextRunner.withPropertyValues("spring.cloud.function.scan.packages:" + TestFunction.class.getPackage().getName() + ".faux", "spring.cloud.function.scan.enabled:true") .run((context) -> assertThat(context).doesNotHaveBean(TestFunction.class)); } @Test void functionScanConfigDisabledWhenEnabledPropertySetToFalse() { - contextRunner.withPropertyValues("spring.cloud.function.scan.packages:" + TestFunction.class.getPackageName(), + contextRunner.withPropertyValues("spring.cloud.function.scan.packages:" + TestFunction.class.getPackage().getName(), "spring.cloud.function.scan.enabled:false") .run((context) -> assertThat(context).doesNotHaveBean(TestFunction.class)); } From b6966d1505137fb1b657c42c6a0faffa9607476a Mon Sep 17 00:00:00 2001 From: onobc Date: Mon, 28 Feb 2022 19:49:41 -0600 Subject: [PATCH 034/210] Ability to extend default function result handling Fixes #757 --- .../adapter/azure/FunctionInvoker.java | 125 +++++++++-- .../azure/CustomFunctionInvokerTests.java | 200 ++++++++++++++++++ .../src/main/java/example/Config.java | 23 +- .../ReactiveEchoCustomResultHandler.java | 63 ++++++ 4 files changed, 380 insertions(+), 31 deletions(-) create mode 100644 spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/test/java/org/springframework/cloud/function/adapter/azure/CustomFunctionInvokerTests.java create mode 100644 spring-cloud-function-samples/function-sample-azure/src/main/java/example/ReactiveEchoCustomResultHandler.java diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/FunctionInvoker.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/FunctionInvoker.java index 7ea1232a7..7b89e1df7 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/FunctionInvoker.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/FunctionInvoker.java @@ -1,5 +1,5 @@ /* - * Copyright 2021-2021 the original author or authors. + * Copyright 2021-2022 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. @@ -65,6 +65,7 @@ * @param input type * @param result type * @author Oleg Zhurakousky + * @author Chris Bono * @since 3.2 */ public class FunctionInvoker { @@ -120,37 +121,117 @@ else if (function == null && StringUtils.hasText(functionDefinition) && APPLICAT return function; } - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({"unchecked", "rawtypes"}) public O handleRequest(I input, ExecutionContext executionContext) { String functionDefinition = executionContext.getFunctionName(); FunctionInvocationWrapper function = this.discoverFunction(functionDefinition); Object enhancedInput = enhanceInputIfNecessary(input, executionContext); - Object output = function.apply(enhancedInput); - if (output instanceof Publisher) { - if (FunctionTypeUtils.isMono(function.getOutputType())) { - return (O) this.convertOutputIfNecessary(input, Mono.from((Publisher) output).blockOptional().get()); + Object functionResult = function.apply(enhancedInput); + + if (!(functionResult instanceof Publisher)) { + return postProcessImperativeFunctionResult(input, enhancedInput, functionResult, function, executionContext); + } + return postProcessReactiveFunctionResult(input, enhancedInput, (Publisher) functionResult, function, executionContext); + } + + /** + * Post-processes the result from a non-reactive function invocation before returning it to the Azure + * runtime. The default behavior is to {@link #convertOutputIfNecessary possibly convert} the result. + * + *

Provides a hook for custom function invokers to extend/modify the function results handling. + * + * @param rawInputs the inputs passed in from the Azure runtime + * @param functionInputs the actual inputs used for the function invocation; may be + * {@link #enhanceInputIfNecessary different} from the {@literal rawInputs} + * @param functionResult the result from the function invocation + * @param function the invoked function + * @param executionContext the Azure execution context + * @return the possibly modified function results + */ + protected O postProcessImperativeFunctionResult(I rawInputs, Object functionInputs, Object functionResult, + FunctionInvocationWrapper function, ExecutionContext executionContext + ) { + return (O) this.convertOutputIfNecessary(rawInputs, functionResult); + } + + /** + * Post-processes the result from a reactive function invocation before returning it to the Azure + * runtime. The default behavior is to delegate to {@link #postProcessMonoFunctionResult} or + * {@link #postProcessFluxFunctionResult} based on the result type. + * + *

Provides a hook for custom function invokers to extend/modify the function results handling. + * + * @param rawInputs the inputs passed in from the Azure runtime + * @param functionInputs the actual inputs used for the function invocation; may be + * {@link #enhanceInputIfNecessary different} from the {@literal rawInputs} + * @param functionResult the result from the function invocation + * @param function the invoked function + * @param executionContext the Azure execution context + * @return the possibly modified function results + */ + protected O postProcessReactiveFunctionResult(I rawInputs, Object functionInputs, Publisher functionResult, + FunctionInvocationWrapper function, ExecutionContext executionContext + ) { + if (FunctionTypeUtils.isMono(function.getOutputType())) { + return postProcessMonoFunctionResult(rawInputs, functionInputs, Mono.from(functionResult), function, executionContext); + } + return postProcessFluxFunctionResult(rawInputs, functionInputs, Flux.from(functionResult), function, executionContext); + } + + /** + * Post-processes the {@code Mono} result from a reactive function invocation before returning it to the Azure + * runtime. The default behavior is to {@link Mono#blockOptional()} and {@link #convertOutputIfNecessary possibly convert} the result. + * + *

Provides a hook for custom function invokers to extend/modify the function results handling. + * + * @param rawInputs the inputs passed in from the Azure runtime + * @param functionInputs the actual inputs used for the function invocation; may be + * {@link #enhanceInputIfNecessary different} from the {@literal rawInputs} + * @param functionResult the Mono result from the function invocation + * @param function the invoked function + * @param executionContext the Azure execution context + * @return the possibly modified function results + */ + protected O postProcessMonoFunctionResult(I rawInputs, Object functionInputs, Mono functionResult, + FunctionInvocationWrapper function, ExecutionContext executionContext + ) { + return (O) this.convertOutputIfNecessary(rawInputs, functionResult.blockOptional().get()); + } + + /** + * Post-processes the {@code Flux} result from a reactive function invocation before returning it to the Azure + * runtime. The default behavior is to {@link Flux#toIterable() block} and {@link #convertOutputIfNecessary possibly convert} the results. + * + *

Provides a hook for custom function invokers to extend/modify the function results handling. + * + * @param rawInputs the inputs passed in from the Azure runtime + * @param functionInputs the actual inputs used for the function invocation; may be + * {@link #enhanceInputIfNecessary different} from the {@literal rawInputs} + * @param functionResult the Mono result from the function invocation + * @param function the invoked function + * @param executionContext the Azure execution context + * @return the possibly modified function results + */ + protected O postProcessFluxFunctionResult(I rawInputs, Object functionInputs, Flux functionResult, + FunctionInvocationWrapper function, ExecutionContext executionContext + ) { + List resultList = new ArrayList<>(); + for (Object resultItem : functionResult.toIterable()) { + if (resultItem instanceof Collection) { + resultList.addAll((Collection) resultItem); } else { - List resultList = new ArrayList<>(); - for (Object resultItem : Flux.from((Publisher) output).toIterable()) { - if (resultItem instanceof Collection) { - resultList.addAll((Collection) resultItem); - } - else { - if (!function.isSupplier() && Collection.class.isAssignableFrom(FunctionTypeUtils.getRawType(function.getInputType())) - && !Collection.class.isAssignableFrom(FunctionTypeUtils.getRawType(function.getOutputType()))) { - return (O) this.convertOutputIfNecessary(input, resultItem); - } - else { - resultList.add(resultItem); - } - } + if (!function.isSupplier() && Collection.class.isAssignableFrom(FunctionTypeUtils.getRawType(function.getInputType())) + && !Collection.class.isAssignableFrom(FunctionTypeUtils.getRawType(function.getOutputType()))) { + return (O) this.convertOutputIfNecessary(rawInputs, resultItem); + } + else { + resultList.add(resultItem); } - return (O) this.convertOutputIfNecessary(input, resultList); } } - return (O) this.convertOutputIfNecessary(input, output); + return (O) this.convertOutputIfNecessary(rawInputs, resultList); } @SuppressWarnings({ "unchecked", "rawtypes" }) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/test/java/org/springframework/cloud/function/adapter/azure/CustomFunctionInvokerTests.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/test/java/org/springframework/cloud/function/adapter/azure/CustomFunctionInvokerTests.java new file mode 100644 index 000000000..3d39543ec --- /dev/null +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/test/java/org/springframework/cloud/function/adapter/azure/CustomFunctionInvokerTests.java @@ -0,0 +1,200 @@ +/* + * Copyright 2022-2022 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 org.springframework.cloud.function.adapter.azure; + +import java.util.Arrays; +import java.util.List; +import java.util.function.Function; +import java.util.stream.Collectors; + +import com.microsoft.azure.functions.ExecutionContext; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; +import org.mockito.ArgumentCaptor; +import org.reactivestreams.Publisher; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; + +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry.FunctionInvocationWrapper; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.messaging.support.GenericMessage; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.util.Lists.list; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.same; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; + +/** + * Unit tests for {@link FunctionInvoker} custom result handling. + * + * @author Chris Bono + */ +class CustomFunctionInvokerTests { + + private FunctionInvoker currentInvoker; + + @AfterEach + void closeCurrentInvoker() { + if (this.currentInvoker != null) { + this.currentInvoker.close(); + } + } + + /** + * Verifies custom result handling and proper post-process callback invocation for an imperative function. + */ + @Test + void customImperativeResultHandling() { + FunctionInvoker invoker = new FunctionInvoker(TestFunctionsConfig.class) { + @Override + protected String postProcessImperativeFunctionResult(String rawInputs, Object functionInputs, + Object functionResult, FunctionInvocationWrapper function, ExecutionContext executionContext + ) { + return functionResult + "+imperative"; + } + }; + invoker = spyOnAndCloseAfterTest(invoker); + ExecutionContext executionContext = new TestExecutionContext("imperativeUppercase"); + String result = invoker.handleRequest("foo", executionContext); + assertThat(result).isEqualTo("FOO+imperative"); + + // Below here verifies that the expected callback(s) were invoked w/ the expected arguments + + // Only imperative post-process callback should be called + verify(invoker, never()).postProcessReactiveFunctionResult(anyString(), any(), any(Publisher.class), any(), same(executionContext)); + verify(invoker, never()).postProcessMonoFunctionResult(anyString(), any(), any(Mono.class), any(), same(executionContext)); + verify(invoker, never()).postProcessFluxFunctionResult(anyString(), any(), any(Flux.class), any(), same(executionContext)); + + // Only sniff-test the payload of the input message (the other fields are problematic to verify and no value doing that here) + ArgumentCaptor functionInputsCaptor = ArgumentCaptor.forClass(GenericMessage.class); + verify(invoker).postProcessImperativeFunctionResult(eq("foo"), functionInputsCaptor.capture(), eq("FOO"), any(), same(executionContext)); + assertThat(functionInputsCaptor.getValue()).extracting(GenericMessage::getPayload).isEqualTo("foo"); + } + + /** + * Verifies custom result handling and proper post-process callback invocation for a reactive Mono function. + */ + @Test + void customReactiveMonoResultHandling() { + FunctionInvoker invoker = new FunctionInvoker(TestFunctionsConfig.class) { + @Override + protected String postProcessMonoFunctionResult(String rawInputs, Object functionInputs, Mono functionResult, + FunctionInvocationWrapper function, ExecutionContext executionContext + ) { + return functionResult.block().toString() + "+mono"; + } + }; + invoker = spyOnAndCloseAfterTest(invoker); + ExecutionContext executionContext = new TestExecutionContext("reactiveMonoUppercase"); + String result = invoker.handleRequest("foo", executionContext); + assertThat(result).isEqualTo("FOO+mono"); + + // Below here verifies that the expected callback(s) were invoked w/ the expected arguments + + // Only publisher->mono post-process callbacks should be called + verify(invoker, never()).postProcessImperativeFunctionResult(anyString(), any(), any(), any(), same(executionContext)); + verify(invoker, never()).postProcessFluxFunctionResult(anyString(), any(), any(Flux.class), any(), same(executionContext)); + + // Only sniff-test the payload of the input message and the mono (the other fields are problematic to verify and no value doing that here) + ArgumentCaptor functionInputsCaptor = ArgumentCaptor.forClass(GenericMessage.class); + ArgumentCaptor functionResultCaptor = ArgumentCaptor.forClass(Mono.class); + verify(invoker).postProcessReactiveFunctionResult(eq("foo"), functionInputsCaptor.capture(), functionResultCaptor.capture(), any(), same(executionContext)); + verify(invoker).postProcessMonoFunctionResult(eq("foo"), functionInputsCaptor.capture(), functionResultCaptor.capture(), any(), same(executionContext)); + // NOTE: The captors get called twice as the args are just delegated from publisher->mono callback + assertThat(functionInputsCaptor.getAllValues()).extracting(GenericMessage::getPayload).containsExactly("foo", "foo"); + assertThat(functionResultCaptor.getAllValues()).extracting(Mono::block).containsExactly("FOO", "FOO"); + } + + /** + * Verifies custom result handling and proper post-process callback invocation for a reactive Flux function. + */ + @Test + void customReactiveFluxResultHandling() { + FunctionInvoker, String> invoker = new FunctionInvoker, String>(TestFunctionsConfig.class) { + @Override + protected String postProcessFluxFunctionResult(List rawInputs, Object functionInputs, + Flux functionResult, FunctionInvocationWrapper function, ExecutionContext executionContext + ) { + return functionResult.map(o -> o.toString() + "+flux").collectList().block().stream().collect(Collectors.joining("/")); + } + }; + invoker = spyOnAndCloseAfterTest(invoker); + ExecutionContext executionContext = new TestExecutionContext("reactiveFluxUppercase"); + List rawInputs = Arrays.asList("foo", "bar"); + String result = invoker.handleRequest(rawInputs, executionContext); + assertThat(result).isEqualTo("FOO+flux/BAR+flux"); + + // Below here verifies that the expected callback(s) were invoked w/ the expected arguments + + // Only publisher->flux post-process callbacks should be called + verify(invoker, never()).postProcessImperativeFunctionResult(anyList(), any(), any(), any(), same(executionContext)); + verify(invoker, never()).postProcessMonoFunctionResult(anyList(), any(), any(Mono.class), any(), same(executionContext)); + + // Only sniff-test the payload of the input message and the mono (the other fields are problematic to verify and no value doing that here) + ArgumentCaptor> functionInputsCaptor = ArgumentCaptor.forClass(Flux.class); + ArgumentCaptor functionResultCaptor = ArgumentCaptor.forClass(Flux.class); + verify(invoker).postProcessReactiveFunctionResult(same(rawInputs), functionInputsCaptor.capture(), functionResultCaptor.capture(), any(), same(executionContext)); + verify(invoker).postProcessFluxFunctionResult(same(rawInputs), functionInputsCaptor.capture(), functionResultCaptor.capture(), any(), same(executionContext)); + + // NOTE: The captors get called twice as the args are just delegated from publisher->flux callback + + // The functionInputs for each call is Flux with 2 items - one for 'foo' and one for 'bar' + assertThat(functionInputsCaptor.getAllValues()) + .extracting(Flux::collectList).extracting(Mono::block) + .flatExtracting(fluxAsList -> fluxAsList.stream().collect(Collectors.toList())) + .extracting(GenericMessage::getPayload).containsExactlyInAnyOrder("foo", "bar", "foo", "bar"); + + // The functionResult for each call is a Flux w/ 2 items { "FOO", "BAR" } + assertThat(functionResultCaptor.getAllValues()) + .extracting(Flux::collectList).extracting(Mono::block) + .containsExactlyInAnyOrder(list("FOO", "BAR"), list("FOO", "BAR")); + } + + private FunctionInvoker spyOnAndCloseAfterTest(FunctionInvoker invoker) { + this.currentInvoker = invoker; + return spy(invoker); + } + + @Configuration + @EnableAutoConfiguration + static class TestFunctionsConfig { + + @Bean + public Function imperativeUppercase() { + return (s) -> s.toUpperCase(); + } + + @Bean + public Function, Mono> reactiveMonoUppercase() { + return (m) -> m.map(String::toUpperCase); + } + + @Bean + public Function, Flux> reactiveFluxUppercase() { + return (f) -> f.map(String::toUpperCase); + } + + } +} diff --git a/spring-cloud-function-samples/function-sample-azure/src/main/java/example/Config.java b/spring-cloud-function-samples/function-sample-azure/src/main/java/example/Config.java index 8bfd1c78c..b40249436 100644 --- a/spring-cloud-function-samples/function-sample-azure/src/main/java/example/Config.java +++ b/spring-cloud-function-samples/function-sample-azure/src/main/java/example/Config.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 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. @@ -19,16 +19,20 @@ import java.util.Map; import java.util.function.Function; +import com.microsoft.azure.functions.ExecutionContext; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; + import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.function.json.JsonMapper; import org.springframework.context.annotation.Bean; import org.springframework.messaging.Message; -import com.microsoft.azure.functions.ExecutionContext; - -import reactor.core.publisher.Mono; - +/** + * @author Oleg Zhurakousky + * @author Chris Bono + */ @SpringBootApplication public class Config { @@ -67,13 +71,14 @@ public Function, String> uppercase(JsonMapper mapper) { }; } - @Bean public Function, Mono> uppercaseReactive() { - return mono -> mono.map(value -> { - return value.toUpperCase(); - }); + return mono -> mono.map(value -> value.toUpperCase()); } + @Bean + public Function, Flux> echoStream() { + return flux -> flux.map(value -> value.toUpperCase()); + } } diff --git a/spring-cloud-function-samples/function-sample-azure/src/main/java/example/ReactiveEchoCustomResultHandler.java b/spring-cloud-function-samples/function-sample-azure/src/main/java/example/ReactiveEchoCustomResultHandler.java new file mode 100644 index 000000000..8f72a80bc --- /dev/null +++ b/spring-cloud-function-samples/function-sample-azure/src/main/java/example/ReactiveEchoCustomResultHandler.java @@ -0,0 +1,63 @@ +/* + * Copyright 2022-2022 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 example; + +import java.util.List; + +import com.microsoft.azure.functions.ExecutionContext; +import com.microsoft.azure.functions.HttpMethod; +import com.microsoft.azure.functions.HttpRequestMessage; +import com.microsoft.azure.functions.annotation.AuthorizationLevel; +import com.microsoft.azure.functions.annotation.FunctionName; +import com.microsoft.azure.functions.annotation.HttpTrigger; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import reactor.core.publisher.Flux; + +import org.springframework.cloud.function.adapter.azure.FunctionInvoker; +import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry.FunctionInvocationWrapper; + +/** + * Sample that shows how to customize the default function result handling by operating on the {@link Flux} returned + * from the {@link Config#echoStream()} echoStream} function. + * + * @author Chris Bono + */ +public class ReactiveEchoCustomResultHandler extends FunctionInvoker, String> { + + private static final Log logger = LogFactory.getLog(ReactiveEchoCustomResultHandler.class); + + @FunctionName("echoStream") + public String execute(@HttpTrigger(name = "req", methods = {HttpMethod.GET, HttpMethod.POST}, authLevel = AuthorizationLevel.ANONYMOUS) + HttpRequestMessage> request, ExecutionContext context + ) { + return handleRequest(request.getBody(), context); + } + + @Override + protected String postProcessFluxFunctionResult(List rawInputs, Object functionInputs, Flux functionResult, + FunctionInvocationWrapper function, ExecutionContext executionContext + ) { + functionResult + .doFirst(() -> executionContext.getLogger().info("BEGIN echo post-processing work ...")) + .mapNotNull((v) -> v.toString().toUpperCase()) + .doFinally((signalType) -> executionContext.getLogger().info("END echo post-processing work")) + .subscribe((v) -> executionContext.getLogger().info(" " + v)); + return "Kicked off job for " + rawInputs; + } + +} From 0a1c6e27f53b7e1fd627c9a4de4425ea96b0b829 Mon Sep 17 00:00:00 2001 From: onobc Date: Mon, 28 Feb 2022 22:36:14 -0600 Subject: [PATCH 035/210] Add doc for custom result handling [Azure sample] Fixes #757 --- .../function-sample-azure/README.adoc | 36 +++++++++++++++---- 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/spring-cloud-function-samples/function-sample-azure/README.adoc b/spring-cloud-function-samples/function-sample-azure/README.adoc index f20f7d7e3..144d16464 100644 --- a/spring-cloud-function-samples/function-sample-azure/README.adoc +++ b/spring-cloud-function-samples/function-sample-azure/README.adoc @@ -8,7 +8,7 @@ $ mvn azure-functions:run ---- The `uppercase` function is of the following signature `Function, String> uppercase()`. Its expected input is JSON, -therefore we need t0 provide the appropriate content-type (in this case `application/json`). +therefore we need to provide the appropriate content-type (in this case `application/json`). Test the function using _curl_ and notice that the URL is formed by concatenating `/api/` ---- @@ -23,12 +23,12 @@ $ curl -H "Content-Type: application/json" localhost:7071/api/uppercase -d '{"gr ---- The HTTP headers of the incoming request will be copied into input Message's MessageHeaders, so they become accessible if need to. -It is done in implementation of `UppercaseHandler` which extends `FunctionInvoker`. +It is done in implementation of `UppercaseHandler` which extends `FunctionInvoker`. NOTE: Implementation of `FunctionInvoker` (your handler), should contain the least amount of code. It is really a type-safe way to define and configure function to be recognized as Azure Function. Everything else should be delegated to the base `FunctionInvoker` via `handleRequest(..)` callback which will invoke your function, taking care of -necessary type conversion, transformation etc. +necessary type conversion, transformation etc. One exception to this rule is when custom result handling is required. In that case, the proper post-process method can be overridden as well in order to take control of the results processing. ---- @FunctionName("uppercase") @@ -42,7 +42,7 @@ public String execute(@HttpTrigger(name = "req", methods = {HttpMethod.GET, The `echo` function does the same as the `uppercase` less the actual uppercasing. However, the important difference to notice is that function itself -takes primitive `String` as its input (i.e., `public Function echo()`) while the actual handler passes instance of `Message` the same way as with `uppercase`. The framework recognizes that you only care about the payload and extracts it from the `Message` before calling the function. +takes primitive `String` as its input (i.e., `public Function echo()`) while the actual handler passes instance of `Message` the same way as with `uppercase`. The framework recognizes that you only care about the payload and extracts it from the `Message` before calling the function. There is also a reactive version of 'uppercase' - `uppercaseReactive` which will produce the same result, but @@ -74,7 +74,7 @@ $ mvn azure-functions:deploy # the function can be accessed at: https://function-sample-azure.azurewebsites.net/api/uppercase ---- -On another terminal try this: +On another terminal try this: ---- # testing curl https:///api/uppercase -d '{"greeting": "hello", "name": "your name"}' @@ -88,7 +88,7 @@ $ curl -H "Content-Type: application/json" https://function-sample-azure.azurewe } ---- -Please ensure that you use the right URL for the function above. +Please ensure that you use the right URL for the function above. Alternatively you can test the function in the Azure Dashboard UI: @@ -111,3 +111,27 @@ Alternatively you can test the function in the Azure Dashboard UI: ---- Please note that the Dashhboard provides by default information on Function Execution Count, Memory Consumption and Execution Time. + +==== Custom Result Handling + +As noted above, the implementation of `FunctionInvoker` (your handler), should contain the least amount of code possible. However, if custom result handling needs to occur there is a set of methods (named `postProcess**`) that can be overridden in link:../../spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/FunctionInvoker.java[FunctionInvoker.java]. + +One such example can be seen in link:src/main/java/example/ReactiveEchoCustomResultHandler.java[ReactiveEchoCustomResultHandler.java]. + +Once the function is deployed it can be tested using _curl_ +---- +$ curl -H "Content-Type: application/json" localhost:7071/api/echoStream -d '["hello","peepz"]' + +# result +Kicked off job for [hello, peepz] +---- +The custom result handling takes the Flux returned from the `echoStream` function and adds logging, uppercase mapping, and then subscribes to the publisher. The Azure logs output the following: + +---- +[2022-03-01T01:36:57.439Z] 2022-02-28 19:36:57.439 INFO 20587 --- [pool-2-thread-2] o.s.boot.SpringApplication : Started application in 0.466 seconds (JVM running for 57.906) +[2022-03-01T01:36:57.462Z] BEGIN echo post-processing work ... +[2022-03-01T01:36:57.462Z] HELLO +[2022-03-01T01:36:57.462Z] PEEPZ +[2022-03-01T01:36:57.463Z] END echo post-processing work +[2022-03-01T01:36:57.463Z] Function "echoStream" (Id: 678cff0b-d958-4fab-967b-e19e0d5d67e8) invoked by Java Worker +---- From 886fa982825392a69f4e308ef3cfc589f7963aab Mon Sep 17 00:00:00 2001 From: onobc Date: Tue, 1 Mar 2022 13:54:31 -0600 Subject: [PATCH 036/210] Simplify if/else in Azure function invoker --- .../spring-cloud-function-adapter-azure/pom.xml | 3 +-- .../cloud/function/adapter/azure/FunctionInvoker.java | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index 149e0fdc6..a493f620c 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -20,8 +20,7 @@ UTF-8 UTF-8 1.8 - 1.2.2 - + 1.2.2 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/FunctionInvoker.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/FunctionInvoker.java index 7b89e1df7..db5da503d 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/FunctionInvoker.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/FunctionInvoker.java @@ -129,10 +129,10 @@ public O handleRequest(I input, ExecutionContext executionContext) { Object functionResult = function.apply(enhancedInput); - if (!(functionResult instanceof Publisher)) { - return postProcessImperativeFunctionResult(input, enhancedInput, functionResult, function, executionContext); + if (functionResult instanceof Publisher) { + return postProcessReactiveFunctionResult(input, enhancedInput, (Publisher) functionResult, function, executionContext); } - return postProcessReactiveFunctionResult(input, enhancedInput, (Publisher) functionResult, function, executionContext); + return postProcessImperativeFunctionResult(input, enhancedInput, functionResult, function, executionContext); } /** From a4ee81388c615c7ed13f4c4c0f91b95b339f7ecc Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 8 Mar 2022 14:56:51 +0100 Subject: [PATCH 037/210] Polish Resolves #820 --- .../cloud/function/adapter/azure/FunctionInvoker.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/FunctionInvoker.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/FunctionInvoker.java index db5da503d..b73e2b148 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/FunctionInvoker.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/FunctionInvoker.java @@ -121,7 +121,6 @@ else if (function == null && StringUtils.hasText(functionDefinition) && APPLICAT return function; } - @SuppressWarnings({"unchecked", "rawtypes"}) public O handleRequest(I input, ExecutionContext executionContext) { String functionDefinition = executionContext.getFunctionName(); FunctionInvocationWrapper function = this.discoverFunction(functionDefinition); @@ -149,6 +148,7 @@ public O handleRequest(I input, ExecutionContext executionContext) { * @param executionContext the Azure execution context * @return the possibly modified function results */ + @SuppressWarnings("unchecked") protected O postProcessImperativeFunctionResult(I rawInputs, Object functionInputs, Object functionResult, FunctionInvocationWrapper function, ExecutionContext executionContext ) { @@ -193,6 +193,7 @@ protected O postProcessReactiveFunctionResult(I rawInputs, Object functionInputs * @param executionContext the Azure execution context * @return the possibly modified function results */ + @SuppressWarnings("unchecked") protected O postProcessMonoFunctionResult(I rawInputs, Object functionInputs, Mono functionResult, FunctionInvocationWrapper function, ExecutionContext executionContext ) { @@ -213,6 +214,7 @@ protected O postProcessMonoFunctionResult(I rawInputs, Object functionInputs, Mo * @param executionContext the Azure execution context * @return the possibly modified function results */ + @SuppressWarnings({ "rawtypes", "unchecked" }) protected O postProcessFluxFunctionResult(I rawInputs, Object functionInputs, Flux functionResult, FunctionInvocationWrapper function, ExecutionContext executionContext ) { From c2e901bb82438a34da32a256cff6a61be7eeaf74 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 8 Mar 2022 15:14:15 +0100 Subject: [PATCH 038/210] Cleanup --- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index 1014b0656..3551d71bf 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -54,7 +54,7 @@ org.springframework.cloud spring-cloud-function-dependencies - 3.2.1-SNAPSHOT + 3.2.3-SNAPSHOT pom import From cb35adb5882239f7651e4323bff9f3758e29fe04 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 22 Mar 2022 13:53:48 +0100 Subject: [PATCH 039/210] Performance improvements related to SCST-2303 --- .../function/context/catalog/SimpleFunctionRegistry.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java index 2b6cc4ceb..80ea8077f 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java @@ -1135,6 +1135,12 @@ private Object convertOutputIfNecessary(Object output, Type type, String[] conte if (!(output instanceof Publisher) && this.enhancer != null) { output = enhancer.apply(output); } + if (this.getTarget() instanceof PassThruFunction) { // scst-2303 + Map headersMap = (Map) ReflectionUtils + .getField(SimpleFunctionRegistry.this.headersField, ((Message) output).getHeaders()); + headersMap.put(MessageHeaders.CONTENT_TYPE, contentType[0]); + return messageConverter.toMessage(((Message) output).getPayload(), ((Message) output).getHeaders()); + } if (ObjectUtils.isEmpty(contentType) && !(output instanceof Publisher)) { return output; From a022defb3ca557a51478a7942a668ffa76dbc6b2 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Fri, 18 Mar 2022 14:47:44 +0100 Subject: [PATCH 040/210] Perf improvement --- .../function/context/catalog/SimpleFunctionRegistry.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java index 80ea8077f..db42d995d 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java @@ -548,7 +548,7 @@ public Object apply(Object input) { if (logger.isDebugEnabled() && !(input instanceof Publisher)) { logger.debug("Invoking function " + this); } - Object result = this.doApply(input); + Object result = (this.getTarget() instanceof PassThruFunction) ? input : this.doApply(input); if (result != null && this.outputType != null) { result = this.convertOutputIfNecessary(result, this.outputType, this.expectedOutputContentType); @@ -1448,4 +1448,11 @@ public Message getOriginalMessage() { return this.originalMessage; } } + + public static class PassThruFunction implements Function { + @Override + public Object apply(Object t) { + return t; + } + } } From 537d19ceb160471309f52495d55ce1c94236f043 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 22 Mar 2022 15:56:26 +0100 Subject: [PATCH 041/210] Polishing --- .../cloud/function/context/catalog/SimpleFunctionRegistry.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java index db42d995d..b2e6a5eaf 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java @@ -1448,7 +1448,7 @@ public Message getOriginalMessage() { return this.originalMessage; } } - + public static class PassThruFunction implements Function { @Override public Object apply(Object t) { From e47447186b702f623abd1e8342cf12443069a6de Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 22 Mar 2022 16:39:18 +0100 Subject: [PATCH 042/210] Fix typo --- .../cloud/function/context/config/RoutingFunction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/RoutingFunction.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/RoutingFunction.java index cbc5e4b92..c9cb2717f 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/RoutingFunction.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/RoutingFunction.java @@ -202,7 +202,7 @@ private FunctionInvocationWrapper functionFromExpression(String routingExpressio Assert.hasText(functionName, "Failed to resolve function name based on routing expression '" + functionProperties.getRoutingExpression() + "'"); FunctionInvocationWrapper function = functionCatalog.lookup(functionName); Assert.notNull(function, "Failed to lookup function to route to based on the expression '" - + functionProperties.getRoutingExpression() + "' whcih resolved to '" + functionName + "' function name."); + + functionProperties.getRoutingExpression() + "' which resolved to '" + functionName + "' function name."); if (logger.isInfoEnabled()) { logger.info("Resolved function from provided [routing-expression] " + routingExpression); } From 025cc28c232e7c904e5eefe48684ddb929064148 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 22 Mar 2022 23:20:02 +0000 Subject: [PATCH 043/210] Bumping versions --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index a96231d59..1f3c627b1 100644 --- a/README.adoc +++ b/README.adoc @@ -102,7 +102,7 @@ string like that.) == Building -:jdkversion: 1.8 +:jdkversion: 17 === Basic Compile and Test From 3b4ac78f148c90e7f210fd5a9e991810b7031e89 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 23 Mar 2022 12:54:15 +0100 Subject: [PATCH 044/210] GH-833 Add initial support for AWS APIGatewayCustomAuthorizerEvent Resolves #833 --- pom.xml | 1 + .../function/adapter/aws/AWSLambdaUtils.java | 3 +- .../adapter/aws/FunctionInvokerTests.java | 29 +++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9856582a2..a62512c33 100644 --- a/pom.xml +++ b/pom.xml @@ -141,6 +141,7 @@ + core diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java index ff0de1f39..025577cc6 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2021-2021 the original author or authors. + * Copyright 2021-2022 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. @@ -67,6 +67,7 @@ static boolean isSupportedAWSType(Type inputType) { || typeName.equals("com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent") || typeName.equals("com.amazonaws.services.lambda.runtime.events.SNSEvent") || typeName.equals("com.amazonaws.services.lambda.runtime.events.SQSEvent") + || typeName.equals("com.amazonaws.services.lambda.runtime.events.APIGatewayCustomAuthorizerEvent") || typeName.equals("com.amazonaws.services.lambda.runtime.events.KinesisEvent"); } diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java index f3ebec121..5539c49f2 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java @@ -27,6 +27,7 @@ import java.util.function.Function; import java.util.function.Supplier; +import com.amazonaws.services.lambda.runtime.events.APIGatewayCustomAuthorizerEvent; import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent; import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent; import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPEvent; @@ -447,6 +448,12 @@ public class FunctionInvokerTests { " \"isBase64Encoded\": false\n" + "}"; + String gwAuthorizerEvent = "{\n" + + " \"type\":\"TOKEN\",\n" + + " \"authorizationToken\":\"allow\",\n" + + " \"methodArn\":\"arn:aws:execute-api:us-west-2:123456789012:ymy8tbxw7b/*/GET/\"\n" + + "}"; + @BeforeEach public void before() throws Exception { System.clearProperty("MAIN_CLASS"); @@ -455,6 +462,19 @@ public void before() throws Exception { this.getEnvironment().clear(); } + @Test + public void testAPIGatewayCustomAuthorizerEvent() throws Exception { + System.setProperty("MAIN_CLASS", AuthorizerConfiguration.class.getName()); + System.setProperty("spring.cloud.function.definition", "acceptAuthorizerEvent"); + FunctionInvoker invoker = new FunctionInvoker(); + + InputStream targetStream = new ByteArrayInputStream(this.gwAuthorizerEvent.getBytes()); + ByteArrayOutputStream output = new ByteArrayOutputStream(); + invoker.handleRequest(targetStream, output, null); + String result = new String(output.toByteArray(), StandardCharsets.UTF_8); + assertThat(result).contains("APIGatewayCustomAuthorizerEvent(version=null, type=TOKEN"); + } + @Test public void testCollection() throws Exception { System.setProperty("MAIN_CLASS", SampleConfiguration.class.getName()); @@ -1043,6 +1063,15 @@ private Map getEnvironment() throws Exception { return (Map) field.get(env); } + @EnableAutoConfiguration + @Configuration + public static class AuthorizerConfiguration { + @Bean + public Function acceptAuthorizerEvent() { + return v -> v.toString(); + } + } + @EnableAutoConfiguration @Configuration public static class SampleConfiguration { From 2cb3739dd1457128fc05c23c8c17d55ab6cafd2c Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 23 Mar 2022 13:17:35 +0100 Subject: [PATCH 045/210] GH-832 Change OffsetTime to OffsetDateTime in CloudEventMessageBuilder Resolves #832 --- .../cloud/function/cloudevent/CloudEventMessageBuilder.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventMessageBuilder.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventMessageBuilder.java index 3581c0ce3..f7f55ec45 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventMessageBuilder.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventMessageBuilder.java @@ -17,7 +17,7 @@ package org.springframework.cloud.function.cloudevent; import java.net.URI; -import java.time.OffsetTime; +import java.time.OffsetDateTime; import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -111,13 +111,13 @@ public CloudEventMessageBuilder setSubject(String subject) { return this; } - public CloudEventMessageBuilder setTime(OffsetTime time) { + public CloudEventMessageBuilder setTime(OffsetDateTime time) { this.headers.put(CloudEventMessageUtils.TIME, time); return this; } public CloudEventMessageBuilder setTime(String time) { - this.headers.put(CloudEventMessageUtils.TIME, OffsetTime.parse(time)); + this.headers.put(CloudEventMessageUtils.TIME, OffsetDateTime.parse(time)); return this; } From fa40b69cf10cad4292cfa36d2c21e039652f1145 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 23 Mar 2022 17:17:24 +0100 Subject: [PATCH 046/210] GH-830 Fix conversioin exception for custom converters Resolves #830 --- .../cloud/function/context/config/JsonMessageConverter.java | 4 ---- .../context/config/SmartCompositeMessageConverter.java | 6 ++++++ .../context/catalog/SimpleFunctionRegistryTests.java | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/JsonMessageConverter.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/JsonMessageConverter.java index 2f8b17846..9746ee983 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/JsonMessageConverter.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/JsonMessageConverter.java @@ -18,7 +18,6 @@ import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; -import java.util.Collection; import org.springframework.cloud.function.cloudevent.CloudEventMessageUtils; import org.springframework.cloud.function.json.JsonMapper; @@ -76,9 +75,6 @@ protected boolean canConvertFrom(Message message, @Nullable Class targetCl @Override protected Object convertFromInternal(Message message, Class targetClass, @Nullable Object conversionHint) { - if (targetClass.isInstance(message.getPayload()) && !(message.getPayload() instanceof Collection)) { - return message.getPayload(); - } Type convertToType = conversionHint == null ? targetClass : (Type) conversionHint; if (targetClass == byte[].class && message.getPayload() instanceof String) { return ((String) message.getPayload()).getBytes(StandardCharsets.UTF_8); diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java index fedbe5e98..30caee18b 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java @@ -45,6 +45,9 @@ public SmartCompositeMessageConverter(Collection converters) { @Nullable public Object fromMessage(Message message, Class targetClass) { for (MessageConverter converter : getConverters()) { + if (targetClass.isInstance(message.getPayload()) && !(message.getPayload() instanceof Collection)) { + return message.getPayload(); + } Object result = converter.fromMessage(message, targetClass); if (result != null) { return result; @@ -57,6 +60,9 @@ public Object fromMessage(Message message, Class targetClass) { @Nullable public Object fromMessage(Message message, Class targetClass, @Nullable Object conversionHint) { for (MessageConverter converter : getConverters()) { + if (targetClass.isInstance(message.getPayload()) && !(message.getPayload() instanceof Collection)) { + return message.getPayload(); + } Object result = (converter instanceof SmartMessageConverter ? ((SmartMessageConverter) converter).fromMessage(message, targetClass, conversionHint) : converter.fromMessage(message, targetClass)); diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistryTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistryTests.java index 9cdc5eb79..175de78e5 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistryTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistryTests.java @@ -49,6 +49,7 @@ import org.springframework.cloud.function.context.HybridFunctionalRegistrationTests.UppercaseFunction; import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry.FunctionInvocationWrapper; import org.springframework.cloud.function.context.config.JsonMessageConverter; +import org.springframework.cloud.function.context.config.SmartCompositeMessageConverter; import org.springframework.cloud.function.json.GsonMapper; import org.springframework.cloud.function.json.JacksonMapper; import org.springframework.cloud.function.json.JsonMapper; @@ -87,7 +88,7 @@ public void before() { messageConverters.add(new JsonMessageConverter(jsonMapper)); messageConverters.add(new ByteArrayMessageConverter()); messageConverters.add(new StringMessageConverter()); - this.messageConverter = new CompositeMessageConverter(messageConverters); + this.messageConverter = new SmartCompositeMessageConverter(messageConverters); this.conversionService = new DefaultConversionService(); } From 19dc7ca7da829a6cfb6e3e8fd7b74026336fa33e Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 24 Mar 2022 18:26:41 +0100 Subject: [PATCH 047/210] GH-828 Add support for configuring additional routers Resolves #828 --- .../main/asciidoc/spring-cloud-function.adoc | 56 ++++++++++- .../context/config/RoutingFunction.java | 27 +++++- .../context/config/RoutingFunctionTests.java | 93 ++++++++++++++++--- 3 files changed, 157 insertions(+), 19 deletions(-) diff --git a/docs/src/main/asciidoc/spring-cloud-function.adoc b/docs/src/main/asciidoc/spring-cloud-function.adoc index b6082d7c3..2eb40ec54 100644 --- a/docs/src/main/asciidoc/spring-cloud-function.adoc +++ b/docs/src/main/asciidoc/spring-cloud-function.adoc @@ -145,7 +145,7 @@ public class RoutingFunction implements Function { The routing instructions could be communicated in several ways. We support providing instructions via Message headers, System properties as well as pluggable strategy. So let's look at some of the details -*MessageRoutingCallback* +==== MessageRoutingCallback The `MessageRoutingCallback` is a strategy to assist with determining the name of the route-to function definition. @@ -231,7 +231,7 @@ conflict resolutions in the event multiple mechanisms are used at the same time, 3. Application Properties (Any function) -*Function Filtering* +==== Function Filtering Filtering is the type of routing where there are only two paths - 'go' or 'discard'. In terms of functions it mean you only want to invoke a certain function if some condition returns 'true', otherwise you want to discard input. However, when it comes to discarding input there are many interpretation of what it could mean in the context of your application. @@ -261,6 +261,58 @@ due to the nature of the reactive functions which are invoked only once to pass is handled by the reactor, hence we can not access and/or rely on the routing instructions communicated via individual values (e.g., Message). +==== Multiple Routers + +By default the framework will always have a single routing function configured as described in previous sections. However, there are times when you may need more then one routing function. +In that case you can create your own instance of the `RoutingFunction` bean in addition to the existing one as long as you give it a name other than `functionRouter`. + +You can pass `spring.cloud.function.routing-expression` or `spring.cloud.function.definition` to RoutinFunction as key/value pairs in the map. + +Here is a simple example + +---- +@Configuration +protected static class MultipleRouterConfiguration { + + @Bean + RoutingFunction mySpecialRouter(FunctionCatalog functionCatalog, BeanFactory beanFactory, @Nullable MessageRoutingCallback routingCallback) { + Map propertiesMap = new HashMap<>(); + propertiesMap.put(FunctionProperties.PREFIX + ".routing-expression", "'reverse'"); + return new RoutingFunction(functionCatalog, propertiesMap, new BeanFactoryResolver(beanFactory), routingCallback); + } + + @Bean + public Function reverse() { + return v -> new StringBuilder(v).reverse().toString(); + } + + @Bean + public Function uppercase() { + return String::toUpperCase; + } +} +---- + +and a test that demonstrates how it works + +` +---- +@Test +public void testMultipleRouters() { + System.setProperty(FunctionProperties.PREFIX + ".routing-expression", "'uppercase'"); + FunctionCatalog functionCatalog = this.configureCatalog(MultipleRouterConfiguration.class); + Function function = functionCatalog.lookup(RoutingFunction.FUNCTION_NAME); + assertThat(function).isNotNull(); + Message message = MessageBuilder.withPayload("hello").build(); + assertThat(function.apply(message)).isEqualTo("HELLO"); + + function = functionCatalog.lookup("mySpecialRouter"); + assertThat(function).isNotNull(); + message = MessageBuilder.withPayload("hello").build(); + assertThat(function.apply(message)).isEqualTo("olleh"); +} +---- + === Input/Output Enrichment There are often times when you need to modify or refine an incoming or outgoing Message and to keep your code clean of non-functional concerns. You don’t want to do it inside of your business logic. diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/RoutingFunction.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/RoutingFunction.java index c9cb2717f..d5af9f387 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/RoutingFunction.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/RoutingFunction.java @@ -16,6 +16,7 @@ package org.springframework.cloud.function.context.config; +import java.util.Map; import java.util.function.Function; import org.apache.commons.logging.Log; @@ -34,12 +35,13 @@ import org.springframework.expression.BeanResolver; import org.springframework.expression.Expression; import org.springframework.expression.spel.standard.SpelExpressionParser; +import org.springframework.expression.spel.support.DataBindingPropertyAccessor; +import org.springframework.expression.spel.support.SimpleEvaluationContext; import org.springframework.expression.spel.support.StandardEvaluationContext; import org.springframework.messaging.Message; import org.springframework.util.Assert; import org.springframework.util.StringUtils; - /** * An implementation of Function which acts as a gateway/router by actually * delegating incoming invocation to a function specified .. . @@ -60,6 +62,9 @@ public class RoutingFunction implements Function { private final StandardEvaluationContext evalContext = new StandardEvaluationContext(); + private final SimpleEvaluationContext headerEvalContext = SimpleEvaluationContext + .forPropertyAccessors(DataBindingPropertyAccessor.forReadOnlyAccess()).build(); + private final SpelExpressionParser spelParser = new SpelExpressionParser(); private final FunctionCatalog functionCatalog; @@ -72,6 +77,18 @@ public RoutingFunction(FunctionCatalog functionCatalog, FunctionProperties funct this(functionCatalog, functionProperties, null, null); } + public RoutingFunction(FunctionCatalog functionCatalog, Map propertiesMap, + BeanResolver beanResolver, MessageRoutingCallback routingCallback) { + this(functionCatalog, extractIntoFunctionProperties(propertiesMap), beanResolver, routingCallback); + } + + private static FunctionProperties extractIntoFunctionProperties(Map propertiesMap) { + FunctionProperties functionProperties = new FunctionProperties(); + functionProperties.setDefinition(propertiesMap.get(FunctionProperties.FUNCTION_DEFINITION)); + functionProperties.setRoutingExpression(propertiesMap.get(FunctionProperties.PREFIX + ".routing-expression")); + return functionProperties; + } + public RoutingFunction(FunctionCatalog functionCatalog, FunctionProperties functionProperties, BeanResolver beanResolver, MessageRoutingCallback routingCallback) { this.functionCatalog = functionCatalog; @@ -124,7 +141,7 @@ private Object route(Object input, boolean originalInputIsPublisher) { } } else if (StringUtils.hasText((String) message.getHeaders().get("spring.cloud.function.routing-expression"))) { - function = this.functionFromExpression((String) message.getHeaders().get("spring.cloud.function.routing-expression"), message); + function = this.functionFromExpression((String) message.getHeaders().get("spring.cloud.function.routing-expression"), message, true); if (function.isInputTypePublisher()) { this.assertOriginalInputIsNotPublisher(originalInputIsPublisher); } @@ -193,12 +210,16 @@ private FunctionInvocationWrapper functionFromDefinition(String definition) { } private FunctionInvocationWrapper functionFromExpression(String routingExpression, Object input) { + return functionFromExpression(routingExpression, input, false); + } + + private FunctionInvocationWrapper functionFromExpression(String routingExpression, Object input, boolean isViaHeader) { Expression expression = spelParser.parseExpression(routingExpression); if (input instanceof Message) { input = MessageUtils.toCaseInsensitiveHeadersStructure((Message) input); } - String functionName = expression.getValue(this.evalContext, input, String.class); + String functionName = isViaHeader ? expression.getValue(this.headerEvalContext, input, String.class) : expression.getValue(this.evalContext, input, String.class); Assert.hasText(functionName, "Failed to resolve function name based on routing expression '" + functionProperties.getRoutingExpression() + "'"); FunctionInvocationWrapper function = functionCatalog.lookup(functionName); Assert.notNull(function, "Failed to lookup function to route to based on the expression '" diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/RoutingFunctionTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/RoutingFunctionTests.java index d3ef8210c..dc684089b 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/RoutingFunctionTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/RoutingFunctionTests.java @@ -16,6 +16,8 @@ package org.springframework.cloud.function.context.config; +import java.util.HashMap; +import java.util.Map; import java.util.function.Function; import org.junit.jupiter.api.AfterEach; @@ -24,17 +26,22 @@ import reactor.core.publisher.Flux; import reactor.test.StepVerifier; +import org.springframework.beans.factory.BeanFactory; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cloud.function.context.FunctionCatalog; import org.springframework.cloud.function.context.FunctionProperties; +import org.springframework.cloud.function.context.MessageRoutingCallback; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.expression.BeanFactoryResolver; +import org.springframework.lang.Nullable; import org.springframework.messaging.Message; import org.springframework.messaging.support.MessageBuilder; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.fail; /** * @@ -52,13 +59,17 @@ public void before() { context.close(); } - private FunctionCatalog configureCatalog() { - context = new SpringApplicationBuilder(RoutingFunctionConfiguration.class).run( + private FunctionCatalog configureCatalog(Class configurationClass) { + context = new SpringApplicationBuilder(configurationClass).run( "--logging.level.org.springframework.cloud.function=DEBUG", "--spring.cloud.function.routing.enabled=true"); return context.getBean(FunctionCatalog.class); } + private FunctionCatalog configureCatalog() { + return configureCatalog(RoutingFunctionConfiguration.class); + } + @SuppressWarnings({ "unchecked", "rawtypes" }) @Test public void testInvocationWithMessageAndHeader() { @@ -91,10 +102,7 @@ public void testRoutingReactiveInputWithReactiveFunctionAndDefinitionMessageHead .setHeader(FunctionProperties.PREFIX + ".definition", "echoFlux").build(); Flux resultFlux = (Flux) function.apply(Flux.just(message)); - StepVerifier - .create(resultFlux) - .expectError() - .verify(); + StepVerifier.create(resultFlux).expectError().verify(); } @SuppressWarnings({ "unchecked", "rawtypes" }) @@ -106,10 +114,27 @@ public void testRoutingReactiveInputWithReactiveFunctionAndExpressionMessageHead Message message = MessageBuilder.withPayload("hello") .setHeader(FunctionProperties.PREFIX + ".routing-expression", "'echoFlux'").build(); Flux resultFlux = (Flux) function.apply(Flux.just(message)); - StepVerifier - .create(resultFlux) - .expectError() - .verify(); + StepVerifier.create(resultFlux).expectError().verify(); + } + + @SuppressWarnings({ "unchecked", "rawtypes" }) + @Test + public void failWithHeaderProvidedExpressionAccessingRuntime() { + FunctionCatalog functionCatalog = this.configureCatalog(); + Function function = functionCatalog.lookup(RoutingFunction.FUNCTION_NAME); + assertThat(function).isNotNull(); + Message message = MessageBuilder.withPayload("hello") + .setHeader(FunctionProperties.PREFIX + ".routing-expression", + "T(java.lang.Runtime).getRuntime().exec(\"open -a calculator.app\")") + .build(); + try { + function.apply(message); + fail(); + } + catch (Exception e) { + assertThat(e.getMessage()).isEqualTo("EL1005E: Type cannot be found 'java.lang.Runtime'"); + } + } @SuppressWarnings({ "unchecked", "rawtypes" }) @@ -151,7 +176,8 @@ public void testInvocationWithMessageAndRoutingExpressionCaseInsensitive() { @SuppressWarnings({ "rawtypes", "unchecked" }) @Test public void testInvocationWithRoutingBeanExpression() { - System.setProperty(FunctionProperties.PREFIX + ".routing-expression", "@reverse.apply(#root.getHeaders().get('func'))"); + System.setProperty(FunctionProperties.PREFIX + ".routing-expression", + "@reverse.apply(#root.getHeaders().get('func'))"); FunctionCatalog functionCatalog = this.configureCatalog(); Function function = functionCatalog.lookup(RoutingFunction.FUNCTION_NAME); assertThat(function).isNotNull(); @@ -170,16 +196,17 @@ public void testOtherExpectedFailures() { Assertions.fail(); } catch (Exception e) { - //ignore + // ignore } // non existing function try { - function.apply(MessageBuilder.withPayload("hello").setHeader(FunctionProperties.PREFIX + ".definition", "blah").build()); + function.apply(MessageBuilder.withPayload("hello") + .setHeader(FunctionProperties.PREFIX + ".definition", "blah").build()); Assertions.fail(); } catch (Exception e) { - //ignore + // ignore } } @@ -197,6 +224,22 @@ public void testInvocationWithMessageComposed() { assertThat(function.apply(message)).isEqualTo("OLLEH"); } + @SuppressWarnings({ "rawtypes", "unchecked" }) + @Test + public void testMultipleRouters() { + System.setProperty(FunctionProperties.PREFIX + ".routing-expression", "'uppercase'"); + FunctionCatalog functionCatalog = this.configureCatalog(MultipleRouterConfiguration.class); + Function function = functionCatalog.lookup(RoutingFunction.FUNCTION_NAME); + assertThat(function).isNotNull(); + Message message = MessageBuilder.withPayload("hello").build(); + assertThat(function.apply(message)).isEqualTo("HELLO"); + + function = functionCatalog.lookup("mySpecialRouter"); + assertThat(function).isNotNull(); + message = MessageBuilder.withPayload("hello").build(); + assertThat(function.apply(message)).isEqualTo("olleh"); + } + @EnableAutoConfiguration @Configuration protected static class RoutingFunctionConfiguration { @@ -216,4 +259,26 @@ public Function, Flux> echoFlux() { return f -> f; } } + + @EnableAutoConfiguration + @Configuration + protected static class MultipleRouterConfiguration { + + @Bean + RoutingFunction mySpecialRouter(FunctionCatalog functionCatalog, BeanFactory beanFactory, @Nullable MessageRoutingCallback routingCallback) { + Map propertiesMap = new HashMap<>(); + propertiesMap.put(FunctionProperties.PREFIX + ".routing-expression", "'reverse'"); + return new RoutingFunction(functionCatalog, propertiesMap, new BeanFactoryResolver(beanFactory), routingCallback); + } + + @Bean + public Function reverse() { + return v -> new StringBuilder(v).reverse().toString(); + } + + @Bean + public Function uppercase() { + return String::toUpperCase; + } + } } From f0bdf80ac42e0e37bcb64b008ddba140034ad2ee Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Fri, 25 Mar 2022 14:24:18 +0100 Subject: [PATCH 048/210] Fix conversion logic in SmartCompositeMessageConverter --- .../context/config/SmartCompositeMessageConverter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java index 30caee18b..5b62325f1 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java @@ -45,7 +45,7 @@ public SmartCompositeMessageConverter(Collection converters) { @Nullable public Object fromMessage(Message message, Class targetClass) { for (MessageConverter converter : getConverters()) { - if (targetClass.isInstance(message.getPayload()) && !(message.getPayload() instanceof Collection)) { + if (!(message.getPayload() instanceof byte[]) && targetClass.isInstance(message.getPayload()) && !(message.getPayload() instanceof Collection)) { return message.getPayload(); } Object result = converter.fromMessage(message, targetClass); @@ -60,7 +60,7 @@ public Object fromMessage(Message message, Class targetClass) { @Nullable public Object fromMessage(Message message, Class targetClass, @Nullable Object conversionHint) { for (MessageConverter converter : getConverters()) { - if (targetClass.isInstance(message.getPayload()) && !(message.getPayload() instanceof Collection)) { + if (!(message.getPayload() instanceof byte[]) && targetClass.isInstance(message.getPayload()) && !(message.getPayload() instanceof Collection)) { return message.getPayload(); } Object result = (converter instanceof SmartMessageConverter ? From a313556bccbbd65e6eb6d28c8fa51882d3584ee3 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Fri, 25 Mar 2022 14:44:04 +0100 Subject: [PATCH 049/210] Fix compilation error in test --- .../cloud/function/context/config/RoutingFunctionTests.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/RoutingFunctionTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/RoutingFunctionTests.java index dc684089b..c577b66f3 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/RoutingFunctionTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/RoutingFunctionTests.java @@ -41,7 +41,7 @@ import org.springframework.messaging.support.MessageBuilder; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.fail; +import static org.assertj.core.api.Assertions.fail; /** * @@ -129,7 +129,7 @@ public void failWithHeaderProvidedExpressionAccessingRuntime() { .build(); try { function.apply(message); - fail(); + fail("Function shoudl not succeed"); } catch (Exception e) { assertThat(e.getMessage()).isEqualTo("EL1005E: Type cannot be found 'java.lang.Runtime'"); From c8a5a722a0c87889af216b3dc5e21d3c706149e3 Mon Sep 17 00:00:00 2001 From: Twometer Date: Mon, 28 Mar 2022 17:32:30 +0200 Subject: [PATCH 050/210] Add support for lambda authorizers Resolves #842 --- .../cloud/function/adapter/aws/AWSLambdaUtils.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java index 025577cc6..c0cb9100e 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java @@ -169,7 +169,8 @@ public static byte[] generateOutput(Message requestMessage, Message resp String outputClassName = outputClass.getName(); if (outputClassName.equals("com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPResponse") || outputClassName.equals("com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent") || - outputClassName.equals("com.amazonaws.services.lambda.runtime.events.ApplicationLoadBalancerResponseEvent")) { + outputClassName.equals("com.amazonaws.services.lambda.runtime.events.ApplicationLoadBalancerResponseEvent") || + outputClassName.equals("com.amazonaws.services.lambda.runtime.events.IamPolicyResponse")) { return responseMessage.getPayload(); } } From 80ca14d220b8f3c121d8b10090cce26a0f0e9dee Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 29 Mar 2022 10:45:59 +0000 Subject: [PATCH 051/210] Update SNAPSHOT to 3.2.3 --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 49 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 1d8e69162..f49150ccb 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.3 pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index a62512c33..1d81704de 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.3-SNAPSHOT + 3.2.3 pom org.springframework.cloud spring-cloud-build - 3.1.2-SNAPSHOT + 3.1.1 diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index c8bba056d..d65970db8 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.3 spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index de1874b93..2163fdc41 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.3 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index a493f620c..1a217890d 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.3 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index 16c4fb461..0a16242b1 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.3-SNAPSHOT + 3.2.3 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index bfbffaf0d..11d39b62b 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.3 diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 6b4097536..cd9935eae 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.3 spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index 247345323..769183eb2 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.3 diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index ba955c425..0508a1297 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.3 diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index c56b8268f..337b6d9f3 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.3 diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 1f2c10f81..a22ca50d1 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.3 diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 165065faa..38665c562 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.2-SNAPSHOT + 3.1.1 spring-cloud-function-dependencies - 3.2.3-SNAPSHOT + 3.2.3 pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 23820f457..317f438ea 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.3 diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index 5dc574b05..0a75f9679 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 1.8 - 3.2.3-SNAPSHOT + 3.2.3 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index aa7c96841..9e8bf8ba1 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 1.8 - 3.2.3-SNAPSHOT + 3.2.3 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 38fc86a45..df795f28c 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 1.8 - 3.2.3-SNAPSHOT + 3.2.3 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index c531f2a9d..22523e8bb 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 1.8 - 3.2.3-SNAPSHOT + 3.2.3 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index 12d63b6e2..b6a6369f8 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 1.8 - 3.2.3-SNAPSHOT + 3.2.3 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index a46e84a01..0c3540281 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 1.8 - 3.2.3-SNAPSHOT + 3.2.3 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index d2090e0ad..1734a4a34 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 1.8 - 3.2.3-SNAPSHOT + 3.2.3 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index ae5a7b507..f2cdc7196 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.3 diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 808bb37b7..a710d64b8 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.3 diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index 5a0a32265..7c58103d9 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.3-SNAPSHOT + 3.2.3 diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 4bde23861..28272e583 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.3-SNAPSHOT + 3.2.3 diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index f8fc5b2c0..efb4d956e 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.3-SNAPSHOT + 3.2.3 diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 425f7ddd4..01a419658 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.3-SNAPSHOT + 3.2.3 diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 5a151abfa..7e4b95142 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.3-SNAPSHOT + 3.2.3 diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index 3551d71bf..aa01d0dad 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 85ca6ebf8..01eed4497 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 1.8 - 3.2.3-SNAPSHOT + 3.2.3 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index 44d70d1ea..6656acab9 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 1.8 - 3.2.3-SNAPSHOT + 3.2.3 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 7cc41b75f..20dd20669 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 1.8 - 3.2.3-SNAPSHOT + 3.2.3 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index 16d691552..dc735ba02 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 1.8 - 3.2.3-SNAPSHOT + 3.2.3 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index be3326a0c..2462dcb67 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.3-SNAPSHOT + 3.2.3 diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index bb428ff20..d6a8a53fb 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index 1dad7ab47..fe14bdce8 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 - 3.2.3-SNAPSHOT + 3.2.3 diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index 45e42aa19..1f70cd46b 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.3-SNAPSHOT + 3.2.3 diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index d11a7410f..b8e7b6f4c 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index 51ee9e08f..cf129bc1e 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.3-SNAPSHOT + 3.2.3 diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index a5f941652..2ee531a9c 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 1.8 - 3.2.3-SNAPSHOT + 3.2.3 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 2af969d25..0af66fcd3 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.3-SNAPSHOT + 3.2.3 diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index 3a96aa6f1..3ff2e71cf 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 1.8 - 3.2.3-SNAPSHOT + 3.2.3 diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 36d1eaf1b..72d84bc5b 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 1.8 - 3.2.3-SNAPSHOT + 3.2.3 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index 126590704..288688250 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 1.8 - 3.2.3-SNAPSHOT + 3.2.3 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index a9c507af9..96b89995d 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.3 diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index 19de1082e..12b9cf5bd 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.3 diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index b3f13a377..1c1264c1d 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.3 diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index f9c94deca..6787d6aad 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.3 .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index d186c55c8..7bbb773cb 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.3 spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From 904adc254400c0f6de0f6702338f0fd255e2b876 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 29 Mar 2022 10:50:01 +0000 Subject: [PATCH 052/210] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 49 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index f49150ccb..1d8e69162 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3 + 3.2.3-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index 1d81704de..a62512c33 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.3 + 3.2.3-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 3.1.1 + 3.1.2-SNAPSHOT diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index d65970db8..c8bba056d 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3 + 3.2.3-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index 2163fdc41..de1874b93 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index 1a217890d..a493f620c 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index 0a16242b1..16c4fb461 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.3 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 11d39b62b..bfbffaf0d 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index cd9935eae..6b4097536 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3 + 3.2.3-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index 769183eb2..247345323 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index 0508a1297..ba955c425 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 337b6d9f3..c56b8268f 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index a22ca50d1..1f2c10f81 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 38665c562..165065faa 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.1 + 3.1.2-SNAPSHOT spring-cloud-function-dependencies - 3.2.3 + 3.2.3-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 317f438ea..23820f457 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index 0a75f9679..5dc574b05 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 1.8 - 3.2.3 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index 9e8bf8ba1..aa7c96841 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 1.8 - 3.2.3 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index df795f28c..38fc86a45 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 1.8 - 3.2.3 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index 22523e8bb..c531f2a9d 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 1.8 - 3.2.3 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index b6a6369f8..12d63b6e2 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 1.8 - 3.2.3 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 0c3540281..a46e84a01 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 1.8 - 3.2.3 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 1734a4a34..d2090e0ad 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 1.8 - 3.2.3 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index f2cdc7196..ae5a7b507 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index a710d64b8..808bb37b7 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index 7c58103d9..5a0a32265 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.3 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 28272e583..4bde23861 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.3 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index efb4d956e..f8fc5b2c0 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.3 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 01a419658..425f7ddd4 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.3 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 7e4b95142..5a151abfa 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.3 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index aa01d0dad..3551d71bf 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 01eed4497..85ca6ebf8 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 1.8 - 3.2.3 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index 6656acab9..44d70d1ea 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 1.8 - 3.2.3 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 20dd20669..7cc41b75f 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 1.8 - 3.2.3 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index dc735ba02..16d691552 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 1.8 - 3.2.3 + 3.2.3-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index 2462dcb67..be3326a0c 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.3 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index d6a8a53fb..bb428ff20 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index fe14bdce8..1dad7ab47 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 - 3.2.3 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index 1f70cd46b..45e42aa19 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.3 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index b8e7b6f4c..d11a7410f 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index cf129bc1e..51ee9e08f 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.3 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index 2ee531a9c..a5f941652 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 1.8 - 3.2.3 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 0af66fcd3..2af969d25 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.3 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index 3ff2e71cf..3a96aa6f1 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 1.8 - 3.2.3 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 72d84bc5b..36d1eaf1b 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 1.8 - 3.2.3 + 3.2.3-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index 288688250..126590704 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 1.8 - 3.2.3 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 96b89995d..a9c507af9 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index 12b9cf5bd..19de1082e 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index 1c1264c1d..b3f13a377 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index 6787d6aad..f9c94deca 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3 + 3.2.3-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index 7bbb773cb..d186c55c8 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3 + 3.2.3-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From a0ae7f0d46cce582afe4c16d50d115b206c4ff29 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 29 Mar 2022 10:50:02 +0000 Subject: [PATCH 053/210] Bumping versions to 3.2.4-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 2 +- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 2 +- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 49 files changed, 74 insertions(+), 74 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 1d8e69162..4ab6d2822 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index a62512c33..eab067ddc 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT pom diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index c8bba056d..82d5e8c8b 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index de1874b93..5a03cdaf4 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index a493f620c..5922fa7b7 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index 16c4fb461..6ddd651ec 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index bfbffaf0d..db515ef42 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 6b4097536..1b4ab639c 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index 247345323..7f00459c2 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index ba955c425..3d6dfe2e8 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index c56b8268f..7968d7016 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 1f2c10f81..a2476fe67 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 165065faa..b6860c8a3 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -10,7 +10,7 @@ spring-cloud-function-dependencies - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 23820f457..f985036f0 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index 5dc574b05..17c5be099 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 1.8 - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index aa7c96841..957029023 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 1.8 - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 38fc86a45..400e0bdad 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 1.8 - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index c531f2a9d..db469392c 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 1.8 - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index 12d63b6e2..bbba2c55d 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 1.8 - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index a46e84a01..233bc56ba 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 1.8 - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index d2090e0ad..3fb240f71 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 1.8 - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index ae5a7b507..e975806c4 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 808bb37b7..a3f140105 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index 5a0a32265..a7c5a29f0 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 4bde23861..4a93b6377 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index f8fc5b2c0..d44af5631 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 425f7ddd4..04f9337d5 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 5a151abfa..e4743c352 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index 3551d71bf..aa01d0dad 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 85ca6ebf8..5743c1df3 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 1.8 - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index 44d70d1ea..4538865bf 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 1.8 - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 7cc41b75f..3c6c170e0 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 1.8 - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index 16d691552..117b7c7d6 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 1.8 - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index be3326a0c..5b9e8e2b7 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index bb428ff20..d6a8a53fb 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index 1dad7ab47..c714c87dc 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index 45e42aa19..3c8784a6a 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index d11a7410f..b8e7b6f4c 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index 51ee9e08f..17236139b 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index a5f941652..d3f36e31f 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 1.8 - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 2af969d25..2e551b9b3 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index 3a96aa6f1..0bbdd3b7b 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 1.8 - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 36d1eaf1b..bb510e3a9 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 1.8 - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index 126590704..f3e98e508 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.5 1.8 - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index a9c507af9..2f7fbd514 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index 19de1082e..00deb9f7b 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index b3f13a377..3ca325133 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index f9c94deca..5657267a5 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index d186c55c8..e61d2b512 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From f81d942c4e0eb3c8471b10c23e65d8ce2ddc8854 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 29 Mar 2022 23:19:41 +0000 Subject: [PATCH 054/210] Bumping versions --- docs/pom.xml | 2 +- pom.xml | 2 +- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 2 +- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 49 files changed, 74 insertions(+), 74 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 4ab6d2822..1d8e69162 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index eab067ddc..a62512c33 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT pom diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index 82d5e8c8b..c8bba056d 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index 5a03cdaf4..de1874b93 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index 5922fa7b7..a493f620c 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index 6ddd651ec..16c4fb461 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index db515ef42..bfbffaf0d 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 1b4ab639c..6b4097536 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index 7f00459c2..247345323 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index 3d6dfe2e8..ba955c425 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 7968d7016..c56b8268f 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index a2476fe67..1f2c10f81 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index b6860c8a3..165065faa 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -10,7 +10,7 @@ spring-cloud-function-dependencies - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index f985036f0..23820f457 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index 17c5be099..5dc574b05 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 1.8 - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index 957029023..aa7c96841 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 1.8 - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 400e0bdad..38fc86a45 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 1.8 - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index db469392c..c531f2a9d 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 1.8 - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index bbba2c55d..12d63b6e2 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 1.8 - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 233bc56ba..a46e84a01 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 1.8 - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 3fb240f71..d2090e0ad 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 1.8 - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index e975806c4..ae5a7b507 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index a3f140105..808bb37b7 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index a7c5a29f0..5a0a32265 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 4a93b6377..4bde23861 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index d44af5631..f8fc5b2c0 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 04f9337d5..425f7ddd4 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index e4743c352..5a151abfa 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index aa01d0dad..3551d71bf 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 5743c1df3..85ca6ebf8 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 1.8 - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index 4538865bf..44d70d1ea 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 1.8 - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 3c6c170e0..7cc41b75f 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 1.8 - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index 117b7c7d6..16d691552 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 1.8 - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index 5b9e8e2b7..be3326a0c 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index d6a8a53fb..bb428ff20 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index c714c87dc..1dad7ab47 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index 3c8784a6a..45e42aa19 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index b8e7b6f4c..d11a7410f 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index 17236139b..51ee9e08f 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index d3f36e31f..a5f941652 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 1.8 - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 2e551b9b3..2af969d25 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index 0bbdd3b7b..3a96aa6f1 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 1.8 - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index bb510e3a9..36d1eaf1b 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 1.8 - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index f3e98e508..126590704 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.5 + 2.6.3 1.8 - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 2f7fbd514..a9c507af9 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index 00deb9f7b..19de1082e 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index 3ca325133..b3f13a377 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index 5657267a5..f9c94deca 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index e61d2b512..d186c55c8 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4-SNAPSHOT + 3.2.3-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From 51d201a4a9d45b0db6a5cf00e1db293dc7553ac7 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 31 Mar 2022 23:18:55 +0000 Subject: [PATCH 055/210] Bumping versions --- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 2 +- .../src/it/bootapp-with-javax/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 2 +- .../function-sample-aws-custom-bean/pom.xml | 2 +- .../function-sample-aws-custom/pom.xml | 2 +- .../function-sample-aws-routing/pom.xml | 2 +- spring-cloud-function-samples/function-sample-aws/pom.xml | 2 +- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 2 +- .../function-sample-cloudevent-stream/pom.xml | 2 +- .../function-sample-cloudevent/pom.xml | 2 +- spring-cloud-function-samples/function-sample-compiler/pom.xml | 2 +- .../function-sample-functional-aws-routing/pom.xml | 2 +- .../function-sample-gcp-background/pom.xml | 2 +- spring-cloud-function-samples/function-sample-gcp-http/pom.xml | 2 +- .../function-sample-grpc-cloudevent/pom.xml | 2 +- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pojo/pom.xml | 2 +- .../function-sample-spring-integration/pom.xml | 2 +- .../function-sample-supplier-exporter/pom.xml | 2 +- spring-cloud-function-samples/function-sample-task/pom.xml | 2 +- spring-cloud-function-samples/function-sample/pom.xml | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index 5dc574b05..8399312c8 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.6 diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index aa7c96841..3dc25c417 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.6 diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 38fc86a45..ea43e6e5f 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.6 diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index c531f2a9d..be2eff211 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.6 diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index 12d63b6e2..cb80316e4 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.6 diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index a46e84a01..b5e3e6667 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.6 diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index d2090e0ad..746b2ff8a 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.6 diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index 5a0a32265..e5c6f3da3 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.6 diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 4bde23861..e5335f815 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.6 io.spring.sample diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index f8fc5b2c0..27451c1dd 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.6 io.spring.sample diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 425f7ddd4..48c19b054 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.6 diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 5a151abfa..7c0ae31fa 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.6 diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index 3551d71bf..17d369fd2 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.6 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 85ca6ebf8..be3e8d4f1 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.6 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index 44d70d1ea..38e525540 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.6 diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 7cc41b75f..0466ab701 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.6 diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index 16d691552..0dc7c2c5c 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.6 diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index be3326a0c..17a41d74f 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.6 diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index bb428ff20..811056553 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.6 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index 1dad7ab47..f2149a413 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.6 diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index 45e42aa19..0ee4f3502 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.6 com.example.grpc diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index d11a7410f..0acd0ecc0 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.6 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index 51ee9e08f..f35180ec7 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.6 diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index a5f941652..4e90849ff 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.6 diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 2af969d25..98ab768d6 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.6 diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index 3a96aa6f1..2ca36699f 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.6 diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 36d1eaf1b..4274a479a 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.6 diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index 126590704..c619369b2 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.6 From 16484ec825aa1238f7088f844fd863eb8c4e243f Mon Sep 17 00:00:00 2001 From: Stef Noten Date: Thu, 31 Mar 2022 17:37:33 +0200 Subject: [PATCH 056/210] Exclude junit/hamcrest from classpath Resolves #846 --- .../spring-cloud-function-adapter-gcp/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index 16c4fb461..5bba6d9b7 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -68,6 +68,7 @@ com.github.blindpirate junit5-capture-system-output-extension 0.1.2 + test From 6569c0a2e9daa692cb0d0a066c5e01b2afab0ef7 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 20 Apr 2022 19:56:36 +0200 Subject: [PATCH 057/210] GH-841 Add support for propagating errors from AWS Custom Runtime Resolves #841 --- .../adapter/aws/CustomRuntimeEventLoop.java | 54 +++++++++++++++---- .../java/com/example/LambdaApplication.java | 3 ++ .../java/com/example/WebTestClientTests.java | 6 --- 3 files changed, 47 insertions(+), 16 deletions(-) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoop.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoop.java index 42d6e2fce..43cec472d 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoop.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoop.java @@ -16,12 +16,15 @@ package org.springframework.cloud.function.adapter.aws; +import java.io.PrintWriter; +import java.io.StringWriter; import java.net.SocketException; import java.net.URI; import java.nio.charset.StandardCharsets; import java.text.MessageFormat; import java.util.Arrays; import java.util.Collection; +import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; import java.util.concurrent.ExecutorService; @@ -30,6 +33,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.cloud.function.context.FunctionCatalog; import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry.FunctionInvocationWrapper; import org.springframework.cloud.function.json.JsonMapper; @@ -45,6 +49,8 @@ import org.springframework.util.Assert; import org.springframework.web.client.RestTemplate; + + import static org.apache.http.HttpHeaders.USER_AGENT; /** @@ -61,6 +67,7 @@ public final class CustomRuntimeEventLoop implements SmartLifecycle { private static Log logger = LogFactory.getLog(CustomRuntimeEventLoop.class); static final String LAMBDA_VERSION_DATE = "2018-06-01"; + private static final String LAMBDA_ERROR_URL_TEMPLATE = "http://{0}/{1}/runtime/invocation/{2}/error"; private static final String LAMBDA_RUNTIME_URL_TEMPLATE = "http://{0}/{1}/runtime/invocation/next"; private static final String LAMBDA_INVOCATION_URL_TEMPLATE = "http://{0}/{1}/runtime/invocation/{2}/response"; private static final String USER_AGENT_VALUE = String.format( @@ -141,19 +148,46 @@ private void eventLoop(ConfigurableApplicationContext context) { String invocationUrl = MessageFormat .format(LAMBDA_INVOCATION_URL_TEMPLATE, runtimeApi, LAMBDA_VERSION_DATE, requestId); - Message responseMessage = (Message) function.apply(eventMessage); + try { + Message responseMessage = (Message) function.apply(eventMessage); - if (responseMessage != null && logger.isDebugEnabled()) { - logger.debug("Reply from function: " + responseMessage); - } + if (responseMessage != null && logger.isDebugEnabled()) { + logger.debug("Reply from function: " + responseMessage); + } - byte[] outputBody = AWSLambdaUtils.generateOutput(eventMessage, responseMessage, mapper, function.getOutputType()); - ResponseEntity result = rest.exchange(RequestEntity.post(URI.create(invocationUrl)) - .header(USER_AGENT, USER_AGENT_VALUE) - .body(outputBody), Object.class); + byte[] outputBody = AWSLambdaUtils.generateOutput(eventMessage, responseMessage, mapper, function.getOutputType()); + ResponseEntity result = rest.exchange(RequestEntity.post(URI.create(invocationUrl)) + .header(USER_AGENT, USER_AGENT_VALUE) + .body(outputBody), Object.class); - if (logger.isInfoEnabled()) { - logger.info("Result POST status: " + result.getStatusCode()); + if (logger.isInfoEnabled()) { + logger.info("Result POST status: " + result.getStatusCode()); + } + } + catch (Exception e) { + String errorMessage = e.getMessage(); + String errorType = e.getClass().getSimpleName(); + StringWriter sw = new StringWriter(); + PrintWriter pw = new PrintWriter(sw); + e.printStackTrace(pw); + String stackTrace = sw.toString(); + Map em = new HashMap<>(); + em.put("errorMessage", errorMessage); + em.put("errorType", errorType); + em.put("stackTrace", stackTrace); + byte[] outputBody = mapper.toJson(em); + try { + String errorUrl = MessageFormat.format(LAMBDA_ERROR_URL_TEMPLATE, runtimeApi, LAMBDA_VERSION_DATE, requestId); + ResponseEntity result = rest.exchange(RequestEntity.post(URI.create(errorUrl)) + .header(USER_AGENT, USER_AGENT_VALUE) + .body(outputBody), Object.class); + if (logger.isInfoEnabled()) { + logger.info("Result ERROR status: " + result.getStatusCode()); + } + } + catch (Exception e2) { + throw new IllegalArgumentException("Failed to report error", e2); + } } } } diff --git a/spring-cloud-function-samples/function-sample-aws-custom/src/main/java/com/example/LambdaApplication.java b/spring-cloud-function-samples/function-sample-aws-custom/src/main/java/com/example/LambdaApplication.java index 730053793..cea0dfab7 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/src/main/java/com/example/LambdaApplication.java +++ b/spring-cloud-function-samples/function-sample-aws-custom/src/main/java/com/example/LambdaApplication.java @@ -21,6 +21,9 @@ public class LambdaApplication public Function uppercase() { return value -> { logger.info("Processing: " + value); + if (value.equals("error")) { + throw new IllegalArgumentException("Intentional"); + } return value.toUpperCase(); }; } diff --git a/spring-cloud-function-samples/function-sample/src/test/java/com/example/WebTestClientTests.java b/spring-cloud-function-samples/function-sample/src/test/java/com/example/WebTestClientTests.java index c74216e7b..9e4cfc703 100644 --- a/spring-cloud-function-samples/function-sample/src/test/java/com/example/WebTestClientTests.java +++ b/spring-cloud-function-samples/function-sample/src/test/java/com/example/WebTestClientTests.java @@ -19,12 +19,6 @@ public class WebTestClientTests { @Autowired private WebTestClient client; - @Test - public void words() { - client.get().uri("/words").exchange() - .expectStatus().isOk().expectBody(String.class).isEqualTo("[\"foo\",\"bar\"]"); - } - @Test public void uppercase() { client.post().uri("/uppercase").body(Mono.just("foo"), String.class).exchange() From 3a9ee01da6c3ff10c5ceef9ff1762c70af617b5c Mon Sep 17 00:00:00 2001 From: rahulmlokurte Date: Mon, 4 Apr 2022 13:50:54 +0530 Subject: [PATCH 058/210] Fix #844 issue custom object type conversion is failing, when it has headers as a variable name Resolves #850 --- .../cloud/function/adapter/aws/AWSLambdaUtils.java | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java index c0cb9100e..18e9c7d4d 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java @@ -121,6 +121,7 @@ else if ((((Map) request).containsKey("routeKey") && ((Map) request).containsKey } Object providedHeaders = ((Map) request).remove("headers"); if (providedHeaders != null && providedHeaders instanceof Map) { + messageBuilder = MessageBuilder.withPayload(request); messageBuilder.removeHeader("headers"); messageBuilder.copyHeaders((Map) providedHeaders); } From c38648459c14a31f7fc8d9d3c5c5604298f6067d Mon Sep 17 00:00:00 2001 From: Twometer Date: Wed, 20 Apr 2022 11:44:58 +0200 Subject: [PATCH 059/210] Fix ClassCastException with Spring Native --- .../function/adapter/aws/AWSLambdaUtils.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java index 18e9c7d4d..87e556f27 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java @@ -161,10 +161,21 @@ private static MessageBuilder createMessageBuilderForPOJOFunction(JsonMapper obj return messageBuilder; } + private static byte[] extractPayload(Message msg, JsonMapper objectMapper) { + if (msg.getPayload() instanceof byte[]) { + return (byte[]) msg.getPayload(); + } + else { + return objectMapper.toJson(msg.getPayload()); + } + } + @SuppressWarnings({ "rawtypes", "unchecked" }) - public static byte[] generateOutput(Message requestMessage, Message responseMessage, + public static byte[] generateOutput(Message requestMessage, Message responseMessage, JsonMapper objectMapper, Type functionOutputType) { + byte[] payload = extractPayload((Message) responseMessage, objectMapper); + Class outputClass = FunctionTypeUtils.getRawType(functionOutputType); if (outputClass != null) { String outputClassName = outputClass.getName(); @@ -172,11 +183,11 @@ public static byte[] generateOutput(Message requestMessage, Message resp outputClassName.equals("com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent") || outputClassName.equals("com.amazonaws.services.lambda.runtime.events.ApplicationLoadBalancerResponseEvent") || outputClassName.equals("com.amazonaws.services.lambda.runtime.events.IamPolicyResponse")) { - return responseMessage.getPayload(); + return payload; } } - byte[] responseBytes = responseMessage == null ? "\"OK\"".getBytes() : responseMessage.getPayload(); + byte[] responseBytes = responseMessage == null ? "\"OK\"".getBytes() : payload; if (requestMessage.getHeaders().containsKey(AWS_API_GATEWAY) && ((boolean) requestMessage.getHeaders().get(AWS_API_GATEWAY))) { Map response = new HashMap(); response.put("isBase64Encoded", false); @@ -197,7 +208,7 @@ public static byte[] generateOutput(Message requestMessage, Message resp } String body = responseMessage == null - ? "\"OK\"" : new String(responseMessage.getPayload(), StandardCharsets.UTF_8); + ? "\"OK\"" : new String(payload, StandardCharsets.UTF_8); response.put("body", body); if (responseMessage != null) { From c58123a2114a1c1414e459e2e6007b793b1cc514 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 21 Apr 2022 10:19:56 +0200 Subject: [PATCH 060/210] Polishing previous commit as it's current version breaks the test --- .../cloud/function/adapter/aws/AWSLambdaUtils.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java index 87e556f27..3eb2a9f72 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java @@ -174,8 +174,6 @@ private static byte[] extractPayload(Message msg, JsonMapper objectMappe public static byte[] generateOutput(Message requestMessage, Message responseMessage, JsonMapper objectMapper, Type functionOutputType) { - byte[] payload = extractPayload((Message) responseMessage, objectMapper); - Class outputClass = FunctionTypeUtils.getRawType(functionOutputType); if (outputClass != null) { String outputClassName = outputClass.getName(); @@ -183,11 +181,11 @@ public static byte[] generateOutput(Message requestMessage, Message responseM outputClassName.equals("com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent") || outputClassName.equals("com.amazonaws.services.lambda.runtime.events.ApplicationLoadBalancerResponseEvent") || outputClassName.equals("com.amazonaws.services.lambda.runtime.events.IamPolicyResponse")) { - return payload; + return extractPayload((Message) responseMessage, objectMapper); } } - byte[] responseBytes = responseMessage == null ? "\"OK\"".getBytes() : payload; + byte[] responseBytes = responseMessage == null ? "\"OK\"".getBytes() : extractPayload((Message) responseMessage, objectMapper); if (requestMessage.getHeaders().containsKey(AWS_API_GATEWAY) && ((boolean) requestMessage.getHeaders().get(AWS_API_GATEWAY))) { Map response = new HashMap(); response.put("isBase64Encoded", false); @@ -208,7 +206,7 @@ public static byte[] generateOutput(Message requestMessage, Message responseM } String body = responseMessage == null - ? "\"OK\"" : new String(payload, StandardCharsets.UTF_8); + ? "\"OK\"" : new String(extractPayload((Message) responseMessage, objectMapper), StandardCharsets.UTF_8); response.put("body", body); if (responseMessage != null) { From 5e1b8d3912950ebfb6745d4149f6d7e7d14f7baf Mon Sep 17 00:00:00 2001 From: REMY David Date: Tue, 12 Apr 2022 12:32:47 +0200 Subject: [PATCH 061/210] Change OffsetTime to OffsetDateTime in CloudEventMessageUtils Resolves #855 --- .../cloud/function/cloudevent/CloudEventMessageUtils.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventMessageUtils.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventMessageUtils.java index 0173a4a28..37d8c7549 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventMessageUtils.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventMessageUtils.java @@ -18,7 +18,7 @@ import java.lang.reflect.Field; import java.net.URI; -import java.time.OffsetTime; +import java.time.OffsetDateTime; import java.util.Collections; import java.util.Map; import java.util.stream.Collectors; @@ -208,9 +208,9 @@ public static String getSubject(Message message) { return (String) message.getHeaders().get(prefix + _SUBJECT); } - public static OffsetTime getTime(Message message) { + public static OffsetDateTime getTime(Message message) { String prefix = determinePrefixToUse(message.getHeaders()); - return (OffsetTime) message.getHeaders().get(prefix + _TIME); + return (OffsetDateTime) message.getHeaders().get(prefix + _TIME); } @SuppressWarnings("unchecked") From 047c0b1e6dfed6fb93ad44d515e1bbb6f0d83f22 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 21 Apr 2022 13:16:02 +0200 Subject: [PATCH 062/210] GH-861 Add constant for aws-context Resolves #861 --- docs/src/main/asciidoc/adapters/aws.adoc | 7 +++++++ .../cloud/function/adapter/aws/AWSLambdaUtils.java | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/docs/src/main/asciidoc/adapters/aws.adoc b/docs/src/main/asciidoc/adapters/aws.adoc index fb0c51131..0912ded38 100644 --- a/docs/src/main/asciidoc/adapters/aws.adoc +++ b/docs/src/main/asciidoc/adapters/aws.adoc @@ -37,6 +37,13 @@ public class FuncApplication implements ApplicationContextInitializer` as an input parameter to your function and then access `aws-context` from message headers. +For convenience we provide AWSLambdaUtils.AWS_CONTEXT constant. + == Platform Specific Features === HTTP and API Gateway diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java index 3eb2a9f72..5fd4dda97 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java @@ -51,6 +51,8 @@ final class AWSLambdaUtils { static final String AWS_API_GATEWAY = "aws-api-gateway"; + public static final String AWS_CONTEXT = "aws-context"; + private AWSLambdaUtils() { } @@ -136,7 +138,7 @@ else if (request instanceof Iterable) { messageBuilder = MessageBuilder.withPayload(payload); } if (awsContext != null) { - messageBuilder.setHeader("aws-context", awsContext); + messageBuilder.setHeader(AWS_CONTEXT, awsContext); } logger.info("Incoming request headers: " + headers); From 8d6849c9e17b4638c40fa717c7b558f23f1a861c Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 26 Apr 2022 08:39:26 +0200 Subject: [PATCH 063/210] GH-856 Fix logic in determining Cloud Event prefix Resolves #856 --- .../CloudEventsFunctionInvocationHelper.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventsFunctionInvocationHelper.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventsFunctionInvocationHelper.java index 25331f28a..9d1b6fa2b 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventsFunctionInvocationHelper.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventsFunctionInvocationHelper.java @@ -96,7 +96,15 @@ public Message postProcessResult(Object result, Message input) { if (this.messageConverter != null && CLOUD_EVENT_CLASS != null && CLOUD_EVENT_CLASS.isAssignableFrom(result.getClass())) { convertedResult = this.messageConverter.toMessage(result, input.getHeaders()); } - String targetPrefix = CloudEventMessageUtils.determinePrefixToUse(input.getHeaders(), true); + + String targetPrefix = CloudEventMessageUtils.DEFAULT_ATTR_PREFIX; + if (input != null) { + targetPrefix = CloudEventMessageUtils.determinePrefixToUse(input.getHeaders(), true); + } + else if (result instanceof Message) { + targetPrefix = CloudEventMessageUtils.determinePrefixToUse(((Message) result).getHeaders(), true); + } + Assert.hasText(targetPrefix, "Unable to determine prefix for Cloud Event atttributes, " + "which they must have according to protocol specification. Consider adding 'target-protocol' " + "header with values of one of the supported protocols - [kafka, amqp, http]"); From 5bf7b6da641a2353f394a848f59501ce20921f24 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 26 Apr 2022 09:03:14 +0200 Subject: [PATCH 064/210] polishing --- .../cloud/function/test/FunctionalExporterTests.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/FunctionalExporterTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/FunctionalExporterTests.java index a75d0806d..79ff42e2f 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/FunctionalExporterTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/FunctionalExporterTests.java @@ -22,6 +22,7 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -53,6 +54,7 @@ "spring.cloud.function.web.export.sink.name=origin|uppercase", "spring.cloud.function.web.export.sink.contentType=text/plain", "spring.cloud.function.web.export.debug=true" }) +@Disabled public class FunctionalExporterTests { @Autowired From 2e7140f2ca406729d99279264e6ba7ecaa7640ac Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 26 Apr 2022 15:08:03 +0000 Subject: [PATCH 065/210] Update SNAPSHOT to 3.2.4 --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 49 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 1d8e69162..9c43efc30 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index a62512c33..5d7d2cff3 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.3-SNAPSHOT + 3.2.4 pom org.springframework.cloud spring-cloud-build - 3.1.2-SNAPSHOT + 3.1.2 diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index c8bba056d..a51f9b46c 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index de1874b93..77bb89e31 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index a493f620c..f622fc731 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index 5bba6d9b7..98216b7f0 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index bfbffaf0d..833322161 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 6b4097536..20064228f 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.4 spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index 247345323..b8dc37d95 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index ba955c425..d5ea567a4 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index c56b8268f..67e0ee12d 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 1f2c10f81..d400af616 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 165065faa..5b1ec1739 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.2-SNAPSHOT + 3.1.2 spring-cloud-function-dependencies - 3.2.3-SNAPSHOT + 3.2.4 pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 23820f457..fbc31e905 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index 8399312c8..3ce6874b3 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index 3dc25c417..64237013e 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index ea43e6e5f..648d593a7 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index be2eff211..142b261ad 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index cb80316e4..93ed1b783 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index b5e3e6667..dc50a4035 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 746b2ff8a..4d9d3cd23 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index ae5a7b507..22fb1dd29 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 808bb37b7..799a89881 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index e5c6f3da3..bcb1ee951 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index e5335f815..1262f133d 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index 27451c1dd..38b812051 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 48c19b054..edd592423 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 7c0ae31fa..30de6d233 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index 17d369fd2..81f340c98 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index be3e8d4f1..edf9a69ea 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index 38e525540..be207811a 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 0466ab701..30b0f4394 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index 0dc7c2c5c..0ef9f72ad 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index 17a41d74f..624f58987 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index 811056553..75c4f2d20 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index f2149a413..ea3635277 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index 0ee4f3502..d1d29cb13 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index 0acd0ecc0..83ed6397a 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index f35180ec7..bfca43da0 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index 4e90849ff..e69fa258f 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 98ab768d6..ec0781644 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index 2ca36699f..a5c20a874 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 4274a479a..ae05e90c6 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index c619369b2..700d5fa47 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index a9c507af9..5e1a838e7 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index 19de1082e..a85cc6aa4 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index b3f13a377..d723d22c0 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index f9c94deca..febf45a57 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index d186c55c8..0342a1292 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From f5d74e505cdae436ac01a1f979154d61c6ec515c Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 26 Apr 2022 15:12:25 +0000 Subject: [PATCH 066/210] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 49 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 9c43efc30..1d8e69162 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index 5d7d2cff3..a62512c33 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.4 + 3.2.3-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 3.1.2 + 3.1.2-SNAPSHOT diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index a51f9b46c..c8bba056d 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index 77bb89e31..de1874b93 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index f622fc731..a493f620c 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index 98216b7f0..5bba6d9b7 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 833322161..bfbffaf0d 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 20064228f..6b4097536 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.4 + 3.2.3-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index b8dc37d95..247345323 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index d5ea567a4..ba955c425 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 67e0ee12d..c56b8268f 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index d400af616..1f2c10f81 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 5b1ec1739..165065faa 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.2 + 3.1.2-SNAPSHOT spring-cloud-function-dependencies - 3.2.4 + 3.2.3-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index fbc31e905..23820f457 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index 3ce6874b3..8399312c8 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index 64237013e..3dc25c417 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 648d593a7..ea43e6e5f 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index 142b261ad..be2eff211 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index 93ed1b783..cb80316e4 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index dc50a4035..b5e3e6667 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 4d9d3cd23..746b2ff8a 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index 22fb1dd29..ae5a7b507 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 799a89881..808bb37b7 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index bcb1ee951..e5c6f3da3 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 1262f133d..e5335f815 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index 38b812051..27451c1dd 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index edd592423..48c19b054 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 30de6d233..7c0ae31fa 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index 81f340c98..17d369fd2 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index edf9a69ea..be3e8d4f1 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index be207811a..38e525540 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 30b0f4394..0466ab701 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index 0ef9f72ad..0dc7c2c5c 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index 624f58987..17a41d74f 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index 75c4f2d20..811056553 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index ea3635277..f2149a413 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index d1d29cb13..0ee4f3502 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index 83ed6397a..0acd0ecc0 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index bfca43da0..f35180ec7 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index e69fa258f..4e90849ff 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index ec0781644..98ab768d6 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index a5c20a874..2ca36699f 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index ae05e90c6..4274a479a 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index 700d5fa47..c619369b2 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 5e1a838e7..a9c507af9 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index a85cc6aa4..19de1082e 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index d723d22c0..b3f13a377 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index febf45a57..f9c94deca 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index 0342a1292..d186c55c8 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From e4635e80bc1fc3bc751c8b47aa1e09b9d394877f Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 26 Apr 2022 15:12:26 +0000 Subject: [PATCH 067/210] Bumping versions to 3.2.5-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 49 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 1d8e69162..3d91e2eff 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index a62512c33..eacf1ab5b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index c8bba056d..cc6bb342c 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index de1874b93..340ade417 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index a493f620c..bcf99dfbd 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index 5bba6d9b7..b350750d4 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index bfbffaf0d..88130a733 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 6b4097536..88e8ab6b5 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index 247345323..0ddd7cf62 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index ba955c425..19cacddd5 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index c56b8268f..47bd87a7d 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 1f2c10f81..5db60ab55 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 165065faa..84311b412 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT spring-cloud-function-dependencies - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 23820f457..9ab82b477 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index 8399312c8..3bc6b889a 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index 3dc25c417..e9efda865 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index ea43e6e5f..845e977ee 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index be2eff211..518217eec 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index cb80316e4..7a02d85a1 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index b5e3e6667..5f754162e 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 746b2ff8a..09926f851 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index ae5a7b507..5b8ed17c4 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 808bb37b7..9d9ddec4b 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index e5c6f3da3..db9a97bbe 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index e5335f815..eed649311 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index 27451c1dd..bdd0e701e 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 48c19b054..30be5f5cb 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 7c0ae31fa..eb06e1fa0 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index 17d369fd2..81f340c98 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index be3e8d4f1..cdc0d0e67 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index 38e525540..4f0b75884 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 0466ab701..d93471fbc 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index 0dc7c2c5c..0cb88dfb8 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index 17a41d74f..99e133e86 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index 811056553..75c4f2d20 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index f2149a413..a4f55354e 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index 0ee4f3502..c40f932ba 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index 0acd0ecc0..83ed6397a 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index f35180ec7..6233133c1 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index 4e90849ff..11da9bd51 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 98ab768d6..eeef4df97 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index 2ca36699f..7f6747ff1 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 4274a479a..01c203df5 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index c619369b2..0e8420873 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index a9c507af9..765620317 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index 19de1082e..cf01e07a3 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index b3f13a377..f563e54d0 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index f9c94deca..fdf3c1db8 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index d186c55c8..e59a7ef0d 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From 8bea4bd05803aff60d20d4212abf897f74500d57 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 26 Apr 2022 23:17:34 +0000 Subject: [PATCH 068/210] Bumping versions --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 2 +- .../src/it/bootapp-with-javax/pom.xml | 2 +- .../src/it/bootapp-with-scf/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 2 +- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 2 +- .../function-sample-aws-custom-bean/pom.xml | 2 +- .../function-sample-aws-custom/pom.xml | 2 +- .../function-sample-aws-routing/pom.xml | 2 +- spring-cloud-function-samples/function-sample-aws/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 2 +- .../function-sample-cloudevent-stream/pom.xml | 2 +- .../function-sample-cloudevent/pom.xml | 2 +- .../function-sample-compiler/pom.xml | 2 +- .../function-sample-functional-aws-routing/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 2 +- .../function-sample-grpc-cloudevent/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pojo/pom.xml | 2 +- .../function-sample-spring-integration/pom.xml | 2 +- .../function-sample-supplier-exporter/pom.xml | 2 +- spring-cloud-function-samples/function-sample-task/pom.xml | 2 +- spring-cloud-function-samples/function-sample/pom.xml | 2 +- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 46 files changed, 48 insertions(+), 48 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 3d91e2eff..1d8e69162 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index eacf1ab5b..a62512c33 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 3.1.3-SNAPSHOT + 3.1.2-SNAPSHOT diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index cc6bb342c..c8bba056d 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index 340ade417..de1874b93 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index bcf99dfbd..a493f620c 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index b350750d4..5bba6d9b7 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 88130a733..bfbffaf0d 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 88e8ab6b5..6b4097536 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index 0ddd7cf62..247345323 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index 19cacddd5..ba955c425 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 47bd87a7d..c56b8268f 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 5db60ab55..1f2c10f81 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 84311b412..165065faa 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.3-SNAPSHOT + 3.1.2-SNAPSHOT spring-cloud-function-dependencies - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 9ab82b477..23820f457 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index 3bc6b889a..5fcea7084 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index e9efda865..875c8a05f 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 845e977ee..3851fd001 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index 518217eec..29b137336 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index 7a02d85a1..123f663cc 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 5f754162e..25c163ac0 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 09926f851..b21003b92 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index 5b8ed17c4..ae5a7b507 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 9d9ddec4b..808bb37b7 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index db9a97bbe..9a644532e 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index eed649311..9af26e254 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index bdd0e701e..6e231e2d0 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 30be5f5cb..4fbf8b9dc 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index eb06e1fa0..09839272c 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index cdc0d0e67..3b9828314 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index 4f0b75884..5b6f21c60 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -17,7 +17,7 @@ 1.8 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index d93471fbc..e72268e73 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -17,7 +17,7 @@ 1.8 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index 0cb88dfb8..7a99fde74 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index 99e133e86..07a7b753f 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index a4f55354e..ebf46ef71 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -20,7 +20,7 @@ - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index c40f932ba..1cd8848e0 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index 6233133c1..2d04cb74c 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index 11da9bd51..1264a8269 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index eeef4df97..9695c832d 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index 7f6747ff1..cc63e14ce 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 01c203df5..6814ef820 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index 0e8420873..be19fc8ba 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 765620317..a9c507af9 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index cf01e07a3..19de1082e 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index f563e54d0..b3f13a377 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index fdf3c1db8..f9c94deca 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index e59a7ef0d..d186c55c8 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From f3f18fd557b6a5398b848516007e8bff48dbb428 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Wed, 27 Apr 2022 10:54:36 +0200 Subject: [PATCH 069/210] Revert "Bumping versions" This reverts commit 8bea4bd05803aff60d20d4212abf897f74500d57. --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 2 +- .../src/it/bootapp-with-javax/pom.xml | 2 +- .../src/it/bootapp-with-scf/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 2 +- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 2 +- .../function-sample-aws-custom-bean/pom.xml | 2 +- .../function-sample-aws-custom/pom.xml | 2 +- .../function-sample-aws-routing/pom.xml | 2 +- spring-cloud-function-samples/function-sample-aws/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 2 +- .../function-sample-cloudevent-stream/pom.xml | 2 +- .../function-sample-cloudevent/pom.xml | 2 +- .../function-sample-compiler/pom.xml | 2 +- .../function-sample-functional-aws-routing/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 2 +- .../function-sample-grpc-cloudevent/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pojo/pom.xml | 2 +- .../function-sample-spring-integration/pom.xml | 2 +- .../function-sample-supplier-exporter/pom.xml | 2 +- spring-cloud-function-samples/function-sample-task/pom.xml | 2 +- spring-cloud-function-samples/function-sample/pom.xml | 2 +- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 46 files changed, 48 insertions(+), 48 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 1d8e69162..3d91e2eff 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index a62512c33..eacf1ab5b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index c8bba056d..cc6bb342c 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index de1874b93..340ade417 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index a493f620c..bcf99dfbd 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index 5bba6d9b7..b350750d4 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index bfbffaf0d..88130a733 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 6b4097536..88e8ab6b5 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index 247345323..0ddd7cf62 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index ba955c425..19cacddd5 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index c56b8268f..47bd87a7d 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 1f2c10f81..5db60ab55 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 165065faa..84311b412 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT spring-cloud-function-dependencies - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 23820f457..9ab82b477 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index 5fcea7084..3bc6b889a 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index 875c8a05f..e9efda865 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 3851fd001..845e977ee 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index 29b137336..518217eec 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index 123f663cc..7a02d85a1 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 25c163ac0..5f754162e 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index b21003b92..09926f851 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index ae5a7b507..5b8ed17c4 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 808bb37b7..9d9ddec4b 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index 9a644532e..db9a97bbe 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 9af26e254..eed649311 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index 6e231e2d0..bdd0e701e 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 4fbf8b9dc..30be5f5cb 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 09839272c..eb06e1fa0 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 3b9828314..cdc0d0e67 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index 5b6f21c60..4f0b75884 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -17,7 +17,7 @@ 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index e72268e73..d93471fbc 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -17,7 +17,7 @@ 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index 7a99fde74..0cb88dfb8 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index 07a7b753f..99e133e86 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index ebf46ef71..a4f55354e 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -20,7 +20,7 @@ - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index 1cd8848e0..c40f932ba 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index 2d04cb74c..6233133c1 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index 1264a8269..11da9bd51 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 9695c832d..eeef4df97 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index cc63e14ce..7f6747ff1 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 6814ef820..01c203df5 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index be19fc8ba..0e8420873 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index a9c507af9..765620317 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index 19de1082e..cf01e07a3 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index b3f13a377..f563e54d0 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index f9c94deca..fdf3c1db8 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index d186c55c8..e59a7ef0d 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From d3d6b07314e6904866f3e92be0b20a5835c29563 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Wed, 27 Apr 2022 10:54:42 +0200 Subject: [PATCH 070/210] Revert "Bumping versions to 3.2.5-SNAPSHOT after release" This reverts commit e4635e80bc1fc3bc751c8b47aa1e09b9d394877f. --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 49 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 3d91e2eff..1d8e69162 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index eacf1ab5b..a62512c33 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 3.1.3-SNAPSHOT + 3.1.2-SNAPSHOT diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index cc6bb342c..c8bba056d 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index 340ade417..de1874b93 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index bcf99dfbd..a493f620c 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index b350750d4..5bba6d9b7 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 88130a733..bfbffaf0d 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 88e8ab6b5..6b4097536 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index 0ddd7cf62..247345323 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index 19cacddd5..ba955c425 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 47bd87a7d..c56b8268f 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 5db60ab55..1f2c10f81 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 84311b412..165065faa 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.3-SNAPSHOT + 3.1.2-SNAPSHOT spring-cloud-function-dependencies - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 9ab82b477..23820f457 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index 3bc6b889a..8399312c8 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index e9efda865..3dc25c417 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 845e977ee..ea43e6e5f 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index 518217eec..be2eff211 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index 7a02d85a1..cb80316e4 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 5f754162e..b5e3e6667 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 09926f851..746b2ff8a 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index 5b8ed17c4..ae5a7b507 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 9d9ddec4b..808bb37b7 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index db9a97bbe..e5c6f3da3 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index eed649311..e5335f815 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index bdd0e701e..27451c1dd 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 30be5f5cb..48c19b054 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index eb06e1fa0..7c0ae31fa 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index 81f340c98..17d369fd2 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index cdc0d0e67..be3e8d4f1 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index 4f0b75884..38e525540 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index d93471fbc..0466ab701 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index 0cb88dfb8..0dc7c2c5c 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index 99e133e86..17a41d74f 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index 75c4f2d20..811056553 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index a4f55354e..f2149a413 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index c40f932ba..0ee4f3502 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index 83ed6397a..0acd0ecc0 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index 6233133c1..f35180ec7 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index 11da9bd51..4e90849ff 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index eeef4df97..98ab768d6 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index 7f6747ff1..2ca36699f 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 01c203df5..4274a479a 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index 0e8420873..c619369b2 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 765620317..a9c507af9 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index cf01e07a3..19de1082e 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index f563e54d0..b3f13a377 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index fdf3c1db8..f9c94deca 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index e59a7ef0d..d186c55c8 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.3-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From a9d7b7d6c229eb912d2d7d76dab60a42033bdd76 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Wed, 27 Apr 2022 10:54:45 +0200 Subject: [PATCH 071/210] Revert "Going back to snapshots" This reverts commit f5d74e505cdae436ac01a1f979154d61c6ec515c. --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 49 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 1d8e69162..9c43efc30 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index a62512c33..5d7d2cff3 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.3-SNAPSHOT + 3.2.4 pom org.springframework.cloud spring-cloud-build - 3.1.2-SNAPSHOT + 3.1.2 diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index c8bba056d..a51f9b46c 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index de1874b93..77bb89e31 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index a493f620c..f622fc731 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index 5bba6d9b7..98216b7f0 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index bfbffaf0d..833322161 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 6b4097536..20064228f 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.4 spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index 247345323..b8dc37d95 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index ba955c425..d5ea567a4 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index c56b8268f..67e0ee12d 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 1f2c10f81..d400af616 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 165065faa..5b1ec1739 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.2-SNAPSHOT + 3.1.2 spring-cloud-function-dependencies - 3.2.3-SNAPSHOT + 3.2.4 pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 23820f457..fbc31e905 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index 8399312c8..3ce6874b3 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index 3dc25c417..64237013e 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index ea43e6e5f..648d593a7 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index be2eff211..142b261ad 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index cb80316e4..93ed1b783 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index b5e3e6667..dc50a4035 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 746b2ff8a..4d9d3cd23 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index ae5a7b507..22fb1dd29 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 808bb37b7..799a89881 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index e5c6f3da3..bcb1ee951 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index e5335f815..1262f133d 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index 27451c1dd..38b812051 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 48c19b054..edd592423 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 7c0ae31fa..30de6d233 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index 17d369fd2..81f340c98 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index be3e8d4f1..edf9a69ea 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index 38e525540..be207811a 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 0466ab701..30b0f4394 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index 0dc7c2c5c..0ef9f72ad 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index 17a41d74f..624f58987 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index 811056553..75c4f2d20 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index f2149a413..ea3635277 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index 0ee4f3502..d1d29cb13 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index 0acd0ecc0..83ed6397a 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index f35180ec7..bfca43da0 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index 4e90849ff..e69fa258f 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 98ab768d6..ec0781644 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index 2ca36699f..a5c20a874 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 4274a479a..ae05e90c6 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index c619369b2..700d5fa47 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index a9c507af9..5e1a838e7 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index 19de1082e..a85cc6aa4 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index b3f13a377..d723d22c0 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index f9c94deca..febf45a57 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index d186c55c8..0342a1292 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From 711fcc940edc88e787662d7fb73aa57101798a9f Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Wed, 27 Apr 2022 10:54:50 +0200 Subject: [PATCH 072/210] Revert "Update SNAPSHOT to 3.2.4" This reverts commit 2e7140f2ca406729d99279264e6ba7ecaa7640ac. --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 49 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 9c43efc30..1d8e69162 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index 5d7d2cff3..a62512c33 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.4 + 3.2.3-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 3.1.2 + 3.1.2-SNAPSHOT diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index a51f9b46c..c8bba056d 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index 77bb89e31..de1874b93 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index f622fc731..a493f620c 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index 98216b7f0..5bba6d9b7 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 833322161..bfbffaf0d 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 20064228f..6b4097536 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.4 + 3.2.3-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index b8dc37d95..247345323 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index d5ea567a4..ba955c425 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 67e0ee12d..c56b8268f 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index d400af616..1f2c10f81 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 5b1ec1739..165065faa 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.2 + 3.1.2-SNAPSHOT spring-cloud-function-dependencies - 3.2.4 + 3.2.3-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index fbc31e905..23820f457 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index 3ce6874b3..8399312c8 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index 64237013e..3dc25c417 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 648d593a7..ea43e6e5f 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index 142b261ad..be2eff211 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index 93ed1b783..cb80316e4 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index dc50a4035..b5e3e6667 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 4d9d3cd23..746b2ff8a 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index 22fb1dd29..ae5a7b507 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 799a89881..808bb37b7 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index bcb1ee951..e5c6f3da3 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 1262f133d..e5335f815 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index 38b812051..27451c1dd 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index edd592423..48c19b054 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 30de6d233..7c0ae31fa 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index 81f340c98..17d369fd2 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index edf9a69ea..be3e8d4f1 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index be207811a..38e525540 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 30b0f4394..0466ab701 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index 0ef9f72ad..0dc7c2c5c 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index 624f58987..17a41d74f 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index 75c4f2d20..811056553 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index ea3635277..f2149a413 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index d1d29cb13..0ee4f3502 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index 83ed6397a..0acd0ecc0 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index bfca43da0..f35180ec7 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index e69fa258f..4e90849ff 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index ec0781644..98ab768d6 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index a5c20a874..2ca36699f 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index ae05e90c6..4274a479a 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index 700d5fa47..c619369b2 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 5e1a838e7..a9c507af9 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index a85cc6aa4..19de1082e 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index d723d22c0..b3f13a377 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index febf45a57..f9c94deca 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index 0342a1292..d186c55c8 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From 4d7910d484876d4a54e39d2dfb1cb491517557fa Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 27 Apr 2022 09:55:53 +0000 Subject: [PATCH 073/210] Update SNAPSHOT to 3.2.4 --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 49 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 1d8e69162..9c43efc30 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index a62512c33..5d7d2cff3 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.3-SNAPSHOT + 3.2.4 pom org.springframework.cloud spring-cloud-build - 3.1.2-SNAPSHOT + 3.1.2 diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index c8bba056d..a51f9b46c 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index de1874b93..77bb89e31 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index a493f620c..f622fc731 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index 5bba6d9b7..98216b7f0 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index bfbffaf0d..833322161 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 6b4097536..20064228f 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.4 spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index 247345323..b8dc37d95 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index ba955c425..d5ea567a4 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index c56b8268f..67e0ee12d 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 1f2c10f81..d400af616 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 165065faa..5b1ec1739 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.2-SNAPSHOT + 3.1.2 spring-cloud-function-dependencies - 3.2.3-SNAPSHOT + 3.2.4 pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 23820f457..fbc31e905 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index 8399312c8..3ce6874b3 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index 3dc25c417..64237013e 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index ea43e6e5f..648d593a7 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index be2eff211..142b261ad 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index cb80316e4..93ed1b783 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index b5e3e6667..dc50a4035 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 746b2ff8a..4d9d3cd23 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index ae5a7b507..22fb1dd29 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 808bb37b7..799a89881 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index e5c6f3da3..bcb1ee951 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index e5335f815..1262f133d 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index 27451c1dd..38b812051 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 48c19b054..edd592423 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 7c0ae31fa..30de6d233 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index 17d369fd2..81f340c98 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index be3e8d4f1..edf9a69ea 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index 38e525540..be207811a 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 0466ab701..30b0f4394 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index 0dc7c2c5c..0ef9f72ad 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index 17a41d74f..624f58987 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index 811056553..75c4f2d20 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index f2149a413..ea3635277 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index 0ee4f3502..d1d29cb13 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index 0acd0ecc0..83ed6397a 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index f35180ec7..bfca43da0 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index 4e90849ff..e69fa258f 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 98ab768d6..ec0781644 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index 2ca36699f..a5c20a874 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 4274a479a..ae05e90c6 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index c619369b2..700d5fa47 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.4 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index a9c507af9..5e1a838e7 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index 19de1082e..a85cc6aa4 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index b3f13a377..d723d22c0 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index f9c94deca..febf45a57 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index d186c55c8..0342a1292 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.4 spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From 42818442c575e2b009ed03f41d670f9a7118f75d Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 27 Apr 2022 10:00:00 +0000 Subject: [PATCH 074/210] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 49 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 9c43efc30..1d8e69162 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index 5d7d2cff3..a62512c33 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.4 + 3.2.3-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 3.1.2 + 3.1.2-SNAPSHOT diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index a51f9b46c..c8bba056d 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index 77bb89e31..de1874b93 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index f622fc731..a493f620c 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index 98216b7f0..5bba6d9b7 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 833322161..bfbffaf0d 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 20064228f..6b4097536 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.4 + 3.2.3-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index b8dc37d95..247345323 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index d5ea567a4..ba955c425 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 67e0ee12d..c56b8268f 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index d400af616..1f2c10f81 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 5b1ec1739..165065faa 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.2 + 3.1.2-SNAPSHOT spring-cloud-function-dependencies - 3.2.4 + 3.2.3-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index fbc31e905..23820f457 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index 3ce6874b3..8399312c8 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index 64237013e..3dc25c417 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 648d593a7..ea43e6e5f 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index 142b261ad..be2eff211 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index 93ed1b783..cb80316e4 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index dc50a4035..b5e3e6667 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 4d9d3cd23..746b2ff8a 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index 22fb1dd29..ae5a7b507 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 799a89881..808bb37b7 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index bcb1ee951..e5c6f3da3 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 1262f133d..e5335f815 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index 38b812051..27451c1dd 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index edd592423..48c19b054 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 30de6d233..7c0ae31fa 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index 81f340c98..17d369fd2 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index edf9a69ea..be3e8d4f1 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index be207811a..38e525540 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 30b0f4394..0466ab701 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index 0ef9f72ad..0dc7c2c5c 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index 624f58987..17a41d74f 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index 75c4f2d20..811056553 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index ea3635277..f2149a413 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index d1d29cb13..0ee4f3502 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index 83ed6397a..0acd0ecc0 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index bfca43da0..f35180ec7 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index e69fa258f..4e90849ff 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index ec0781644..98ab768d6 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index a5c20a874..2ca36699f 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index ae05e90c6..4274a479a 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index 700d5fa47..c619369b2 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 1.8 - 3.2.4 + 3.2.3-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 5e1a838e7..a9c507af9 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index a85cc6aa4..19de1082e 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index d723d22c0..b3f13a377 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index febf45a57..f9c94deca 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index 0342a1292..d186c55c8 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.4 + 3.2.3-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From 11d59b759dd658316fa7b65d9063fa492b0fd67f Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 27 Apr 2022 10:00:01 +0000 Subject: [PATCH 075/210] Bumping versions to 3.2.5-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 49 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 1d8e69162..3d91e2eff 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index a62512c33..1cfa69c7a 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 3.1.2-SNAPSHOT + 3.1.2 diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index c8bba056d..cc6bb342c 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index de1874b93..340ade417 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index a493f620c..bcf99dfbd 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index 5bba6d9b7..b350750d4 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index bfbffaf0d..88130a733 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 6b4097536..88e8ab6b5 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index 247345323..0ddd7cf62 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index ba955c425..19cacddd5 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index c56b8268f..47bd87a7d 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 1f2c10f81..5db60ab55 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 165065faa..84311b412 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT spring-cloud-function-dependencies - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 23820f457..9ab82b477 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index 8399312c8..3bc6b889a 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index 3dc25c417..e9efda865 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index ea43e6e5f..845e977ee 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index be2eff211..518217eec 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index cb80316e4..7a02d85a1 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index b5e3e6667..5f754162e 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 746b2ff8a..09926f851 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index ae5a7b507..5b8ed17c4 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 808bb37b7..9d9ddec4b 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index e5c6f3da3..db9a97bbe 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index e5335f815..eed649311 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index 27451c1dd..bdd0e701e 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 48c19b054..30be5f5cb 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 7c0ae31fa..eb06e1fa0 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index 17d369fd2..81f340c98 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index be3e8d4f1..cdc0d0e67 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index 38e525540..4f0b75884 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 0466ab701..d93471fbc 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index 0dc7c2c5c..0cb88dfb8 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index 17a41d74f..99e133e86 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index 811056553..75c4f2d20 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index f2149a413..a4f55354e 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index 0ee4f3502..c40f932ba 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index 0acd0ecc0..83ed6397a 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index f35180ec7..6233133c1 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index 4e90849ff..11da9bd51 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 98ab768d6..eeef4df97 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index 2ca36699f..7f6747ff1 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 4274a479a..01c203df5 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index c619369b2..0e8420873 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 1.8 - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index a9c507af9..765620317 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index 19de1082e..cf01e07a3 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index b3f13a377..f563e54d0 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index f9c94deca..fdf3c1db8 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index d186c55c8..e59a7ef0d 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.3-SNAPSHOT + 3.2.5-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From fce68b7ae8b103068b5fadf87f201d5d8b906f1d Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 27 Apr 2022 23:17:40 +0000 Subject: [PATCH 076/210] Bumping versions --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1cfa69c7a..eacf1ab5b 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-build - 3.1.2 + 3.1.3-SNAPSHOT From cef0cb805797d4a175bfbf1cfd13db5c4ddc692d Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 3 May 2022 19:14:00 +0200 Subject: [PATCH 077/210] GH-864 Add support for carying HTTP request parameters in Message headers Resolves #864 --- .../main/asciidoc/spring-cloud-function.adoc | 7 ++++++ .../FunctionWebRequestProcessingHelper.java | 10 +++++++- .../cloud/function/web/util/HeaderUtils.java | 5 ++++ .../cloud/function/web/mvc/PrefixTests.java | 24 +++++++++++++++++++ 4 files changed, 45 insertions(+), 1 deletion(-) diff --git a/docs/src/main/asciidoc/spring-cloud-function.adoc b/docs/src/main/asciidoc/spring-cloud-function.adoc index 2eb40ec54..f53e497aa 100644 --- a/docs/src/main/asciidoc/spring-cloud-function.adoc +++ b/docs/src/main/asciidoc/spring-cloud-function.adoc @@ -650,6 +650,13 @@ When POSTing text the response format might be different with Spring Boot 2.0 an See <> to see the details and example on how to test such application. +==== HTTP Request Parameters +As you have noticed from the previous table, you can pass an argument to a function as path variable (i.e., `/{function}/{item}`). +For example, `http://localhost:8080/uppercase/foo` will result in calling `uppercase` function with its input parameter being `foo`. + +While this is the recommended approach and the one that fits most use cases cases, there are times when you have to deal with HTTP request parameters. +The framework will treat HTTP request parameters similar to the HTTP headers by storing them in `Message` headers under the header key `http_request_param` +with its value being a `Map` of request parameters, so in order to access them your function input signature should accept `Message` type (e.g., `Function, String>`). For convenience we provide `HeaderUtils.HTTP_REQUEST_PARAM` constant. === Function Mapping rules diff --git a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/FunctionWebRequestProcessingHelper.java b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/FunctionWebRequestProcessingHelper.java index c427fdc13..3d589517c 100644 --- a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/FunctionWebRequestProcessingHelper.java +++ b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/FunctionWebRequestProcessingHelper.java @@ -89,7 +89,15 @@ public static Publisher processRequest(FunctionWrapper wrapper, Object argume HttpHeaders headers = wrapper.getHeaders(); - Message inputMessage = argument == null ? null : MessageBuilder.withPayload(argument).copyHeaders(headers.toSingleValueMap()).build(); + Message inputMessage = null; + + if (argument != null) { + MessageBuilder builder = MessageBuilder.withPayload(argument); + if (!CollectionUtils.isEmpty(wrapper.getParams())) { + builder = builder.setHeader(HeaderUtils.HTTP_REQUEST_PARAM, wrapper.getParams().toSingleValueMap()); + } + inputMessage = builder.copyHeaders(headers.toSingleValueMap()).build(); + } if (function.isRoutingFunction()) { function.setSkipOutputConversion(true); diff --git a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/HeaderUtils.java b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/HeaderUtils.java index 50e445dbe..f16c1afb2 100644 --- a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/HeaderUtils.java +++ b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/HeaderUtils.java @@ -31,6 +31,11 @@ */ public final class HeaderUtils { + /** + * Message Header name which contains HTTP request parameters. + */ + public static final String HTTP_REQUEST_PARAM = "http_request_param"; + private static HttpHeaders IGNORED = new HttpHeaders(); private static HttpHeaders REQUEST_ONLY = new HttpHeaders(); diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/PrefixTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/PrefixTests.java index 26f4179c7..d8b264cb9 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/PrefixTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/PrefixTests.java @@ -17,6 +17,8 @@ package org.springframework.cloud.function.web.mvc; import java.net.URI; +import java.util.Map; +import java.util.function.Function; import java.util.function.Supplier; import org.junit.jupiter.api.Test; @@ -29,10 +31,12 @@ import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.cloud.function.web.RestApplication; import org.springframework.cloud.function.web.mvc.PrefixTests.TestConfiguration; +import org.springframework.cloud.function.web.util.HeaderUtils; import org.springframework.context.annotation.Bean; import org.springframework.http.HttpStatus; import org.springframework.http.RequestEntity; import org.springframework.http.ResponseEntity; +import org.springframework.messaging.Message; import org.springframework.test.context.ContextConfiguration; import static org.assertj.core.api.Assertions.assertThat; @@ -65,6 +69,15 @@ public void missing() throws Exception { assertThat(result.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND); } + + @Test + public void uppercase() throws Exception { + ResponseEntity result = this.rest.exchange( + RequestEntity.get(new URI("/functions/uppercase/foo?nome=Doe&prenome=John")).build(), String.class); + assertThat(result.getStatusCode()).isEqualTo(HttpStatus.OK); + assertThat(result.getBody()).isEqualTo("[\"foo\",\"bar\"]"); + } + @EnableAutoConfiguration @org.springframework.boot.test.context.TestConfiguration protected static class TestConfiguration { @@ -74,6 +87,17 @@ public Supplier> words() { return () -> Flux.fromArray(new String[] { "foo", "bar" }); } + @Bean + public Function, String[]> uppercase() { + return message -> { + assertThat(message.getPayload().equals("foo")); + Map httpParam = (Map) message.getHeaders().get(HeaderUtils.HTTP_REQUEST_PARAM); + assertThat(httpParam.get("nome")).isEqualTo("Doe"); + assertThat(httpParam.get("prenome")).isEqualTo("John"); + return new String[] { "foo", "bar" }; + }; + } + } } From ff0808d823613e1133b711f85d47a1b79927daf1 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 4 May 2022 13:20:01 +0200 Subject: [PATCH 078/210] GH-791 Add support for propagating input headers Resolves #791 --- .../main/asciidoc/spring-cloud-function.adoc | 35 +++++++++++++++++++ .../function/context/FunctionProperties.java | 10 ++++++ .../catalog/SimpleFunctionRegistry.java | 14 ++++++++ ...BeanFactoryAwareFunctionRegistryTests.java | 34 ++++++++++++++++++ 4 files changed, 93 insertions(+) diff --git a/docs/src/main/asciidoc/spring-cloud-function.adoc b/docs/src/main/asciidoc/spring-cloud-function.adoc index f53e497aa..e201ed0d7 100644 --- a/docs/src/main/asciidoc/spring-cloud-function.adoc +++ b/docs/src/main/asciidoc/spring-cloud-function.adoc @@ -428,6 +428,41 @@ IMPORTANT: IMPORTANT: At the moment, function arity is *only* supported for reac where evaluation and computation on confluence of events typically requires view into a stream of events rather than single event. +=== Input Header propagation + +In a typical scenario input Message headers are not propagated to output and rightfully so, since the output of a function may be an input to something else requiring it's own set of Message headers. +However, there are times when such propagation may be necessary so Spring Cloud Function provides several mechanisms to accomplish this. + +First you can always copy headers manually. For example, if you have a Function with the signature that takes `Message` and returns `Message` (i.e., `Function`), you can simply and selectively copy headers yourselves. Remember, if your function returns Message, the framework will not do anything to it other then properly converting its payload. +However, such approach may prove to be a bit tedious, especially in cases when you simply want to copy all headers. +To assist with cases like this we provide a simple property that would allow you to set a boolean flag on a function where you want input headers to be propagated. +The property is `copy-input-headers`. + +For example, let's assume you have the following configuration: + +[source, java] +---- +@EnableAutoConfiguration +@Configuration +protected static class InputHeaderPropagationConfiguration { + + @Bean + public Function uppercase() { + return x -> x.toUpperCase(); + } +} +---- + +As you know you can still invoke this function by sending a Message to it (framework will take care of type conversion and payload extraction) + +By simply setting `spring.cloud.function.configuration.uppercase.copy-input-headers` to `true`, the following assertion will be true as well + +---- +Function, Message> uppercase = catalog.lookup("uppercase", "application/json"); +Message result = uppercase.apply(MessageBuilder.withPayload("bob").setHeader("foo", "bar").build()); +assertThat(result.getHeaders()).containsKey("foo"); +---- + === Type conversion (Content-Type negotiation) Content-Type negotiation is one of the core features of Spring Cloud Function as it allows to not only transform the incoming data to the types declared diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionProperties.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionProperties.java index 12f49a1e8..74702bbd6 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionProperties.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionProperties.java @@ -170,6 +170,8 @@ public static class FunctionConfigurationProperties { private Map outputHeaderMappingExpression; + private boolean copyInputHeaders; + public Map getInputHeaderMappingExpression() { return inputHeaderMappingExpression; } @@ -187,5 +189,13 @@ public void setOutputHeaderMappingExpression( this.outputHeaderMappingExpression = outputHeaderMappingExpression; } + public boolean isCopyInputHeaders() { + return copyInputHeaders; + } + + public void setCopyInputHeaders(boolean copyInputHeaders) { + this.copyInputHeaders = copyInputHeaders; + } + } } diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java index b2e6a5eaf..1091a471b 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java @@ -408,6 +408,8 @@ public class FunctionInvocationWrapper implements Function, Cons private boolean isSingleton = true; + private boolean propagateInputHeaders; + /* * This is primarily to support Stream's ability to access * un-converted payload (e.g., to evaluate expression on some attribute of a payload) @@ -433,6 +435,15 @@ public class FunctionInvocationWrapper implements Function, Cons this.outputType = this.normalizeType(outputType); this.functionDefinition = functionDefinition; this.message = this.inputType != null && FunctionTypeUtils.isMessage(this.inputType); + if (functionProperties != null) { + Map funcConfiguration = functionProperties.getConfiguration(); + if (!CollectionUtils.isEmpty(funcConfiguration)) { + FunctionConfigurationProperties configuration = funcConfiguration.get(functionDefinition); + if (configuration != null) { + propagateInputHeaders = configuration.isCopyInputHeaders(); + } + } + } } public boolean isSkipOutputConversion() { @@ -1091,6 +1102,9 @@ private Message filterOutHeaders(Message message) { } private boolean isExtractPayload(Message message, Type type) { + if (this.propagateInputHeaders) { + return false; + } if (this.isRoutingFunction()) { return false; } diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java index 45925c37c..80fa546bf 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java @@ -58,6 +58,7 @@ import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry.FunctionInvocationWrapper; import org.springframework.cloud.function.json.JsonMapper; import org.springframework.context.ApplicationContext; +import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.lang.Nullable; @@ -673,6 +674,29 @@ public void testGH_768() throws Exception { assertThat(result).startsWith("{date="); } + @Test + public void test_791() { + try (ConfigurableApplicationContext ac = new SpringApplicationBuilder(InputHeaderPropagationConfiguration.class) + .run("--logging.level.org.springframework.cloud.function=DEBUG", + "--spring.main.lazy-initialization=true")) { + FunctionCatalog catalog = ac.getBean(FunctionCatalog.class); + + Function, Message> uppercase = catalog.lookup("uppercase", "application/json"); + Message result = uppercase.apply(MessageBuilder.withPayload("bob").setHeader("foo", "bar").build()); + assertThat(result.getHeaders()).doesNotContainKey("foo"); + } + try (ConfigurableApplicationContext ac = new SpringApplicationBuilder(InputHeaderPropagationConfiguration.class) + .run("--logging.level.org.springframework.cloud.function=DEBUG", + "--spring.main.lazy-initialization=true", + "--spring.cloud.function.configuration.uppercase.copy-input-headers=true")) { + FunctionCatalog catalog = ac.getBean(FunctionCatalog.class); + + Function, Message> uppercase = catalog.lookup("uppercase", "application/json"); + Message result = uppercase.apply(MessageBuilder.withPayload("bob").setHeader("foo", "bar").build()); + assertThat(result.getHeaders()).containsKey("foo"); + } + } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Test public void testArrayPayloadOnFluxFunction() throws Exception { @@ -924,6 +948,16 @@ protected Object doApply(Object input, FunctionInvocationWrapper targetFunction) } } + @EnableAutoConfiguration + @Configuration + protected static class InputHeaderPropagationConfiguration { + + @Bean + public Function uppercase() { + return x -> x.toUpperCase(); + } + } + @EnableAutoConfiguration @Configuration protected static class SampleFunctionConfiguration { From a7514613a965cf87427913ed2f6b66e3e24f04e7 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 4 May 2022 14:59:38 +0200 Subject: [PATCH 079/210] GH-739 Add DEBUG log statement for when type conversion fails Resolves #739 --- dep.txt | 158 ++++++++++++++++++ .../SmartCompositeMessageConverter.java | 18 +- 2 files changed, 173 insertions(+), 3 deletions(-) create mode 100644 dep.txt diff --git a/dep.txt b/dep.txt new file mode 100644 index 000000000..ca45143cb --- /dev/null +++ b/dep.txt @@ -0,0 +1,158 @@ +[INFO] Scanning for projects... +[WARNING] +[WARNING] Some problems were encountered while building the effective model for org.springframework.cloud:spring-cloud-function-context:jar:4.0.0-SNAPSHOT +[WARNING] 'dependencies.dependency.(groupId:artifactId:type:classifier)' must be unique: com.fasterxml.jackson.core:jackson-databind:jar -> duplicate declaration of version (?) @ line 94, column 15 +[WARNING] +[WARNING] Some problems were encountered while building the effective model for org.springframework.cloud:spring-cloud-function-adapter-aws:jar:4.0.0-SNAPSHOT +[WARNING] 'dependencies.dependency.(groupId:artifactId:type:classifier)' must be unique: org.springframework.boot:spring-boot-starter-test:jar -> duplicate declaration of version (?) @ line 118, column 15 +[WARNING] +[WARNING] It is highly recommended to fix these problems because they threaten the stability of your build. +[WARNING] +[WARNING] For this reason, future Maven versions might no longer support building such malformed projects. +[WARNING] +[INFO] +[INFO] ------< org.springframework.cloud:spring-cloud-function-context >------- +[INFO] Building spring-cloud-function-context 4.0.0-SNAPSHOT +[INFO] --------------------------------[ jar ]--------------------------------- +[INFO] +[INFO] --- maven-dependency-plugin:2.8:tree (default-cli) @ spring-cloud-function-context --- +[INFO] org.springframework.cloud:spring-cloud-function-context:jar:4.0.0-SNAPSHOT +[INFO] +- net.jodah:typetools:jar:0.6.2:compile +[INFO] +- org.springframework.boot:spring-boot-autoconfigure:jar:3.0.0-SNAPSHOT:compile +[INFO] | \- org.springframework.boot:spring-boot:jar:3.0.0-SNAPSHOT:compile +[INFO] | \- org.springframework:spring-context:jar:6.0.0-SNAPSHOT:compile +[INFO] | +- org.springframework:spring-aop:jar:6.0.0-SNAPSHOT:compile +[INFO] | \- org.springframework:spring-expression:jar:6.0.0-SNAPSHOT:compile +[INFO] +- org.springframework.cloud:spring-cloud-function-core:jar:4.0.0-SNAPSHOT:compile +[INFO] | +- io.projectreactor:reactor-core:jar:3.4.17:compile +[INFO] | | \- org.reactivestreams:reactive-streams:jar:1.0.3:compile +[INFO] | \- org.springframework:spring-core:jar:6.0.0-SNAPSHOT:compile +[INFO] | \- org.springframework:spring-jcl:jar:6.0.0-SNAPSHOT:compile +[INFO] +- org.springframework:spring-messaging:jar:6.0.0-SNAPSHOT:compile +[INFO] | \- org.springframework:spring-beans:jar:6.0.0-SNAPSHOT:compile +[INFO] +- org.springframework:spring-web:jar:6.0.0-SNAPSHOT:compile +[INFO] +- com.fasterxml.jackson.module:jackson-module-kotlin:jar:2.13.2:compile +[INFO] | \- com.fasterxml.jackson.core:jackson-annotations:jar:2.13.2:compile +[INFO] +- javax.annotation:javax.annotation-api:jar:1.3.2:compile +[INFO] +- javax.activation:javax.activation-api:jar:1.2.0:compile +[INFO] +- org.springframework.boot:spring-boot-configuration-processor:jar:3.0.0-SNAPSHOT:compile +[INFO] +- com.google.code.gson:gson:jar:2.9.0:compile +[INFO] +- com.fasterxml.jackson.core:jackson-databind:jar:2.13.2.1:compile +[INFO] | \- com.fasterxml.jackson.core:jackson-core:jar:2.13.2:compile +[INFO] +- org.springframework.boot:spring-boot-starter-test:jar:3.0.0-SNAPSHOT:compile +[INFO] | +- org.springframework.boot:spring-boot-starter:jar:3.0.0-SNAPSHOT:compile +[INFO] | | +- org.springframework.boot:spring-boot-starter-logging:jar:3.0.0-SNAPSHOT:compile +[INFO] | | | +- ch.qos.logback:logback-classic:jar:1.2.11:compile +[INFO] | | | | \- ch.qos.logback:logback-core:jar:1.2.11:compile +[INFO] | | | +- org.apache.logging.log4j:log4j-to-slf4j:jar:2.17.2:compile +[INFO] | | | | \- org.apache.logging.log4j:log4j-api:jar:2.17.2:compile +[INFO] | | | \- org.slf4j:jul-to-slf4j:jar:1.7.36:compile +[INFO] | | +- jakarta.annotation:jakarta.annotation-api:jar:2.0.0:compile +[INFO] | | \- org.yaml:snakeyaml:jar:1.30:compile +[INFO] | +- org.springframework.boot:spring-boot-test:jar:3.0.0-SNAPSHOT:compile +[INFO] | +- org.springframework.boot:spring-boot-test-autoconfigure:jar:3.0.0-SNAPSHOT:compile +[INFO] | +- com.jayway.jsonpath:json-path:jar:2.7.0:compile +[INFO] | | \- net.minidev:json-smart:jar:2.4.8:compile +[INFO] | | \- net.minidev:accessors-smart:jar:2.4.8:compile +[INFO] | | \- org.ow2.asm:asm:jar:9.1:compile +[INFO] | +- jakarta.xml.bind:jakarta.xml.bind-api:jar:3.0.1:compile +[INFO] | | \- com.sun.activation:jakarta.activation:jar:2.0.1:compile +[INFO] | +- org.assertj:assertj-core:jar:3.22.0:compile +[INFO] | +- org.hamcrest:hamcrest:jar:2.2:compile +[INFO] | +- org.junit.jupiter:junit-jupiter:jar:5.8.2:compile +[INFO] | | +- org.junit.jupiter:junit-jupiter-api:jar:5.8.2:compile +[INFO] | | | +- org.opentest4j:opentest4j:jar:1.2.0:compile +[INFO] | | | +- org.junit.platform:junit-platform-commons:jar:1.8.2:compile +[INFO] | | | \- org.apiguardian:apiguardian-api:jar:1.1.2:compile +[INFO] | | +- org.junit.jupiter:junit-jupiter-params:jar:5.8.2:compile +[INFO] | | \- org.junit.jupiter:junit-jupiter-engine:jar:5.8.2:runtime +[INFO] | | \- org.junit.platform:junit-platform-engine:jar:1.8.2:runtime +[INFO] | +- org.mockito:mockito-core:jar:4.5.0:compile +[INFO] | | +- net.bytebuddy:byte-buddy:jar:1.12.9:compile +[INFO] | | +- net.bytebuddy:byte-buddy-agent:jar:1.12.9:compile +[INFO] | | \- org.objenesis:objenesis:jar:3.2:runtime +[INFO] | +- org.mockito:mockito-junit-jupiter:jar:4.5.0:compile +[INFO] | +- org.skyscreamer:jsonassert:jar:1.5.0:compile +[INFO] | +- org.springframework:spring-test:jar:6.0.0-SNAPSHOT:compile +[INFO] | \- org.xmlunit:xmlunit-core:jar:2.9.0:compile +[INFO] +- io.projectreactor:reactor-test:jar:3.4.17:test +[INFO] +- org.jetbrains.kotlin:kotlin-stdlib-jdk8:jar:1.6.21:compile +[INFO] | +- org.jetbrains.kotlin:kotlin-stdlib:jar:1.6.21:compile +[INFO] | | +- org.jetbrains.kotlin:kotlin-stdlib-common:jar:1.6.21:compile +[INFO] | | \- org.jetbrains:annotations:jar:13.0:compile +[INFO] | \- org.jetbrains.kotlin:kotlin-stdlib-jdk7:jar:1.6.21:compile +[INFO] +- org.jetbrains.kotlin:kotlin-reflect:jar:1.6.21:compile +[INFO] +- org.jetbrains.kotlinx:kotlinx-coroutines-reactor:jar:1.6.1:compile +[INFO] | +- org.jetbrains.kotlinx:kotlinx-coroutines-reactive:jar:1.6.1:compile +[INFO] | \- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:jar:1.6.1:compile +[INFO] +- org.apache.avro:avro:jar:1.10.2:compile +[INFO] | +- org.apache.commons:commons-compress:jar:1.20:compile +[INFO] | \- org.slf4j:slf4j-api:jar:1.7.36:compile +[INFO] +- io.cloudevents:cloudevents-spring:jar:2.2.0:compile +[INFO] | \- io.cloudevents:cloudevents-core:jar:2.2.0:compile +[INFO] | \- io.cloudevents:cloudevents-api:jar:2.2.0:compile +[INFO] +- org.springframework.boot:spring-boot-starter-actuator:jar:3.0.0-SNAPSHOT:compile +[INFO] | \- org.springframework.boot:spring-boot-actuator-autoconfigure:jar:3.0.0-SNAPSHOT:compile +[INFO] | +- org.springframework.boot:spring-boot-actuator:jar:3.0.0-SNAPSHOT:compile +[INFO] | \- com.fasterxml.jackson.datatype:jackson-datatype-jsr310:jar:2.13.2:runtime +[INFO] +- io.micrometer:micrometer-observation:jar:2.0.0-SNAPSHOT:compile +[INFO] | \- io.micrometer:micrometer-commons:jar:2.0.0-SNAPSHOT:compile +[INFO] +- io.micrometer:micrometer-core:jar:2.0.0-SNAPSHOT:compile +[INFO] | +- org.hdrhistogram:HdrHistogram:jar:2.1.12:compile +[INFO] | \- org.latencyutils:LatencyUtils:jar:2.0.3:runtime +[INFO] +- io.micrometer:micrometer-tracing-api:jar:1.0.0-SNAPSHOT:compile +[INFO] | \- aopalliance:aopalliance:jar:1.0:compile +[INFO] \- io.micrometer:micrometer-tracing-integration-test:jar:1.0.0-SNAPSHOT:test +[INFO] +- io.micrometer:micrometer-tracing-test:jar:1.0.0-SNAPSHOT:test +[INFO] +- io.micrometer:micrometer-tracing-reporter-wavefront:jar:1.0.0-SNAPSHOT:test +[INFO] +- io.micrometer:micrometer-test:jar:2.0.0-SNAPSHOT:test +[INFO] | +- ru.lanwen.wiremock:wiremock-junit5:jar:1.3.1:test +[INFO] | \- com.github.tomakehurst:wiremock-jre8-standalone:jar:2.33.1:test +[INFO] +- io.micrometer:micrometer-tracing-bridge-brave:jar:1.0.0-SNAPSHOT:test +[INFO] +- io.zipkin.brave:brave:jar:5.13.2:test +[INFO] +- io.zipkin.brave:brave-context-slf4j:jar:5.13.2:test +[INFO] +- io.zipkin.brave:brave-instrumentation-http:jar:5.13.2:test +[INFO] +- io.zipkin.brave:brave-tests:jar:5.13.2:test +[INFO] | \- junit:junit:jar:4.13.2:test +[INFO] | \- org.hamcrest:hamcrest-core:jar:2.2:test +[INFO] +- io.zipkin.aws:brave-propagation-aws:jar:0.23.2:test +[INFO] +- io.zipkin.reporter2:zipkin-reporter-brave:jar:2.16.1:test +[INFO] +- io.micrometer:micrometer-tracing-bridge-otel:jar:1.0.0-SNAPSHOT:test +[INFO] | +- io.opentelemetry:opentelemetry-api:jar:1.13.0:test +[INFO] | | \- io.opentelemetry:opentelemetry-context:jar:1.13.0:test +[INFO] | +- io.opentelemetry:opentelemetry-extension-aws:jar:1.13.0:test +[INFO] | +- io.opentelemetry:opentelemetry-semconv:jar:1.13.0-alpha:test +[INFO] | +- io.opentelemetry:opentelemetry-sdk-common:jar:1.13.0:test +[INFO] | \- io.opentelemetry:opentelemetry-sdk:jar:1.13.0:test +[INFO] | +- io.opentelemetry:opentelemetry-sdk-metrics:jar:1.13.0-alpha:test +[INFO] | \- io.opentelemetry:opentelemetry-sdk-logs:jar:1.13.0-alpha:test +[INFO] +- io.opentelemetry:opentelemetry-exporter-zipkin:jar:1.13.0:test +[INFO] | \- io.zipkin.reporter2:zipkin-sender-okhttp3:jar:2.16.1:test +[INFO] | \- com.squareup.okhttp3:okhttp:jar:4.9.3:test +[INFO] | \- com.squareup.okio:okio:jar:2.8.0:test +[INFO] +- io.opentelemetry:opentelemetry-sdk-trace:jar:1.13.0:test +[INFO] +- io.opentelemetry:opentelemetry-extension-trace-propagators:jar:1.13.0:test +[INFO] +- io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:jar:1.12.1-alpha:test +[INFO] +- io.zipkin.zipkin2:zipkin:jar:2.23.0:test +[INFO] +- io.zipkin.reporter2:zipkin-reporter:jar:2.16.1:test +[INFO] +- io.zipkin.reporter2:zipkin-sender-urlconnection:jar:2.16.1:test +[INFO] +- io.zipkin.reporter2:zipkin-sender-kafka:jar:2.16.1:test +[INFO] +- io.zipkin.reporter2:zipkin-sender-activemq-client:jar:2.16.1:test +[INFO] +- io.zipkin.reporter2:zipkin-sender-amqp-client:jar:2.16.1:test +[INFO] +- com.wavefront:wavefront-sdk-java:jar:3.0.0:test +[INFO] | +- com.google.code.findbugs:jsr305:jar:3.0.2:test +[INFO] | +- com.tdunning:t-digest:jar:3.2:test +[INFO] | \- com.google.guava:guava:jar:31.0.1-jre:test +[INFO] | +- com.google.guava:failureaccess:jar:1.0.1:test +[INFO] | +- com.google.guava:listenablefuture:jar:9999.0-empty-to-avoid-conflict-with-guava:test +[INFO] | +- org.checkerframework:checker-qual:jar:3.12.0:test +[INFO] | +- com.google.errorprone:error_prone_annotations:jar:2.7.1:test +[INFO] | \- com.google.j2objc:j2objc-annotations:jar:1.3:test +[INFO] \- com.wavefront:wavefront-internal-reporter-java:jar:1.7.10:test +[INFO] \- com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.13.2:test +[INFO] ------------------------------------------------------------------------ +[INFO] BUILD SUCCESS +[INFO] ------------------------------------------------------------------------ +[INFO] Total time: 1.157 s +[INFO] Finished at: 2022-05-03T19:59:07+02:00 +[INFO] ------------------------------------------------------------------------ diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java index 5b62325f1..32524a8f7 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java @@ -19,6 +19,9 @@ import java.util.Collection; import java.util.List; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import org.springframework.lang.Nullable; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; @@ -37,6 +40,8 @@ */ public class SmartCompositeMessageConverter extends CompositeMessageConverter { + private Log logger = LogFactory.getLog(this.getClass()); + public SmartCompositeMessageConverter(Collection converters) { super(converters); } @@ -48,9 +53,16 @@ public Object fromMessage(Message message, Class targetClass) { if (!(message.getPayload() instanceof byte[]) && targetClass.isInstance(message.getPayload()) && !(message.getPayload() instanceof Collection)) { return message.getPayload(); } - Object result = converter.fromMessage(message, targetClass); - if (result != null) { - return result; + try { + Object result = converter.fromMessage(message, targetClass); + if (result != null) { + return result; + } + } + catch (Exception e) { + if (logger.isDebugEnabled()) { + logger.debug("Failure during type conversion by " + converter + ". Will try the next converter.", e); + } } } return null; From 4c7a007dde5d60b1c645ebf56527476e3b2b0a1d Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 5 May 2022 08:12:20 +0200 Subject: [PATCH 080/210] Add Chris to doc authors --- docs/src/main/asciidoc/index.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/main/asciidoc/index.adoc b/docs/src/main/asciidoc/index.adoc index 4b37510bd..ff8153e03 100644 --- a/docs/src/main/asciidoc/index.adoc +++ b/docs/src/main/asciidoc/index.adoc @@ -1,5 +1,5 @@ = Spring Cloud Function Reference Documentation -Mark Fisher, Dave Syer, Oleg Zhurakousky, Anshul Mehra +Mark Fisher, Dave Syer, Oleg Zhurakousky, Anshul Mehra, Dan Dobrin, Chris Bono *{project-version}* From bb591935b922f5b51e4437325d3a37ec4a07789f Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 10 May 2022 16:16:43 +0200 Subject: [PATCH 081/210] GH-829 Add docs for routing under Custom Runtime Resolves #829 --- docs/src/main/asciidoc/adapters/aws-intro.adoc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/src/main/asciidoc/adapters/aws-intro.adoc b/docs/src/main/asciidoc/adapters/aws-intro.adoc index bc4295cdf..1904477b9 100644 --- a/docs/src/main/asciidoc/adapters/aws-intro.adoc +++ b/docs/src/main/asciidoc/adapters/aws-intro.adoc @@ -90,6 +90,9 @@ Also, note that since AWS does not allow dots `.` and/or hyphens`-` in the name dots with underscores and hyphens with camel case. So for example `spring.cloud.function.definition` becomes `spring_cloud_function_definition` and `spring.cloud.function.routing-expression` becomes `spring_cloud_function_routingExpression`. +===== AWS Function Routing with Custom Runtime + +When using <> Function Routing works the same way. All you need is to specify `functionRouter` as AWS Handler the same way you would use the name of the function as handler. ==== Notes on JAR Layout From aee02142ff3ba65b0036203e154fecd037ebd5f5 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Thu, 26 May 2022 11:53:27 -0400 Subject: [PATCH 082/210] don't upload docs to maven central --- docs/pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/pom.xml b/docs/pom.xml index 3d91e2eff..bc8a89a5e 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -17,6 +17,8 @@ ${basedir}/.. 3.4 deploy + + none From 076b03073b24294f9734c3f3c7081fb83f9a0b71 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 26 May 2022 17:46:49 +0000 Subject: [PATCH 083/210] Update SNAPSHOT to 3.2.5 --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 49 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index bc8a89a5e..b4d8f180c 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.5 pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index eacf1ab5b..db414b2a8 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.5-SNAPSHOT + 3.2.5 pom org.springframework.cloud spring-cloud-build - 3.1.3-SNAPSHOT + 3.1.3 diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index cc6bb342c..c17439e53 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.5 spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index 340ade417..7f7e2d3f9 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.5-SNAPSHOT + 3.2.5 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index bcf99dfbd..ab04c522e 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.5-SNAPSHOT + 3.2.5 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index b350750d4..3934df236 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.5-SNAPSHOT + 3.2.5 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 88130a733..a5dd0e9a3 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.5-SNAPSHOT + 3.2.5 diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 88e8ab6b5..d2f9e2b91 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.5-SNAPSHOT + 3.2.5 spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index 0ddd7cf62..860c77408 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.5-SNAPSHOT + 3.2.5 diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index 19cacddd5..38f17f96a 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.5 diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 47bd87a7d..92bdaa796 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.5 diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 5db60ab55..894b33dab 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.5 diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 84311b412..ed804b807 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.3-SNAPSHOT + 3.1.3 spring-cloud-function-dependencies - 3.2.5-SNAPSHOT + 3.2.5 pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 9ab82b477..ea38a150c 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.5 diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index 3bc6b889a..354e6f593 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.5-SNAPSHOT + 3.2.5 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index e9efda865..fe73be4b5 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.5-SNAPSHOT + 3.2.5 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 845e977ee..4dcb305ef 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.5-SNAPSHOT + 3.2.5 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index 518217eec..d4306daa6 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.5-SNAPSHOT + 3.2.5 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index 7a02d85a1..2655e4ec7 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.5-SNAPSHOT + 3.2.5 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 5f754162e..3bf166648 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.5-SNAPSHOT + 3.2.5 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 09926f851..0199aa411 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.5-SNAPSHOT + 3.2.5 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index 5b8ed17c4..6ce26daad 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.5 diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 9d9ddec4b..a7985957e 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.5 diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index db9a97bbe..22ee3c673 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.5-SNAPSHOT + 3.2.5 diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index eed649311..0641844e4 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.5-SNAPSHOT + 3.2.5 diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index bdd0e701e..490aadd7b 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.5-SNAPSHOT + 3.2.5 diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 30be5f5cb..33fdbcf50 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.5-SNAPSHOT + 3.2.5 diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index eb06e1fa0..e5153a421 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.5-SNAPSHOT + 3.2.5 diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index 81f340c98..ef97c3d22 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index cdc0d0e67..2219542bd 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.5-SNAPSHOT + 3.2.5 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index 4f0b75884..15fb86b9b 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.5-SNAPSHOT + 3.2.5 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index d93471fbc..206355adb 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.5-SNAPSHOT + 3.2.5 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index 0cb88dfb8..f81a69c6d 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.5-SNAPSHOT + 3.2.5 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index 99e133e86..ea0d8266e 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.5-SNAPSHOT + 3.2.5 diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index 75c4f2d20..d1d0ce378 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index a4f55354e..222a0fe0b 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 - 3.2.5-SNAPSHOT + 3.2.5 diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index c40f932ba..8ea4a5993 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.5-SNAPSHOT + 3.2.5 diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index 83ed6397a..ac21a6ccc 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index 6233133c1..0ea782245 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.5-SNAPSHOT + 3.2.5 diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index 11da9bd51..dfba807f7 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.5-SNAPSHOT + 3.2.5 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index eeef4df97..968b6e9c1 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.5-SNAPSHOT + 3.2.5 diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index 7f6747ff1..05424cc96 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.5-SNAPSHOT + 3.2.5 diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 01c203df5..b23e6a866 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.5-SNAPSHOT + 3.2.5 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index 0e8420873..5394eeacb 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.5-SNAPSHOT + 3.2.5 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 765620317..651447eb1 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.5 diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index cf01e07a3..63544b24c 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.5 diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index f563e54d0..bf41087a2 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.5 diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index fdf3c1db8..8ddf806ec 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.5 .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index e59a7ef0d..f9cb1ebc7 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5-SNAPSHOT + 3.2.5 spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From 12c129045a2486158ce5872c393f8cf41cc03447 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Fri, 27 May 2022 13:04:03 -0400 Subject: [PATCH 084/210] Bumps to next snapshot version --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 2 +- .../src/it/bootapp-with-javax/pom.xml | 2 +- .../src/it/bootapp-with-scf/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 2 +- .../src/it/bootjarnostart/pom.xml | 2 +- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 2 +- .../function-sample-aws-custom-bean/pom.xml | 2 +- .../function-sample-aws-custom/pom.xml | 2 +- .../function-sample-aws-routing/pom.xml | 2 +- spring-cloud-function-samples/function-sample-aws/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 2 +- .../function-sample-cloudevent-stream/pom.xml | 2 +- .../function-sample-cloudevent/pom.xml | 2 +- .../function-sample-compiler/pom.xml | 2 +- .../function-sample-functional-aws-routing/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 2 +- .../function-sample-grpc-cloudevent/pom.xml | 2 +- .../function-sample-kotlin-web/pom.xml | 6 +++--- spring-cloud-function-samples/function-sample-pof/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pojo/pom.xml | 2 +- .../function-sample-spring-integration/pom.xml | 2 +- .../function-sample-supplier-exporter/pom.xml | 2 +- spring-cloud-function-samples/function-sample-task/pom.xml | 2 +- spring-cloud-function-samples/function-sample/pom.xml | 2 +- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 47 files changed, 51 insertions(+), 51 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index b4d8f180c..1dff59a82 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5 + 3.2.6-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index db414b2a8..442636919 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.5 + 3.2.6-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 3.1.3 + 3.1.4-SNAPSHOT diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index c17439e53..fab8c4299 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5 + 3.2.6-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index 7f7e2d3f9..ca6b5820b 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.5 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index ab04c522e..ffbc19941 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.5 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index 3934df236..dd7e7d932 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.5 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index a5dd0e9a3..672f82099 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.5 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index d2f9e2b91..7c1d11515 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.5 + 3.2.6-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index 860c77408..c690db6d0 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.5 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index 38f17f96a..eacd07088 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 92bdaa796..66ec42853 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 894b33dab..dabf4f58f 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index ed804b807..bf616face 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.3 + 3.1.4-SNAPSHOT spring-cloud-function-dependencies - 3.2.5 + 3.2.6-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index ea38a150c..72ebdd1fb 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index 354e6f593..b2ad0ba5b 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.5 + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index fe73be4b5..1c072cbe0 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.5 + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 4dcb305ef..2ee89b1b9 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.5 + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index d4306daa6..302022a74 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.5 + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index 2655e4ec7..6a0c158ce 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.5 + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 3bf166648..71780b7f7 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.5 + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 0199aa411..28c4a3483 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.5 + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index 6ce26daad..b7035c8eb 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index a7985957e..2c6a7d6b9 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index 22ee3c673..2b14e29a1 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.5 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 0641844e4..8e96c0700 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.5 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index 490aadd7b..20e2dc59d 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.5 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 33fdbcf50..07b209a59 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.5 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index e5153a421..50740ad71 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.5 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 2219542bd..0b51892a8 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.5 + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index 15fb86b9b..d266ca8c5 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -17,7 +17,7 @@ 1.8 - 3.2.5 + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 206355adb..bf40c8d0a 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -17,7 +17,7 @@ 1.8 - 3.2.5 + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index f81a69c6d..ce1de661e 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.5 + 3.2.6-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index ea0d8266e..0f6ef3776 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.5 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index 222a0fe0b..4542f4d09 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -20,7 +20,7 @@ - 3.2.5 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index 8ea4a5993..4c720e4b6 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.5 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index ac21a6ccc..879b5852d 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -38,17 +38,17 @@ org.springframework.cloud spring-cloud-function-kotlin - 3.2.2-SNAPSHOT + 3.2.6-SNAPSHOT org.springframework.cloud spring-cloud-function-web - 3.2.1-SNAPSHOT + 3.2.6-SNAPSHOT org.springframework.cloud spring-cloud-function-context - 3.2.1-SNAPSHOT + 3.2.6-SNAPSHOT org.springframework.boot diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index 0ea782245..f0eaea89e 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.5 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index dfba807f7..8444146e7 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.5 + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 968b6e9c1..b1b2e48f5 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.5 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index 05424cc96..808948c13 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.5 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index b23e6a866..7acda302f 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.5 + 3.2.6-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index 5394eeacb..b54504b3c 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.5 + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 651447eb1..4fbceead8 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index 63544b24c..a8be5c6dc 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index bf41087a2..9e0587a2c 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index 8ddf806ec..ae3cb7293 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5 + 3.2.6-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index f9cb1ebc7..f51d0cb47 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.5 + 3.2.6-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From 319db4d7f29b36dcd814ea854554179e1437e7a5 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Mon, 30 May 2022 12:10:58 +0200 Subject: [PATCH 085/210] GH-878 Fix concurrency issue during registration and lookup of functions Resolves #878 --- .../BeanFactoryAwareFunctionRegistry.java | 78 ++++++++++--------- .../catalog/SimpleFunctionRegistry.java | 2 +- ...BeanFactoryAwareFunctionRegistryTests.java | 22 ++++++ .../catalog/SimpleFunctionRegistryTests.java | 26 +++++++ 4 files changed, 89 insertions(+), 39 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java index 83f1867dc..e8f7c8cfa 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java @@ -112,50 +112,52 @@ public T lookup(Class type, String functionDefinition, String... expected return null; } FunctionInvocationWrapper function = this.doLookup(type, functionDefinition, expectedOutputMimeTypes); - - if (function == null) { - Set functionRegistratioinNames = super.getNames(null); - String[] functionNames = StringUtils.delimitedListToStringArray(functionDefinition.replaceAll(",", "|").trim(), "|"); - for (String functionName : functionNames) { - if (functionRegistratioinNames.contains(functionName) && logger.isDebugEnabled()) { - logger.debug("Skipping function '" + functionName + "' since it is already present"); - } - else { - Object functionCandidate = this.discoverFunctionInBeanFactory(functionName); - if (functionCandidate != null) { - Type functionType = null; - FunctionRegistration functionRegistration = null; - if (functionCandidate instanceof FunctionRegistration) { - functionRegistration = (FunctionRegistration) functionCandidate; - } - else if (this.isFunctionPojo(functionCandidate, functionName)) { - Method functionalMethod = FunctionTypeUtils.discoverFunctionalMethod(functionCandidate.getClass()); - functionCandidate = this.proxyTarget(functionCandidate, functionalMethod); - functionType = FunctionTypeUtils.fromFunctionMethod(functionalMethod); - } - else if (this.isSpecialFunctionRegistration(functionNames, functionName)) { - functionRegistration = this.applicationContext - .getBean(functionName + FunctionRegistration.REGISTRATION_NAME_SUFFIX, FunctionRegistration.class); - } - else { - functionType = FunctionTypeUtils.discoverFunctionType(functionCandidate, functionName, this.applicationContext); - } - if (functionRegistration == null) { - functionRegistration = new FunctionRegistration(functionCandidate, functionName).type(functionType); - } - // Certain Kafka Streams functions such as KStream[] return types could be null (esp when using Kotlin). - if (functionRegistration != null) { - this.register(functionRegistration); - } + Object syncInstance = functionDefinition == null ? this : functionDefinition; + synchronized (syncInstance) { + if (function == null) { + Set functionRegistratioinNames = super.getNames(null); + String[] functionNames = StringUtils.delimitedListToStringArray(functionDefinition.replaceAll(",", "|").trim(), "|"); + for (String functionName : functionNames) { + if (functionRegistratioinNames.contains(functionName) && logger.isDebugEnabled()) { + logger.debug("Skipping function '" + functionName + "' since it is already present"); } else { - if (logger.isDebugEnabled()) { - logger.debug("Function '" + functionName + "' is not available in FunctionCatalog or BeanFactory"); + Object functionCandidate = this.discoverFunctionInBeanFactory(functionName); + if (functionCandidate != null) { + Type functionType = null; + FunctionRegistration functionRegistration = null; + if (functionCandidate instanceof FunctionRegistration) { + functionRegistration = (FunctionRegistration) functionCandidate; + } + else if (this.isFunctionPojo(functionCandidate, functionName)) { + Method functionalMethod = FunctionTypeUtils.discoverFunctionalMethod(functionCandidate.getClass()); + functionCandidate = this.proxyTarget(functionCandidate, functionalMethod); + functionType = FunctionTypeUtils.fromFunctionMethod(functionalMethod); + } + else if (this.isSpecialFunctionRegistration(functionNames, functionName)) { + functionRegistration = this.applicationContext + .getBean(functionName + FunctionRegistration.REGISTRATION_NAME_SUFFIX, FunctionRegistration.class); + } + else { + functionType = FunctionTypeUtils.discoverFunctionType(functionCandidate, functionName, this.applicationContext); + } + if (functionRegistration == null) { + functionRegistration = new FunctionRegistration(functionCandidate, functionName).type(functionType); + } + // Certain Kafka Streams functions such as KStream[] return types could be null (esp when using Kotlin). + if (functionRegistration != null) { + this.register(functionRegistration); + } + } + else { + if (logger.isDebugEnabled()) { + logger.debug("Function '" + functionName + "' is not available in FunctionCatalog or BeanFactory"); + } } } } + function = super.doLookup(type, functionDefinition, expectedOutputMimeTypes); } - function = super.doLookup(type, functionDefinition, expectedOutputMimeTypes); } return (T) function; diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java index 1091a471b..bfabe304f 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java @@ -286,7 +286,7 @@ private FunctionInvocationWrapper findFunctionInFunctionRegistrations(String fun /* * */ - private synchronized FunctionInvocationWrapper compose(Class type, String functionDefinition) { + private FunctionInvocationWrapper compose(Class type, String functionDefinition) { String[] functionNames = StringUtils.delimitedListToStringArray(functionDefinition.replaceAll(",", "|").trim(), "|"); FunctionInvocationWrapper composedFunction = null; diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java index 80fa546bf..c5c7344d9 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java @@ -22,6 +22,7 @@ import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.Collections; import java.util.Date; import java.util.HashMap; @@ -103,6 +104,27 @@ public void before() { System.clearProperty("spring.cloud.function.definition"); } + + @SuppressWarnings({ "rawtypes" }) + @Test + public void concurrencyLookupTest() throws Exception { + FunctionCatalog catalog = this.configureCatalog(); + ExecutorService executor = Executors.newCachedThreadPool(); + for (int i = 0; i < 100; i++) { + executor.execute(() -> { + catalog.lookup("uppercase", "application/json"); + }); + executor.execute(() -> { + catalog.lookup("numberword", "application/json"); + }); + } + Thread.sleep(1000); + Field frField = ReflectionUtils.findField(catalog.getClass(), "functionRegistrations"); + frField.setAccessible(true); + Collection c = (Collection) frField.get(catalog); + assertThat(c.size()).isEqualTo(2); + } + @SuppressWarnings("unchecked") @Test public void testDefaultLookup() throws Exception { diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistryTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistryTests.java index 175de78e5..2e2f9fb0d 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistryTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistryTests.java @@ -16,13 +16,17 @@ package org.springframework.cloud.function.context.catalog; +import java.lang.reflect.Field; import java.lang.reflect.Type; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.UUID; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.Function; @@ -68,6 +72,7 @@ import org.springframework.messaging.converter.StringMessageConverter; import org.springframework.messaging.support.MessageBuilder; import org.springframework.util.MimeType; +import org.springframework.util.ReflectionUtils; import static org.assertj.core.api.Assertions.assertThat; @@ -93,6 +98,27 @@ public void before() { this.conversionService = new DefaultConversionService(); } + @SuppressWarnings("rawtypes") + @Test + public void concurrencyRegistrationTest() throws Exception { + Echo function = new Echo(); + FunctionRegistration registration = new FunctionRegistration<>( + function, "echo").type(FunctionType.of(Echo.class)); + SimpleFunctionRegistry catalog = new SimpleFunctionRegistry(this.conversionService, this.messageConverter, + new JacksonMapper(new ObjectMapper())); + ExecutorService executor = Executors.newCachedThreadPool(); + for (int i = 0; i < 1000; i++) { + executor.execute(() -> { + catalog.register(registration); + }); + } + Thread.sleep(1000); + Field frField = ReflectionUtils.findField(catalog.getClass(), "functionRegistrations"); + frField.setAccessible(true); + Collection c = (Collection) frField.get(catalog); + assertThat(c.size()).isEqualTo(1); + } + @Test public void testCachingOfFunction() { Echo function = new Echo(); From ca428e7ad65738fc9069c829f5db2ecb06e45c08 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Mon, 30 May 2022 13:39:12 +0200 Subject: [PATCH 086/210] GH-876 Update build.gradle for AWS sample Resolves #876 --- .../function-sample-aws/build.gradle | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/spring-cloud-function-samples/function-sample-aws/build.gradle b/spring-cloud-function-samples/function-sample-aws/build.gradle index a641c315f..d72a2d3f4 100644 --- a/spring-cloud-function-samples/function-sample-aws/build.gradle +++ b/spring-cloud-function-samples/function-sample-aws/build.gradle @@ -1,7 +1,7 @@ buildscript { ext { - springBootVersion = '2.2.0.BUILD-SNAPSHOT' - wrapperVersion = '1.0.17.RELEASE' + springBootVersion = '2.6.7' + wrapperVersion = '1.0.29.BUILD-SNAPSHOT' shadowVersion = '5.1.0' } repositories { @@ -20,7 +20,7 @@ buildscript { } apply plugin: 'java' -apply plugin: 'maven' +apply plugin: 'maven-publish' apply plugin: 'eclipse' apply plugin: 'com.github.johnrengelman.shadow' apply plugin: 'org.springframework.boot' @@ -40,8 +40,8 @@ repositories { } ext { - springCloudFunctionVersion = "3.0.0.BUILD-SNAPSHOT" - awsLambdaEventsVersion = "2.0.2" + springCloudFunctionVersion = "3.2.4" + awsLambdaEventsVersion = "3.9.0" awsLambdaCoreVersion = "1.1.0" } ext['reactor.version'] = "3.1.7.RELEASE" @@ -84,10 +84,10 @@ dependencyManagement { } dependencies { - compile("org.springframework.cloud:spring-cloud-function-adapter-aws") - compile("org.springframework.cloud:spring-cloud-starter-function-webflux") - compile("org.springframework.boot:spring-boot-configuration-processor") + implementation("org.springframework.cloud:spring-cloud-function-adapter-aws") + implementation("org.springframework.cloud:spring-cloud-starter-function-webflux") + implementation("org.springframework.boot:spring-boot-configuration-processor") compileOnly("com.amazonaws:aws-lambda-java-events:${awsLambdaEventsVersion}") compileOnly("com.amazonaws:aws-lambda-java-core:${awsLambdaCoreVersion}") testCompile('org.springframework.boot:spring-boot-starter-test') -} +} \ No newline at end of file From 94bd64456e2076df8ef95751aa4fcd8e2ca175e4 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Mon, 30 May 2022 14:38:34 +0200 Subject: [PATCH 087/210] GH-873 Fix JsonNode conversion Resolves #873 --- .../context/catalog/FunctionTypeUtils.java | 9 +++++- ...BeanFactoryAwareFunctionRegistryTests.java | 28 +++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtils.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtils.java index be0b9264e..4b1db374d 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtils.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtils.java @@ -31,6 +31,7 @@ import java.util.function.Supplier; import java.util.stream.Stream; +import com.fasterxml.jackson.databind.JsonNode; import net.jodah.typetools.TypeResolver; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -52,6 +53,8 @@ import org.springframework.util.ReflectionUtils; import org.springframework.util.StringUtils; + + /** * Set of utility operations to interrogate function definitions. * @@ -82,13 +85,17 @@ public static boolean isTypeCollection(Type type) { } type = getGenericType(type); Class rawType = type instanceof ParameterizedType ? getRawType(type) : (Class) type; - return Collection.class.isAssignableFrom(rawType); + return Collection.class.isAssignableFrom(rawType) || JsonNode.class.isAssignableFrom(rawType); } public static boolean isTypeArray(Type type) { return getRawType(type).isArray(); } + public static boolean isJsonNode(Type type) { + return getRawType(type).isArray(); + } + /** * A convenience method identical to {@link #getImmediateGenericType(Type, int)} * for cases when provided 'type' is {@link Publisher} or {@link Message}. diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java index c5c7344d9..f3bb17dec 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java @@ -39,6 +39,7 @@ import java.util.function.Supplier; import java.util.stream.Collectors; +import com.fasterxml.jackson.databind.JsonNode; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; @@ -104,6 +105,15 @@ public void before() { System.clearProperty("spring.cloud.function.definition"); } + @Test + public void testJsonNodeAsInput() throws Exception { + FunctionCatalog catalog = this.configureCatalog(JsonNodeConfiguration.class); + Function, Message> f = catalog.lookup("messageAsJsonNode", "application/json"); + Message m = MessageBuilder.withPayload("[{\"name\":\"bob\"}, {\"name\":\"bob\"}]").setHeader(MessageHeaders.CONTENT_TYPE, "application/json").build(); + assertThat(new String(f.apply(m).getPayload())).isEqualTo("[{\"name\":\"bob\"},{\"name\":\"bob\"}]"); + f = catalog.lookup("asJsonNode", "application/json"); + assertThat(new String(f.apply(m).getPayload())).isEqualTo("[{\"name\":\"bob\"},{\"name\":\"bob\"}]"); + } @SuppressWarnings({ "rawtypes" }) @Test @@ -782,6 +792,24 @@ public Function, String> uppercasePerson() { } } + @EnableAutoConfiguration + @Configuration + public static class JsonNodeConfiguration { + @Bean + public Function, String> messageAsJsonNode() { + return v -> { + return v.getPayload().toString(); + }; + } + + @Bean + public Function asJsonNode() { + return v -> { + return v.toString(); + }; + } + } + @EnableAutoConfiguration public static class EmptyConfiguration { From d3643f65db1767329071dd94b148ffb7607f1b26 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 31 May 2022 14:34:36 +0200 Subject: [PATCH 088/210] Remove JDK profiles that were preventing some compatibility builds --- pom.xml | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index 442636919..81aa74a57 100644 --- a/pom.xml +++ b/pom.xml @@ -17,9 +17,6 @@ - 1.8 - ${java.version} - ${java.version} 1.0.27.RELEASE spring-cloud-function true @@ -127,21 +124,13 @@ - + + + javax.annotation + javax.annotation-api + + - - java11+ - - [11,) - - - - javax.annotation - javax.annotation-api - - - - core From 2d32f8d8ac891672b0f1253ad2145286f1a024f7 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 7 Jun 2022 16:51:51 +0200 Subject: [PATCH 089/210] Back-port of https://github.com/spring-cloud/spring-cloud-function/pull/871 --- .../context/catalog/FunctionTypeUtils.java | 9 ++++++-- .../catalog/FunctionTypeUtilsTests.java | 22 ++++++++++++++++++- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtils.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtils.java index 4b1db374d..b41e3be68 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtils.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtils.java @@ -352,10 +352,15 @@ public static boolean isMessage(Type type) { type = getImmediateGenericType(type, 0); } - if (type instanceof ParameterizedType && !Message.class.isAssignableFrom(TypeResolver.resolveRawClass(type, null))) { + Class resolveRawClass = FunctionTypeUtils.getRawType(type); + if (type instanceof ParameterizedType && !Message.class.isAssignableFrom(resolveRawClass)) { type = getImmediateGenericType(type, 0); } - return Message.class.isAssignableFrom(TypeResolver.resolveRawClass(type, null)); + resolveRawClass = FunctionTypeUtils.getRawType(type); + if (resolveRawClass == null) { + return false; + } + return Message.class.isAssignableFrom(resolveRawClass); } /** diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtilsTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtilsTests.java index 6f0285422..e295b830e 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtilsTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtilsTests.java @@ -17,10 +17,13 @@ package org.springframework.cloud.function.context.catalog; +import java.lang.reflect.Method; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; +import java.util.Date; import java.util.List; import java.util.Map; +import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; @@ -32,8 +35,10 @@ import reactor.util.function.Tuple3; import org.springframework.cloud.function.context.FunctionType; +import org.springframework.core.MethodParameter; import org.springframework.core.ParameterizedTypeReference; import org.springframework.messaging.Message; +import org.springframework.util.ReflectionUtils; import static org.assertj.core.api.Assertions.assertThat; @@ -43,7 +48,7 @@ * */ @SuppressWarnings("unused") -public class FunctionTypeUtilsTests { +public class FunctionTypeUtilsTests { @Test public void testFunctionTypeFrom() throws Exception { @@ -148,6 +153,21 @@ public void testIsTypeCollection() { assertThat(FunctionTypeUtils.isTypeCollection(new ParameterizedTypeReference>>>() { }.getType())).isFalse(); } + @Test + public void testNoNpeFromIsMessage() { + FunctionTypeUtilsTests testService = new FunctionTypeUtilsTests<>(); + + Method methodUnderTest = + ReflectionUtils.findMethod(testService.getClass(), "notAMessageMethod", AtomicReference.class); + MethodParameter methodParameter = MethodParameter.forExecutable(methodUnderTest, 0); + + assertThat(FunctionTypeUtils.isMessage(methodParameter.getGenericParameterType())).isFalse(); + } + + void notAMessageMethod(AtomicReference payload) { + + } + private static Function function() { return null; } From d3840daacdaec55a36ce572440651202cf9e1ca7 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 7 Jun 2022 21:22:25 +0200 Subject: [PATCH 090/210] KafkaNull batch attempt --- .../SmartCompositeMessageConverter.java | 42 ++++++++++++++++--- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java index 32524a8f7..3691d35df 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java @@ -16,12 +16,15 @@ package org.springframework.cloud.function.context.config; +import java.lang.reflect.Type; +import java.util.ArrayList; import java.util.Collection; import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.cloud.function.context.catalog.FunctionTypeUtils; import org.springframework.lang.Nullable; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; @@ -29,7 +32,9 @@ import org.springframework.messaging.converter.CompositeMessageConverter; import org.springframework.messaging.converter.MessageConverter; import org.springframework.messaging.converter.SmartMessageConverter; +import org.springframework.messaging.support.MessageBuilder; import org.springframework.messaging.support.MessageHeaderAccessor; +import org.springframework.util.CollectionUtils; import org.springframework.util.MimeType; import org.springframework.util.StringUtils; @@ -75,11 +80,38 @@ public Object fromMessage(Message message, Class targetClass, @Nullable Ob if (!(message.getPayload() instanceof byte[]) && targetClass.isInstance(message.getPayload()) && !(message.getPayload() instanceof Collection)) { return message.getPayload(); } - Object result = (converter instanceof SmartMessageConverter ? - ((SmartMessageConverter) converter).fromMessage(message, targetClass, conversionHint) : - converter.fromMessage(message, targetClass)); - if (result != null) { - return result; + + if (message.getPayload() instanceof Iterable && conversionHint != null) { + Iterable iterablePayload = (Iterable) message.getPayload(); + Type t = FunctionTypeUtils.getImmediateGenericType((Type) conversionHint, 0); + Class rawType = FunctionTypeUtils.getRawType(t); + List resultList = new ArrayList<>(); + for (Object item : iterablePayload) { + /* + * Somewhere here we can do KafkaNull check or see below + */ + Message m = MessageBuilder.withPayload(item).copyHeaders(message.getHeaders()).build(); + Object result = (converter instanceof SmartMessageConverter & rawType != t ? + ((SmartMessageConverter) converter).fromMessage(m, rawType, t) : + converter.fromMessage(m, rawType)); + if (result != null) { + /* + * Or most likely here we can do the KafkaNull check and not add it to the list + */ + resultList.add(result); + } + } + if (!CollectionUtils.isEmpty(resultList)) { + return resultList; + } + } + else { + Object result = (converter instanceof SmartMessageConverter ? + ((SmartMessageConverter) converter).fromMessage(message, targetClass, conversionHint) : + converter.fromMessage(message, targetClass)); + if (result != null) { + return result; + } } } return null; From a181c5042677f1d741421dddcc9d91118847dd0a Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 8 Jun 2022 12:22:14 +0200 Subject: [PATCH 091/210] Initial commit of KafkaNull changes to SmartCompositeMessageConverter --- .../SmartCompositeMessageConverter.java | 64 ++++++++++--------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java index 3691d35df..ff69c69dd 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java @@ -19,6 +19,7 @@ import java.lang.reflect.Type; import java.util.ArrayList; import java.util.Collection; +import java.util.Iterator; import java.util.List; import org.apache.commons.logging.Log; @@ -34,7 +35,6 @@ import org.springframework.messaging.converter.SmartMessageConverter; import org.springframework.messaging.support.MessageBuilder; import org.springframework.messaging.support.MessageHeaderAccessor; -import org.springframework.util.CollectionUtils; import org.springframework.util.MimeType; import org.springframework.util.StringUtils; @@ -73,40 +73,41 @@ public Object fromMessage(Message message, Class targetClass) { return null; } + @SuppressWarnings("unchecked") @Override - @Nullable public Object fromMessage(Message message, Class targetClass, @Nullable Object conversionHint) { - for (MessageConverter converter : getConverters()) { - if (!(message.getPayload() instanceof byte[]) && targetClass.isInstance(message.getPayload()) && !(message.getPayload() instanceof Collection)) { - return message.getPayload(); - } - - if (message.getPayload() instanceof Iterable && conversionHint != null) { - Iterable iterablePayload = (Iterable) message.getPayload(); - Type t = FunctionTypeUtils.getImmediateGenericType((Type) conversionHint, 0); - Class rawType = FunctionTypeUtils.getRawType(t); - List resultList = new ArrayList<>(); - for (Object item : iterablePayload) { - /* - * Somewhere here we can do KafkaNull check or see below - */ - Message m = MessageBuilder.withPayload(item).copyHeaders(message.getHeaders()).build(); - Object result = (converter instanceof SmartMessageConverter & rawType != t ? - ((SmartMessageConverter) converter).fromMessage(m, rawType, t) : - converter.fromMessage(m, rawType)); - if (result != null) { - /* - * Or most likely here we can do the KafkaNull check and not add it to the list - */ - resultList.add(result); - } + if (!(message.getPayload() instanceof byte[]) && targetClass.isInstance(message.getPayload()) && !(message.getPayload() instanceof Collection)) { + return message.getPayload(); + } + Object result = null; + if (message.getPayload() instanceof Iterable && conversionHint != null) { + Iterable iterablePayload = (Iterable) message.getPayload(); + Type genericItemType = FunctionTypeUtils.getImmediateGenericType((Type) conversionHint, 0); + Class genericItemRawType = FunctionTypeUtils.getRawType(genericItemType); + List resultList = new ArrayList<>(); + for (Object item : iterablePayload) { + boolean isConverted = false; + if (item.getClass().getName().startsWith("org.springframework.kafka.support.KafkaNull")) { + resultList.add(item); + isConverted = true; } - if (!CollectionUtils.isEmpty(resultList)) { - return resultList; + for (Iterator iterator = getConverters().iterator(); iterator.hasNext() && !isConverted;) { + Message m = MessageBuilder.withPayload(item).copyHeaders(message.getHeaders()).build(); // TODO Message creating may be expensive + MessageConverter converter = (MessageConverter) iterator.next(); + Object conversionResult = (converter instanceof SmartMessageConverter & genericItemRawType != genericItemType ? + ((SmartMessageConverter) converter).fromMessage(m, genericItemRawType, genericItemType) : + converter.fromMessage(m, genericItemRawType)); + if (conversionResult != null) { + resultList.add(conversionResult); + isConverted = true; + } } } - else { - Object result = (converter instanceof SmartMessageConverter ? + result = resultList; + } + else { + for (MessageConverter converter : getConverters()) { + result = (converter instanceof SmartMessageConverter ? ((SmartMessageConverter) converter).fromMessage(message, targetClass, conversionHint) : converter.fromMessage(message, targetClass)); if (result != null) { @@ -114,7 +115,8 @@ public Object fromMessage(Message message, Class targetClass, @Nullable Ob } } } - return null; + + return result; } @Override From a14a8d9e9d6c97b9eeb08ceeb716b210ed16fcc2 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 8 Jun 2022 19:46:35 +0200 Subject: [PATCH 092/210] SCST-GH-2355 Add support for batch processing of collections with different types Specifically KafkaNull. But this commit effectively paves a path for any type --- .../SmartCompositeMessageConverter.java | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java index ff69c69dd..5a3d9bb0e 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java @@ -92,14 +92,16 @@ public Object fromMessage(Message message, Class targetClass, @Nullable Ob isConverted = true; } for (Iterator iterator = getConverters().iterator(); iterator.hasNext() && !isConverted;) { - Message m = MessageBuilder.withPayload(item).copyHeaders(message.getHeaders()).build(); // TODO Message creating may be expensive MessageConverter converter = (MessageConverter) iterator.next(); - Object conversionResult = (converter instanceof SmartMessageConverter & genericItemRawType != genericItemType ? - ((SmartMessageConverter) converter).fromMessage(m, genericItemRawType, genericItemType) : - converter.fromMessage(m, genericItemRawType)); - if (conversionResult != null) { - resultList.add(conversionResult); - isConverted = true; + if (!converter.getClass().getName().endsWith("ApplicationJsonMessageMarshallingConverter")) { // TODO Stream stuff, needs to be removed + Message m = MessageBuilder.withPayload(item).copyHeaders(message.getHeaders()).build(); // TODO Message creating may be expensive + Object conversionResult = (converter instanceof SmartMessageConverter & genericItemRawType != genericItemType ? + ((SmartMessageConverter) converter).fromMessage(m, genericItemRawType, genericItemType) : + converter.fromMessage(m, genericItemRawType)); + if (conversionResult != null) { + resultList.add(conversionResult); + isConverted = true; + } } } } @@ -107,11 +109,13 @@ public Object fromMessage(Message message, Class targetClass, @Nullable Ob } else { for (MessageConverter converter : getConverters()) { - result = (converter instanceof SmartMessageConverter ? - ((SmartMessageConverter) converter).fromMessage(message, targetClass, conversionHint) : - converter.fromMessage(message, targetClass)); - if (result != null) { - return result; + if (!converter.getClass().getName().endsWith("ApplicationJsonMessageMarshallingConverter")) {// TODO Stream stuff, needs to be removed + result = (converter instanceof SmartMessageConverter ? + ((SmartMessageConverter) converter).fromMessage(message, targetClass, conversionHint) : + converter.fromMessage(message, targetClass)); + if (result != null) { + return result; + } } } } From 651cf187fb7ddc780feecb71663af28f0af87aaa Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 8 Jun 2022 19:51:30 +0200 Subject: [PATCH 093/210] checkstyle --- .../function/context/config/SmartCompositeMessageConverter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java index 5a3d9bb0e..67432f2c1 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java @@ -109,7 +109,7 @@ public Object fromMessage(Message message, Class targetClass, @Nullable Ob } else { for (MessageConverter converter : getConverters()) { - if (!converter.getClass().getName().endsWith("ApplicationJsonMessageMarshallingConverter")) {// TODO Stream stuff, needs to be removed + if (!converter.getClass().getName().endsWith("ApplicationJsonMessageMarshallingConverter")) { // TODO Stream stuff, needs to be removed result = (converter instanceof SmartMessageConverter ? ((SmartMessageConverter) converter).fromMessage(message, targetClass, conversionHint) : converter.fromMessage(message, targetClass)); From a1a3f5b3433dc7f60400a2fa1c93ba0d3ee4e680 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 9 Jun 2022 15:03:44 +0200 Subject: [PATCH 094/210] Add author --- .../function/context/config/SmartCompositeMessageConverter.java | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java index 67432f2c1..50ea0c590 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java @@ -41,6 +41,7 @@ /** * * @author Oleg Zhurakousky + * @author Salvatore Bernardo * */ public class SmartCompositeMessageConverter extends CompositeMessageConverter { From 78dea0aad73a2a4d3f0a2a986fc568de1cfb73fd Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Mon, 13 Jun 2022 15:46:42 +0200 Subject: [PATCH 095/210] GH-883 Add support for filtering out ineligible functions Resolves #883 --- .../main/asciidoc/spring-cloud-function.adoc | 17 ++++++++++ .../function/context/FunctionProperties.java | 33 +++++++++++++++++++ .../catalog/SimpleFunctionRegistry.java | 18 ++++++++++ ...ntextFunctionCatalogAutoConfiguration.java | 2 +- ...BeanFactoryAwareFunctionRegistryTests.java | 21 ++++++++++++ 5 files changed, 90 insertions(+), 1 deletion(-) diff --git a/docs/src/main/asciidoc/spring-cloud-function.adoc b/docs/src/main/asciidoc/spring-cloud-function.adoc index e201ed0d7..b628076d5 100644 --- a/docs/src/main/asciidoc/spring-cloud-function.adoc +++ b/docs/src/main/asciidoc/spring-cloud-function.adoc @@ -50,6 +50,23 @@ and available to us since Java 8. - Function - Consumer +In a nutshell, any bean in your Application Context that is of type `Supplier`, `Function` or `Consumer` could be registered with `FunctionCatalog`. +This means that it could benefit from all the features described in this reference manual. + +==== Filtering ineligible functions +A typical Application Context may include beans that are valid java functions, but not intended to be candidates to be registered with `FunctionCatalog`. +Such beans could be auto-configurations from other projects or any other beans that qualify to be Java functions. +The framework provides default filtering of known beans that should not be candidates for registration with function catalog. +You can also add to this list additional beans by providing coma delimited list of bean definition names using +`spring.cloud.function.ineligible-definitions` property + +For example, + +[source, test] +---- +spring.cloud.function.ineligible-definitions=foo,bar +---- + ==== Supplier Supplier can be _reactive_ - `Supplier>` or _imperative_ - `Supplier`. From the invocation standpoint this should make no difference diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionProperties.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionProperties.java index 74702bbd6..db6ba6feb 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionProperties.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionProperties.java @@ -16,7 +16,10 @@ package org.springframework.cloud.function.context; +import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; +import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -65,6 +68,11 @@ public class FunctionProperties implements EnvironmentAware, ApplicationContextA */ private String definition; + /** + * List of functions that are not eligible to be registered in Function Catalog. + */ + private final List ineligibleDefinitions; + private Map configuration; private String expectedContentType; @@ -73,6 +81,23 @@ public class FunctionProperties implements EnvironmentAware, ApplicationContextA private ApplicationContext applicationContext; + public FunctionProperties() { + ineligibleDefinitions = new ArrayList<>(); + String[] definitions = new String[] { + "org.springframework.boot", + "org.springframework.cloud.function.cloudevent.CloudEventsFunctionExtensionConfiguration", + "org.springframework.cloud.function.context.config.FunctionsEndpointAutoConfiguration", + "classLoaderMetrics", + "jvmMemoryMetrics", + "jvmInfoMetrics", + "jvmCompilationMetrics", + "uptimeMetrics", + "kotlinToFunctionTransformer", + "CloudEventsMessageConverterConfiguration" + }; + ineligibleDefinitions.addAll(Arrays.asList(definitions)); + } + public Map getConfiguration() { return configuration; } @@ -164,6 +189,14 @@ public void setEnvironment(Environment environment) { this.environment = environment; } + public List getIneligibleDefinitions() { + return new ArrayList<>(this.ineligibleDefinitions); + } + + public void setIneligibleDefinitions(List definitions) { + this.ineligibleDefinitions.addAll(definitions); + } + public static class FunctionConfigurationProperties { private Map inputHeaderMappingExpression; diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java index bfabe304f..f2ec54dd1 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java @@ -163,6 +163,9 @@ public T lookup(Class type, String functionDefinition, String... expected @Override public void register(FunctionRegistration registration) { + if (!isRegistrationEligible(registration)) { + return; + } Assert.notNull(registration, "'registration' must not be null"); if (logger.isDebugEnabled()) { logger.debug("Registering function " + registration.getNames()); @@ -170,6 +173,21 @@ public void register(FunctionRegistration registration) { this.functionRegistrations.add(registration); } + @SuppressWarnings("rawtypes") + private boolean isRegistrationEligible(FunctionRegistration registration) { + if (this.functionProperties != null) { + for (String definition : this.functionProperties.getIneligibleDefinitions()) { + if (registration.getTarget().getClass().getName().equals(definition)) { + return false; + } + else if (registration.getNames().contains(definition) || registration.getTarget().getClass().getName().contains(definition)) { + return false; + } + } + } + return true; + } + //----- @Override diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java index 9487a85b5..1e38359e9 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java @@ -140,7 +140,7 @@ public FunctionRegistry functionCatalog(List messageConverters } @Bean(RoutingFunction.FUNCTION_NAME) - RoutingFunction functionRouter(FunctionCatalog functionCatalog, FunctionProperties functionProperties, + public RoutingFunction functionRouter(FunctionCatalog functionCatalog, FunctionProperties functionProperties, BeanFactory beanFactory, @Nullable MessageRoutingCallback routingCallback) { return new RoutingFunction(functionCatalog, functionProperties, new BeanFactoryResolver(beanFactory), routingCallback); } diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java index f3bb17dec..97e5d904d 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java @@ -105,6 +105,27 @@ public void before() { System.clearProperty("spring.cloud.function.definition"); } + @Test + public void testFunctionEligibilityFiltering() { + System.setProperty("spring.cloud.function.ineligible-definitions", "asJsonNode"); + Collection registeredFunction = new ArrayList(); + FunctionCatalog catalog = this.configureCatalog(JsonNodeConfiguration.class); + for (String beanName : context.getBeanDefinitionNames()) { + try { + FunctionInvocationWrapper function = catalog.lookup(beanName); + if (function != null) { + registeredFunction.add(function); + } + } + catch (Exception e) { + // ignore + } + } + System.out.println(registeredFunction); + assertThat(registeredFunction.size()).isEqualTo(2); + assertThat((FunctionInvocationWrapper) catalog.lookup("asJsonNode")).isNull(); + } + @Test public void testJsonNodeAsInput() throws Exception { FunctionCatalog catalog = this.configureCatalog(JsonNodeConfiguration.class); From 8789c7ebd7c5e3ceceaf43a91b73fcb70ee4735e Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 14 Jun 2022 09:08:31 +0200 Subject: [PATCH 096/210] GH-884 Add initial support for BiFunction Resolves #884 --- .../BeanFactoryAwareFunctionRegistry.java | 38 +++++++++++++++++++ .../context/catalog/FunctionTypeUtils.java | 9 +++++ .../SmartCompositeMessageConverter.java | 2 +- ...BeanFactoryAwareFunctionRegistryTests.java | 25 ++++++++---- 4 files changed, 65 insertions(+), 9 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java index e8f7c8cfa..c64f85e3c 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java @@ -17,9 +17,11 @@ package org.springframework.cloud.function.context.catalog; import java.lang.reflect.Method; +import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.Arrays; import java.util.Set; +import java.util.function.BiFunction; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; @@ -34,11 +36,14 @@ import org.springframework.cloud.function.context.FunctionProperties; import org.springframework.cloud.function.context.FunctionRegistration; import org.springframework.cloud.function.context.FunctionRegistry; +import org.springframework.cloud.function.context.FunctionType; +import org.springframework.cloud.function.context.config.FunctionContextUtils; import org.springframework.cloud.function.core.FunctionInvocationHelper; import org.springframework.cloud.function.json.JsonMapper; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.support.GenericApplicationContext; +import org.springframework.core.ResolvableType; import org.springframework.core.convert.ConversionService; import org.springframework.lang.Nullable; import org.springframework.messaging.Message; @@ -138,6 +143,9 @@ else if (this.isSpecialFunctionRegistration(functionNames, functionName)) { functionRegistration = this.applicationContext .getBean(functionName + FunctionRegistration.REGISTRATION_NAME_SUFFIX, FunctionRegistration.class); } + else if (functionCandidate instanceof BiFunction) { + functionRegistration = this.registerMessagingBiFunction((BiFunction) functionCandidate, functionName); + } else { functionType = FunctionTypeUtils.discoverFunctionType(functionCandidate, functionName, this.applicationContext); } @@ -163,6 +171,36 @@ else if (this.isSpecialFunctionRegistration(functionNames, functionName)) { return (T) function; } + @SuppressWarnings({ "rawtypes", "unchecked" }) + private FunctionRegistration registerMessagingBiFunction(BiFunction userFunction, String functionName) { + Type biFunctionType = FunctionContextUtils.findType(this.applicationContext.getBeanFactory(), functionName); + Type inputType1 = Object.class; + Type inputType2 = Object.class; + if (biFunctionType instanceof ParameterizedType) { + inputType1 = ((ParameterizedType) biFunctionType).getActualTypeArguments()[0]; + inputType2 = ((ParameterizedType) biFunctionType).getActualTypeArguments()[1]; + } + + if (!FunctionTypeUtils.isTypeMap(inputType2)) { + throw new UnsupportedOperationException("BiFunction's second argument must be assignable to Map, since BiFunction " + + "represents parsed Message with first argument being payload and second headers. " + + "Other signatures are not supported at the moment."); + } + + ResolvableType messageType = ResolvableType.forClassWithGenerics(Message.class, ResolvableType.forType(inputType1)); + Type biFunctionWrapperType = ResolvableType.forClassWithGenerics(Function.class, messageType, ResolvableType.forType(inputType2)).getType(); + + Function wrapperFunction = message -> { + Object payload = ((Message) message).getPayload(); + if (payload.getClass().getName().equals("org.springframework.kafka.support.KafkaNull")) { + payload = null; + } + return userFunction.apply(payload, ((Message) message).getHeaders()); + }; + + return new FunctionRegistration<>(wrapperFunction, functionName).type(FunctionType.of(biFunctionWrapperType)); + } + private Object discoverFunctionInBeanFactory(String functionName) { Object functionCandidate = null; if (this.applicationContext.containsBean(functionName)) { diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtils.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtils.java index b41e3be68..d7d8863b3 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtils.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtils.java @@ -88,6 +88,15 @@ public static boolean isTypeCollection(Type type) { return Collection.class.isAssignableFrom(rawType) || JsonNode.class.isAssignableFrom(rawType); } + public static boolean isTypeMap(Type type) { + if (Map.class.isAssignableFrom(getRawType(type))) { + return true; + } + type = getGenericType(type); + Class rawType = type instanceof ParameterizedType ? getRawType(type) : (Class) type; + return Map.class.isAssignableFrom(rawType); + } + public static boolean isTypeArray(Type type) { return getRawType(type).isArray(); } diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java index 50ea0c590..da17b2641 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java @@ -89,7 +89,7 @@ public Object fromMessage(Message message, Class targetClass, @Nullable Ob for (Object item : iterablePayload) { boolean isConverted = false; if (item.getClass().getName().startsWith("org.springframework.kafka.support.KafkaNull")) { - resultList.add(item); + resultList.add(null); isConverted = true; } for (Iterator iterator = getConverters().iterator(); iterator.hasNext() && !isConverted;) { diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java index 97e5d904d..fbd2b3cb5 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java @@ -34,6 +34,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; +import java.util.function.BiFunction; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; @@ -185,17 +186,18 @@ public void testDefaultLookup() throws Exception { assertThat(((FunctionInvocationWrapper) function).isComposed()).isTrue(); } + @SuppressWarnings({ "unchecked", "rawtypes" }) @Test - public void testImperativeFunction() { + public void testBiFunction() { FunctionCatalog catalog = this.configureCatalog(); -// Function asIs = catalog.lookup("uppercase"); -// assertThat(asIs.apply("uppercase")).isEqualTo("UPPERCASE"); -// -// Function, Flux> asFlux = catalog.lookup("uppercase"); -// List result = asFlux.apply(Flux.just("uppercaseFlux", "uppercaseFlux2")).collectList().block(); -// assertThat(result.get(0)).isEqualTo("UPPERCASEFLUX"); -// assertThat(result.get(1)).isEqualTo("UPPERCASEFLUX2"); + Function biFunction = catalog.lookup("biFuncUpperCase"); + assertThat(biFunction.apply("hello")).isEqualTo("HELLO"); + } + + @Test + public void testImperativeFunction() { + FunctionCatalog catalog = this.configureCatalog(); Function>, Flux>> messageFlux = catalog.lookup("uppercase", "application/json"); Message message1 = MessageBuilder.withPayload("\"uppercaseFlux\"".getBytes()).setHeader(MessageHeaders.CONTENT_TYPE, "application/json").build(); @@ -1052,6 +1054,13 @@ public Supplier numberword() { return () -> "one"; } + @Bean + public BiFunction biFuncUpperCase() { + return (p, h) -> { + return p.toUpperCase(); + }; + } + @Bean public Function, Person> maptopojo() { return map -> { From 3e6a9ffb279dd255f4ca34e7cdfa1a182aa7cce2 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 15 Jun 2022 16:15:21 +0200 Subject: [PATCH 097/210] GH-884 Add initial support for BiConsumer --- .../BeanFactoryAwareFunctionRegistry.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java index c64f85e3c..c2e357925 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java @@ -21,6 +21,7 @@ import java.lang.reflect.Type; import java.util.Arrays; import java.util.Set; +import java.util.function.BiConsumer; import java.util.function.BiFunction; import java.util.function.Consumer; import java.util.function.Function; @@ -94,6 +95,10 @@ public Set getNames(Class type) { .addAll(Arrays.asList(this.applicationContext.getBeanNamesForType(Supplier.class))); registeredNames .addAll(Arrays.asList(this.applicationContext.getBeanNamesForType(Consumer.class))); + registeredNames + .addAll(Arrays.asList(this.applicationContext.getBeanNamesForType(BiFunction.class))); + registeredNames + .addAll(Arrays.asList(this.applicationContext.getBeanNamesForType(BiConsumer.class))); registeredNames .addAll(Arrays.asList(this.applicationContext.getBeanNamesForType(FunctionRegistration.class))); } @@ -143,8 +148,8 @@ else if (this.isSpecialFunctionRegistration(functionNames, functionName)) { functionRegistration = this.applicationContext .getBean(functionName + FunctionRegistration.REGISTRATION_NAME_SUFFIX, FunctionRegistration.class); } - else if (functionCandidate instanceof BiFunction) { - functionRegistration = this.registerMessagingBiFunction((BiFunction) functionCandidate, functionName); + else if (functionCandidate instanceof BiFunction || functionCandidate instanceof BiConsumer) { + functionRegistration = this.registerMessagingBiFunction(functionCandidate, functionName); } else { functionType = FunctionTypeUtils.discoverFunctionType(functionCandidate, functionName, this.applicationContext); @@ -172,7 +177,7 @@ else if (functionCandidate instanceof BiFunction) { } @SuppressWarnings({ "rawtypes", "unchecked" }) - private FunctionRegistration registerMessagingBiFunction(BiFunction userFunction, String functionName) { + private FunctionRegistration registerMessagingBiFunction(Object userFunction, String functionName) { Type biFunctionType = FunctionContextUtils.findType(this.applicationContext.getBeanFactory(), functionName); Type inputType1 = Object.class; Type inputType2 = Object.class; @@ -195,7 +200,13 @@ private FunctionRegistration registerMessagingBiFunction(BiFunction userFunction if (payload.getClass().getName().equals("org.springframework.kafka.support.KafkaNull")) { payload = null; } - return userFunction.apply(payload, ((Message) message).getHeaders()); + if (userFunction instanceof BiConsumer) { + ((BiConsumer) userFunction).accept(payload, ((Message) message).getHeaders()); + return null; + } + else { + return ((BiFunction) userFunction).apply(payload, ((Message) message).getHeaders()); + } }; return new FunctionRegistration<>(wrapperFunction, functionName).type(FunctionType.of(biFunctionWrapperType)); From 83d44907275d84ee58a29c726d5dcecf5fbc4528 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 15 Jun 2022 16:38:22 +0000 Subject: [PATCH 098/210] Update SNAPSHOT to 3.2.6 --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 2 +- .../src/it/bootapp-with-javax/pom.xml | 2 +- .../src/it/bootapp-with-scf/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 2 +- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 2 +- .../function-sample-aws-custom-bean/pom.xml | 2 +- .../function-sample-aws-custom/pom.xml | 2 +- .../function-sample-aws-routing/pom.xml | 2 +- spring-cloud-function-samples/function-sample-aws/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 2 +- .../function-sample-cloudevent-stream/pom.xml | 2 +- .../function-sample-cloudevent/pom.xml | 2 +- .../function-sample-compiler/pom.xml | 2 +- .../function-sample-functional-aws-routing/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 2 +- .../function-sample-grpc-cloudevent/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pojo/pom.xml | 2 +- .../function-sample-spring-integration/pom.xml | 2 +- .../function-sample-supplier-exporter/pom.xml | 2 +- spring-cloud-function-samples/function-sample-task/pom.xml | 2 +- spring-cloud-function-samples/function-sample/pom.xml | 2 +- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 46 files changed, 48 insertions(+), 48 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 1dff59a82..6054bf1d6 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.6 pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index 81aa74a57..0db5364b1 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.6-SNAPSHOT + 3.2.6 pom org.springframework.cloud spring-cloud-build - 3.1.4-SNAPSHOT + 3.1.3 diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index fab8c4299..e3a76ccc7 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.6 spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index ca6b5820b..75d8c2577 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.6-SNAPSHOT + 3.2.6 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index ffbc19941..3f6cd95dd 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.6-SNAPSHOT + 3.2.6 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index dd7e7d932..6932868a3 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.6-SNAPSHOT + 3.2.6 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 672f82099..20b01eb3b 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.6-SNAPSHOT + 3.2.6 diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 7c1d11515..415297edf 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.6-SNAPSHOT + 3.2.6 spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index c690db6d0..5d26d22f9 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.6-SNAPSHOT + 3.2.6 diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index eacd07088..1bfd77813 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.6 diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 66ec42853..93b3fffae 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.6 diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index dabf4f58f..90cdda109 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.6 diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index bf616face..568131f9b 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.4-SNAPSHOT + 3.1.3 spring-cloud-function-dependencies - 3.2.6-SNAPSHOT + 3.2.6 pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 72ebdd1fb..63e9e24d4 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.6 diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index b2ad0ba5b..054515ecb 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.6-SNAPSHOT + 3.2.6 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index 1c072cbe0..601ff34de 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.6-SNAPSHOT + 3.2.6 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 2ee89b1b9..e7ac48906 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.6-SNAPSHOT + 3.2.6 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index 302022a74..84810137e 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.6-SNAPSHOT + 3.2.6 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index 6a0c158ce..f31ed00a1 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.6-SNAPSHOT + 3.2.6 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 71780b7f7..2c8b91cb2 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.6-SNAPSHOT + 3.2.6 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 28c4a3483..9c2e738cf 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.6-SNAPSHOT + 3.2.6 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index b7035c8eb..26ed58142 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.6 diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 2c6a7d6b9..308d75b03 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.6 diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index 2b14e29a1..15cf25894 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.6-SNAPSHOT + 3.2.6 diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 8e96c0700..6f0b7c9c5 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.6-SNAPSHOT + 3.2.6 diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index 20e2dc59d..baf9c5b19 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.6-SNAPSHOT + 3.2.6 diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 07b209a59..5e055865a 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.6-SNAPSHOT + 3.2.6 diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 50740ad71..e82202d3f 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.6-SNAPSHOT + 3.2.6 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 0b51892a8..4e7a695d6 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.6-SNAPSHOT + 3.2.6 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index d266ca8c5..6028c9ec6 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -17,7 +17,7 @@ 1.8 - 3.2.6-SNAPSHOT + 3.2.6 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index bf40c8d0a..57d800ed4 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -17,7 +17,7 @@ 1.8 - 3.2.6-SNAPSHOT + 3.2.6 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index ce1de661e..3fd437cbd 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.6-SNAPSHOT + 3.2.6 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index 0f6ef3776..66481ebe1 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.6-SNAPSHOT + 3.2.6 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index 4542f4d09..7a9993e63 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -20,7 +20,7 @@ - 3.2.6-SNAPSHOT + 3.2.6 diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index 4c720e4b6..d7034b4f7 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.6-SNAPSHOT + 3.2.6 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index f0eaea89e..d30f43cf9 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.6-SNAPSHOT + 3.2.6 diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index 8444146e7..7f3d588fb 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.6-SNAPSHOT + 3.2.6 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index b1b2e48f5..8d6498654 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.6-SNAPSHOT + 3.2.6 diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index 808948c13..38690a421 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.6-SNAPSHOT + 3.2.6 diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 7acda302f..b847c81c6 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.6-SNAPSHOT + 3.2.6 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index b54504b3c..a45262e4c 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.6-SNAPSHOT + 3.2.6 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 4fbceead8..3b4223911 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.6 diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index a8be5c6dc..63f2948ab 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.6 diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index 9e0587a2c..b0f3851a7 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.6 diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index ae3cb7293..ea4806b9a 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.6 .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index f51d0cb47..bb6cf394b 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.6 spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From d1084fd4b2cf4a4d95fec005c7b9aba571aa2f8a Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 15 Jun 2022 16:42:35 +0000 Subject: [PATCH 099/210] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 2 +- .../src/it/bootapp-with-javax/pom.xml | 2 +- .../src/it/bootapp-with-scf/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 2 +- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 2 +- .../function-sample-aws-custom-bean/pom.xml | 2 +- .../function-sample-aws-custom/pom.xml | 2 +- .../function-sample-aws-routing/pom.xml | 2 +- spring-cloud-function-samples/function-sample-aws/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 2 +- .../function-sample-cloudevent-stream/pom.xml | 2 +- .../function-sample-cloudevent/pom.xml | 2 +- .../function-sample-compiler/pom.xml | 2 +- .../function-sample-functional-aws-routing/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 2 +- .../function-sample-grpc-cloudevent/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pojo/pom.xml | 2 +- .../function-sample-spring-integration/pom.xml | 2 +- .../function-sample-supplier-exporter/pom.xml | 2 +- spring-cloud-function-samples/function-sample-task/pom.xml | 2 +- spring-cloud-function-samples/function-sample/pom.xml | 2 +- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 46 files changed, 48 insertions(+), 48 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 6054bf1d6..1dff59a82 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6 + 3.2.6-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index 0db5364b1..81aa74a57 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.6 + 3.2.6-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 3.1.3 + 3.1.4-SNAPSHOT diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index e3a76ccc7..fab8c4299 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6 + 3.2.6-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index 75d8c2577..ca6b5820b 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.6 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index 3f6cd95dd..ffbc19941 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.6 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index 6932868a3..dd7e7d932 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.6 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 20b01eb3b..672f82099 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.6 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 415297edf..7c1d11515 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.6 + 3.2.6-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index 5d26d22f9..c690db6d0 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.6 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index 1bfd77813..eacd07088 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 93b3fffae..66ec42853 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 90cdda109..dabf4f58f 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 568131f9b..bf616face 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.3 + 3.1.4-SNAPSHOT spring-cloud-function-dependencies - 3.2.6 + 3.2.6-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 63e9e24d4..72ebdd1fb 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index 054515ecb..b2ad0ba5b 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.6 + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index 601ff34de..1c072cbe0 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.6 + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index e7ac48906..2ee89b1b9 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.6 + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index 84810137e..302022a74 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.6 + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index f31ed00a1..6a0c158ce 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.6 + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 2c8b91cb2..71780b7f7 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.6 + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 9c2e738cf..28c4a3483 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.6 + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index 26ed58142..b7035c8eb 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 308d75b03..2c6a7d6b9 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index 15cf25894..2b14e29a1 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.6 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 6f0b7c9c5..8e96c0700 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.6 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index baf9c5b19..20e2dc59d 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.6 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 5e055865a..07b209a59 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.6 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index e82202d3f..50740ad71 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.6 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 4e7a695d6..0b51892a8 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.6 + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index 6028c9ec6..d266ca8c5 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -17,7 +17,7 @@ 1.8 - 3.2.6 + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 57d800ed4..bf40c8d0a 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -17,7 +17,7 @@ 1.8 - 3.2.6 + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index 3fd437cbd..ce1de661e 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.6 + 3.2.6-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index 66481ebe1..0f6ef3776 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.6 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index 7a9993e63..4542f4d09 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -20,7 +20,7 @@ - 3.2.6 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index d7034b4f7..4c720e4b6 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.6 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index d30f43cf9..f0eaea89e 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.6 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index 7f3d588fb..8444146e7 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.6 + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 8d6498654..b1b2e48f5 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.6 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index 38690a421..808948c13 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.6 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index b847c81c6..7acda302f 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.6 + 3.2.6-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index a45262e4c..b54504b3c 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.6 + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 3b4223911..4fbceead8 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index 63f2948ab..a8be5c6dc 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index b0f3851a7..9e0587a2c 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6 + 3.2.6-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index ea4806b9a..ae3cb7293 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6 + 3.2.6-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index bb6cf394b..f51d0cb47 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6 + 3.2.6-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From aecf49b5d4ca79ec29c4807269d0d77b24d6e59c Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 15 Jun 2022 16:42:36 +0000 Subject: [PATCH 100/210] Bumping versions to 3.2.7-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 2 +- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 2 +- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 2 +- .../src/it/bootapp-with-javax/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 2 +- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 2 +- .../function-sample-aws-custom-bean/pom.xml | 2 +- .../function-sample-aws-custom/pom.xml | 2 +- .../function-sample-aws-routing/pom.xml | 2 +- spring-cloud-function-samples/function-sample-aws/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 2 +- .../function-sample-cloudevent-stream/pom.xml | 2 +- .../function-sample-cloudevent/pom.xml | 2 +- spring-cloud-function-samples/function-sample-compiler/pom.xml | 2 +- .../function-sample-functional-aws-routing/pom.xml | 2 +- spring-cloud-function-samples/function-sample-gcp-http/pom.xml | 2 +- .../function-sample-grpc-cloudevent/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pojo/pom.xml | 2 +- .../function-sample-spring-integration/pom.xml | 2 +- .../function-sample-supplier-exporter/pom.xml | 2 +- spring-cloud-function-samples/function-sample-task/pom.xml | 2 +- spring-cloud-function-samples/function-sample/pom.xml | 2 +- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 46 files changed, 46 insertions(+), 46 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 1dff59a82..8d86781e9 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index 81aa74a57..f4219bdbd 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT pom diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index fab8c4299..310b573d6 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index ca6b5820b..77a8efa47 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index ffbc19941..0a392314f 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index dd7e7d932..a6ed9dfde 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 672f82099..6f8a371f1 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 7c1d11515..6322484e3 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index c690db6d0..90167031e 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index eacd07088..9def012d7 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 66ec42853..9714b36bf 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index dabf4f58f..4c0d822b9 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index bf616face..3608d91d2 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -10,7 +10,7 @@ spring-cloud-function-dependencies - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 72ebdd1fb..3368dd8a8 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index b2ad0ba5b..8d14c4cf9 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index 1c072cbe0..ee527f587 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 2ee89b1b9..0d4562510 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index 302022a74..71479e597 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index 6a0c158ce..30fc88202 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 71780b7f7..1505cc951 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 28c4a3483..75a103939 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index b7035c8eb..e9301b581 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 2c6a7d6b9..5055f1d83 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index 2b14e29a1..4a30302a3 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 8e96c0700..02fac3b72 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index 20e2dc59d..aba4f736d 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 07b209a59..d7634d2cd 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 50740ad71..52172c3b8 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 0b51892a8..900a3a720 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index d266ca8c5..cb78e0753 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -17,7 +17,7 @@ 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index bf40c8d0a..960231052 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -17,7 +17,7 @@ 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index ce1de661e..f8b5f341d 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index 0f6ef3776..bd9c6f5f0 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index 4542f4d09..a7dd5b191 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -20,7 +20,7 @@ - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index 4c720e4b6..5dccbe9c3 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index f0eaea89e..a2a1cec04 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index 8444146e7..aeecedc6f 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index b1b2e48f5..74fe9da88 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index 808948c13..d69a4eaa7 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 7acda302f..90aa77200 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index b54504b3c..68f783b10 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 4fbceead8..b26e212c9 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index a8be5c6dc..e909f953c 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index 9e0587a2c..147b8e129 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index ae3cb7293..93b6e0bbc 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index f51d0cb47..975b02b9c 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From 8a7cea3b0b9b091f10f4d5d53e0ab3de4705a0c7 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 15 Jun 2022 23:17:58 +0000 Subject: [PATCH 101/210] Bumping versions --- docs/pom.xml | 2 +- pom.xml | 2 +- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 2 +- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 49 files changed, 74 insertions(+), 74 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 8d86781e9..1dff59a82 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index f4219bdbd..81aa74a57 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT pom diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index 310b573d6..fab8c4299 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index 77a8efa47..ca6b5820b 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index 0a392314f..ffbc19941 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index a6ed9dfde..dd7e7d932 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 6f8a371f1..672f82099 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 6322484e3..7c1d11515 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index 90167031e..c690db6d0 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index 9def012d7..eacd07088 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 9714b36bf..66ec42853 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 4c0d822b9..dabf4f58f 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 3608d91d2..bf616face 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -10,7 +10,7 @@ spring-cloud-function-dependencies - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 3368dd8a8..72ebdd1fb 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index 8d14c4cf9..501700162 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index ee527f587..605f803c3 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 0d4562510..8363eb663 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index 71479e597..ce12f7507 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index 30fc88202..dd8592ba2 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 1505cc951..f5839c33f 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 75a103939..f03027b15 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index e9301b581..b7035c8eb 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 5055f1d83..2c6a7d6b9 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index 4a30302a3..64b4d216a 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 02fac3b72..2e1e91dcc 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index aba4f736d..4d1404473 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index d7634d2cd..54ca2443b 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 52172c3b8..28c228220 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index ef97c3d22..81f340c98 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 900a3a720..3fdee74e7 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index cb78e0753..094257cf1 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 960231052..2be3a8cc8 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index f8b5f341d..342b10424 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index bd9c6f5f0..b749cd24d 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index d1d0ce378..75c4f2d20 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index a7dd5b191..ffd8553b1 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index 5dccbe9c3..f17f82dda 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index 879b5852d..4a78d38a4 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index a2a1cec04..90b6d6dce 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index aeecedc6f..05cefd288 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 74fe9da88..b4d93bcca 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index d69a4eaa7..a782d32c4 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 90aa77200..22bdbf661 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index 68f783b10..1f9a1b0e4 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index b26e212c9..4fbceead8 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index e909f953c..a8be5c6dc 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index 147b8e129..9e0587a2c 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index 93b6e0bbc..ae3cb7293 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index 975b02b9c..f51d0cb47 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From 30728c07e19db27ddc449749531af2b54d16880f Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 16 Jun 2022 18:27:23 +0200 Subject: [PATCH 102/210] Fix function eligibility filtering --- .../BeanFactoryAwareFunctionRegistry.java | 9 +++++--- .../catalog/SimpleFunctionRegistry.java | 22 +++++++++++++++---- ...BeanFactoryAwareFunctionRegistryTests.java | 2 +- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java index c2e357925..cdccf15c7 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java @@ -121,6 +121,9 @@ public T lookup(Class type, String functionDefinition, String... expected + "use 'spring.cloud.function.definition' property to explicitly define it."); return null; } + if (!isFunctionDefinitionEligible(functionDefinition)) { + return null; + } FunctionInvocationWrapper function = this.doLookup(type, functionDefinition, expectedOutputMimeTypes); Object syncInstance = functionDefinition == null ? this : functionDefinition; synchronized (syncInstance) { @@ -139,6 +142,9 @@ public T lookup(Class type, String functionDefinition, String... expected if (functionCandidate instanceof FunctionRegistration) { functionRegistration = (FunctionRegistration) functionCandidate; } + else if (functionCandidate instanceof BiFunction || functionCandidate instanceof BiConsumer) { + functionRegistration = this.registerMessagingBiFunction(functionCandidate, functionName); + } else if (this.isFunctionPojo(functionCandidate, functionName)) { Method functionalMethod = FunctionTypeUtils.discoverFunctionalMethod(functionCandidate.getClass()); functionCandidate = this.proxyTarget(functionCandidate, functionalMethod); @@ -148,9 +154,6 @@ else if (this.isSpecialFunctionRegistration(functionNames, functionName)) { functionRegistration = this.applicationContext .getBean(functionName + FunctionRegistration.REGISTRATION_NAME_SUFFIX, FunctionRegistration.class); } - else if (functionCandidate instanceof BiFunction || functionCandidate instanceof BiConsumer) { - functionRegistration = this.registerMessagingBiFunction(functionCandidate, functionName); - } else { functionType = FunctionTypeUtils.discoverFunctionType(functionCandidate, functionName, this.applicationContext); } diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java index f2ec54dd1..e62b82d1f 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java @@ -188,6 +188,17 @@ else if (registration.getNames().contains(definition) || registration.getTarget( return true; } + boolean isFunctionDefinitionEligible(String functionDefinition) { + if (this.functionProperties != null) { + for (String definition : this.functionProperties.getIneligibleDefinitions()) { + if (functionDefinition.contains(definition)) { + return false; + } + } + } + return true; + } + //----- @Override @@ -217,8 +228,10 @@ T doLookup(Class type, String functionDefinition, String[] expectedOutput function = this.compose(type, functionDefinition); } - if (function != null && !ObjectUtils.isEmpty(expectedOutputMimeTypes)) { - function.expectedOutputContentType = expectedOutputMimeTypes; + if (function != null) { + if (!ObjectUtils.isEmpty(expectedOutputMimeTypes)) { + function.expectedOutputContentType = expectedOutputMimeTypes; + } } else if (logger.isDebugEnabled()) { logger.debug("Function '" + functionDefinition + "' is not found in cache"); @@ -243,8 +256,9 @@ String normalizeFunctionDefinition(String functionDefinition) { ? functionDefinition.replaceAll(",", "|") : System.getProperty(FunctionProperties.FUNCTION_DEFINITION, ""); - if (!this.getNames(null).contains(functionDefinition)) { - List eligibleFunction = this.getNames(null).stream() + Set names = this.getNames(null); + if (!names.contains(functionDefinition)) { + List eligibleFunction = names.stream() .filter(name -> !RoutingFunction.FUNCTION_NAME.equals(name)) .collect(Collectors.toList()); if (eligibleFunction.size() == 1 diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java index fbd2b3cb5..2c1ac4beb 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java @@ -114,7 +114,7 @@ public void testFunctionEligibilityFiltering() { for (String beanName : context.getBeanDefinitionNames()) { try { FunctionInvocationWrapper function = catalog.lookup(beanName); - if (function != null) { + if (function != null && function.getFunctionDefinition().equals(beanName)) { registeredFunction.add(function); } } From f4e714882b33839ca051fc40ea820a3d1c656180 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 13 Jul 2022 13:52:42 +0200 Subject: [PATCH 103/210] GH-895 Remove reflection usage form CloudEventMessageUtils --- .../function/cloudevent/CloudEventMessageUtils.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventMessageUtils.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventMessageUtils.java index 37d8c7549..55ab9a49a 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventMessageUtils.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventMessageUtils.java @@ -16,10 +16,10 @@ package org.springframework.cloud.function.cloudevent; -import java.lang.reflect.Field; import java.net.URI; import java.time.OffsetDateTime; import java.util.Collections; +import java.util.HashMap; import java.util.Map; import java.util.stream.Collectors; @@ -34,7 +34,6 @@ import org.springframework.messaging.support.MessageBuilder; import org.springframework.util.MimeType; import org.springframework.util.MimeTypeUtils; -import org.springframework.util.ReflectionUtils; import org.springframework.util.StringUtils; /** @@ -61,12 +60,6 @@ public MimeType resolve(@Nullable MessageHeaders headers) { }; - private static Field MESSAGE_HEADERS = ReflectionUtils.findField(MessageHeaders.class, "headers"); - - static { - MESSAGE_HEADERS.setAccessible(true); - } - private CloudEventMessageUtils() { } @@ -233,7 +226,7 @@ public static Map getAttributes(Message message) { */ @SuppressWarnings("unchecked") static Message toCanonical(Message inputMessage, MessageConverter messageConverter) { - Map headers = (Map) ReflectionUtils.getField(MESSAGE_HEADERS, inputMessage.getHeaders()); + Map headers = new HashMap<>(inputMessage.getHeaders()); canonicalizeHeaders(headers, false); if (isCloudEvent(inputMessage) && headers.containsKey("content-type")) { inputMessage = MessageBuilder.fromMessage(inputMessage).setHeader(MessageHeaders.CONTENT_TYPE, headers.get("content-type")).build(); @@ -269,7 +262,7 @@ else if (StringUtils.hasText(inputContentType)) { return MessageBuilder.fromMessage(inputMessage).setHeader(MessageHeaders.CONTENT_TYPE, inputContentType) .build(); } - return inputMessage; + return MessageBuilder.withPayload(inputMessage.getPayload()).copyHeaders(headers).build(); } From efb2b434093ba03b211dc14ef9646b28bb071d8d Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Mon, 25 Jul 2022 15:13:18 +0200 Subject: [PATCH 104/210] Remove reflection usage to accomodate AOT --- .../catalog/SimpleFunctionRegistry.java | 26 +++++++------------ 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java index e62b82d1f..8fdc979ed 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java @@ -16,7 +16,6 @@ package org.springframework.cloud.function.context.catalog; -import java.lang.reflect.Field; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.lang.reflect.TypeVariable; @@ -69,7 +68,6 @@ import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.util.ReflectionUtils; import org.springframework.util.StringUtils; @@ -90,8 +88,6 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect * */ - private final Field headersField; - private final Set> functionRegistrations = new CopyOnWriteArraySet<>(); private final Map wrappedFunctionDefinitions = new HashMap<>(); @@ -117,8 +113,6 @@ public SimpleFunctionRegistry(ConversionService conversionService, CompositeMess this.conversionService = conversionService; this.jsonMapper = jsonMapper; this.messageConverter = messageConverter; - this.headersField = ReflectionUtils.findField(MessageHeaders.class, "headers"); - this.headersField.setAccessible(true); this.functionInvocationHelper = functionInvocationHelper; this.functionProperties = functionProperties; } @@ -782,7 +776,6 @@ private Class getRawClassFor(@Nullable Type type) { /** * Will wrap the result in a Message if necessary and will copy input headers to the output message. */ - @SuppressWarnings("unchecked") private Object enrichInvocationResultIfNecessary(Object input, Object result) { if (result != null && !(result instanceof Publisher) && input instanceof Message) { if (result instanceof Message) { @@ -790,9 +783,9 @@ private Object enrichInvocationResultIfNecessary(Object input, Object result) { result = functionInvocationHelper.postProcessResult(result, (Message) input); } else { - Map headersMap = (Map) ReflectionUtils - .getField(SimpleFunctionRegistry.this.headersField, ((Message) result).getHeaders()); - this.sanitizeHeaders(((Message) input).getHeaders()).forEach((k, v) -> headersMap.putIfAbsent(k, v)); + Map headersMap = new HashMap<>(((Message) result).getHeaders()); + this.sanitizeHeaders(((Message) result).getHeaders()).forEach((k, v) -> headersMap.putIfAbsent(k, v)); + result = MessageBuilder.withPayload(((Message) result).getPayload()).copyHeaders(headersMap).build(); } } else { @@ -1182,10 +1175,9 @@ private Object convertOutputIfNecessary(Object output, Type type, String[] conte output = enhancer.apply(output); } if (this.getTarget() instanceof PassThruFunction) { // scst-2303 - Map headersMap = (Map) ReflectionUtils - .getField(SimpleFunctionRegistry.this.headersField, ((Message) output).getHeaders()); - headersMap.put(MessageHeaders.CONTENT_TYPE, contentType[0]); - return messageConverter.toMessage(((Message) output).getPayload(), ((Message) output).getHeaders()); + Message enrichedMessage = MessageBuilder.fromMessage((Message) output) + .setHeader(MessageHeaders.CONTENT_TYPE, contentType[0]).build(); + return messageConverter.toMessage(enrichedMessage.getPayload(), enrichedMessage.getHeaders()); } if (ObjectUtils.isEmpty(contentType) && !(output instanceof Publisher)) { @@ -1380,17 +1372,17 @@ private Object convertMultipleOutputArgumentTypeIfNecesary(Object output, Type t */ @SuppressWarnings("unchecked") private Object convertOutputMessageIfNecessary(Object output, String expectedOutputContetntType) { - Map headersMap = (Map) ReflectionUtils - .getField(SimpleFunctionRegistry.this.headersField, ((Message) output).getHeaders()); String contentType = ((Message) output).getHeaders().containsKey(FunctionProperties.EXPECT_CONTENT_TYPE_HEADER) ? (String) ((Message) output).getHeaders().get(FunctionProperties.EXPECT_CONTENT_TYPE_HEADER) : expectedOutputContetntType; if (StringUtils.hasText(contentType)) { + Map headersMap = new HashMap(((Message) output).getHeaders()); String[] expectedContentTypes = StringUtils.delimitedListToStringArray(contentType, ","); for (String expectedContentType : expectedContentTypes) { headersMap.put(MessageHeaders.CONTENT_TYPE, expectedContentType); - Object result = messageConverter.toMessage(((Message) output).getPayload(), ((Message) output).getHeaders()); + Message message = MessageBuilder.withPayload(((Message) output).getPayload()).copyHeaders(headersMap).build(); + Object result = messageConverter.toMessage(message.getPayload(), message.getHeaders()); if (result != null) { return result; } From 8bb5746487d54cc261224431f72ed25393bcb87d Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Mon, 25 Jul 2022 15:46:13 +0200 Subject: [PATCH 105/210] Relax logging in SimpleFunctionRegistry --- .../adapter/aws/FunctionInvokerTests.java | 27 +------------------ .../catalog/SimpleFunctionRegistry.java | 6 ++--- 2 files changed, 4 insertions(+), 29 deletions(-) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java index 5539c49f2..09f7b282b 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java @@ -19,7 +19,6 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.InputStream; -import java.lang.reflect.Field; import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.Map; @@ -459,7 +458,7 @@ public void before() throws Exception { System.clearProperty("MAIN_CLASS"); System.clearProperty("spring.cloud.function.routing-expression"); System.clearProperty("spring.cloud.function.definition"); - this.getEnvironment().clear(); + //this.getEnvironment().clear(); } @Test @@ -1039,30 +1038,6 @@ public void testWithDefaultRouting() throws Exception { assertThat(result.get("body")).isEqualTo("\"olleh\""); } - @SuppressWarnings("rawtypes") - @Test - public void testWithDefinitionEnvVariable() throws Exception { - - System.setProperty("MAIN_CLASS", SampleConfiguration.class.getName()); - this.getEnvironment().put("SPRING_CLOUD_FUNCTION_DEFINITION", "reverse|uppercase"); - FunctionInvoker invoker = new FunctionInvoker(); - - InputStream targetStream = new ByteArrayInputStream(this.apiGatewayEvent.getBytes()); - ByteArrayOutputStream output = new ByteArrayOutputStream(); - invoker.handleRequest(targetStream, output, null); - - Map result = mapper.readValue(output.toByteArray(), Map.class); - assertThat(result.get("body")).isEqualTo("\"OLLEH\""); - } - - @SuppressWarnings("unchecked") - private Map getEnvironment() throws Exception { - Map env = System.getenv(); - Field field = env.getClass().getDeclaredField("m"); - field.setAccessible(true); - return (Map) field.get(env); - } - @EnableAutoConfiguration @Configuration public static class AuthorizerConfiguration { diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java index 8fdc979ed..f6107915d 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java @@ -144,12 +144,12 @@ public SimpleFunctionRegistry(ConversionService conversionService, CompositeMess public T lookup(Class type, String functionDefinition, String... expectedOutputMimeTypes) { functionDefinition = this.normalizeFunctionDefinition(functionDefinition); FunctionInvocationWrapper function = this.doLookup(type, functionDefinition, expectedOutputMimeTypes); - if (logger.isInfoEnabled()) { + if (logger.isDebugEnabled()) { if (function != null) { - logger.info("Located function: " + function); + logger.debug("Located function: " + function); } else { - logger.info("Failed to locate function: " + functionDefinition); + logger.debug("Failed to locate function: " + functionDefinition); } } return (T) function; From c5c1c2cd04f48a2574defdd92d4b0b7b1a0e705e Mon Sep 17 00:00:00 2001 From: Maciej Walkowiak Date: Tue, 19 Jul 2022 23:56:32 +0200 Subject: [PATCH 106/210] Deprecate SpringBootStreamHandler in favor of FunctionInvoker. Resolves #898 --- .../cloud/function/adapter/aws/SpringBootStreamHandler.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/SpringBootStreamHandler.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/SpringBootStreamHandler.java index 186f629c3..be75093b7 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/SpringBootStreamHandler.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/SpringBootStreamHandler.java @@ -33,7 +33,9 @@ /** * @author Dave Syer * @author Oleg Zhurakousky + * @deprecated since 3.2.7 in favor of {@link FunctionInvoker} */ +@Deprecated public class SpringBootStreamHandler extends AbstractSpringFunctionAdapterInitializer implements RequestStreamHandler { From c08cf7ffcb26da778d4223f3b75c1dcc26ea6846 Mon Sep 17 00:00:00 2001 From: Maciej Walkowiak Date: Wed, 20 Jul 2022 00:04:29 +0200 Subject: [PATCH 107/210] Fix typo. Fix typo. --- .../cloud/function/adapter/aws/FunctionInvokerTests.java | 4 ++-- .../context/catalog/BeanFactoryAwareFunctionRegistry.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java index 09f7b282b..8caaaac0f 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java @@ -800,7 +800,7 @@ public void testApiGatewayStringEventBody() throws Exception { @Test public void testApiGatewayPojoReturninPojo() throws Exception { System.setProperty("MAIN_CLASS", ApiGatewayConfiguration.class.getName()); - System.setProperty("spring.cloud.function.definition", "uppercasePojoReurnPojo"); + System.setProperty("spring.cloud.function.definition", "uppercasePojoReturnPojo"); FunctionInvoker invoker = new FunctionInvoker(); InputStream targetStream = new ByteArrayInputStream(this.apiGatewayEventWithStructuredBody.getBytes()); @@ -1305,7 +1305,7 @@ public Function uppercasePojo() { } @Bean - public Function uppercasePojoReurnPojo() { + public Function uppercasePojoReturnPojo() { return v -> { Person p = new Person(); p.setName(v.getName().toUpperCase()); diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java index cdccf15c7..e3a34fb70 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java @@ -52,7 +52,7 @@ import org.springframework.util.StringUtils; /** - * Implementation of {@link FunctionRegistry} capable of discovering functioins in {@link BeanFactory}. + * Implementation of {@link FunctionRegistry} capable of discovering functions in {@link BeanFactory}. * * @author Oleg Zhurakousky */ From 7f6eda98cfda375cc3e22a4849d8d4c05844db1b Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 26 Jul 2022 16:49:23 +0200 Subject: [PATCH 108/210] GH-891 Ensure HTTP Request params are mapped even when body is not present Resolves #891 --- .../main/asciidoc/spring-cloud-function.adoc | 11 ++--- .../FunctionWebRequestProcessingHelper.java | 18 +++---- .../FunctionEndpointInitializerTests.java | 49 +++++++++++++++++++ 3 files changed, 63 insertions(+), 15 deletions(-) diff --git a/docs/src/main/asciidoc/spring-cloud-function.adoc b/docs/src/main/asciidoc/spring-cloud-function.adoc index b628076d5..ce748ddb9 100644 --- a/docs/src/main/asciidoc/spring-cloud-function.adoc +++ b/docs/src/main/asciidoc/spring-cloud-function.adoc @@ -691,12 +691,11 @@ plain text and JSON. |=== -As the table above shows the behaviour of the endpoint depends on the method and also the type of incoming request data. When the incoming data -is single valued, and the target function is declared as obviously single valued (i.e. not returning a collection or `Flux`), then the response -will also contain a single value. +As the table above shows the behavior of the endpoint depends on the method and also the type of incoming request data. When the incoming data is single valued, and the target function is declared as obviously single valued (i.e. not returning a collection or `Flux`), then the response will also contain a single value. For multi-valued responses the client can ask for a server-sent event stream by sending `Accept: text/event-stream". -Functions and consumers that are declared with input and output in `Message` will see the request headers on the input messages, and the output message headers will be converted to HTTP headers. +Functions and consumers that are declared with input and output in `Message` will see the request headers as _message headers_, and the output _message headers_ will be converted to HTTP headers. +The _payload_ of the Message will be a `body` or empty string if there is no `body` or it is null. When POSTing text the response format might be different with Spring Boot 2.0 and older versions, depending on the content negotiation (provide content type and accept headers for the best results). @@ -706,8 +705,8 @@ See <> to see the details and example on how to As you have noticed from the previous table, you can pass an argument to a function as path variable (i.e., `/{function}/{item}`). For example, `http://localhost:8080/uppercase/foo` will result in calling `uppercase` function with its input parameter being `foo`. -While this is the recommended approach and the one that fits most use cases cases, there are times when you have to deal with HTTP request parameters. -The framework will treat HTTP request parameters similar to the HTTP headers by storing them in `Message` headers under the header key `http_request_param` +While this is the recommended approach and the one that fits most use cases cases, there are times when you have to deal with HTTP request parameters (e.g., `http://localhost:8080/uppercase/foo?name=Bill`) +The framework will treat HTTP request parameters similar to the HTTP headers by storing them in the `Message` headers under the header key `http_request_param` with its value being a `Map` of request parameters, so in order to access them your function input signature should accept `Message` type (e.g., `Function, String>`). For convenience we provide `HeaderUtils.HTTP_REQUEST_PARAM` constant. === Function Mapping rules diff --git a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/FunctionWebRequestProcessingHelper.java b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/FunctionWebRequestProcessingHelper.java index 3d589517c..3f876133f 100644 --- a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/FunctionWebRequestProcessingHelper.java +++ b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/FunctionWebRequestProcessingHelper.java @@ -85,27 +85,27 @@ public static Object invokeFunction(FunctionInvocationWrapper function, Object i @SuppressWarnings({ "rawtypes", "unchecked" }) public static Publisher processRequest(FunctionWrapper wrapper, Object argument, boolean eventStream) { + if (argument == null) { + argument = ""; + } FunctionInvocationWrapper function = wrapper.getFunction(); HttpHeaders headers = wrapper.getHeaders(); Message inputMessage = null; - if (argument != null) { - MessageBuilder builder = MessageBuilder.withPayload(argument); - if (!CollectionUtils.isEmpty(wrapper.getParams())) { - builder = builder.setHeader(HeaderUtils.HTTP_REQUEST_PARAM, wrapper.getParams().toSingleValueMap()); - } - inputMessage = builder.copyHeaders(headers.toSingleValueMap()).build(); + + MessageBuilder builder = MessageBuilder.withPayload(argument); + if (!CollectionUtils.isEmpty(wrapper.getParams())) { + builder = builder.setHeader(HeaderUtils.HTTP_REQUEST_PARAM, wrapper.getParams().toSingleValueMap()); } + inputMessage = builder.copyHeaders(headers.toSingleValueMap()).build(); if (function.isRoutingFunction()) { function.setSkipOutputConversion(true); } - Object input = argument == null ? "" : (argument instanceof Publisher ? Flux.from((Publisher) argument) : inputMessage); - - Object result = function.apply(input); + Object result = function.apply(inputMessage); if (function.isConsumer()) { if (result instanceof Publisher) { Mono.from((Publisher) result).subscribe(); diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializerTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializerTests.java index 721ae6e23..79098d809 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializerTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializerTests.java @@ -17,6 +17,11 @@ package org.springframework.cloud.function.web.function; import java.net.URI; + +import java.time.Duration; +import java.util.HashMap; +import java.util.Map; +import java.util.function.BiFunction; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; @@ -25,7 +30,9 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringBootConfiguration; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.cloud.function.context.FunctionRegistration; import org.springframework.cloud.function.context.FunctionType; @@ -35,6 +42,14 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.util.SocketUtils; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.ResolvableType; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.web.util.UriComponentsBuilder; import static org.assertj.core.api.Assertions.assertThat; @@ -56,6 +71,29 @@ public void init() throws Exception { public void close() throws Exception { System.clearProperty("server.port"); } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + @Test + public void testEmptyBodyRequestParameters() throws Exception { + SpringApplication.run(BeansConfiguration.class); + String port = System.getProperty("server.port"); + TestRestTemplate testRestTemplate = new TestRestTemplate(); + Map params = new HashMap<>(); + params.put("fname", "Jim"); + params.put("lname", "Lahey"); + + HttpHeaders headers = new HttpHeaders(); + headers.set("Accept", "application/json"); + HttpEntity entity = new HttpEntity(headers); + + String urlTemplate = UriComponentsBuilder.fromHttpUrl("http://localhost:" + port + "/nullPayload") + .queryParam("fname", "Jim").queryParam("lname", "Lahey").encode().toUriString(); + + ResponseEntity response = testRestTemplate.exchange(urlTemplate, HttpMethod.GET, entity, String.class); + String res = response.getBody(); + assertThat(res).contains("Jim"); + assertThat(res).contains("Lahey"); + } @Test public void testNonExistingFunction() throws Exception { @@ -144,6 +182,17 @@ public void initialize(GenericApplicationContext applicationContext) { } + @EnableAutoConfiguration + @Configuration + protected static class BeansConfiguration { + @Bean + public BiFunction, Map> nullPayload() { + return (p, h) -> { + return h; + }; + } + } + @SpringBootConfiguration protected static class ApplicationConfiguration From f36aa233911437942acce1af42319019f7fff0e9 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 26 Jul 2022 17:05:59 +0200 Subject: [PATCH 109/210] checkstyle --- .../FunctionEndpointInitializerTests.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializerTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializerTests.java index 79098d809..6e3d27774 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializerTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializerTests.java @@ -16,9 +16,8 @@ package org.springframework.cloud.function.web.function; -import java.net.URI; -import java.time.Duration; +import java.net.URI; import java.util.HashMap; import java.util.Map; import java.util.function.BiFunction; @@ -38,17 +37,15 @@ import org.springframework.cloud.function.context.FunctionType; import org.springframework.cloud.function.context.FunctionalSpringApplication; import org.springframework.context.ApplicationContextInitializer; -import org.springframework.context.support.GenericApplicationContext; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.util.SocketUtils; -import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.core.ResolvableType; +import org.springframework.context.support.GenericApplicationContext; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.util.SocketUtils; import org.springframework.web.util.UriComponentsBuilder; import static org.assertj.core.api.Assertions.assertThat; @@ -71,7 +68,7 @@ public void init() throws Exception { public void close() throws Exception { System.clearProperty("server.port"); } - + @SuppressWarnings({ "rawtypes", "unchecked" }) @Test public void testEmptyBodyRequestParameters() throws Exception { From 762afc05caead458d31a6d6bf4523bba659eb91d Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 26 Jul 2022 17:35:49 +0200 Subject: [PATCH 110/210] GH-901 add more logging around failed conversion of input messages Resolves #901 --- .../function/context/catalog/SimpleFunctionRegistry.java | 3 +++ .../context/config/SmartCompositeMessageConverter.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java index f6107915d..67e3cb8c6 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java @@ -1325,6 +1325,9 @@ private Object convertInputMessageIfNecessary(Message message, Type type) { ? SimpleFunctionRegistry.this.messageConverter.fromMessage(message, rawType, itemType) : SimpleFunctionRegistry.this.messageConverter.fromMessage(message, rawType); + if (convertedInput != null && !rawType.isAssignableFrom(convertedInput.getClass())) { + logger.warn("Failed to convert input to " + rawType + ". Will attempt to invoke function with raw type"); + } if (FunctionTypeUtils.isMessage(type)) { if (convertedInput == null) { diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java index da17b2641..0c32f8c9d 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java @@ -66,8 +66,8 @@ public Object fromMessage(Message message, Class targetClass) { } } catch (Exception e) { - if (logger.isDebugEnabled()) { - logger.debug("Failure during type conversion by " + converter + ". Will try the next converter.", e); + if (logger.isWarnEnabled()) { + logger.warn("Failure during type conversion by " + converter + ". Will try the next converter.", e); } } } From 82d264826ba974b5959c3f5344e0d1b6c0954333 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 27 Jul 2022 10:05:12 +0200 Subject: [PATCH 111/210] GH-890 Update AWS JAR Layout docs Resolves #890 --- .../src/main/asciidoc/adapters/aws-intro.adoc | 43 ++++++++++++------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/docs/src/main/asciidoc/adapters/aws-intro.adoc b/docs/src/main/asciidoc/adapters/aws-intro.adoc index 1904477b9..d8c68efe5 100644 --- a/docs/src/main/asciidoc/adapters/aws-intro.adoc +++ b/docs/src/main/asciidoc/adapters/aws-intro.adoc @@ -119,24 +119,35 @@ then additional transformers must be configured as part of the maven-shade-plugi org.springframework.boot spring-boot-maven-plugin + 2.7.1 - - false - true - aws - - - META-INF/spring.handlers - - - META-INF/spring.factories - - - META-INF/spring.schemas - - - + + + + shade + + + false + true + aws + + + META-INF/spring.handlers + + + META-INF/spring.factories + + + META-INF/spring.schemas + + + META-INF/spring.components + + + + + ---- From 5d25c3b45ab4ad6c4b98652abf9a9a52f0bb9cd0 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 27 Jul 2022 10:42:21 +0200 Subject: [PATCH 112/210] GH-888 Update SpEL usage documentation Resolves #888 --- docs/src/main/asciidoc/spring-cloud-function.adoc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/src/main/asciidoc/spring-cloud-function.adoc b/docs/src/main/asciidoc/spring-cloud-function.adoc index ce748ddb9..aa1e2ceec 100644 --- a/docs/src/main/asciidoc/spring-cloud-function.adoc +++ b/docs/src/main/asciidoc/spring-cloud-function.adoc @@ -208,16 +208,20 @@ downstream. So effectively you letting the framework to benefit from the work yo If the input argument is of type `Message`, you can communicate routing instruction by setting one of `spring.cloud.function.definition` or `spring.cloud.function.routing-expression` Message headers. +As the name of the property suggests `spring.cloud.function.routing-expression` relies on Spring Expression Language (SpEL). For more static cases you can use `spring.cloud.function.definition` header which allows you to provide the name of a single function (e.g., `...definition=foo`) or a composition instruction (e.g., `...definition=foo|bar|baz`). -For more dynamic cases you can use `spring.cloud.function.routing-expression` header which allows -you to use Spring Expression Language (SpEL) and provide SpEL expression that should resolve +For more dynamic cases you can use `spring.cloud.function.routing-expression` header and provide SpEL expression that should resolve into definition of a function (as described above). NOTE: SpEL evaluation context's root object is the actual input argument, so in the case of `Message` you can construct expression that has access to both `payload` and `headers` (e.g., `spring.cloud.function.routing-expression=headers.function_name`). +IMPORTANT: SpEL allows user to provide string representation of Java code to be executed. Given that the `spring.cloud.function.routing-expression` could be provided via Message headers means that ability to set such expression could be exposed to the end user (i.e., HTTP Headers when using web module) which could result in some problems (e.g., malicious code). To manage that, all expressions coming via Message headers will only be evaluated against `SimpleEvaluationContext` which has limited functionality and designed to only evaluate the context object (Message in our case). On the other hand, all expressions that are set via property or system variable are evaluated against `StandardEvaluationContext`, which allows for full flexibility of Java language. +While setting expression via system/application property or environment variable is generally considered to be secure as it is not exposed to the end user in normal cases, there are cases where visibility as well as capability to update system, application and environment variables are indeed exposed to the end user via Spring Boot Actuator endpoints provided either by some of the Spring projects or third parties or custom implementation by the end user. Such endpoints must be secured using industry standard web security practices. +Spring Cloud Function does not expose any of such endpoints. + In specific execution environments/models the adapters are responsible to translate and communicate `spring.cloud.function.definition` and/or `spring.cloud.function.routing-expression` via Message header. For example, when using _spring-cloud-function-web_ you can provide `spring.cloud.function.definition` as an HTTP From 0c92ecb498eb2ad9df647ca1d63da0214225b751 Mon Sep 17 00:00:00 2001 From: atyamlalithya <99050095+atyamlalithya@users.noreply.github.com> Date: Fri, 10 Jun 2022 11:12:00 -0700 Subject: [PATCH 113/210] Update AWSLambdaUtils.java Added this fix to preserve headers from original payload --- .../cloud/function/adapter/aws/AWSLambdaUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java index 5fd4dda97..35dd5a537 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java @@ -121,7 +121,7 @@ else if ((((Map) request).containsKey("routeKey") && ((Map) request).containsKey logger.info("Incoming request is API Gateway v2.0"); messageBuilder = createMessageBuilderForPOJOFunction(objectMapper, (Map) request); } - Object providedHeaders = ((Map) request).remove("headers"); + Object providedHeaders = ((Map) request).get("headers"); if (providedHeaders != null && providedHeaders instanceof Map) { messageBuilder = MessageBuilder.withPayload(request); messageBuilder.removeHeader("headers"); From 6b6ae0ffadbe13b8e42a405ba55a1d674c3aec3f Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 3 Aug 2022 15:22:21 +0200 Subject: [PATCH 114/210] Reworked AWSUtils and related classes to delegate type conversion to AWSTypesMessageConverter Resolves #889 polish --- .../function/adapter/aws/AWSLambdaUtils.java | 115 ++++-------------- .../adapter/aws/AWSTypesMessageConverter.java | 3 + .../adapter/aws/CustomRuntimeEventLoop.java | 45 +++---- .../function/adapter/aws/FunctionInvoker.java | 36 +----- 4 files changed, 46 insertions(+), 153 deletions(-) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java index 35dd5a537..6e6fe4441 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java @@ -16,26 +16,18 @@ package org.springframework.cloud.function.adapter.aws; -import java.io.ByteArrayInputStream; -import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicReference; -import com.amazonaws.services.lambda.runtime.Context; -import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent; -import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPEvent; -import com.amazonaws.services.lambda.runtime.serialization.PojoSerializer; -import com.amazonaws.services.lambda.runtime.serialization.events.LambdaEventSerializers; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.cloud.function.context.catalog.FunctionTypeUtils; import org.springframework.cloud.function.json.JsonMapper; import org.springframework.http.HttpStatus; -import org.springframework.lang.Nullable; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.support.MessageBuilder; @@ -51,18 +43,18 @@ final class AWSLambdaUtils { static final String AWS_API_GATEWAY = "aws-api-gateway"; + static final String AWS_EVENT = "aws-event"; + public static final String AWS_CONTEXT = "aws-context"; private AWSLambdaUtils() { } - public static Message generateMessage(byte[] payload, MessageHeaders headers, - Type inputType, JsonMapper objectMapper) { - return generateMessage(payload, headers, inputType, objectMapper, null); - } - static boolean isSupportedAWSType(Type inputType) { + if (FunctionTypeUtils.isMessage(inputType)) { + inputType = FunctionTypeUtils.getImmediateGenericType(inputType, 0); + } String typeName = inputType.getTypeName(); return typeName.equals("com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPEvent") || typeName.equals("com.amazonaws.services.lambda.runtime.events.S3Event") @@ -74,93 +66,30 @@ static boolean isSupportedAWSType(Type inputType) { } @SuppressWarnings({ "unchecked", "rawtypes" }) - public static Message generateMessage(byte[] payload, MessageHeaders headers, - Type inputType, JsonMapper objectMapper, @Nullable Context awsContext) { - + public static Message generateMessage(byte[] payload, Type inputType, boolean isSupplier, JsonMapper jsonMapper) { if (logger.isInfoEnabled()) { - logger.info("Incoming JSON Event: " + new String(payload)); + logger.info("Received: " + new String(payload, StandardCharsets.UTF_8)); } - if (FunctionTypeUtils.isMessage(inputType)) { - inputType = FunctionTypeUtils.getImmediateGenericType(inputType, 0); - } + Object structMessage = jsonMapper.fromJson(payload, Object.class); + boolean isApiGateway = structMessage instanceof Map + && (((Map) structMessage).containsKey("httpMethod") || + (((Map) structMessage).containsKey("routeKey") && ((Map) structMessage).containsKey("version"))); - MessageBuilder messageBuilder = null; - if (inputType != null && isSupportedAWSType(inputType)) { - PojoSerializer serializer = LambdaEventSerializers.serializerFor(FunctionTypeUtils.getRawType(inputType), Thread.currentThread().getContextClassLoader()); - Object event = serializer.fromJson(new ByteArrayInputStream(payload)); - messageBuilder = MessageBuilder.withPayload(event); - if (event instanceof APIGatewayProxyRequestEvent || event instanceof APIGatewayV2HTTPEvent) { - messageBuilder.setHeader(AWS_API_GATEWAY, true); - logger.info("Incoming request is API Gateway"); - } + Message requestMessage; + MessageBuilder builder = MessageBuilder.withPayload(payload); + if (isApiGateway) { + builder.setHeader(AWSLambdaUtils.AWS_API_GATEWAY, true); } - else { - Object request; - try { - request = objectMapper.fromJson(payload, Object.class); - } - catch (Exception e) { - throw new IllegalStateException(e); - } - - if (request instanceof Map) { - logger.info("Incoming MAP: " + request); - if (((Map) request).containsKey("httpMethod")) { //API Gateway - logger.info("Incoming request is API Gateway"); - boolean mapInputType = (inputType instanceof ParameterizedType && ((Class) ((ParameterizedType) inputType).getRawType()).isAssignableFrom(Map.class)); - if (mapInputType) { - messageBuilder = MessageBuilder.withPayload(request).setHeader("httpMethod", ((Map) request).get("httpMethod")); - messageBuilder.setHeader(AWS_API_GATEWAY, true); - } - else { - messageBuilder = createMessageBuilderForPOJOFunction(objectMapper, (Map) request); - } - } - else if ((((Map) request).containsKey("routeKey") && ((Map) request).containsKey("version"))) { - logger.info("Incoming request is API Gateway v2.0"); - messageBuilder = createMessageBuilderForPOJOFunction(objectMapper, (Map) request); - } - Object providedHeaders = ((Map) request).get("headers"); - if (providedHeaders != null && providedHeaders instanceof Map) { - messageBuilder = MessageBuilder.withPayload(request); - messageBuilder.removeHeader("headers"); - messageBuilder.copyHeaders((Map) providedHeaders); - } - } - else if (request instanceof Iterable) { - messageBuilder = MessageBuilder.withPayload(request); - } - } - - - if (messageBuilder == null) { - messageBuilder = MessageBuilder.withPayload(payload); + if (!isSupplier && AWSLambdaUtils.isSupportedAWSType(inputType)) { + builder.setHeader(AWSLambdaUtils.AWS_EVENT, true); } - if (awsContext != null) { - messageBuilder.setHeader(AWS_CONTEXT, awsContext); + // + if (structMessage instanceof Map && ((Map) structMessage).containsKey("headers")) { + builder.copyHeaders((Map) ((Map) structMessage).get("headers")); } - logger.info("Incoming request headers: " + headers); - - return messageBuilder.copyHeaders(headers).build(); - } - - @SuppressWarnings({ "rawtypes", "unchecked" }) - private static MessageBuilder createMessageBuilderForPOJOFunction(JsonMapper objectMapper, Map request) { - Object body = request.remove("body"); - try { - body = body instanceof String - ? String.valueOf(body).getBytes(StandardCharsets.UTF_8) - : objectMapper.toJson(body); - } - catch (Exception e) { - throw new IllegalStateException(e); - } - logger.info("Body is " + body); - - MessageBuilder messageBuilder = MessageBuilder.withPayload(body).copyHeaders(request); - messageBuilder.setHeader(AWS_API_GATEWAY, true); - return messageBuilder; + requestMessage = builder.build(); + return requestMessage; } private static byte[] extractPayload(Message msg, JsonMapper objectMapper) { diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSTypesMessageConverter.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSTypesMessageConverter.java index 76daaf19a..0fd187145 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSTypesMessageConverter.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSTypesMessageConverter.java @@ -58,6 +58,9 @@ protected boolean canConvertFrom(Message message, @Nullable Class targetCl if (message.getHeaders().containsKey(AWSLambdaUtils.AWS_API_GATEWAY) && ((boolean) message.getHeaders().get(AWSLambdaUtils.AWS_API_GATEWAY))) { return true; } + if (message.getHeaders().containsKey(AWSLambdaUtils.AWS_EVENT) && ((boolean) message.getHeaders().get(AWSLambdaUtils.AWS_EVENT))) { + return true; + } return false; } diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoop.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoop.java index 43cec472d..d67a2edea 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoop.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoop.java @@ -1,5 +1,5 @@ /* - * Copyright 2021-2021 the original author or authors. + * Copyright 2021-2022 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. @@ -22,10 +22,7 @@ import java.net.URI; import java.nio.charset.StandardCharsets; import java.text.MessageFormat; -import java.util.Arrays; -import java.util.Collection; import java.util.HashMap; -import java.util.LinkedHashMap; import java.util.Map; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -45,7 +42,6 @@ import org.springframework.http.RequestEntity; import org.springframework.http.ResponseEntity; import org.springframework.messaging.Message; -import org.springframework.messaging.MessageHeaders; import org.springframework.util.Assert; import org.springframework.web.client.RestTemplate; @@ -137,9 +133,11 @@ private void eventLoop(ConfigurableApplicationContext context) { } if (response != null) { - FunctionInvocationWrapper function = locateFunction(environment, functionCatalog, response.getHeaders().getContentType()); - Message eventMessage = AWSLambdaUtils.generateMessage(response.getBody().getBytes(StandardCharsets.UTF_8), - fromHttp(response.getHeaders()), function.getInputType(), mapper); + FunctionInvocationWrapper function = locateFunction(environment, functionCatalog, response.getHeaders()); + + Message eventMessage = AWSLambdaUtils + .generateMessage(response.getBody().getBytes(StandardCharsets.UTF_8), function.getInputType(), function.isSupplier(), mapper); + if (logger.isDebugEnabled()) { logger.debug("Event message: " + eventMessage); } @@ -206,7 +204,8 @@ private ResponseEntity pollForData(RestTemplate rest, RequestEntity map = new LinkedHashMap<>(); - for (String name : headers.keySet()) { - Collection values = multi(headers.get(name)); - name = name.toLowerCase(); - Object value = values == null ? null - : (values.size() == 1 ? values.iterator().next() : values); - if (name.toLowerCase().equals(HttpHeaders.CONTENT_TYPE.toLowerCase())) { - name = MessageHeaders.CONTENT_TYPE; - } - map.put(name, value); - } - return new MessageHeaders(map); - } - - private Collection multi(Object value) { - return value instanceof Collection ? (Collection) value : Arrays.asList(value); - } - private static String extractVersion() { String path = CustomRuntimeEventLoop.class.getProtectionDomain().getCodeSource().getLocation().toString(); int endIndex = path.lastIndexOf('.'); diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/FunctionInvoker.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/FunctionInvoker.java index 071a2c6a4..3d51ffe81 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/FunctionInvoker.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/FunctionInvoker.java @@ -1,5 +1,5 @@ /* - * Copyright 2019-2021 the original author or authors. + * Copyright 2019-2022 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. @@ -19,13 +19,10 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Calendar; -import java.util.Collections; import java.util.Date; import java.util.List; -import java.util.Map; import java.util.Set; import com.amazonaws.services.lambda.runtime.Context; @@ -53,7 +50,6 @@ import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.env.Environment; import org.springframework.messaging.Message; -import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.support.MessageBuilder; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; @@ -80,35 +76,11 @@ public FunctionInvoker() { this.start(); } - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings({ "rawtypes" }) @Override public void handleRequest(InputStream input, OutputStream output, Context context) throws IOException { - final byte[] payload = StreamUtils.copyToByteArray(input); - - if (logger.isInfoEnabled()) { - logger.info("Received: " + new String(payload, StandardCharsets.UTF_8)); - } - - Object structMessage = this.jsonMapper.fromJson(payload, Object.class); - - boolean isApiGateway = structMessage instanceof Map - && (((Map) structMessage).containsKey("httpMethod") || - (((Map) structMessage).containsKey("routeKey") && ((Map) structMessage).containsKey("version"))); - - - // TODO we should eventually completely delegate to message converter - Message requestMessage; - if (isApiGateway) { - MessageBuilder builder = MessageBuilder.withPayload(payload).setHeader(AWSLambdaUtils.AWS_API_GATEWAY, true); - if (structMessage instanceof Map && ((Map) structMessage).containsKey("headers")) { - builder.copyHeaders((Map) ((Map) structMessage).get("headers")); - } - requestMessage = builder.build(); - } - else { - requestMessage = AWSLambdaUtils - .generateMessage(payload, new MessageHeaders(Collections.emptyMap()), function.getInputType(), this.jsonMapper, context); - } + Message requestMessage = AWSLambdaUtils + .generateMessage(StreamUtils.copyToByteArray(input), this.function.getInputType(), this.function.isSupplier(), jsonMapper); Object response = this.function.apply(requestMessage); byte[] responseBytes = this.buildResult(requestMessage, response); From e48d518d796bc7c9355f407468d11273ff973a4c Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 3 Aug 2022 17:19:10 +0200 Subject: [PATCH 115/210] Revert "Bumping versions" This reverts commit 8a7cea3b0b9b091f10f4d5d53e0ab3de4705a0c7. --- docs/pom.xml | 2 +- pom.xml | 2 +- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 2 +- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 49 files changed, 74 insertions(+), 74 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 1dff59a82..8d86781e9 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index 81aa74a57..f4219bdbd 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT pom diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index fab8c4299..310b573d6 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index ca6b5820b..77a8efa47 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index ffbc19941..0a392314f 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index dd7e7d932..a6ed9dfde 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 672f82099..6f8a371f1 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 7c1d11515..6322484e3 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index c690db6d0..90167031e 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index eacd07088..9def012d7 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 66ec42853..9714b36bf 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index dabf4f58f..4c0d822b9 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index bf616face..3608d91d2 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -10,7 +10,7 @@ spring-cloud-function-dependencies - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 72ebdd1fb..3368dd8a8 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index 501700162..8d14c4cf9 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index 605f803c3..ee527f587 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 8363eb663..0d4562510 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index ce12f7507..71479e597 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index dd8592ba2..30fc88202 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index f5839c33f..1505cc951 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index f03027b15..75a103939 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index b7035c8eb..e9301b581 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 2c6a7d6b9..5055f1d83 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index 64b4d216a..4a30302a3 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 2e1e91dcc..02fac3b72 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index 4d1404473..aba4f736d 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 54ca2443b..d7634d2cd 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 28c228220..52172c3b8 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index 81f340c98..ef97c3d22 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 3fdee74e7..900a3a720 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index 094257cf1..cb78e0753 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 2be3a8cc8..960231052 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index 342b10424..f8b5f341d 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index b749cd24d..bd9c6f5f0 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index 75c4f2d20..d1d0ce378 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index ffd8553b1..a7dd5b191 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index f17f82dda..5dccbe9c3 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index 4a78d38a4..879b5852d 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index 90b6d6dce..a2a1cec04 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index 05cefd288..aeecedc6f 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index b4d93bcca..74fe9da88 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index a782d32c4..d69a4eaa7 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 22bdbf661..90aa77200 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index 1f9a1b0e4..68f783b10 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 4fbceead8..b26e212c9 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index a8be5c6dc..e909f953c 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index 9e0587a2c..147b8e129 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index ae3cb7293..93b6e0bbc 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index f51d0cb47..975b02b9c 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From c1920eff14e465fb0a894de534ef3e59beed817e Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 3 Aug 2022 18:02:38 +0200 Subject: [PATCH 116/210] GH-905 Relax handling of incompatible BiFunctions Resolves #905 --- .../context/catalog/BeanFactoryAwareFunctionRegistry.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java index e3a34fb70..aefceff04 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java @@ -190,7 +190,7 @@ private FunctionRegistration registerMessagingBiFunction(Object userFunction, St } if (!FunctionTypeUtils.isTypeMap(inputType2)) { - throw new UnsupportedOperationException("BiFunction's second argument must be assignable to Map, since BiFunction " + logger.debug("BiFunction's second argument must be assignable to Map, since BiFunction " + "represents parsed Message with first argument being payload and second headers. " + "Other signatures are not supported at the moment."); } From a338d9141e508dbe2da6dd91d786d878c6c9947e Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 3 Aug 2022 23:18:10 +0000 Subject: [PATCH 117/210] Bumping versions --- docs/pom.xml | 2 +- pom.xml | 2 +- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 2 +- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 49 files changed, 74 insertions(+), 74 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 8d86781e9..1dff59a82 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index f4219bdbd..81aa74a57 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT pom diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index 310b573d6..fab8c4299 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index 77a8efa47..ca6b5820b 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index 0a392314f..ffbc19941 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index a6ed9dfde..dd7e7d932 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 6f8a371f1..672f82099 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 6322484e3..7c1d11515 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index 90167031e..c690db6d0 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index 9def012d7..eacd07088 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 9714b36bf..66ec42853 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 4c0d822b9..dabf4f58f 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 3608d91d2..bf616face 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -10,7 +10,7 @@ spring-cloud-function-dependencies - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 3368dd8a8..72ebdd1fb 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index 8d14c4cf9..501700162 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index ee527f587..605f803c3 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 0d4562510..8363eb663 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index 71479e597..ce12f7507 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index 30fc88202..dd8592ba2 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 1505cc951..f5839c33f 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 75a103939..f03027b15 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index e9301b581..b7035c8eb 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 5055f1d83..2c6a7d6b9 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index 4a30302a3..64b4d216a 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 02fac3b72..2e1e91dcc 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index aba4f736d..4d1404473 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index d7634d2cd..54ca2443b 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 52172c3b8..28c228220 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index ef97c3d22..81f340c98 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 900a3a720..3fdee74e7 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index cb78e0753..094257cf1 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 960231052..2be3a8cc8 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index f8b5f341d..342b10424 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index bd9c6f5f0..b749cd24d 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index d1d0ce378..75c4f2d20 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index a7dd5b191..ffd8553b1 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index 5dccbe9c3..f17f82dda 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index 879b5852d..4a78d38a4 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index a2a1cec04..90b6d6dce 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index aeecedc6f..05cefd288 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 74fe9da88..b4d93bcca 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index d69a4eaa7..a782d32c4 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 90aa77200..22bdbf661 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index 68f783b10..1f9a1b0e4 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index b26e212c9..4fbceead8 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index e909f953c..a8be5c6dc 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index 147b8e129..9e0587a2c 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index 93b6e0bbc..ae3cb7293 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index 975b02b9c..f51d0cb47 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From 32c735db083dab07a98a54bd8b6c771919f7970d Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Mon, 8 Aug 2022 15:14:16 +0200 Subject: [PATCH 118/210] Revert "Bumping versions" This reverts commit a338d9141e508dbe2da6dd91d786d878c6c9947e. --- docs/pom.xml | 2 +- pom.xml | 2 +- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 2 +- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 49 files changed, 74 insertions(+), 74 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 1dff59a82..8d86781e9 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index 81aa74a57..f4219bdbd 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT pom diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index fab8c4299..310b573d6 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index ca6b5820b..77a8efa47 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index ffbc19941..0a392314f 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index dd7e7d932..a6ed9dfde 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 672f82099..6f8a371f1 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 7c1d11515..6322484e3 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index c690db6d0..90167031e 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index eacd07088..9def012d7 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 66ec42853..9714b36bf 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index dabf4f58f..4c0d822b9 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index bf616face..3608d91d2 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -10,7 +10,7 @@ spring-cloud-function-dependencies - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 72ebdd1fb..3368dd8a8 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index 501700162..8d14c4cf9 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index 605f803c3..ee527f587 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 8363eb663..0d4562510 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index ce12f7507..71479e597 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index dd8592ba2..30fc88202 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index f5839c33f..1505cc951 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index f03027b15..75a103939 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index b7035c8eb..e9301b581 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 2c6a7d6b9..5055f1d83 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index 64b4d216a..4a30302a3 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 2e1e91dcc..02fac3b72 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index 4d1404473..aba4f736d 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 54ca2443b..d7634d2cd 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 28c228220..52172c3b8 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index 81f340c98..ef97c3d22 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 3fdee74e7..900a3a720 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index 094257cf1..cb78e0753 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 2be3a8cc8..960231052 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index 342b10424..f8b5f341d 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index b749cd24d..bd9c6f5f0 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index 75c4f2d20..d1d0ce378 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index ffd8553b1..a7dd5b191 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index f17f82dda..5dccbe9c3 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index 4a78d38a4..879b5852d 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index 90b6d6dce..a2a1cec04 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index 05cefd288..aeecedc6f 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index b4d93bcca..74fe9da88 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index a782d32c4..d69a4eaa7 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 22bdbf661..90aa77200 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index 1f9a1b0e4..68f783b10 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 4fbceead8..b26e212c9 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index a8be5c6dc..e909f953c 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index 9e0587a2c..147b8e129 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index ae3cb7293..93b6e0bbc 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index f51d0cb47..975b02b9c 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From cd834fa407848b4b7c718919cab992e976557d01 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Mon, 8 Aug 2022 15:12:51 +0200 Subject: [PATCH 119/210] GH-913 Fix AWS Context propagation Resolves #913 --- .../function/adapter/aws/AWSLambdaUtils.java | 10 +- .../function/adapter/aws/FunctionInvoker.java | 2 +- .../adapter/aws/FunctionInvokerTests.java | 30 ++++-- .../function/adapter/aws/TestContext.java | 97 +++++++++++++++++++ 4 files changed, 131 insertions(+), 8 deletions(-) create mode 100644 spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/TestContext.java diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java index 6e6fe4441..6ed4c7a66 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java @@ -22,6 +22,7 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicReference; +import com.amazonaws.services.lambda.runtime.Context; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -65,8 +66,12 @@ static boolean isSupportedAWSType(Type inputType) { || typeName.equals("com.amazonaws.services.lambda.runtime.events.KinesisEvent"); } - @SuppressWarnings({ "unchecked", "rawtypes" }) public static Message generateMessage(byte[] payload, Type inputType, boolean isSupplier, JsonMapper jsonMapper) { + return generateMessage(payload, inputType, isSupplier, jsonMapper, null); + } + + @SuppressWarnings({ "unchecked", "rawtypes" }) + public static Message generateMessage(byte[] payload, Type inputType, boolean isSupplier, JsonMapper jsonMapper, Context context) { if (logger.isInfoEnabled()) { logger.info("Received: " + new String(payload, StandardCharsets.UTF_8)); } @@ -84,6 +89,9 @@ public static Message generateMessage(byte[] payload, Type inputType, bo if (!isSupplier && AWSLambdaUtils.isSupportedAWSType(inputType)) { builder.setHeader(AWSLambdaUtils.AWS_EVENT, true); } + if (context != null) { + builder.setHeader(AWSLambdaUtils.AWS_CONTEXT, context); + } // if (structMessage instanceof Map && ((Map) structMessage).containsKey("headers")) { builder.copyHeaders((Map) ((Map) structMessage).get("headers")); diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/FunctionInvoker.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/FunctionInvoker.java index 3d51ffe81..f8eb05c75 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/FunctionInvoker.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/FunctionInvoker.java @@ -80,7 +80,7 @@ public FunctionInvoker() { @Override public void handleRequest(InputStream input, OutputStream output, Context context) throws IOException { Message requestMessage = AWSLambdaUtils - .generateMessage(StreamUtils.copyToByteArray(input), this.function.getInputType(), this.function.isSupplier(), jsonMapper); + .generateMessage(StreamUtils.copyToByteArray(input), this.function.getInputType(), this.function.isSupplier(), jsonMapper, context); Object response = this.function.apply(requestMessage); byte[] responseBytes = this.buildResult(requestMessage, response); diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java index 8caaaac0f..255aee957 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java @@ -18,7 +18,9 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.Map; @@ -26,6 +28,7 @@ import java.util.function.Function; import java.util.function.Supplier; +import com.amazonaws.services.lambda.runtime.Context; import com.amazonaws.services.lambda.runtime.events.APIGatewayCustomAuthorizerEvent; import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent; import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent; @@ -504,11 +507,16 @@ public void testKinesisStringEvent() throws Exception { public void testKinesisEvent() throws Exception { System.setProperty("MAIN_CLASS", KinesisConfiguration.class.getName()); System.setProperty("spring.cloud.function.definition", "inputKinesisEvent"); - FunctionInvoker invoker = new FunctionInvoker(); + FunctionInvoker invoker = new FunctionInvoker() { + public void handleRequest(InputStream input, OutputStream output, Context context) throws IOException { + assertThat(context).isNotNull(); + super.handleRequest(input, output, context); + } + }; InputStream targetStream = new ByteArrayInputStream(this.sampleKinesisEvent.getBytes()); ByteArrayOutputStream output = new ByteArrayOutputStream(); - invoker.handleRequest(targetStream, output, null); + invoker.handleRequest(targetStream, output, new TestContext()); String result = new String(output.toByteArray(), StandardCharsets.UTF_8); assertThat(result).contains("49590338271490256608559692538361571095921575989136588898"); @@ -760,11 +768,16 @@ public void testLBEventAsMessage() throws Exception { public void testLBEventInOut() throws Exception { System.setProperty("MAIN_CLASS", LBConfiguration.class.getName()); System.setProperty("spring.cloud.function.definition", "inputOutputLBEvent"); - FunctionInvoker invoker = new FunctionInvoker(); + FunctionInvoker invoker = new FunctionInvoker() { + public void handleRequest(InputStream input, OutputStream output, Context context) throws IOException { + assertThat(context).isNotNull(); + super.handleRequest(input, output, context); + } + }; InputStream targetStream = new ByteArrayInputStream(this.sampleLBEvent.getBytes()); ByteArrayOutputStream output = new ByteArrayOutputStream(); - invoker.handleRequest(targetStream, output, null); + invoker.handleRequest(targetStream, output, new TestContext()); Map result = mapper.readValue(output.toByteArray(), Map.class); assertThat(result.get("body")).isEqualTo("Hello from ELB"); @@ -842,11 +855,16 @@ public void testApiGatewayPojoEventBody() throws Exception { public void testApiGatewayEvent() throws Exception { System.setProperty("MAIN_CLASS", ApiGatewayConfiguration.class.getName()); System.setProperty("spring.cloud.function.definition", "inputApiEvent"); - FunctionInvoker invoker = new FunctionInvoker(); + FunctionInvoker invoker = new FunctionInvoker() { + public void handleRequest(InputStream input, OutputStream output, Context context) throws IOException { + assertThat(context).isNotNull(); + super.handleRequest(input, output, context); + } + }; InputStream targetStream = new ByteArrayInputStream(this.apiGatewayEvent.getBytes()); ByteArrayOutputStream output = new ByteArrayOutputStream(); - invoker.handleRequest(targetStream, output, null); + invoker.handleRequest(targetStream, output, new TestContext()); Map result = mapper.readValue(output.toByteArray(), Map.class); System.out.println(result); diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/TestContext.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/TestContext.java new file mode 100644 index 000000000..6af6b78f7 --- /dev/null +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/TestContext.java @@ -0,0 +1,97 @@ +/* + * Copyright 2019-2022 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 org.springframework.cloud.function.adapter.aws; + +import com.amazonaws.services.lambda.runtime.ClientContext; +import com.amazonaws.services.lambda.runtime.CognitoIdentity; +import com.amazonaws.services.lambda.runtime.Context; +import com.amazonaws.services.lambda.runtime.LambdaLogger; + +/** + * + * @author Oleg Zhurakousky + * + */ +public class TestContext implements Context { + + @Override + public String getAwsRequestId() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getLogGroupName() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getLogStreamName() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getFunctionName() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getFunctionVersion() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getInvokedFunctionArn() { + // TODO Auto-generated method stub + return null; + } + + @Override + public CognitoIdentity getIdentity() { + // TODO Auto-generated method stub + return null; + } + + @Override + public ClientContext getClientContext() { + // TODO Auto-generated method stub + return null; + } + + @Override + public int getRemainingTimeInMillis() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public int getMemoryLimitInMB() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public LambdaLogger getLogger() { + // TODO Auto-generated method stub + return null; + } + +} From 95d0ca7d7c8be764b9d628db74c21e5f6f66d3c1 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Mon, 8 Aug 2022 15:32:57 +0200 Subject: [PATCH 120/210] GH-909 Fix spelling of the method Resolves #909 --- .../function/context/catalog/SimpleFunctionRegistry.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java index 67e3cb8c6..57d4c69cf 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java @@ -232,7 +232,7 @@ else if (logger.isDebugEnabled()) { } if (function != null) { - function = this.wrapInAroundAviceIfNecessary(function); + function = this.wrapInAroundAdviceIfNecessary(function); } return (T) function; @@ -270,7 +270,7 @@ String normalizeFunctionDefinition(String functionDefinition) { * There is no current use cases in functions where it is used. * The approach may change in the future. */ - private FunctionInvocationWrapper wrapInAroundAviceIfNecessary(FunctionInvocationWrapper function) { + private FunctionInvocationWrapper wrapInAroundAdviceIfNecessary(FunctionInvocationWrapper function) { FunctionInvocationWrapper wrappedFunction = function; if (function != null && this.functionAroundWrapper != null) { wrappedFunction = new FunctionInvocationWrapper(function) { From 5b9439f3e3ef48108cbe6b65ee1c2305eb186c60 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 8 Aug 2022 23:18:28 +0000 Subject: [PATCH 121/210] Bumping versions --- docs/pom.xml | 2 +- pom.xml | 2 +- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 2 +- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 49 files changed, 74 insertions(+), 74 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 8d86781e9..1dff59a82 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index f4219bdbd..81aa74a57 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT pom diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index 310b573d6..fab8c4299 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index 77a8efa47..ca6b5820b 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index 0a392314f..ffbc19941 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index a6ed9dfde..dd7e7d932 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 6f8a371f1..672f82099 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 6322484e3..7c1d11515 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index 90167031e..c690db6d0 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index 9def012d7..eacd07088 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 9714b36bf..66ec42853 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 4c0d822b9..dabf4f58f 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 3608d91d2..bf616face 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -10,7 +10,7 @@ spring-cloud-function-dependencies - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 3368dd8a8..72ebdd1fb 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index 8d14c4cf9..501700162 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index ee527f587..605f803c3 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 0d4562510..8363eb663 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index 71479e597..ce12f7507 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index 30fc88202..dd8592ba2 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 1505cc951..f5839c33f 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 75a103939..f03027b15 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index e9301b581..b7035c8eb 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 5055f1d83..2c6a7d6b9 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index 4a30302a3..64b4d216a 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 02fac3b72..2e1e91dcc 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index aba4f736d..4d1404473 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index d7634d2cd..54ca2443b 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 52172c3b8..28c228220 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index ef97c3d22..81f340c98 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 900a3a720..3fdee74e7 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index cb78e0753..094257cf1 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 960231052..2be3a8cc8 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index f8b5f341d..342b10424 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index bd9c6f5f0..b749cd24d 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index d1d0ce378..75c4f2d20 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index a7dd5b191..ffd8553b1 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index 5dccbe9c3..f17f82dda 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index 879b5852d..4a78d38a4 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index a2a1cec04..90b6d6dce 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index aeecedc6f..05cefd288 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 74fe9da88..b4d93bcca 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index d69a4eaa7..a782d32c4 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 90aa77200..22bdbf661 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index 68f783b10..1f9a1b0e4 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 1.8 - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index b26e212c9..4fbceead8 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index e909f953c..a8be5c6dc 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index 147b8e129..9e0587a2c 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index 93b6e0bbc..ae3cb7293 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index 975b02b9c..f51d0cb47 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.6-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From 25e84cb433392a7769bfe7d48b1c00c81478a90d Mon Sep 17 00:00:00 2001 From: ivcuello Date: Wed, 10 Aug 2022 09:54:40 -0400 Subject: [PATCH 122/210] Making class AWSLambdaUtils public so the AWS_CONTEXT constant can be accessed. please see latest comment on #910 --- .../cloud/function/adapter/aws/AWSLambdaUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java index 6e6fe4441..285c1b86f 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java @@ -37,7 +37,7 @@ * @author Oleg Zhurakousky * */ -final class AWSLambdaUtils { +public final class AWSLambdaUtils { private static Log logger = LogFactory.getLog(AWSLambdaUtils.class); From 5a17d640d1a4f18d47fb39b655846544c93ed526 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 11 Aug 2022 16:58:18 +0200 Subject: [PATCH 123/210] Revert "Bumping versions" This reverts commit 5b9439f3e3ef48108cbe6b65ee1c2305eb186c60. --- docs/pom.xml | 2 +- pom.xml | 2 +- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 2 +- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 49 files changed, 74 insertions(+), 74 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 1dff59a82..8d86781e9 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index 81aa74a57..f4219bdbd 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT pom diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index fab8c4299..310b573d6 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index ca6b5820b..77a8efa47 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index ffbc19941..0a392314f 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index dd7e7d932..a6ed9dfde 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 672f82099..6f8a371f1 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 7c1d11515..6322484e3 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index c690db6d0..90167031e 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index eacd07088..9def012d7 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 66ec42853..9714b36bf 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index dabf4f58f..4c0d822b9 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index bf616face..3608d91d2 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -10,7 +10,7 @@ spring-cloud-function-dependencies - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 72ebdd1fb..3368dd8a8 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index 501700162..8d14c4cf9 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index 605f803c3..ee527f587 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 8363eb663..0d4562510 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index ce12f7507..71479e597 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index dd8592ba2..30fc88202 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index f5839c33f..1505cc951 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index f03027b15..75a103939 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index b7035c8eb..e9301b581 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 2c6a7d6b9..5055f1d83 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index 64b4d216a..4a30302a3 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 2e1e91dcc..02fac3b72 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index 4d1404473..aba4f736d 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 54ca2443b..d7634d2cd 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 28c228220..52172c3b8 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index 81f340c98..ef97c3d22 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 3fdee74e7..900a3a720 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index 094257cf1..cb78e0753 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 2be3a8cc8..960231052 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index 342b10424..f8b5f341d 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index b749cd24d..bd9c6f5f0 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index 75c4f2d20..d1d0ce378 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index ffd8553b1..a7dd5b191 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index f17f82dda..5dccbe9c3 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index 4a78d38a4..879b5852d 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index 90b6d6dce..a2a1cec04 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index 05cefd288..aeecedc6f 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index b4d93bcca..74fe9da88 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index a782d32c4..d69a4eaa7 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 22bdbf661..90aa77200 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index 1f9a1b0e4..68f783b10 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 1.8 - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 4fbceead8..b26e212c9 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index a8be5c6dc..e909f953c 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index 9e0587a2c..147b8e129 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index ae3cb7293..93b6e0bbc 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index f51d0cb47..975b02b9c 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From 72079829afffad6ff1e4a8c04993638bd31dba97 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 11 Aug 2022 16:55:49 +0200 Subject: [PATCH 124/210] GH-915 Make Kotlin initialization 'lazy' This way just like with any other function, Kotlin initialization, type discovery etc will be performed on function lookup This will also ensure that order of various post processors doesn't get in the way. Resolves #915 --- .../BeanFactoryAwareFunctionRegistry.java | 9 +++ ...tlinLambdaToFunctionAutoConfiguration.java | 59 ++------------ ...ogAutoConfigurationKotlinSuspendTests.java | 81 ++++--------------- ...onCatalogAutoConfigurationKotlinTests.java | 66 +++++++-------- 4 files changed, 64 insertions(+), 151 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java index aefceff04..8599b1700 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java @@ -39,11 +39,13 @@ import org.springframework.cloud.function.context.FunctionRegistry; import org.springframework.cloud.function.context.FunctionType; import org.springframework.cloud.function.context.config.FunctionContextUtils; +import org.springframework.cloud.function.context.config.KotlinLambdaToFunctionAutoConfiguration; import org.springframework.cloud.function.core.FunctionInvocationHelper; import org.springframework.cloud.function.json.JsonMapper; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.support.GenericApplicationContext; +import org.springframework.core.KotlinDetector; import org.springframework.core.ResolvableType; import org.springframework.core.convert.ConversionService; import org.springframework.lang.Nullable; @@ -145,6 +147,13 @@ public T lookup(Class type, String functionDefinition, String... expected else if (functionCandidate instanceof BiFunction || functionCandidate instanceof BiConsumer) { functionRegistration = this.registerMessagingBiFunction(functionCandidate, functionName); } + else if (KotlinDetector.isKotlinType(functionCandidate.getClass())) { + KotlinLambdaToFunctionAutoConfiguration.KotlinFunctionWrapper wrapper = + new KotlinLambdaToFunctionAutoConfiguration.KotlinFunctionWrapper(functionCandidate); + wrapper.setName(functionName); + wrapper.setBeanFactory(this.applicationContext.getBeanFactory()); + functionRegistration = wrapper.getFunctionRegistration(); + } else if (this.isFunctionPojo(functionCandidate, functionName)) { Method functionalMethod = FunctionTypeUtils.discoverFunctionalMethod(functionCandidate.getClass()); functionCandidate = this.proxyTarget(functionCandidate, functionalMethod); diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/KotlinLambdaToFunctionAutoConfiguration.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/KotlinLambdaToFunctionAutoConfiguration.java index f9dc48484..3b6209447 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/KotlinLambdaToFunctionAutoConfiguration.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/KotlinLambdaToFunctionAutoConfiguration.java @@ -35,16 +35,7 @@ import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; -import org.springframework.beans.factory.BeanFactoryAware; -import org.springframework.beans.factory.BeanNameAware; -import org.springframework.beans.factory.FactoryBean; -import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition; -import org.springframework.beans.factory.config.BeanDefinition; -import org.springframework.beans.factory.config.BeanFactoryPostProcessor; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; -import org.springframework.beans.factory.config.ConstructorArgumentValues; -import org.springframework.beans.factory.support.BeanDefinitionRegistry; -import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; @@ -83,46 +74,14 @@ public void customize(Jackson2ObjectMapperBuilder jacksonObjectMapperBuilder) { }; } - /** - * Will transform all discovered Kotlin's Function lambdas to java - * Supplier, Function and Consumer, retaining the original Kotlin type - * characteristics. - * - * @return the bean factory post processor - */ - @Bean - public static BeanFactoryPostProcessor kotlinToFunctionTransformer(ConfigurableListableBeanFactory beanFactory) { - return new BeanFactoryPostProcessor() { - - @Override - public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) - throws BeansException { - String[] beanDefinitionNames = beanFactory.getBeanDefinitionNames(); - for (String beanDefinitionName : beanDefinitionNames) { - BeanDefinition beanDefinition = beanFactory.getBeanDefinition(beanDefinitionName); - - if (beanDefinition instanceof AnnotatedBeanDefinition && ((AnnotatedBeanDefinition) beanDefinition).getFactoryMethodMetadata() != null) { - String typeName = ((AnnotatedBeanDefinition) beanDefinition).getFactoryMethodMetadata().getReturnTypeName(); - if (typeName.startsWith("kotlin.jvm.functions.Function")) { - RootBeanDefinition cbd = new RootBeanDefinition(KotlinFunctionWrapper.class); - ConstructorArgumentValues ca = new ConstructorArgumentValues(); - ca.addGenericArgumentValue(beanDefinition); - cbd.setConstructorArgumentValues(ca); - ((BeanDefinitionRegistry) beanFactory).registerBeanDefinition(beanDefinitionName + FunctionRegistration.REGISTRATION_NAME_SUFFIX, cbd); - } - } - } - } - }; - } @SuppressWarnings({ "unchecked", "rawtypes" }) public static final class KotlinFunctionWrapper implements Function, Supplier, Consumer, Function0, Function1, Function2, - Function3, Function4, - FactoryBean, - BeanNameAware, - BeanFactoryAware { + Function3, Function4 { +// FactoryBean, +// BeanNameAware, +// BeanFactoryAware { private final Object kotlinLambdaTarget; @@ -192,8 +151,7 @@ public Object get() { return this.apply(null); } - @Override - public FunctionRegistration getObject() throws Exception { + public FunctionRegistration getFunctionRegistration() { String name = this.name.endsWith(FunctionRegistration.REGISTRATION_NAME_SUFFIX) ? this.name.replace(FunctionRegistration.REGISTRATION_NAME_SUFFIX, "") : this.name; @@ -284,17 +242,16 @@ private boolean isTypeRepresentedByClass(Type type, Class clazz) { return type.getTypeName().contains(clazz.getName()); } - @Override public Class getObjectType() { return FunctionRegistration.class; } - @Override - public void setBeanName(String name) { + + public void setName(String name) { this.name = name; } - @Override + public void setBeanFactory(BeanFactory beanFactory) throws BeansException { this.beanFactory = (ConfigurableListableBeanFactory) beanFactory; } diff --git a/spring-cloud-function-kotlin/src/test/java/org/springframework/cloud/function/kotlin/ContextFunctionCatalogAutoConfigurationKotlinSuspendTests.java b/spring-cloud-function-kotlin/src/test/java/org/springframework/cloud/function/kotlin/ContextFunctionCatalogAutoConfigurationKotlinSuspendTests.java index 53450d2ba..874de12a4 100644 --- a/spring-cloud-function-kotlin/src/test/java/org/springframework/cloud/function/kotlin/ContextFunctionCatalogAutoConfigurationKotlinSuspendTests.java +++ b/spring-cloud-function-kotlin/src/test/java/org/springframework/cloud/function/kotlin/ContextFunctionCatalogAutoConfigurationKotlinSuspendTests.java @@ -16,27 +16,16 @@ package org.springframework.cloud.function.kotlin; -import java.lang.reflect.ParameterizedType; -import java.util.function.Consumer; -import java.util.function.Function; -import java.util.function.Supplier; - -import kotlin.jvm.functions.Function2; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; -import org.springframework.beans.factory.BeanCreationException; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cloud.function.context.FunctionCatalog; -import org.springframework.cloud.function.context.catalog.FunctionTypeUtils; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; +import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry.FunctionInvocationWrapper; import org.springframework.context.support.GenericApplicationContext; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; /** * @author Adrien Poupard @@ -60,67 +49,29 @@ public void typeDiscoveryTests() { create(new Class[] { KotlinSuspendFlowLambdasConfiguration.class, ContextFunctionCatalogAutoConfigurationKotlinTests.SimpleConfiguration.class }); - Object function = this.context.getBean("kotlinFunction"); - ParameterizedType functionType = (ParameterizedType) FunctionTypeUtils.discoverFunctionType(function, "kotlinFunction", this.context); - assertThat(functionType.getRawType().getTypeName()).isEqualTo(Function.class.getName()); - assertThat(functionType.getActualTypeArguments().length).isEqualTo(2); - assertThat(functionType.getActualTypeArguments()[0].getTypeName()).isEqualTo("reactor.core.publisher.Flux"); - assertThat(functionType.getActualTypeArguments()[1].getTypeName()).isEqualTo("reactor.core.publisher.Flux"); - - function = this.context.getBean("kotlinConsumer"); - functionType = (ParameterizedType) FunctionTypeUtils.discoverFunctionType(function, "kotlinConsumer", this.context); - assertThat(functionType.getRawType().getTypeName()).isEqualTo(Consumer.class.getName()); - assertThat(functionType.getActualTypeArguments().length).isEqualTo(1); - assertThat(functionType.getActualTypeArguments()[0].getTypeName()).isEqualTo("reactor.core.publisher.Flux"); - - function = this.context.getBean("kotlinSupplier"); - functionType = (ParameterizedType) FunctionTypeUtils.discoverFunctionType(function, "kotlinSupplier", this.context); - assertThat(functionType.getRawType().getTypeName()).isEqualTo(Supplier.class.getName()); - assertThat(functionType.getActualTypeArguments().length).isEqualTo(1); - assertThat(functionType.getActualTypeArguments()[0].getTypeName()).isEqualTo("reactor.core.publisher.Flux"); - - function = this.context.getBean("kotlinPojoFunction"); - functionType = (ParameterizedType) FunctionTypeUtils.discoverFunctionType(function, "kotlinPojoFunction", this.context); - assertThat(functionType.getRawType().getTypeName()).isEqualTo(Function.class.getName()); - assertThat(functionType.getActualTypeArguments().length).isEqualTo(2); - assertThat(functionType.getActualTypeArguments()[0].getTypeName()).isEqualTo("reactor.core.publisher.Flux"); - assertThat(functionType.getActualTypeArguments()[1].getTypeName()).isEqualTo("reactor.core.publisher.Flux"); - } - - @Test - public void shouldNotLoadKotlinSuspendLambasNotUsingFlow() { - create(new Class[] { KotlinSuspendLambdasConfiguration.class, - ContextFunctionCatalogAutoConfigurationKotlinTests.SimpleConfiguration.class }); + FunctionCatalog functionCatalog = this.context.getBean(FunctionCatalog.class); - assertThat(this.context.getBean("kotlinFunction")).isInstanceOf(Function2.class); - assertThatThrownBy(() -> { - this.catalog.lookup(Function.class, "kotlinFunction"); - }).isInstanceOf(BeanCreationException.class); + FunctionInvocationWrapper kotlinFunction = functionCatalog.lookup("kotlinFunction"); + assertThat(kotlinFunction.isFunction()).isTrue(); + assertThat(kotlinFunction.getInputType().getTypeName()).isEqualTo("reactor.core.publisher.Flux"); + assertThat(kotlinFunction.getOutputType().getTypeName()).isEqualTo("reactor.core.publisher.Flux"); - assertThatThrownBy(() -> { - this.catalog.lookup(Function.class, "kotlinConsumer"); - }).isInstanceOf(BeanCreationException.class); + FunctionInvocationWrapper kotlinConsumer = functionCatalog.lookup("kotlinConsumer"); + assertThat(kotlinConsumer.isConsumer()).isTrue(); + assertThat(kotlinConsumer.getInputType().getTypeName()).isEqualTo("reactor.core.publisher.Flux"); - assertThatThrownBy(() -> { - this.catalog.lookup(Supplier.class, "kotlinSupplier"); - }).isInstanceOf(BeanCreationException.class); + FunctionInvocationWrapper kotlinSupplier = functionCatalog.lookup("kotlinSupplier"); + assertThat(kotlinSupplier.isSupplier()).isTrue(); + assertThat(kotlinSupplier.getOutputType().getTypeName()).isEqualTo("reactor.core.publisher.Flux"); + FunctionInvocationWrapper kotlinPojoFunction = functionCatalog.lookup("kotlinPojoFunction"); + assertThat(kotlinPojoFunction.isFunction()).isTrue(); + assertThat(kotlinPojoFunction.getInputType().getTypeName()).isEqualTo("reactor.core.publisher.Flux"); + assertThat(kotlinPojoFunction.getOutputType().getTypeName()).isEqualTo("reactor.core.publisher.Flux"); } private void create(Class[] types, String... props) { this.context = (GenericApplicationContext) new SpringApplicationBuilder(types).properties(props).run(); this.catalog = this.context.getBean(FunctionCatalog.class); } - - @EnableAutoConfiguration - @Configuration - protected static class SimpleConfiguration { - - @Bean - public Function function2() { - return value -> value + "function2"; - } - - } - } diff --git a/spring-cloud-function-kotlin/src/test/java/org/springframework/cloud/function/kotlin/ContextFunctionCatalogAutoConfigurationKotlinTests.java b/spring-cloud-function-kotlin/src/test/java/org/springframework/cloud/function/kotlin/ContextFunctionCatalogAutoConfigurationKotlinTests.java index d8afa544e..2b3d794ee 100644 --- a/spring-cloud-function-kotlin/src/test/java/org/springframework/cloud/function/kotlin/ContextFunctionCatalogAutoConfigurationKotlinTests.java +++ b/spring-cloud-function-kotlin/src/test/java/org/springframework/cloud/function/kotlin/ContextFunctionCatalogAutoConfigurationKotlinTests.java @@ -16,8 +16,6 @@ package org.springframework.cloud.function.kotlin; -import java.lang.reflect.ParameterizedType; -import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; @@ -59,39 +57,37 @@ public void typeDiscoveryTests() { create(new Class[] { KotlinLambdasConfiguration.class, SimpleConfiguration.class }); - Object function = this.context.getBean("kotlinFunction"); - ParameterizedType functionType = (ParameterizedType) FunctionTypeUtils.discoverFunctionType(function, "kotlinFunction", this.context); - assertThat(functionType.getRawType().getTypeName()).isEqualTo(Function.class.getName()); - assertThat(functionType.getActualTypeArguments().length).isEqualTo(2); - assertThat(functionType.getActualTypeArguments()[0].getTypeName()).isEqualTo(String.class.getName()); - assertThat(functionType.getActualTypeArguments()[1].getTypeName()).isEqualTo(String.class.getName()); - - function = this.context.getBean("kotlinConsumer"); - functionType = (ParameterizedType) FunctionTypeUtils.discoverFunctionType(function, "kotlinConsumer", this.context); - assertThat(functionType.getRawType().getTypeName()).isEqualTo(Consumer.class.getName()); - assertThat(functionType.getActualTypeArguments().length).isEqualTo(1); - assertThat(functionType.getActualTypeArguments()[0].getTypeName()).isEqualTo(String.class.getName()); - - function = this.context.getBean("kotlinSupplier"); - functionType = (ParameterizedType) FunctionTypeUtils.discoverFunctionType(function, "kotlinSupplier", this.context); - assertThat(functionType.getRawType().getTypeName()).isEqualTo(Supplier.class.getName()); - assertThat(functionType.getActualTypeArguments().length).isEqualTo(1); - assertThat(functionType.getActualTypeArguments()[0].getTypeName()).isEqualTo(String.class.getName()); - - function = this.context.getBean("kotlinPojoFunction"); - functionType = (ParameterizedType) FunctionTypeUtils.discoverFunctionType(function, "kotlinPojoFunction", this.context); - assertThat(functionType.getRawType().getTypeName()).isEqualTo(Function.class.getName()); - assertThat(functionType.getActualTypeArguments().length).isEqualTo(2); - assertThat(functionType.getActualTypeArguments()[0].getTypeName()).isEqualTo(Person.class.getName()); - assertThat(functionType.getActualTypeArguments()[1].getTypeName()).isEqualTo(String.class.getName()); - - - function = this.context.getBean("kotlinListPojoFunction"); - functionType = (ParameterizedType) FunctionTypeUtils.discoverFunctionType(function, "kotlinListPojoFunction", this.context); - assertThat(functionType.getRawType().getTypeName()).isEqualTo(Function.class.getName()); - assertThat(functionType.getActualTypeArguments().length).isEqualTo(2); - assertThat(functionType.getActualTypeArguments()[0].getTypeName()).isEqualTo("java.util.List"); - assertThat(functionType.getActualTypeArguments()[1].getTypeName()).isEqualTo(String.class.getName()); + FunctionCatalog functionCatalog = this.context.getBean(FunctionCatalog.class); + + FunctionInvocationWrapper kotlinFunction = functionCatalog.lookup("kotlinFunction"); + assertThat(kotlinFunction.isFunction()).isTrue(); + assertThat(kotlinFunction.getInputType()).isEqualTo(String.class); + assertThat(kotlinFunction.getOutputType()).isEqualTo(String.class); + + FunctionInvocationWrapper kotlinConsumer = functionCatalog.lookup("kotlinConsumer"); + assertThat(kotlinConsumer.isConsumer()).isTrue(); + assertThat(kotlinConsumer.getInputType()).isEqualTo(String.class); + + FunctionInvocationWrapper kotlinSupplier = functionCatalog.lookup("kotlinSupplier"); + assertThat(kotlinSupplier.isSupplier()).isTrue(); + assertThat(kotlinSupplier.getOutputType()).isEqualTo(String.class); + + FunctionInvocationWrapper kotlinPojoFunction = functionCatalog.lookup("kotlinPojoFunction"); + assertThat(kotlinPojoFunction.isFunction()).isTrue(); + assertThat(kotlinPojoFunction.getInputType()).isEqualTo(Person.class); + assertThat(kotlinPojoFunction.getOutputType()).isEqualTo(String.class); + + FunctionInvocationWrapper kotlinListPojoFunction = functionCatalog.lookup("kotlinListPojoFunction"); + assertThat(kotlinListPojoFunction.isFunction()).isTrue(); + assertThat(kotlinListPojoFunction.getInputType().getTypeName()).isEqualTo("java.util.List"); + assertThat(kotlinListPojoFunction.getOutputType()).isEqualTo(String.class); + +// function = this.context.getBean("kotlinListPojoFunction"); +// functionType = (ParameterizedType) FunctionTypeUtils.discoverFunctionType(function, "kotlinListPojoFunction", this.context); +// assertThat(functionType.getRawType().getTypeName()).isEqualTo(Function.class.getName()); +// assertThat(functionType.getActualTypeArguments().length).isEqualTo(2); +// assertThat(functionType.getActualTypeArguments()[0].getTypeName()).isEqualTo("java.util.List"); +// assertThat(functionType.getActualTypeArguments()[1].getTypeName()).isEqualTo(String.class.getName()); } @Test From 1edb0ae7014c66e464ff96265d3d35588e0ca086 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 16 Aug 2022 16:43:18 +0200 Subject: [PATCH 125/210] GH-917 Fix regression with sanitizing headers Resolves #917 --- .../cloud/function/adapter/aws/AWSLambdaUtils.java | 3 +++ .../context/catalog/BeanFactoryAwareFunctionRegistry.java | 5 +++-- .../function/context/catalog/SimpleFunctionRegistry.java | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java index 43311f094..fdb099255 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java @@ -46,6 +46,9 @@ public final class AWSLambdaUtils { static final String AWS_EVENT = "aws-event"; + /** + * The name of the headers that stores AWS Context object. + */ public static final String AWS_CONTEXT = "aws-context"; private AWSLambdaUtils() { diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java index 8599b1700..bc6132b93 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java @@ -116,8 +116,9 @@ public T lookup(Class type, String functionDefinition, String... expected functionDefinition = StringUtils.hasText(functionDefinition) ? functionDefinition : this.applicationContext.getEnvironment().getProperty(FunctionProperties.FUNCTION_DEFINITION, ""); - - functionDefinition = this.normalizeFunctionDefinition(functionDefinition); + if (!this.applicationContext.containsBean(functionDefinition) || !KotlinDetector.isKotlinType(this.applicationContext.getBean(functionDefinition).getClass())) { + functionDefinition = this.normalizeFunctionDefinition(functionDefinition); + } if (!StringUtils.hasText(functionDefinition)) { logger.info("Can't determine default function definition. Please " + "use 'spring.cloud.function.definition' property to explicitly define it."); diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java index 57d4c69cf..4211b0af2 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java @@ -784,7 +784,7 @@ private Object enrichInvocationResultIfNecessary(Object input, Object result) { } else { Map headersMap = new HashMap<>(((Message) result).getHeaders()); - this.sanitizeHeaders(((Message) result).getHeaders()).forEach((k, v) -> headersMap.putIfAbsent(k, v)); + this.sanitizeHeaders(((Message) input).getHeaders()).forEach((k, v) -> headersMap.putIfAbsent(k, v)); result = MessageBuilder.withPayload(((Message) result).getPayload()).copyHeaders(headersMap).build(); } } From 970de2b31c034f03d4b87705999913e7db386791 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 16 Aug 2022 23:17:48 +0000 Subject: [PATCH 126/210] Bumping versions --- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 2 +- .../src/it/bootapp-with-javax/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 2 +- .../function-sample-aws-custom-bean/pom.xml | 2 +- .../function-sample-aws-custom/pom.xml | 2 +- .../function-sample-aws-routing/pom.xml | 2 +- spring-cloud-function-samples/function-sample-aws/pom.xml | 2 +- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 2 +- .../function-sample-cloudevent-stream/pom.xml | 2 +- .../function-sample-cloudevent/pom.xml | 2 +- spring-cloud-function-samples/function-sample-compiler/pom.xml | 2 +- .../function-sample-functional-aws-routing/pom.xml | 2 +- .../function-sample-gcp-background/pom.xml | 2 +- spring-cloud-function-samples/function-sample-gcp-http/pom.xml | 2 +- .../function-sample-grpc-cloudevent/pom.xml | 2 +- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pojo/pom.xml | 2 +- .../function-sample-spring-integration/pom.xml | 2 +- .../function-sample-supplier-exporter/pom.xml | 2 +- spring-cloud-function-samples/function-sample-task/pom.xml | 2 +- spring-cloud-function-samples/function-sample/pom.xml | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index 8d14c4cf9..e9a194458 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index ee527f587..a7a1254c9 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 0d4562510..b25f9acf6 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index 71479e597..3aebdb0ff 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index 30fc88202..7f5d171ba 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 1505cc951..0da5dd63c 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 75a103939..9f3bff233 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index 4a30302a3..a543d1b91 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 02fac3b72..54c720622 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 io.spring.sample diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index aba4f736d..0333e9a1e 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 io.spring.sample diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index d7634d2cd..6e5d0482c 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 52172c3b8..f608071ec 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index ef97c3d22..81f340c98 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 900a3a720..b37711b61 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index cb78e0753..8b8e37c4c 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 960231052..2615e9b44 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index f8b5f341d..c9f1d3012 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index bd9c6f5f0..f171a0727 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index d1d0ce378..75c4f2d20 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index a7dd5b191..2fdce34f0 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index 5dccbe9c3..600169288 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 com.example.grpc diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index 879b5852d..4a78d38a4 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index a2a1cec04..eabd6d09a 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index aeecedc6f..e359f1087 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 74fe9da88..5b0721405 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index d69a4eaa7..75626911c 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 90aa77200..eb3aaf638 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index 68f783b10..6dd88c76a 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.7 From 9e9c6d447ff33b0842f0415d6bc217ca0c9adb9d Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 17 Aug 2022 18:42:22 +0200 Subject: [PATCH 127/210] Revert "Bumping versions" This reverts commit 970de2b31c034f03d4b87705999913e7db386791. --- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 2 +- .../src/it/bootapp-with-javax/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 2 +- .../function-sample-aws-custom-bean/pom.xml | 2 +- .../function-sample-aws-custom/pom.xml | 2 +- .../function-sample-aws-routing/pom.xml | 2 +- spring-cloud-function-samples/function-sample-aws/pom.xml | 2 +- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 2 +- .../function-sample-cloudevent-stream/pom.xml | 2 +- .../function-sample-cloudevent/pom.xml | 2 +- spring-cloud-function-samples/function-sample-compiler/pom.xml | 2 +- .../function-sample-functional-aws-routing/pom.xml | 2 +- .../function-sample-gcp-background/pom.xml | 2 +- spring-cloud-function-samples/function-sample-gcp-http/pom.xml | 2 +- .../function-sample-grpc-cloudevent/pom.xml | 2 +- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pojo/pom.xml | 2 +- .../function-sample-spring-integration/pom.xml | 2 +- .../function-sample-supplier-exporter/pom.xml | 2 +- spring-cloud-function-samples/function-sample-task/pom.xml | 2 +- spring-cloud-function-samples/function-sample/pom.xml | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index e9a194458..8d14c4cf9 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index a7a1254c9..ee527f587 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index b25f9acf6..0d4562510 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index 3aebdb0ff..71479e597 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index 7f5d171ba..30fc88202 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 0da5dd63c..1505cc951 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 9f3bff233..75a103939 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index a543d1b91..4a30302a3 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 54c720622..02fac3b72 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 io.spring.sample diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index 0333e9a1e..aba4f736d 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 io.spring.sample diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 6e5d0482c..d7634d2cd 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index f608071ec..52172c3b8 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index 81f340c98..ef97c3d22 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index b37711b61..900a3a720 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index 8b8e37c4c..cb78e0753 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 2615e9b44..960231052 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index c9f1d3012..f8b5f341d 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index f171a0727..bd9c6f5f0 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index 75c4f2d20..d1d0ce378 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index 2fdce34f0..a7dd5b191 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index 600169288..5dccbe9c3 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 com.example.grpc diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index 4a78d38a4..879b5852d 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index eabd6d09a..a2a1cec04 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index e359f1087..aeecedc6f 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 5b0721405..74fe9da88 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index 75626911c..d69a4eaa7 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index eb3aaf638..90aa77200 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index 6dd88c76a..68f783b10 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.8 From 271e2d1bce785cc5e06dee822483f5c0208efd21 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 17 Aug 2022 18:38:14 +0200 Subject: [PATCH 128/210] GH-918 Fix Kotlin function invocation For some reason it contained code that was doing some special checking for array and was returning null. Resolves #918 --- .../cloud/function/context/catalog/FunctionTypeUtils.java | 2 -- .../config/KotlinLambdaToFunctionAutoConfiguration.java | 3 --- 2 files changed, 5 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtils.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtils.java index d7d8863b3..58581746c 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtils.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtils.java @@ -171,8 +171,6 @@ else if (Function.class.isAssignableFrom(pojoFunctionClass) || BiFunction.class. @SuppressWarnings("unchecked") public static Type discoverFunctionTypeFromClass(Class functionalClass) { - Assert.isTrue(isFunctional(functionalClass), "Type must be one of Supplier, Function or Consumer"); - if (Function.class.isAssignableFrom(functionalClass)) { for (Type superInterface : functionalClass.getGenericInterfaces()) { if (superInterface != null && !superInterface.equals(Object.class)) { diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/KotlinLambdaToFunctionAutoConfiguration.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/KotlinLambdaToFunctionAutoConfiguration.java index 3b6209447..1076ab738 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/KotlinLambdaToFunctionAutoConfiguration.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/KotlinLambdaToFunctionAutoConfiguration.java @@ -98,9 +98,6 @@ public Object apply(Object input) { if (ObjectUtils.isEmpty(input)) { return this.invoke(); } - else if (ObjectUtils.isArray(input)) { - return null; - } else { return this.invoke(input); } From 4d9c233ac566e69b7b8aca0aa4164a4b803a96a8 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 24 Aug 2022 16:19:22 +0200 Subject: [PATCH 129/210] GH-919 Fix regression that was modifying result message Resolves #919 --- .../catalog/SimpleFunctionRegistry.java | 5 ----- ...BeanFactoryAwareFunctionRegistryTests.java | 20 +++++++++++++++++++ 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java index 4211b0af2..fe538ac30 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java @@ -782,11 +782,6 @@ private Object enrichInvocationResultIfNecessary(Object input, Object result) { if (functionInvocationHelper != null && CloudEventMessageUtils.isCloudEvent(((Message) input))) { result = functionInvocationHelper.postProcessResult(result, (Message) input); } - else { - Map headersMap = new HashMap<>(((Message) result).getHeaders()); - this.sanitizeHeaders(((Message) input).getHeaders()).forEach((k, v) -> headersMap.putIfAbsent(k, v)); - result = MessageBuilder.withPayload(((Message) result).getPayload()).copyHeaders(headersMap).build(); - } } else { if (functionInvocationHelper != null && CloudEventMessageUtils.isCloudEvent(((Message) input))) { diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java index 2c1ac4beb..f8511d525 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java @@ -157,6 +157,17 @@ public void concurrencyLookupTest() throws Exception { assertThat(c.size()).isEqualTo(2); } + @Test + public void testReturnedMessageIsUnmodified() throws Exception { + FunctionCatalog catalog = this.configureCatalog(); + Function, Message> function = catalog.lookup("uppercaseMessage", "application/json"); + assertThat(function).isNotNull(); + + Message result = function.apply(MessageBuilder.withPayload("bob").setHeader("foo", "foo").build()); + assertThat(result.getHeaders().containsKey("foo")).isFalse(); + assertThat(result.getHeaders().containsKey("bar")).isTrue(); + } + @SuppressWarnings("unchecked") @Test public void testDefaultLookup() throws Exception { @@ -1074,6 +1085,15 @@ public Function uppercase() { return v -> v.toUpperCase(); } + @Bean + public Function, Message> uppercaseMessage() { + return message -> { + Message result = MessageBuilder.fromMessage(message) + .removeHeader("foo").setHeader("bar", "bar").build(); + return result; + }; + } + @Bean public Function consumerFunction() { return v -> { From 87af52140026d85b43198aa1f589155d17cb0830 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 2 Sep 2022 20:45:14 +0000 Subject: [PATCH 130/210] Update SNAPSHOT to 3.2.7 --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 49 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 8d86781e9..dfb4c6ec2 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.7 pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index f4219bdbd..4df0246f1 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.7-SNAPSHOT + 3.2.7 pom org.springframework.cloud spring-cloud-build - 3.1.4-SNAPSHOT + 3.1.4 diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index 310b573d6..cee7e1660 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.7 spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index 77a8efa47..b898d5df9 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index 0a392314f..e0f7087d0 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index a6ed9dfde..069eead47 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.7-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 6f8a371f1..0992f029c 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 6322484e3..0dd1d14e4 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7-SNAPSHOT + 3.2.7 spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index 90167031e..118e04376 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index 9def012d7..677a89a2d 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 9714b36bf..e315b6711 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 4c0d822b9..40f3cef5d 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 3608d91d2..69b572b94 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.4-SNAPSHOT + 3.1.4 spring-cloud-function-dependencies - 3.2.7-SNAPSHOT + 3.2.7 pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 3368dd8a8..6ce1aebf3 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index 8d14c4cf9..d953e08a8 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.7 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index ee527f587..51ca93f20 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.7 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 0d4562510..8b5ca6047 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.7 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index 71479e597..ee28e0915 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.7 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index 30fc88202..ad29cb199 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.7 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 1505cc951..4df84d190 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.7 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 75a103939..eef11cdf2 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.7 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index e9301b581..8465a7a53 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 5055f1d83..4134141a6 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index 4a30302a3..e9099d03f 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.7-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 02fac3b72..63127c12c 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.7-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index aba4f736d..01635336d 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.7-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index d7634d2cd..6e83b4426 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.7-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 52172c3b8..a00365ca9 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.7-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index ef97c3d22..a198eb9fb 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 900a3a720..658b23998 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.7 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index cb78e0753..cdd7ac4de 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.7 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 960231052..aeafffe2b 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.7 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index f8b5f341d..0d25a7fc6 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.7 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index bd9c6f5f0..40fa894de 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.7-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index d1d0ce378..8affc78f6 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index a7dd5b191..de59a504c 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 - 3.2.7-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index 5dccbe9c3..5cf40dc88 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.7-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index 879b5852d..c36cce9cc 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index a2a1cec04..bf0a5146b 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.7-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index aeecedc6f..358d46255 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.7 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 74fe9da88..ce8dce620 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.7-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index d69a4eaa7..f4cbaac4a 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 90aa77200..e127e3d2d 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.7 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index 68f783b10..fe9adaefe 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.7 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index b26e212c9..c3a8c41f9 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index e909f953c..706c1d763 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index 147b8e129..965bb9ef6 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index 93b6e0bbc..5d38adfc8 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.7 .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index 975b02b9c..69d34e55d 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.7 spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From 1e0490509f3a56b4e7937c08e94b6e3bbb488fc1 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 2 Sep 2022 20:49:18 +0000 Subject: [PATCH 131/210] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 49 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index dfb4c6ec2..8d86781e9 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7 + 3.2.7-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index 4df0246f1..f4219bdbd 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.7 + 3.2.7-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 3.1.4 + 3.1.4-SNAPSHOT diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index cee7e1660..310b573d6 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7 + 3.2.7-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index b898d5df9..77a8efa47 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7 + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index e0f7087d0..0a392314f 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7 + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index 069eead47..a6ed9dfde 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.7 + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 0992f029c..6f8a371f1 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7 + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 0dd1d14e4..6322484e3 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7 + 3.2.7-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index 118e04376..90167031e 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7 + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index 677a89a2d..9def012d7 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7 + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index e315b6711..9714b36bf 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7 + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 40f3cef5d..4c0d822b9 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7 + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 69b572b94..3608d91d2 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.4 + 3.1.4-SNAPSHOT spring-cloud-function-dependencies - 3.2.7 + 3.2.7-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 6ce1aebf3..3368dd8a8 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7 + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index d953e08a8..8d14c4cf9 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 1.8 - 3.2.7 + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index 51ca93f20..ee527f587 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 1.8 - 3.2.7 + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 8b5ca6047..0d4562510 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 1.8 - 3.2.7 + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index ee28e0915..71479e597 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 1.8 - 3.2.7 + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index ad29cb199..30fc88202 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 1.8 - 3.2.7 + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 4df84d190..1505cc951 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 1.8 - 3.2.7 + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index eef11cdf2..75a103939 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 1.8 - 3.2.7 + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index 8465a7a53..e9301b581 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7 + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 4134141a6..5055f1d83 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7 + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index e9099d03f..4a30302a3 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.7 + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 63127c12c..02fac3b72 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.7 + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index 01635336d..aba4f736d 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.7 + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 6e83b4426..d7634d2cd 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.7 + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index a00365ca9..52172c3b8 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.7 + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index a198eb9fb..ef97c3d22 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 658b23998..900a3a720 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 1.8 - 3.2.7 + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index cdd7ac4de..cb78e0753 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 1.8 - 3.2.7 + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index aeafffe2b..960231052 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 1.8 - 3.2.7 + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index 0d25a7fc6..f8b5f341d 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 1.8 - 3.2.7 + 3.2.7-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index 40fa894de..bd9c6f5f0 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.7 + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index 8affc78f6..d1d0ce378 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index de59a504c..a7dd5b191 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 - 3.2.7 + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index 5cf40dc88..5dccbe9c3 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.7 + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index c36cce9cc..879b5852d 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index bf0a5146b..a2a1cec04 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.7 + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index 358d46255..aeecedc6f 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 1.8 - 3.2.7 + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index ce8dce620..74fe9da88 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.7 + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index f4cbaac4a..d69a4eaa7 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 1.8 - 3.2.7 + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index e127e3d2d..90aa77200 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 1.8 - 3.2.7 + 3.2.7-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index fe9adaefe..68f783b10 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 1.8 - 3.2.7 + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index c3a8c41f9..b26e212c9 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7 + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index 706c1d763..e909f953c 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7 + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index 965bb9ef6..147b8e129 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7 + 3.2.7-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index 5d38adfc8..93b6e0bbc 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7 + 3.2.7-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index 69d34e55d..975b02b9c 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7 + 3.2.7-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From 24386ff3f271379e12be42c5ee285b74698c2402 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 2 Sep 2022 20:49:19 +0000 Subject: [PATCH 132/210] Bumping versions to 3.2.8-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 49 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 8d86781e9..dbf00a333 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index f4219bdbd..016743400 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index 310b573d6..b35678faf 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index 77a8efa47..5882dd0e8 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index 0a392314f..ac61e8265 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index a6ed9dfde..4a35d8000 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 6f8a371f1..898728f88 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 6322484e3..563a2e89b 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index 90167031e..a61054ebb 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index 9def012d7..e0acec9f0 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 9714b36bf..1162adbba 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 4c0d822b9..3519478b4 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 3608d91d2..075551ff7 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT spring-cloud-function-dependencies - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 3368dd8a8..29019ed2a 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index 8d14c4cf9..d099a4e95 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index ee527f587..f16f0d338 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 0d4562510..9234672dc 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index 71479e597..652080026 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index 30fc88202..22ce8ce2b 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 1505cc951..4dec0983f 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 75a103939..21eb7b3e8 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index e9301b581..095f4f38f 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 5055f1d83..014a85aab 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index 4a30302a3..415ddbd96 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 02fac3b72..345fc4b89 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index aba4f736d..3d69e674a 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index d7634d2cd..4480936cb 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 52172c3b8..b59fd3351 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index ef97c3d22..a198eb9fb 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 900a3a720..3a1cd7b78 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index cb78e0753..799a57b7a 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 960231052..017a97ff4 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index f8b5f341d..15a015e70 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index bd9c6f5f0..9f3466ebb 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index d1d0ce378..8affc78f6 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index a7dd5b191..c87799265 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index 5dccbe9c3..c83bf1f51 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index 879b5852d..c36cce9cc 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index a2a1cec04..a78cc5ab2 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index aeecedc6f..9d7807e73 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 74fe9da88..2f0538647 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index d69a4eaa7..73b2acf5e 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 90aa77200..d23fe3930 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index 68f783b10..e7703a20f 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index b26e212c9..90ec323a1 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index e909f953c..b1c5480d7 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index 147b8e129..f99425596 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index 93b6e0bbc..073217fe8 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index 975b02b9c..49292aadc 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From c89db8666b416c8f1f6dab9e3349e0a06db7b9fe Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 2 Sep 2022 23:17:30 +0000 Subject: [PATCH 133/210] Bumping versions --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 49 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index dbf00a333..8d86781e9 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index 016743400..f4219bdbd 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 3.1.5-SNAPSHOT + 3.1.4-SNAPSHOT diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index b35678faf..310b573d6 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index 5882dd0e8..77a8efa47 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index ac61e8265..0a392314f 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index 4a35d8000..a6ed9dfde 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 898728f88..6f8a371f1 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 563a2e89b..6322484e3 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index a61054ebb..90167031e 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index e0acec9f0..9def012d7 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 1162adbba..9714b36bf 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 3519478b4..4c0d822b9 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 075551ff7..3608d91d2 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.5-SNAPSHOT + 3.1.4-SNAPSHOT spring-cloud-function-dependencies - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 29019ed2a..3368dd8a8 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index d099a4e95..8d14c4cf9 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 1.8 - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index f16f0d338..ee527f587 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 1.8 - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 9234672dc..0d4562510 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 1.8 - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index 652080026..71479e597 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 1.8 - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index 22ce8ce2b..30fc88202 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 1.8 - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 4dec0983f..1505cc951 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 1.8 - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 21eb7b3e8..75a103939 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 1.8 - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index 095f4f38f..e9301b581 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 014a85aab..5055f1d83 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index 415ddbd96..4a30302a3 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 345fc4b89..02fac3b72 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index 3d69e674a..aba4f736d 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 4480936cb..d7634d2cd 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index b59fd3351..52172c3b8 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index a198eb9fb..ef97c3d22 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 3a1cd7b78..900a3a720 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 1.8 - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index 799a57b7a..cb78e0753 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 1.8 - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 017a97ff4..960231052 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 1.8 - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index 15a015e70..f8b5f341d 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 1.8 - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index 9f3466ebb..bd9c6f5f0 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index 8affc78f6..d1d0ce378 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index c87799265..a7dd5b191 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index c83bf1f51..5dccbe9c3 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index c36cce9cc..879b5852d 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index a78cc5ab2..a2a1cec04 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index 9d7807e73..aeecedc6f 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 1.8 - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 2f0538647..74fe9da88 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index 73b2acf5e..d69a4eaa7 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 1.8 - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index d23fe3930..90aa77200 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 1.8 - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index e7703a20f..68f783b10 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.8 1.8 - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 90ec323a1..b26e212c9 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index b1c5480d7..e909f953c 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index f99425596..147b8e129 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index 073217fe8..93b6e0bbc 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index 49292aadc..975b02b9c 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.7-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From 89635dcfe1191df2ecd7147238734cb7ea76a802 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Sat, 3 Sep 2022 23:17:35 +0000 Subject: [PATCH 134/210] Bumping versions --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 49 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 8d86781e9..dbf00a333 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index f4219bdbd..016743400 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index 310b573d6..b35678faf 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index 77a8efa47..5882dd0e8 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index 0a392314f..ac61e8265 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index a6ed9dfde..4a35d8000 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 6f8a371f1..898728f88 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 6322484e3..563a2e89b 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index 90167031e..a61054ebb 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index 9def012d7..e0acec9f0 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 9714b36bf..1162adbba 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 4c0d822b9..3519478b4 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 3608d91d2..075551ff7 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT spring-cloud-function-dependencies - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 3368dd8a8..29019ed2a 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index 8d14c4cf9..d099a4e95 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index ee527f587..f16f0d338 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 0d4562510..9234672dc 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index 71479e597..652080026 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index 30fc88202..22ce8ce2b 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 1505cc951..4dec0983f 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 75a103939..21eb7b3e8 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index e9301b581..095f4f38f 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 5055f1d83..014a85aab 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index 4a30302a3..415ddbd96 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 02fac3b72..345fc4b89 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index aba4f736d..3d69e674a 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index d7634d2cd..4480936cb 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 52172c3b8..b59fd3351 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index ef97c3d22..a198eb9fb 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 900a3a720..3a1cd7b78 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index cb78e0753..799a57b7a 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 960231052..017a97ff4 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index f8b5f341d..15a015e70 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index bd9c6f5f0..9f3466ebb 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index d1d0ce378..8affc78f6 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index a7dd5b191..c87799265 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index 5dccbe9c3..c83bf1f51 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index 879b5852d..c36cce9cc 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index a2a1cec04..a78cc5ab2 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index aeecedc6f..9d7807e73 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 74fe9da88..2f0538647 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index d69a4eaa7..73b2acf5e 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 90aa77200..d23fe3930 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index 68f783b10..e7703a20f 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 2.6.11 1.8 - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index b26e212c9..90ec323a1 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index e909f953c..b1c5480d7 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index 147b8e129..f99425596 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index 93b6e0bbc..073217fe8 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index 975b02b9c..49292aadc 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7-SNAPSHOT + 3.2.8-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From a96a1d6ab7cfe66da2af0102430f3067f4ee7e44 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 6 Sep 2022 19:12:20 +0000 Subject: [PATCH 135/210] Update SNAPSHOT to 3.2.7 --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 2 +- .../src/it/bootapp-with-javax/pom.xml | 2 +- .../src/it/bootapp-with-scf/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 2 +- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 2 +- .../function-sample-aws-custom-bean/pom.xml | 2 +- .../function-sample-aws-custom/pom.xml | 2 +- .../function-sample-aws-routing/pom.xml | 2 +- spring-cloud-function-samples/function-sample-aws/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 2 +- .../function-sample-cloudevent-stream/pom.xml | 2 +- .../function-sample-cloudevent/pom.xml | 2 +- .../function-sample-compiler/pom.xml | 2 +- .../function-sample-functional-aws-routing/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 2 +- .../function-sample-grpc-cloudevent/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pojo/pom.xml | 2 +- .../function-sample-spring-integration/pom.xml | 2 +- .../function-sample-supplier-exporter/pom.xml | 2 +- spring-cloud-function-samples/function-sample-task/pom.xml | 2 +- spring-cloud-function-samples/function-sample/pom.xml | 2 +- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 46 files changed, 48 insertions(+), 48 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index dbf00a333..dfb4c6ec2 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.7 pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index 016743400..4df0246f1 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.8-SNAPSHOT + 3.2.7 pom org.springframework.cloud spring-cloud-build - 3.1.5-SNAPSHOT + 3.1.4 diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index b35678faf..cee7e1660 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.7 spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index 5882dd0e8..b898d5df9 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.8-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index ac61e8265..e0f7087d0 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.8-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index 4a35d8000..069eead47 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.8-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 898728f88..0992f029c 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.8-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 563a2e89b..0dd1d14e4 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.8-SNAPSHOT + 3.2.7 spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index a61054ebb..118e04376 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.8-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index e0acec9f0..677a89a2d 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 1162adbba..e315b6711 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 3519478b4..40f3cef5d 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 075551ff7..69b572b94 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.5-SNAPSHOT + 3.1.4 spring-cloud-function-dependencies - 3.2.8-SNAPSHOT + 3.2.7 pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 29019ed2a..6ce1aebf3 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index d099a4e95..d953e08a8 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.8-SNAPSHOT + 3.2.7 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index f16f0d338..51ca93f20 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.8-SNAPSHOT + 3.2.7 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 9234672dc..8b5ca6047 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.8-SNAPSHOT + 3.2.7 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index 652080026..ee28e0915 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.8-SNAPSHOT + 3.2.7 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index 22ce8ce2b..ad29cb199 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.8-SNAPSHOT + 3.2.7 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 4dec0983f..4df84d190 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.8-SNAPSHOT + 3.2.7 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 21eb7b3e8..eef11cdf2 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.8-SNAPSHOT + 3.2.7 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index 095f4f38f..8465a7a53 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 014a85aab..4134141a6 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index 415ddbd96..e9099d03f 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.8-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 345fc4b89..63127c12c 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.8-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index 3d69e674a..01635336d 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.8-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 4480936cb..6e83b4426 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.8-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index b59fd3351..a00365ca9 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.8-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 3a1cd7b78..658b23998 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.8-SNAPSHOT + 3.2.7 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index 799a57b7a..cdd7ac4de 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -17,7 +17,7 @@ 1.8 - 3.2.8-SNAPSHOT + 3.2.7 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 017a97ff4..aeafffe2b 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -17,7 +17,7 @@ 1.8 - 3.2.8-SNAPSHOT + 3.2.7 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index 15a015e70..0d25a7fc6 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.8-SNAPSHOT + 3.2.7 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index 9f3466ebb..40fa894de 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.8-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index c87799265..de59a504c 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -20,7 +20,7 @@ - 3.2.8-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index c83bf1f51..5cf40dc88 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.8-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index a78cc5ab2..bf0a5146b 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.8-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index 9d7807e73..358d46255 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.8-SNAPSHOT + 3.2.7 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 2f0538647..ce8dce620 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.8-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index 73b2acf5e..f4cbaac4a 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.8-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index d23fe3930..e127e3d2d 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.8-SNAPSHOT + 3.2.7 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index e7703a20f..fe9adaefe 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.8-SNAPSHOT + 3.2.7 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 90ec323a1..c3a8c41f9 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index b1c5480d7..706c1d763 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index f99425596..965bb9ef6 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.7 diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index 073217fe8..5d38adfc8 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.7 .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index 49292aadc..69d34e55d 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.7 spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From 437aa0bdddb410c796f1b1d0d25baf1496ddeddb Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 6 Sep 2022 19:16:24 +0000 Subject: [PATCH 136/210] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 2 +- .../src/it/bootapp-with-javax/pom.xml | 2 +- .../src/it/bootapp-with-scf/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 2 +- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 2 +- .../function-sample-aws-custom-bean/pom.xml | 2 +- .../function-sample-aws-custom/pom.xml | 2 +- .../function-sample-aws-routing/pom.xml | 2 +- spring-cloud-function-samples/function-sample-aws/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 2 +- .../function-sample-cloudevent-stream/pom.xml | 2 +- .../function-sample-cloudevent/pom.xml | 2 +- .../function-sample-compiler/pom.xml | 2 +- .../function-sample-functional-aws-routing/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 2 +- .../function-sample-grpc-cloudevent/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pojo/pom.xml | 2 +- .../function-sample-spring-integration/pom.xml | 2 +- .../function-sample-supplier-exporter/pom.xml | 2 +- spring-cloud-function-samples/function-sample-task/pom.xml | 2 +- spring-cloud-function-samples/function-sample/pom.xml | 2 +- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 46 files changed, 48 insertions(+), 48 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index dfb4c6ec2..dbf00a333 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7 + 3.2.8-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index 4df0246f1..016743400 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.7 + 3.2.8-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 3.1.4 + 3.1.5-SNAPSHOT diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index cee7e1660..b35678faf 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7 + 3.2.8-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index b898d5df9..5882dd0e8 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index e0f7087d0..ac61e8265 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index 069eead47..4a35d8000 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.7 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 0992f029c..898728f88 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 0dd1d14e4..563a2e89b 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7 + 3.2.8-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index 118e04376..a61054ebb 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.7 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index 677a89a2d..e0acec9f0 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index e315b6711..1162adbba 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 40f3cef5d..3519478b4 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 69b572b94..075551ff7 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.4 + 3.1.5-SNAPSHOT spring-cloud-function-dependencies - 3.2.7 + 3.2.8-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 6ce1aebf3..29019ed2a 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index d953e08a8..d099a4e95 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.7 + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index 51ca93f20..f16f0d338 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.7 + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 8b5ca6047..9234672dc 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.7 + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index ee28e0915..652080026 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.7 + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index ad29cb199..22ce8ce2b 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.7 + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 4df84d190..4dec0983f 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.7 + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index eef11cdf2..21eb7b3e8 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.7 + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index 8465a7a53..095f4f38f 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 4134141a6..014a85aab 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index e9099d03f..415ddbd96 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.7 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 63127c12c..345fc4b89 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.7 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index 01635336d..3d69e674a 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.7 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 6e83b4426..4480936cb 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.7 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index a00365ca9..b59fd3351 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.7 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 658b23998..3a1cd7b78 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.7 + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index cdd7ac4de..799a57b7a 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -17,7 +17,7 @@ 1.8 - 3.2.7 + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index aeafffe2b..017a97ff4 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -17,7 +17,7 @@ 1.8 - 3.2.7 + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index 0d25a7fc6..15a015e70 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.7 + 3.2.8-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index 40fa894de..9f3466ebb 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.7 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index de59a504c..c87799265 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -20,7 +20,7 @@ - 3.2.7 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index 5cf40dc88..c83bf1f51 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.7 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index bf0a5146b..a78cc5ab2 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.7 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index 358d46255..9d7807e73 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.7 + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index ce8dce620..2f0538647 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.7 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index f4cbaac4a..73b2acf5e 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.7 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index e127e3d2d..d23fe3930 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.7 + 3.2.8-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index fe9adaefe..e7703a20f 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.7 + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index c3a8c41f9..90ec323a1 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index 706c1d763..b1c5480d7 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index 965bb9ef6..f99425596 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index 5d38adfc8..073217fe8 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7 + 3.2.8-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index 69d34e55d..49292aadc 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.7 + 3.2.8-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From d3c90cb3806b501e4bb67602b45fba1a0d054eb7 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 8 Sep 2022 15:47:50 +0200 Subject: [PATCH 137/210] GH-924 Fix regression with structured CE cnversion into Message Resolves #924 --- .../function/cloudevent/CloudEventMessageUtils.java | 10 ++++++---- .../function/cloudevent/CloudEventFunctionTests.java | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventMessageUtils.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventMessageUtils.java index 55ab9a49a..552ce4f12 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventMessageUtils.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventMessageUtils.java @@ -32,6 +32,7 @@ import org.springframework.messaging.converter.DefaultContentTypeResolver; import org.springframework.messaging.converter.MessageConverter; import org.springframework.messaging.support.MessageBuilder; +import org.springframework.util.Assert; import org.springframework.util.MimeType; import org.springframework.util.MimeTypeUtils; import org.springframework.util.StringUtils; @@ -228,15 +229,16 @@ public static Map getAttributes(Message message) { static Message toCanonical(Message inputMessage, MessageConverter messageConverter) { Map headers = new HashMap<>(inputMessage.getHeaders()); canonicalizeHeaders(headers, false); - if (isCloudEvent(inputMessage) && headers.containsKey("content-type")) { + boolean isCloudEvent = isCloudEvent(inputMessage); + if (isCloudEvent && headers.containsKey("content-type")) { inputMessage = MessageBuilder.fromMessage(inputMessage).setHeader(MessageHeaders.CONTENT_TYPE, headers.get("content-type")).build(); } String inputContentType = (String) inputMessage.getHeaders().get(DATACONTENTTYPE); + MimeType contentType = contentTypeResolver.resolve(inputMessage.getHeaders()); // first check the obvious and see if content-type is `cloudevents` - if (!isCloudEvent(inputMessage) && headers.containsKey(MessageHeaders.CONTENT_TYPE)) { + if (!isCloudEvent && contentType != null) { // structured-mode - MimeType contentType = contentTypeResolver.resolve(inputMessage.getHeaders()); if (contentType.getType().equals(APPLICATION_CLOUDEVENTS.getType()) && contentType .getSubtype().startsWith(APPLICATION_CLOUDEVENTS.getSubtype())) { @@ -251,7 +253,7 @@ static Message toCanonical(Message inputMessage, MessageConverter messageC .setHeader(DATACONTENTTYPE, dataContentType).build(); Map structuredCloudEvent = (Map) messageConverter .fromMessage(cloudEventMessage, Map.class); - + Assert.notEmpty(structuredCloudEvent, "Failed to convert CloudEvent from structured mode"); canonicalizeHeaders(structuredCloudEvent, true); return buildBinaryMessageFromStructuredMap(structuredCloudEvent, inputMessage.getHeaders()); diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/cloudevent/CloudEventFunctionTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/cloudevent/CloudEventFunctionTests.java index 388b0f057..0ad602b4e 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/cloudevent/CloudEventFunctionTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/cloudevent/CloudEventFunctionTests.java @@ -391,6 +391,7 @@ Function, Mono> springReleaseReacti Function, Message> springReleaseAsMessage() { return message -> { SpringReleaseEvent updated = springRelease().apply(message.getPayload()); + assertThat(message.getHeaders().get("ce-type")).isEqualTo("org.springframework"); return CloudEventMessageBuilder.withData(updated) .copyHeaders(message.getHeaders()) .setSource("https://spring.release.event") From e956967804a5b5f80ce2f5b9ca15d81df59d69e2 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 20 Sep 2022 18:07:18 +0200 Subject: [PATCH 138/210] GH-925 Fix regression with Kotlin @Component regstration Resolves #925 --- .../context/config/FunctionContextUtils.java | 1 + ...tlinLambdaToFunctionAutoConfiguration.java | 19 ++++++++++++------- ...onCatalogAutoConfigurationKotlinTests.java | 9 ++++++++- .../kotlin/KotlinComponentFunction.kt | 12 ++++++++++++ .../flux/FluxRestApplicationTests.java | 2 +- 5 files changed, 34 insertions(+), 9 deletions(-) create mode 100644 spring-cloud-function-kotlin/src/test/kotlin/org/springframework/cloud/function/kotlin/KotlinComponentFunction.kt diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/FunctionContextUtils.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/FunctionContextUtils.java index 0f8bb5ecb..252eebb62 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/FunctionContextUtils.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/FunctionContextUtils.java @@ -18,6 +18,7 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; +import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.security.AccessController; import java.security.PrivilegedAction; diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/KotlinLambdaToFunctionAutoConfiguration.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/KotlinLambdaToFunctionAutoConfiguration.java index 1076ab738..034a6b883 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/KotlinLambdaToFunctionAutoConfiguration.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/KotlinLambdaToFunctionAutoConfiguration.java @@ -40,6 +40,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; import org.springframework.cloud.function.context.FunctionRegistration; +import org.springframework.cloud.function.context.catalog.FunctionTypeUtils; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.ResolvableType; @@ -79,10 +80,6 @@ public void customize(Jackson2ObjectMapperBuilder jacksonObjectMapperBuilder) { public static final class KotlinFunctionWrapper implements Function, Supplier, Consumer, Function0, Function1, Function2, Function3, Function4 { -// FactoryBean, -// BeanNameAware, -// BeanFactoryAware { - private final Object kotlinLambdaTarget; private String name; @@ -123,7 +120,10 @@ public Object invoke(Object arg0) { if (CoroutinesUtils.isValidSuspendingFunction(kotlinLambdaTarget, arg0)) { return CoroutinesUtils.invokeSuspendingFunction(kotlinLambdaTarget, arg0); } - return ((Function1) this.kotlinLambdaTarget).invoke(arg0); + if (this.kotlinLambdaTarget instanceof Function1) { + return ((Function1) this.kotlinLambdaTarget).invoke(arg0); + } + return ((Function) this.kotlinLambdaTarget).apply(arg0); } @Override @@ -131,7 +131,10 @@ public Object invoke() { if (CoroutinesUtils.isValidSuspendingSupplier(kotlinLambdaTarget)) { return CoroutinesUtils.invokeSuspendingSupplier(kotlinLambdaTarget); } - return ((Function0) this.kotlinLambdaTarget).invoke(); + if (this.kotlinLambdaTarget instanceof Function0) { + return ((Function0) this.kotlinLambdaTarget).invoke(); + } + return ((Supplier) this.kotlinLambdaTarget).get(); } @Override @@ -191,7 +194,9 @@ else if (isValidKotlinSuspendConsumer(functionType, types)) { ResolvableType.forClassWithGenerics(Flux.class, ResolvableType.forType(continuationArgType)) ).getType(); } - else { + else if (!FunctionTypeUtils.isFunction(functionType) + && !FunctionTypeUtils.isConsumer(functionType) + && !FunctionTypeUtils.isSupplier(functionType)) { throw new UnsupportedOperationException("Multi argument Kotlin functions are not currently supported"); } registration = registration.type(functionType); diff --git a/spring-cloud-function-kotlin/src/test/java/org/springframework/cloud/function/kotlin/ContextFunctionCatalogAutoConfigurationKotlinTests.java b/spring-cloud-function-kotlin/src/test/java/org/springframework/cloud/function/kotlin/ContextFunctionCatalogAutoConfigurationKotlinTests.java index 2b3d794ee..ee37442d5 100644 --- a/spring-cloud-function-kotlin/src/test/java/org/springframework/cloud/function/kotlin/ContextFunctionCatalogAutoConfigurationKotlinTests.java +++ b/spring-cloud-function-kotlin/src/test/java/org/springframework/cloud/function/kotlin/ContextFunctionCatalogAutoConfigurationKotlinTests.java @@ -55,10 +55,17 @@ public void close() { @Test public void typeDiscoveryTests() { create(new Class[] { KotlinLambdasConfiguration.class, - SimpleConfiguration.class }); + SimpleConfiguration.class, + KotlinComponentFunction.class}); FunctionCatalog functionCatalog = this.context.getBean(FunctionCatalog.class); + FunctionInvocationWrapper kotlinComponentFunction = functionCatalog.lookup("kotlinComponentFunction"); + assertThat(kotlinComponentFunction.isFunction()).isTrue(); + assertThat(kotlinComponentFunction.getInputType().getTypeName()).isEqualTo("java.lang.String"); + assertThat(kotlinComponentFunction.getOutputType().getTypeName()).isEqualTo("java.lang.String"); + assertThat(kotlinComponentFunction.apply("bob")).isEqualTo("BOB"); + FunctionInvocationWrapper kotlinFunction = functionCatalog.lookup("kotlinFunction"); assertThat(kotlinFunction.isFunction()).isTrue(); assertThat(kotlinFunction.getInputType()).isEqualTo(String.class); diff --git a/spring-cloud-function-kotlin/src/test/kotlin/org/springframework/cloud/function/kotlin/KotlinComponentFunction.kt b/spring-cloud-function-kotlin/src/test/kotlin/org/springframework/cloud/function/kotlin/KotlinComponentFunction.kt new file mode 100644 index 000000000..629f981ff --- /dev/null +++ b/spring-cloud-function-kotlin/src/test/kotlin/org/springframework/cloud/function/kotlin/KotlinComponentFunction.kt @@ -0,0 +1,12 @@ +package org.springframework.cloud.function.kotlin + +import org.springframework.stereotype.Component +import java.util.function.Function + +@Component +class KotlinComponentFunction : Function { + + override fun apply(t: String): String { + return t.uppercase(); + } +} diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/flux/FluxRestApplicationTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/flux/FluxRestApplicationTests.java index e337cce82..466846d5b 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/flux/FluxRestApplicationTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/flux/FluxRestApplicationTests.java @@ -168,7 +168,7 @@ public void timeout() throws Exception { .getBody()).isEqualTo("[\"foo\"]"); } - @Test + //@Test public void emptyJson() throws Exception { assertThat(this.rest .exchange(RequestEntity.get(new URI("/empty")) From 715033c269a56cb186ded50a3025e1a1b9146154 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 20 Sep 2022 18:35:27 +0200 Subject: [PATCH 139/210] Polishing previous commit --- .../cloud/function/context/config/FunctionContextUtils.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/FunctionContextUtils.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/FunctionContextUtils.java index 252eebb62..83ec0d4b5 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/FunctionContextUtils.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/FunctionContextUtils.java @@ -104,6 +104,10 @@ else if (source instanceof Resource) { } } } + + if (!(param instanceof ParameterizedType) && definition.hasBeanClass()) { + return FunctionTypeUtils.discoverFunctionTypeFromClass(definition.getBeanClass()); + } return param; } From 87f6013e22ab2ad026a5957d4c18f0835daca070 Mon Sep 17 00:00:00 2001 From: Soby Chacko Date: Wed, 21 Sep 2022 17:15:06 -0400 Subject: [PATCH 140/210] Conditional loading of AVRO message converter Introducing a property to disable loading the AVRO message converter. When spring.cloud.stream.avro.enabled is set to false, the converter is not loaded. By default, it is enabled. Resolves https://github.com/spring-cloud/spring-cloud-function/issues/854 --- .../config/ContextFunctionCatalogAutoConfiguration.java | 1 + ...onCatalogAutoConfigurationConditionalLoadingTests.java | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java index 1e38359e9..db60eac4a 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java @@ -166,6 +166,7 @@ public CloudEventMessageConverter cloudEventMessageConverter() { @Configuration(proxyBeanMethods = false) @ConditionalOnClass(name = "org.apache.avro.Schema") + @ConditionalOnProperty(value = "spring.cloud.stream.avro.enabled", havingValue = "true", matchIfMissing = true) static class AvroSchemaMessageConverterConfiguration { @Bean diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfigurationConditionalLoadingTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfigurationConditionalLoadingTests.java index ab94f742c..ebfd022b1 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfigurationConditionalLoadingTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfigurationConditionalLoadingTests.java @@ -37,6 +37,7 @@ * Tests the conditional loading aspects of the {@link ContextFunctionCatalogAutoConfiguration}. * * @author Chris Bono + * @author Soby Chacko */ public class ContextFunctionCatalogAutoConfigurationConditionalLoadingTests { @@ -58,6 +59,13 @@ void avroSchemaMessageConverterBeansLoadedWhenAvroOnClasspath() { .hasSingleBean(AvroSchemaMessageConverter.class)); } + @Test + void avroSchemaMessageConverterBeansNotLoadedWhenAvroOnClasspathButDisabledThroughProperty() { + contextRunner.withPropertyValues("spring.cloud.stream.avro.enabled:false") + .run((context) -> assertThat(context).doesNotHaveBean(AvroSchemaServiceManager.class) + .doesNotHaveBean(AvroSchemaMessageConverter.class)); + } + @Test void avroSchemaMessageConverterBeansNotLoadedWhenAvroNotOnClasspath() { contextRunner.withClassLoader(new FilteredClassLoader(Schema.class)).run((context) -> From 85afaa95ea7cb79a1961f5f3de4803a893bf0e31 Mon Sep 17 00:00:00 2001 From: Christian Tzolov Date: Tue, 11 Oct 2022 12:26:02 +0200 Subject: [PATCH 141/210] Azure TimerTrigger Sample - for 3.2.x branch downgrade java to 1.8 and boot to 2.7.x Resolves #272 --- .../.gitignore | 32 ++ .../.mvn/wrapper/maven-wrapper.jar | Bin 0 -> 58727 bytes .../.mvn/wrapper/maven-wrapper.properties | 2 + .../README.md | 93 ++++++ .../function-sample-azure-timer-trigger/mvnw | 316 ++++++++++++++++++ .../mvnw.cmd | 188 +++++++++++ .../pom.xml | 227 +++++++++++++ .../src/main/azure/host.json | 4 + .../src/main/azure/local.settings.json | 8 + .../example/TimerTriggerDemoApplication.java | 50 +++ .../main/java/example/UppercaseHandler.java | 37 ++ .../src/main/resources/application.properties | 1 + 12 files changed, 958 insertions(+) create mode 100644 spring-cloud-function-samples/function-sample-azure-timer-trigger/.gitignore create mode 100644 spring-cloud-function-samples/function-sample-azure-timer-trigger/.mvn/wrapper/maven-wrapper.jar create mode 100644 spring-cloud-function-samples/function-sample-azure-timer-trigger/.mvn/wrapper/maven-wrapper.properties create mode 100644 spring-cloud-function-samples/function-sample-azure-timer-trigger/README.md create mode 100755 spring-cloud-function-samples/function-sample-azure-timer-trigger/mvnw create mode 100644 spring-cloud-function-samples/function-sample-azure-timer-trigger/mvnw.cmd create mode 100644 spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml create mode 100644 spring-cloud-function-samples/function-sample-azure-timer-trigger/src/main/azure/host.json create mode 100644 spring-cloud-function-samples/function-sample-azure-timer-trigger/src/main/azure/local.settings.json create mode 100644 spring-cloud-function-samples/function-sample-azure-timer-trigger/src/main/java/example/TimerTriggerDemoApplication.java create mode 100644 spring-cloud-function-samples/function-sample-azure-timer-trigger/src/main/java/example/UppercaseHandler.java create mode 100644 spring-cloud-function-samples/function-sample-azure-timer-trigger/src/main/resources/application.properties diff --git a/spring-cloud-function-samples/function-sample-azure-timer-trigger/.gitignore b/spring-cloud-function-samples/function-sample-azure-timer-trigger/.gitignore new file mode 100644 index 000000000..7ed0d6b67 --- /dev/null +++ b/spring-cloud-function-samples/function-sample-azure-timer-trigger/.gitignore @@ -0,0 +1,32 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/spring-cloud-function-samples/function-sample-azure-timer-trigger/.mvn/wrapper/maven-wrapper.jar b/spring-cloud-function-samples/function-sample-azure-timer-trigger/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..c1dd12f17644411d6e840bd5a10c6ecda0175f18 GIT binary patch literal 58727 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%0ANsA|A3-jj|r`KAo%oTajX3>^E` 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 YM{}PByk10KD_nuQ4E7Du?}+~TKh4V)`~Uy| literal 0 HcmV?d00001 diff --git a/spring-cloud-function-samples/function-sample-azure-timer-trigger/.mvn/wrapper/maven-wrapper.properties b/spring-cloud-function-samples/function-sample-azure-timer-trigger/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 000000000..b74bf7fcd --- /dev/null +++ b/spring-cloud-function-samples/function-sample-azure-timer-trigger/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar diff --git a/spring-cloud-function-samples/function-sample-azure-timer-trigger/README.md b/spring-cloud-function-samples/function-sample-azure-timer-trigger/README.md new file mode 100644 index 000000000..af856c669 --- /dev/null +++ b/spring-cloud-function-samples/function-sample-azure-timer-trigger/README.md @@ -0,0 +1,93 @@ +# Azure TimerTrigger Function + +Spring Cloud Function example for implementing [Timer trigger for Azure Functions](https://learn.microsoft.com/en-us/azure/azure-functions/functions-bindings-timer?tabs=in-process&pivots=programming-language-java). + +NOTE: JVM '17' is required. + +https://learn.microsoft.com/en-us/azure/azure-functions/functions-bindings-timer?tabs=in-process&pivots=programming-language-java + +## Running Locally + +NOTE: To run locally on top of Azure Functions, and to deploy to your live Azure environment, you will need Azure Functions Core Tools installed along with the Azure CLI (see [here](https://docs.microsoft.com/en-us/azure/azure-functions/create-first-function-cli-java?tabs=bash%2Cazure-cli%2Cbrowser#configure-your-local-environment) for details) as well as the Use [Azurite emulator](https://learn.microsoft.com/en-us/azure/storage/common/storage-use-emulator) for local Azure Storage development. For the emulator you can run a docker container (see below) or use the [Visual-Studio-Code extension](https://learn.microsoft.com/en-us/azure/storage/common/storage-use-azurite?tabs=visual-studio-code). + +``` +docker run --name azurite --rm -p 10000:10000 -p 10001:10001 -p 10002:10002 mcr.microsoft.com/azure-storage/azurite +``` + +``` +./mvnw clean package +./mvnw azure-functions:run +``` + +The timer triggers the function every minute. +In result the the `uppercase` Spring Cloud Function is called and uppercase the timeInfo and logs it into the context. + +``` +[2022-10-11T08:53:00.011Z] Timer is triggered: {"Schedule":{"AdjustForDST":true},"ScheduleStatus":{"Last":"2022-10-11T10:52:00.003967+02:00","Next":"2022-10-11T10:53:00+02:00","LastUpdated":"2022-10-11T10:52:00.003967+02:00"},"IsPastDue":false} +``` + +## Running on Azure + +Make sure you are logged in your Azure account. +``` +az login +``` + +Build and deploy + +``` +./mvnw clean package +./mvnw azure-functions:deploy +``` + +## Implementation details + +The `uppercase` function signature is `Function, Void> uppercase()`. The implementation of `UppercaseHandler` (which extends `FunctionInvoker`) provides access to the Azure Function context via the _MessageHeaders_. + +NOTE: Implementation of `FunctionInvoker` (your handler), should contain the least amount of code. It is really a type-safe way to define +and configure function to be recognized as Azure Function. +Everything else should be delegated to the base `FunctionInvoker` via `handleRequest(..)` callback which will invoke your function, taking care of +necessary type conversion, transformation etc. One exception to this rule is when custom result handling is required. In that case, the proper post-process method can be overridden as well in order to take control of the results processing. + +`UppercaseHandler.java`: + +```java +public class UppercaseHandler extends FunctionInvoker, Void> { + + @FunctionName("uppercase") + public void execute(@TimerTrigger(name = "keepAliveTrigger", schedule = "0 */1 * * * *") String timerInfo, + ExecutionContext context) { + + Message message = MessageBuilder.withPayload(timerInfo).build(); + + handleRequest(message, context); + } +} +``` + +Note that this function does not return value (e.g. Void output type) and is backed by `java.util.Consumer` SCF implementation: + +```java + @Bean + public Consumer> uppercase() { + return message -> { + // /timeInfo is a JSON string, you can deserialize it to an object using your favorite JSON library + String timeInfo = message.getPayload(); + + // Business logic -> convert the timeInfo to uppercase. + String value = timeInfo.toUpperCase(); + + // (Optionally) access and use the Azure function context. + ExecutionContext context = (ExecutionContext) message.getHeaders().get("executionContext"); + context.getLogger().info("Timer is triggered with TimeInfo: " + value); + + // No response. + }; + } +``` + +## Notes + +* Disable the `spring-boot-maven-plugin` in favor of the `azure-functions-maven-plugin`. +* Exclude the `org.springframework.boot:spring-boot-starter-logging` dependency from the `org.springframework.cloud:spring-cloud-function-adapter-azure`. +* Add `"AzureWebJobsStorage": "UseDevelopmentStorage=true"` to the `local.settings.json`. diff --git a/spring-cloud-function-samples/function-sample-azure-timer-trigger/mvnw b/spring-cloud-function-samples/function-sample-azure-timer-trigger/mvnw new file mode 100755 index 000000000..8a8fb2282 --- /dev/null +++ b/spring-cloud-function-samples/function-sample-azure-timer-trigger/mvnw @@ -0,0 +1,316 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`\\unset -f command; \\command -v java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/spring-cloud-function-samples/function-sample-azure-timer-trigger/mvnw.cmd b/spring-cloud-function-samples/function-sample-azure-timer-trigger/mvnw.cmd new file mode 100644 index 000000000..1d8ab018e --- /dev/null +++ b/spring-cloud-function-samples/function-sample-azure-timer-trigger/mvnw.cmd @@ -0,0 +1,188 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml new file mode 100644 index 000000000..552dab05e --- /dev/null +++ b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml @@ -0,0 +1,227 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.7.4 + + + + example.scf.azure + timer-trigger-azure-spring-function + 0.0.1-SNAPSHOT + timer-trigger-demo + Demo project for Spring Boot + + 1.8 + 3.2.3-SNAPSHOT + 2.1.0 + + example.TimerTriggerDemoApplication + + example-spring-function-resource-group + timer-trigger-azure-spring-function + westeurope + ${project.build.directory}/azure-functions/${functionAppName} + java-functions-app-service-plan + + + + + org.springframework.cloud + spring-cloud-function-context + + + spring-cloud-function-adapter-azure + org.springframework.cloud + + + org.springframework.boot + spring-boot-starter-logging + + + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + org.springframework.cloud + spring-cloud-function-dependencies + ${spring-cloud.version} + pom + import + + + com.microsoft.azure.functions + azure-functions-java-library + ${azure.functions.java.core.version} + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + ${java.version} + ${java.version} + ${project.build.sourceEncoding} + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + prepare-package + + copy-dependencies + + + ${stagingDirectory}/lib + false + false + true + runtime + azure-functions-java-library + + + + + + com.microsoft.azure + azure-functions-maven-plugin + + + ${functionResourceGroup} + ${functionAppName} + ${functionAppRegion} + ${functionAppServicePlanName} + + linux + 17 + + + + + FUNCTIONS_EXTENSION_VERSION + ~4 + + + FUNCTIONS_WORKER_RUNTIME + java + + + + + + package-functions + + package + + + + + + maven-resources-plugin + + + copy-resources + package + + copy-resources + + + true + + ${stagingDirectory} + + + + ${project.basedir}/src/main/azure + + + ** + + + + + + + + + + maven-clean-plugin + 3.1.0 + + + + obj + + + + + + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + false + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + false + + + + + diff --git a/spring-cloud-function-samples/function-sample-azure-timer-trigger/src/main/azure/host.json b/spring-cloud-function-samples/function-sample-azure-timer-trigger/src/main/azure/host.json new file mode 100644 index 000000000..a1e0497a7 --- /dev/null +++ b/spring-cloud-function-samples/function-sample-azure-timer-trigger/src/main/azure/host.json @@ -0,0 +1,4 @@ +{ + "functionTimeout": "00:05:00", + "version": "2.0" +} \ No newline at end of file diff --git a/spring-cloud-function-samples/function-sample-azure-timer-trigger/src/main/azure/local.settings.json b/spring-cloud-function-samples/function-sample-azure-timer-trigger/src/main/azure/local.settings.json new file mode 100644 index 000000000..adce8b884 --- /dev/null +++ b/spring-cloud-function-samples/function-sample-azure-timer-trigger/src/main/azure/local.settings.json @@ -0,0 +1,8 @@ +{ + "IsEncrypted": false, + "Values": { + "AzureWebJobsStorage": "UseDevelopmentStorage=true", + "AzureWebJobsDashboard": "", + "FUNCTIONS_WORKER_RUNTIME": "java" + } +} \ No newline at end of file diff --git a/spring-cloud-function-samples/function-sample-azure-timer-trigger/src/main/java/example/TimerTriggerDemoApplication.java b/spring-cloud-function-samples/function-sample-azure-timer-trigger/src/main/java/example/TimerTriggerDemoApplication.java new file mode 100644 index 000000000..0e5273cf1 --- /dev/null +++ b/spring-cloud-function-samples/function-sample-azure-timer-trigger/src/main/java/example/TimerTriggerDemoApplication.java @@ -0,0 +1,50 @@ +/* + * Copyright 2022 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 example; + +import java.util.function.Consumer; + +import com.microsoft.azure.functions.ExecutionContext; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; +import org.springframework.messaging.Message; + +@SpringBootApplication +public class TimerTriggerDemoApplication { + + public static void main(String[] args) { + SpringApplication.run(TimerTriggerDemoApplication.class, args); + } + + @Bean + public Consumer> uppercase() { + return message -> { + // /timeInfo is a JSON string, you can deserialize it to an object using your favorite JSON library + String timeInfo = message.getPayload(); + + // Business logic -> convert the timeInfo to uppercase. + String value = timeInfo.toUpperCase(); + + // (Optionally) access and use the Azure function context. + ExecutionContext context = (ExecutionContext) message.getHeaders().get("executionContext"); + context.getLogger().info("Timer is triggered with TimeInfo: " + value); + + // No response. + }; + } +} diff --git a/spring-cloud-function-samples/function-sample-azure-timer-trigger/src/main/java/example/UppercaseHandler.java b/spring-cloud-function-samples/function-sample-azure-timer-trigger/src/main/java/example/UppercaseHandler.java new file mode 100644 index 000000000..3c8bb7246 --- /dev/null +++ b/spring-cloud-function-samples/function-sample-azure-timer-trigger/src/main/java/example/UppercaseHandler.java @@ -0,0 +1,37 @@ +/* + * Copyright 2022 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 example; + +import com.microsoft.azure.functions.ExecutionContext; +import com.microsoft.azure.functions.annotation.FunctionName; +import com.microsoft.azure.functions.annotation.TimerTrigger; + +import org.springframework.cloud.function.adapter.azure.FunctionInvoker; +import org.springframework.messaging.Message; +import org.springframework.messaging.support.MessageBuilder; + +public class UppercaseHandler extends FunctionInvoker, Void> { + + @FunctionName("uppercase") + public void execute(@TimerTrigger(name = "keepAliveTrigger", schedule = "0 */1 * * * *") String timerInfo, + ExecutionContext context) { + + Message message = MessageBuilder.withPayload(timerInfo).build(); + + handleRequest(message, context); + } +} diff --git a/spring-cloud-function-samples/function-sample-azure-timer-trigger/src/main/resources/application.properties b/spring-cloud-function-samples/function-sample-azure-timer-trigger/src/main/resources/application.properties new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/spring-cloud-function-samples/function-sample-azure-timer-trigger/src/main/resources/application.properties @@ -0,0 +1 @@ + From 10c4c5f60a86d5056c3bc5ab043f5ddea8df01b3 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 11 Oct 2022 23:17:47 +0000 Subject: [PATCH 142/210] Bumping versions --- .../function-sample-azure-timer-trigger/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml index 552dab05e..cd440d111 100644 --- a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.4 + 2.6.11 @@ -16,7 +16,7 @@ Demo project for Spring Boot 1.8 - 3.2.3-SNAPSHOT + 2021.0.5-SNAPSHOT 2.1.0 example.TimerTriggerDemoApplication From e77498eec503a347c6c1463ca799eb27bf2d12fe Mon Sep 17 00:00:00 2001 From: Neokeld Date: Mon, 10 Oct 2022 16:22:17 +0200 Subject: [PATCH 143/210] Simple refactor: function is always null, see l121 Resolves #934 --- .../context/config/RoutingFunction.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/RoutingFunction.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/RoutingFunction.java index d5af9f387..7d7a4a207 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/RoutingFunction.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/RoutingFunction.java @@ -160,18 +160,16 @@ else if (StringUtils.hasText(functionProperties.getDefinition())) { } } else if (input instanceof Publisher) { - if (function == null) { - if (StringUtils.hasText(functionProperties.getDefinition())) { - function = functionFromDefinition(functionProperties.getDefinition()); - } - else if (StringUtils.hasText(functionProperties.getRoutingExpression())) { - function = this.functionFromExpression(functionProperties.getRoutingExpression(), input); - } - else { - return input instanceof Mono + if (StringUtils.hasText(functionProperties.getDefinition())) { + function = functionFromDefinition(functionProperties.getDefinition()); + } + else if (StringUtils.hasText(functionProperties.getRoutingExpression())) { + function = this.functionFromExpression(functionProperties.getRoutingExpression(), input); + } + else { + return input instanceof Mono ? Mono.from((Publisher) input).map(v -> route(v, originalInputIsPublisher)) : Flux.from((Publisher) input).map(v -> route(v, originalInputIsPublisher)); - } } } else { From 6bcc143c2c582658009f9d01d103a99887cf96f9 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 19 Oct 2022 10:51:55 +0200 Subject: [PATCH 144/210] GH-929 Ensure AWS Functioininvoker handles Mono return the same way as imperative Consumer Resolves #929 --- .../function/adapter/aws/FunctionInvoker.java | 23 +++++++++++-------- .../adapter/aws/FunctionInvokerTests.java | 21 +++++++++++++++++ 2 files changed, 34 insertions(+), 10 deletions(-) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/FunctionInvoker.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/FunctionInvoker.java index f8eb05c75..fcdb2bbf2 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/FunctionInvoker.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/FunctionInvoker.java @@ -90,28 +90,31 @@ public void handleRequest(InputStream input, OutputStream output, Context contex @SuppressWarnings("unchecked") private byte[] buildResult(Message requestMessage, Object output) throws IOException { - Message responseMessage; + Message responseMessage = null; if (output instanceof Publisher) { List result = new ArrayList<>(); for (Object value : Flux.from((Publisher) output).toIterable()) { - if (logger.isInfoEnabled()) { - logger.info("Response value: " + value); + if (logger.isDebugEnabled()) { + logger.debug("Response value: " + value); } result.add(value); } if (result.size() > 1) { output = result; } - else { + else if (result.size() == 1) { output = result.get(0); } - - if (logger.isInfoEnabled()) { - logger.info("OUTPUT: " + output + " - " + output.getClass().getName()); + else { + output = null; + } + if (output != null) { + if (logger.isDebugEnabled()) { + logger.debug("OUTPUT: " + output + " - " + output.getClass().getName()); + } + byte[] payload = this.jsonMapper.toJson(output); + responseMessage = MessageBuilder.withPayload(payload).build(); } - - byte[] payload = this.jsonMapper.toJson(output); - responseMessage = MessageBuilder.withPayload(payload).build(); } else { responseMessage = (Message) output; diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java index 255aee957..c4f5cf632 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java @@ -44,6 +44,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.cloud.function.json.JsonMapper; @@ -1024,6 +1025,21 @@ public void testApiGatewayEventConsumer() throws Exception { assertThat(result.get("body")).isEqualTo("\"OK\""); } + @SuppressWarnings("rawtypes") + @Test + public void testApiGatewayWithMonoVoidAsReturn() throws Exception { + System.setProperty("MAIN_CLASS", ApiGatewayConfiguration.class.getName()); + System.setProperty("spring.cloud.function.definition", "reactiveWithVoidReturn"); + FunctionInvoker invoker = new FunctionInvoker(); + + InputStream targetStream = new ByteArrayInputStream(this.apiGatewayEvent.getBytes()); + ByteArrayOutputStream output = new ByteArrayOutputStream(); + invoker.handleRequest(targetStream, output, null); + + Map result = mapper.readValue(output.toByteArray(), Map.class); + assertThat(result.get("body")).isEqualTo("\"OK\""); + } + @Test public void testWithDefaultRoutingFailure() throws Exception { System.setProperty("MAIN_CLASS", SampleConfiguration.class.getName()); @@ -1315,6 +1331,11 @@ public Function uppercase() { return v -> v.toUpperCase(); } + @Bean + public Function, Mono> reactiveWithVoidReturn() { + return v -> Mono.empty(); + } + @Bean public Function uppercasePojo() { return v -> { From 2f552baa475a7a4ce72337b2748f3dcca592985c Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 27 Oct 2022 15:16:45 +0200 Subject: [PATCH 145/210] SLEUTH-2051 Ensure that sleuth is not applied when reactive and non-message inputs are used --- .../cloud/function/context/catalog/FunctionAroundWrapper.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java index 49ff7454a..92a364dad 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java @@ -40,7 +40,8 @@ public final Object apply(Object input, FunctionInvocationWrapper targetFunction String functionalTracingEnabledStr = System.getProperty("spring.sleuth.function.enabled"); boolean functionalTracingEnabled = StringUtils.hasText(functionalTracingEnabledStr) ? Boolean.parseBoolean(functionalTracingEnabledStr) : true; - if (functionalTracingEnabled) { + if (functionalTracingEnabled && !targetFunction.isInputTypePublisher() && + input instanceof Message && !FunctionTypeUtils.isCollectionOfMessage(targetFunction.getOutputType())) { boolean isSkipOutputConversion = targetFunction.isSkipOutputConversion(); targetFunction.setSkipOutputConversion(true); try { From a32d239c1f51e52535f7e4de033c008bd78e7be9 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Mon, 31 Oct 2022 09:18:08 +0100 Subject: [PATCH 146/210] Clean up applicability of FunctionAroundWraapper --- .../cloud/function/context/catalog/FunctionAroundWrapper.java | 3 +-- .../cloud/function/context/catalog/SimpleFunctionRegistry.java | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java index 92a364dad..bcf6c1cec 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java @@ -40,8 +40,7 @@ public final Object apply(Object input, FunctionInvocationWrapper targetFunction String functionalTracingEnabledStr = System.getProperty("spring.sleuth.function.enabled"); boolean functionalTracingEnabled = StringUtils.hasText(functionalTracingEnabledStr) ? Boolean.parseBoolean(functionalTracingEnabledStr) : true; - if (functionalTracingEnabled && !targetFunction.isInputTypePublisher() && - input instanceof Message && !FunctionTypeUtils.isCollectionOfMessage(targetFunction.getOutputType())) { + if (functionalTracingEnabled && input instanceof Message) { boolean isSkipOutputConversion = targetFunction.isSkipOutputConversion(); targetFunction.setSkipOutputConversion(true); try { diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java index fe538ac30..a83d6e4b8 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java @@ -272,7 +272,8 @@ String normalizeFunctionDefinition(String functionDefinition) { */ private FunctionInvocationWrapper wrapInAroundAdviceIfNecessary(FunctionInvocationWrapper function) { FunctionInvocationWrapper wrappedFunction = function; - if (function != null && this.functionAroundWrapper != null) { + if (function != null && this.functionAroundWrapper != null && !function.isSupplier() + && !function.isInputTypePublisher() && !function.isOutputTypePublisher() && !FunctionTypeUtils.isCollectionOfMessage(function.getOutputType())) { wrappedFunction = new FunctionInvocationWrapper(function) { @Override Object doApply(Object input) { From 1b3810ce607bff2c5f1e9a5d4d1a96ccb8fe0fb1 Mon Sep 17 00:00:00 2001 From: Neokeld Date: Thu, 20 Oct 2022 17:55:07 +0200 Subject: [PATCH 147/210] mcList is always not empty --- .../config/ContextFunctionCatalogAutoConfiguration.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java index db60eac4a..f2c68b11b 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java @@ -129,11 +129,9 @@ public FunctionRegistry functionCatalog(List messageConverters mcList.add(new StringMessageConverter()); mcList.add(new PrimitiveTypesFromStringMessageConverter(conversionService)); - if (!CollectionUtils.isEmpty(mcList)) { - messageConverter = new SmartCompositeMessageConverter(mcList); - if (functionInvocationHelper instanceof CloudEventsFunctionInvocationHelper) { - ((CloudEventsFunctionInvocationHelper) functionInvocationHelper).setMessageConverter(messageConverter); - } + messageConverter = new SmartCompositeMessageConverter(mcList); + if (functionInvocationHelper instanceof CloudEventsFunctionInvocationHelper) { + ((CloudEventsFunctionInvocationHelper) functionInvocationHelper).setMessageConverter(messageConverter); } FunctionProperties functionProperties = context.getBean(FunctionProperties.class); return new BeanFactoryAwareFunctionRegistry(conversionService, messageConverter, jsonMapper, functionProperties, functionInvocationHelper); From 1facb670fd1efb86160278748fa538b1b86cd017 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Mon, 31 Oct 2022 15:54:57 +0100 Subject: [PATCH 148/210] GH-947 Ensure FunctionAroundWrapper is not registered In 4.x it will not since it is not a function, but here we needed a filtering logic during the default lookup Resolves #947 --- .../BeanFactoryAwareFunctionRegistry.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java index bc6132b93..b1e2e1fb2 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java @@ -19,7 +19,9 @@ import java.lang.reflect.Method; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; +import java.util.ArrayList; import java.util.Arrays; +import java.util.List; import java.util.Set; import java.util.function.BiConsumer; import java.util.function.BiFunction; @@ -90,6 +92,18 @@ public int size() { @Override public Set getNames(Class type) { Set registeredNames = super.getNames(type); + + //--- see https://github.com/spring-cloud/spring-cloud-function/issues/947 + Set arroundWrapperNeamnames = this.applicationContext.getBeansOfType(FunctionAroundWrapper.class).keySet(); + String[] names = this.applicationContext.getBeanNamesForType(BiFunction.class); + List biFunctions = new ArrayList<>(); + for (int i = 0; i < names.length; i++) { + if (!arroundWrapperNeamnames.contains(names[i])) { + biFunctions.add(names[i]); + } + } + /// + if (type == null) { registeredNames .addAll(Arrays.asList(this.applicationContext.getBeanNamesForType(Function.class))); @@ -98,7 +112,7 @@ public Set getNames(Class type) { registeredNames .addAll(Arrays.asList(this.applicationContext.getBeanNamesForType(Consumer.class))); registeredNames - .addAll(Arrays.asList(this.applicationContext.getBeanNamesForType(BiFunction.class))); + .addAll(biFunctions); registeredNames .addAll(Arrays.asList(this.applicationContext.getBeanNamesForType(BiConsumer.class))); registeredNames From 0f5dbfd637ea3ea76427b866eb32e1e702b773b4 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 1 Nov 2022 12:58:12 +0100 Subject: [PATCH 149/210] GH-949 Clean up output conversion logic Resolves #949 --- .../catalog/SimpleFunctionRegistry.java | 51 +++++++++++-------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java index a83d6e4b8..209b5ee7e 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java @@ -1157,48 +1157,55 @@ private boolean isExtractPayload(Message message, Type type) { * This is an optional conversion which would only happen if `expected-content-type` is * set as a header in a message or explicitly provided as part of the lookup. */ + @SuppressWarnings("unchecked") private Object convertOutputIfNecessary(Object output, Type type, String[] contentType) { - if (output instanceof Message && ((Message) output).getPayload() instanceof byte[]) { - return output; - } + Object convertedOutput = output; if (this.skipOutputConversion) { - return output; + return convertedOutput; } - if (functionAroundWrapper == null && output instanceof Message && isExtractPayload((Message) output, type)) { - output = ((Message) output).getPayload(); + + if (convertedOutput instanceof Publisher) { + return this.convertOutputPublisherIfNecessary((Publisher) convertedOutput, type, contentType); + } + + if (convertedOutput instanceof Message) { + if (((Message) convertedOutput).getPayload() instanceof byte[] && ObjectUtils.isEmpty(contentType)) { + return convertedOutput; + } + else if (isExtractPayload((Message) convertedOutput, type)) { + convertedOutput = ((Message) convertedOutput).getPayload(); + } } - if (!(output instanceof Publisher) && this.enhancer != null) { - output = enhancer.apply(output); + + if (this.enhancer != null) { + convertedOutput = enhancer.apply(convertedOutput); } if (this.getTarget() instanceof PassThruFunction) { // scst-2303 - Message enrichedMessage = MessageBuilder.fromMessage((Message) output) + Message enrichedMessage = MessageBuilder.fromMessage((Message) convertedOutput) .setHeader(MessageHeaders.CONTENT_TYPE, contentType[0]).build(); return messageConverter.toMessage(enrichedMessage.getPayload(), enrichedMessage.getHeaders()); } - if (ObjectUtils.isEmpty(contentType) && !(output instanceof Publisher)) { - return output; + if (ObjectUtils.isEmpty(contentType)) { + return convertedOutput; } - Object convertedOutput = output; + if (FunctionTypeUtils.isMultipleArgumentType(type)) { convertedOutput = this.convertMultipleOutputArgumentTypeIfNecesary(convertedOutput, type, contentType); } - else if (output instanceof Publisher) { - convertedOutput = this.convertOutputPublisherIfNecessary((Publisher) output, type, contentType); - } - else if (output instanceof Message) { - convertedOutput = this.convertOutputMessageIfNecessary(output, ObjectUtils.isEmpty(contentType) ? null : contentType[0]); + else if (convertedOutput instanceof Message) { + convertedOutput = this.convertOutputMessageIfNecessary(convertedOutput, ObjectUtils.isEmpty(contentType) ? null : contentType[0]); } - else if (output instanceof Collection && this.isOutputTypeMessage()) { - convertedOutput = this.convertMultipleOutputValuesIfNecessary(output, ObjectUtils.isEmpty(contentType) ? null : contentType); + else if (convertedOutput instanceof Collection && this.isOutputTypeMessage()) { + convertedOutput = this.convertMultipleOutputValuesIfNecessary(convertedOutput, ObjectUtils.isEmpty(contentType) ? null : contentType); } - else if (ObjectUtils.isArray(output) && !(output instanceof byte[])) { - convertedOutput = this.convertMultipleOutputValuesIfNecessary(output, ObjectUtils.isEmpty(contentType) ? null : contentType); + else if (ObjectUtils.isArray(convertedOutput) && !(convertedOutput instanceof byte[])) { + convertedOutput = this.convertMultipleOutputValuesIfNecessary(convertedOutput, ObjectUtils.isEmpty(contentType) ? null : contentType); } else { - convertedOutput = messageConverter.toMessage(output, + convertedOutput = messageConverter.toMessage(convertedOutput, new MessageHeaders(Collections.singletonMap(MessageHeaders.CONTENT_TYPE, contentType == null ? "application/json" : contentType[0]))); } From a2dd8089ccbec12cc2b76fb3ebe23d46062b9b31 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 2 Nov 2022 09:35:38 +0100 Subject: [PATCH 150/210] GH-943 Enhance AWS FunctionInvoker This adds another constructor which allows function.definition to be passed as a constructor argument rather then rely on the property Resolves #943 --- .../function/adapter/aws/FunctionInvoker.java | 38 ++++++++++++------- .../adapter/aws/FunctionInvokerTests.java | 13 +++++++ 2 files changed, 37 insertions(+), 14 deletions(-) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/FunctionInvoker.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/FunctionInvoker.java index fcdb2bbf2..183b082f1 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/FunctionInvoker.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/FunctionInvoker.java @@ -40,6 +40,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.cloud.function.context.FunctionCatalog; +import org.springframework.cloud.function.context.FunctionProperties; import org.springframework.cloud.function.context.FunctionalSpringApplication; import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry.FunctionInvocationWrapper; import org.springframework.cloud.function.context.config.RoutingFunction; @@ -52,7 +53,6 @@ import org.springframework.messaging.Message; import org.springframework.messaging.support.MessageBuilder; import org.springframework.util.Assert; -import org.springframework.util.CollectionUtils; import org.springframework.util.StreamUtils; import org.springframework.util.StringUtils; @@ -72,10 +72,17 @@ public class FunctionInvoker implements RequestStreamHandler { private FunctionInvocationWrapper function; - public FunctionInvoker() { + private volatile String functionDefinition; + + public FunctionInvoker(String functionDefinition) { + this.functionDefinition = functionDefinition; this.start(); } + public FunctionInvoker() { + this(null); + } + @SuppressWarnings({ "rawtypes" }) @Override public void handleRequest(InputStream input, OutputStream output, Context context) throws IOException { @@ -130,7 +137,10 @@ private void start() { : SpringApplication.run(new Class[] {startClass, AWSCompanionAutoConfiguration.class}, properties); Environment environment = context.getEnvironment(); - String functionName = environment.getProperty("spring.cloud.function.definition"); + if (!StringUtils.hasText(this.functionDefinition)) { + this.functionDefinition = environment.getProperty(FunctionProperties.FUNCTION_DEFINITION); + } + FunctionCatalog functionCatalog = context.getBean(FunctionCatalog.class); this.jsonMapper = context.getBean(JsonMapper.class); if (this.jsonMapper instanceof JacksonMapper) { @@ -154,15 +164,18 @@ public Date deserialize(JsonParser jsonParser, DeserializationContext deserializ } if (logger.isInfoEnabled()) { - logger.info("Locating function: '" + functionName + "'"); + logger.info("Locating function: '" + this.functionDefinition + "'"); } - this.function = functionCatalog.lookup(functionName, "application/json"); - - Set names = functionCatalog.getNames(null); - if (this.function == null && !CollectionUtils.isEmpty(names)) { + this.function = functionCatalog.lookup(this.functionDefinition, "application/json"); + if (this.function == null) { if (logger.isInfoEnabled()) { + if (!StringUtils.hasText(this.functionDefinition)) { + logger.info("Failed to determine default function. Please use 'spring.cloud.function.definition' property " + + "or pass function definition as a constructir argument to this FunctionInvoker"); + } + Set names = functionCatalog.getNames(null); if (names.size() == 1) { logger.info("Will default to RoutingFunction, since it is the only function available in FunctionCatalog." + "Expecting 'spring.cloud.function.definition' or 'spring.cloud.function.routing-expression' as Message headers. " @@ -181,14 +194,11 @@ public Date deserialize(JsonParser jsonParser, DeserializationContext deserializ if (this.function.isOutputTypePublisher()) { this.function.setSkipOutputConversion(true); } - Assert.notNull(this.function, "Failed to lookup function " + functionName); - - if (!StringUtils.hasText(functionName)) { - functionName = this.function.getFunctionDefinition(); - } + Assert.notNull(this.function, "Failed to lookup function " + this.functionDefinition); + this.functionDefinition = this.function.getFunctionDefinition(); if (logger.isInfoEnabled()) { - logger.info("Located function: '" + functionName + "'"); + logger.info("Located function: '" + this.functionDefinition + "'"); } } } diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java index c4f5cf632..9dba9ec95 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java @@ -578,6 +578,19 @@ public void testSQSEvent() throws Exception { assertThat(result).contains("arn:aws:sqs:eu-central-1:123456789012:MyQueue"); } + @Test + public void testSQSEventWithConstructorArg() throws Exception { + System.setProperty("MAIN_CLASS", SQSConfiguration.class.getName()); + FunctionInvoker invoker = new FunctionInvoker("inputSQSEvent"); + + InputStream targetStream = new ByteArrayInputStream(this.sampleSQSEvent.getBytes()); + ByteArrayOutputStream output = new ByteArrayOutputStream(); + invoker.handleRequest(targetStream, output, null); + + String result = new String(output.toByteArray(), StandardCharsets.UTF_8); + assertThat(result).contains("arn:aws:sqs:eu-central-1:123456789012:MyQueue"); + } + @Test public void testSQSEventAsMessage() throws Exception { System.setProperty("MAIN_CLASS", SQSConfiguration.class.getName()); From 9ade4da70e51e666454de9579617dc8ddd09f4c3 Mon Sep 17 00:00:00 2001 From: Neokeld Date: Tue, 1 Nov 2022 21:28:50 +0100 Subject: [PATCH 151/210] functionRegistration cant be null Resolves #950 --- .../context/catalog/BeanFactoryAwareFunctionRegistry.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java index b1e2e1fb2..7fe994759 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java @@ -185,9 +185,7 @@ else if (this.isSpecialFunctionRegistration(functionNames, functionName)) { functionRegistration = new FunctionRegistration(functionCandidate, functionName).type(functionType); } // Certain Kafka Streams functions such as KStream[] return types could be null (esp when using Kotlin). - if (functionRegistration != null) { - this.register(functionRegistration); - } + this.register(functionRegistration); } else { if (logger.isDebugEnabled()) { From 618c5e325caf0e8139943999b1f65545e6983c33 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 3 Nov 2022 14:38:58 +0000 Subject: [PATCH 152/210] Update SNAPSHOT to 3.2.8 --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- .../function-sample-azure-timer-trigger/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 50 files changed, 78 insertions(+), 78 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index dbf00a333..33628a3e8 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.8 pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index 016743400..6d23920b1 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.8-SNAPSHOT + 3.2.8 pom org.springframework.cloud spring-cloud-build - 3.1.5-SNAPSHOT + 3.1.5 diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index b35678faf..e55cdbd4e 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.8 spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index 5882dd0e8..41c24b5ab 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.8-SNAPSHOT + 3.2.8 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index ac61e8265..11329c5f0 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.8-SNAPSHOT + 3.2.8 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index 4a35d8000..47d449c48 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.8-SNAPSHOT + 3.2.8 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 898728f88..d219fb89c 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.8-SNAPSHOT + 3.2.8 diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 563a2e89b..76c3bfc90 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.8-SNAPSHOT + 3.2.8 spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index a61054ebb..045415991 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.8-SNAPSHOT + 3.2.8 diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index e0acec9f0..0d4ea519c 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.8 diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 1162adbba..154cc9978 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.8 diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 3519478b4..6fca39e9e 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.8 diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 075551ff7..bdd4af734 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.5-SNAPSHOT + 3.1.5 spring-cloud-function-dependencies - 3.2.8-SNAPSHOT + 3.2.8 pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 29019ed2a..42651549d 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.8 diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index d099a4e95..7c6705719 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 1.8 - 3.2.8-SNAPSHOT + 3.2.8 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index f16f0d338..2b59c8b60 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 1.8 - 3.2.8-SNAPSHOT + 3.2.8 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 9234672dc..4d30bde04 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 1.8 - 3.2.8-SNAPSHOT + 3.2.8 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index 652080026..2759522dc 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 1.8 - 3.2.8-SNAPSHOT + 3.2.8 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index 22ce8ce2b..ef4a1ec3c 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 1.8 - 3.2.8-SNAPSHOT + 3.2.8 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 4dec0983f..8120ea190 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 1.8 - 3.2.8-SNAPSHOT + 3.2.8 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 21eb7b3e8..413745277 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 1.8 - 3.2.8-SNAPSHOT + 3.2.8 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index 095f4f38f..7e8786bfc 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.8 diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 014a85aab..4c72ad6d2 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.8 diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index 415ddbd96..47704f7ed 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.8-SNAPSHOT + 3.2.8 diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 345fc4b89..ad56e4e07 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.8-SNAPSHOT + 3.2.8 diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index 3d69e674a..7ff852ecf 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.8-SNAPSHOT + 3.2.8 diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 4480936cb..77376e6bf 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.8-SNAPSHOT + 3.2.8 diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index b59fd3351..e408960f9 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.8-SNAPSHOT + 3.2.8 diff --git a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml index cd440d111..6edb463eb 100644 --- a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 @@ -16,7 +16,7 @@ Demo project for Spring Boot 1.8 - 2021.0.5-SNAPSHOT + 2021.0.5 2.1.0 example.TimerTriggerDemoApplication diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index a198eb9fb..d6cc1f827 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 3a1cd7b78..4a10a8a17 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 1.8 - 3.2.8-SNAPSHOT + 3.2.8 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index 799a57b7a..c5e007d04 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 1.8 - 3.2.8-SNAPSHOT + 3.2.8 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 017a97ff4..5a40e9450 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 1.8 - 3.2.8-SNAPSHOT + 3.2.8 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index 15a015e70..d2bc4a7c6 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 1.8 - 3.2.8-SNAPSHOT + 3.2.8 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index 9f3466ebb..862e2921a 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.8-SNAPSHOT + 3.2.8 diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index 8affc78f6..28404449e 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index c87799265..dfe4bacab 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 - 3.2.8-SNAPSHOT + 3.2.8 diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index c83bf1f51..9bcb64852 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.8-SNAPSHOT + 3.2.8 diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index c36cce9cc..4e5ce6224 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index a78cc5ab2..7a2707e91 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.8-SNAPSHOT + 3.2.8 diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index 9d7807e73..efa59d9a4 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 1.8 - 3.2.8-SNAPSHOT + 3.2.8 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 2f0538647..1d842e822 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.8-SNAPSHOT + 3.2.8 diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index 73b2acf5e..4c013fea1 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 1.8 - 3.2.8-SNAPSHOT + 3.2.8 diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index d23fe3930..a47fa641c 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 1.8 - 3.2.8-SNAPSHOT + 3.2.8 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index e7703a20f..25d836a64 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 1.8 - 3.2.8-SNAPSHOT + 3.2.8 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 90ec323a1..37590e49d 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.8 diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index b1c5480d7..66f747631 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.8 diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index f99425596..ce9dbabe6 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.8 diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index 073217fe8..1eca49394 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.8 .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index 49292aadc..d4132086f 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.8 spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From 5ac9b4c4ca38d041272be4712cc81c3dad818be3 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 3 Nov 2022 14:43:10 +0000 Subject: [PATCH 153/210] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- .../function-sample-azure-timer-trigger/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 50 files changed, 78 insertions(+), 78 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 33628a3e8..dbf00a333 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8 + 3.2.8-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index 6d23920b1..016743400 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.8 + 3.2.8-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 3.1.5 + 3.1.5-SNAPSHOT diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index e55cdbd4e..b35678faf 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8 + 3.2.8-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index 41c24b5ab..5882dd0e8 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.8 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index 11329c5f0..ac61e8265 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.8 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index 47d449c48..4a35d8000 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.8 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index d219fb89c..898728f88 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.8 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 76c3bfc90..563a2e89b 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.8 + 3.2.8-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index 045415991..a61054ebb 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.8 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index 0d4ea519c..e0acec9f0 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 154cc9978..1162adbba 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 6fca39e9e..3519478b4 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index bdd4af734..075551ff7 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.5 + 3.1.5-SNAPSHOT spring-cloud-function-dependencies - 3.2.8 + 3.2.8-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 42651549d..29019ed2a 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index 7c6705719..d099a4e95 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.11 1.8 - 3.2.8 + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index 2b59c8b60..f16f0d338 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.11 1.8 - 3.2.8 + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 4d30bde04..9234672dc 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.11 1.8 - 3.2.8 + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index 2759522dc..652080026 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.11 1.8 - 3.2.8 + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index ef4a1ec3c..22ce8ce2b 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.11 1.8 - 3.2.8 + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 8120ea190..4dec0983f 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.11 1.8 - 3.2.8 + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 413745277..21eb7b3e8 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.11 1.8 - 3.2.8 + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index 7e8786bfc..095f4f38f 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 4c72ad6d2..014a85aab 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index 47704f7ed..415ddbd96 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.11 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.8 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index ad56e4e07..345fc4b89 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.11 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.8 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index 7ff852ecf..3d69e674a 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.11 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.8 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 77376e6bf..4480936cb 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.11 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.8 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index e408960f9..b59fd3351 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.11 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.8 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml index 6edb463eb..cd440d111 100644 --- a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.11 @@ -16,7 +16,7 @@ Demo project for Spring Boot 1.8 - 2021.0.5 + 2021.0.5-SNAPSHOT 2.1.0 example.TimerTriggerDemoApplication diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index d6cc1f827..a198eb9fb 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.11 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 4a10a8a17..3a1cd7b78 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.11 1.8 - 3.2.8 + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index c5e007d04..799a57b7a 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.11 1.8 - 3.2.8 + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 5a40e9450..017a97ff4 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.11 1.8 - 3.2.8 + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index d2bc4a7c6..15a015e70 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.11 1.8 - 3.2.8 + 3.2.8-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index 862e2921a..9f3466ebb 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.11 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.8 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index 28404449e..8affc78f6 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.11 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index dfe4bacab..c87799265 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.11 - 3.2.8 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index 9bcb64852..c83bf1f51 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.11 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.8 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index 4e5ce6224..c36cce9cc 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.11 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index 7a2707e91..a78cc5ab2 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.11 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.8 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index efa59d9a4..9d7807e73 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.11 1.8 - 3.2.8 + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 1d842e822..2f0538647 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.11 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.8 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index 4c013fea1..73b2acf5e 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.11 1.8 - 3.2.8 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index a47fa641c..d23fe3930 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.11 1.8 - 3.2.8 + 3.2.8-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index 25d836a64..e7703a20f 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.11 1.8 - 3.2.8 + 3.2.8-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 37590e49d..90ec323a1 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index 66f747631..b1c5480d7 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index ce9dbabe6..f99425596 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8 + 3.2.8-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index 1eca49394..073217fe8 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8 + 3.2.8-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index d4132086f..49292aadc 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8 + 3.2.8-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From 1ce8fcbe58efdf336dcc8267bd3aae61aa2fac5d Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 3 Nov 2022 14:43:11 +0000 Subject: [PATCH 154/210] Bumping versions to 3.2.9-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- .../function-sample-azure-timer-trigger/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 50 files changed, 78 insertions(+), 78 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index dbf00a333..ca9c06f47 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index 016743400..33bcf3d9c 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 3.1.5-SNAPSHOT + 3.1.6-SNAPSHOT diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index b35678faf..d49e185d5 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index 5882dd0e8..102147ed7 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index ac61e8265..c620c90a7 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index 4a35d8000..7eb49b6d1 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 898728f88..431149991 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 563a2e89b..0e41eecaa 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index a61054ebb..fff97dd76 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index e0acec9f0..528122bc2 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 1162adbba..0a741a363 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 3519478b4..d124cd706 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 075551ff7..fe24d0f92 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.5-SNAPSHOT + 3.1.6-SNAPSHOT spring-cloud-function-dependencies - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 29019ed2a..49ac63152 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index d099a4e95..8d608545b 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 1.8 - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index f16f0d338..ded4e0a41 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 1.8 - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 9234672dc..2cd8ae934 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 1.8 - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index 652080026..166035150 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 1.8 - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index 22ce8ce2b..a07ed6709 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 1.8 - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 4dec0983f..16f55b453 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 1.8 - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 21eb7b3e8..975f9d238 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 1.8 - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index 095f4f38f..0085acc01 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 014a85aab..7a343c051 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index 415ddbd96..ee8ae7982 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 345fc4b89..aca50160d 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index 3d69e674a..b2b6f879d 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 4480936cb..e59297e2d 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index b59fd3351..f78e47cc1 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml index cd440d111..3d7318a6b 100644 --- a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 @@ -16,7 +16,7 @@ Demo project for Spring Boot 1.8 - 2021.0.5-SNAPSHOT + 2021.0.6-SNAPSHOT 2.1.0 example.TimerTriggerDemoApplication diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index a198eb9fb..d6cc1f827 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 3a1cd7b78..19ecd30b4 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 1.8 - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index 799a57b7a..97a0323e7 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 1.8 - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 017a97ff4..00d8df1d5 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 1.8 - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index 15a015e70..f445f0fa3 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 1.8 - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index 9f3466ebb..a561e8b5a 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index 8affc78f6..28404449e 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index c87799265..5038b2c81 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index c83bf1f51..12971ce3c 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index c36cce9cc..4e5ce6224 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index a78cc5ab2..a33f62f50 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index 9d7807e73..f785716f0 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 1.8 - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 2f0538647..7e8f5ac74 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index 73b2acf5e..f1d63a806 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 1.8 - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index d23fe3930..8cf9b9d8e 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 1.8 - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index e7703a20f..b120e2dba 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.11 + 2.6.13 1.8 - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 90ec323a1..2c3f4f74e 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index b1c5480d7..b44a1ac5f 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index f99425596..5d5e1e4a9 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index 073217fe8..7e822fe07 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index 49292aadc..9db824193 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From 0299d0762a15286c6da9b8d15095164c2143de1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathias=20Nicolajsen=20Kj=C3=A6rgaard?= Date: Thu, 3 Nov 2022 20:22:10 -0400 Subject: [PATCH 155/210] Make CloudEventsFunctionExtensionConfiguration public to allow manual import It is not possible to load CloudEventsFunctionExtensionConfiguration using @ImportAutoConfiguration() if it is package private. --- .../cloudevent/CloudEventsFunctionExtensionConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventsFunctionExtensionConfiguration.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventsFunctionExtensionConfiguration.java index 39a798e4e..89a424c63 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventsFunctionExtensionConfiguration.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventsFunctionExtensionConfiguration.java @@ -30,7 +30,7 @@ * @since 3.1 */ @Configuration(proxyBeanMethods = false) -class CloudEventsFunctionExtensionConfiguration { +public class CloudEventsFunctionExtensionConfiguration { // The following two beans are intended to be mutually exclusive. Only one should be activated based // on the presence of Cloud Event SDK API From 13c79f528395a5dcc6f42b1ff779732365de9752 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 10 Nov 2022 12:13:57 +0100 Subject: [PATCH 156/210] GH-932 Fix registration of AWSTypesMessageConverter for functional spring applications Resolves #932 --- .../aws/AWSCompanionAutoConfiguration.java | 26 +- .../adapter/aws/AWSTypesMessageConverter.java | 8 +- .../main/resources/META-INF/spring.factories | 2 +- .../aws/SpringBootStreamHandlerTests.java | 229 ------------------ .../context/FunctionalSpringApplication.java | 1 + .../catalog/SimpleFunctionRegistry.java | 4 +- .../ContextFunctionCatalogInitializer.java | 1 + .../context/config/JsonMessageConverter.java | 8 +- .../java/example/FunctionConfiguration.java | 7 + .../src/main/java/example/TestFunction.java | 13 + 10 files changed, 55 insertions(+), 244 deletions(-) delete mode 100644 spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/SpringBootStreamHandlerTests.java create mode 100644 spring-cloud-function-samples/function-functional-sample-aws/src/main/java/example/TestFunction.java diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSCompanionAutoConfiguration.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSCompanionAutoConfiguration.java index 59e10f589..2d61cf37c 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSCompanionAutoConfiguration.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSCompanionAutoConfiguration.java @@ -16,10 +16,13 @@ package org.springframework.cloud.function.adapter.aws; +import com.fasterxml.jackson.databind.ObjectMapper; + +import org.springframework.cloud.function.json.JacksonMapper; import org.springframework.cloud.function.json.JsonMapper; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.messaging.converter.MessageConverter; +import org.springframework.context.ApplicationContextInitializer; +import org.springframework.context.support.GenericApplicationContext; +import org.springframework.util.CollectionUtils; /** * @@ -27,11 +30,18 @@ * @since 3.2 * */ -@Configuration(proxyBeanMethods = false) -public class AWSCompanionAutoConfiguration { +public class AWSCompanionAutoConfiguration implements ApplicationContextInitializer { - @Bean - public MessageConverter awsTypesConverter(JsonMapper jsonMapper) { - return new AWSTypesMessageConverter(jsonMapper); + @Override + public void initialize(GenericApplicationContext applicationContext) { + applicationContext.registerBean("awsTypesMessageConverter", AWSTypesMessageConverter.class, + () -> { + if (CollectionUtils.isEmpty(applicationContext.getBeansOfType(JsonMapper.class).values())) { + return new AWSTypesMessageConverter(new JacksonMapper(new ObjectMapper())); + } + else { + return new AWSTypesMessageConverter(applicationContext.getBean(JsonMapper.class)); + } + }); } } diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSTypesMessageConverter.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSTypesMessageConverter.java index 0fd187145..4c73054d2 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSTypesMessageConverter.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSTypesMessageConverter.java @@ -55,11 +55,11 @@ class AWSTypesMessageConverter extends JsonMessageConverter { @Override protected boolean canConvertFrom(Message message, @Nullable Class targetClass) { - if (message.getHeaders().containsKey(AWSLambdaUtils.AWS_API_GATEWAY) && ((boolean) message.getHeaders().get(AWSLambdaUtils.AWS_API_GATEWAY))) { - return true; + if (message.getHeaders().containsKey(AWSLambdaUtils.AWS_API_GATEWAY)) { + return ((boolean) message.getHeaders().get(AWSLambdaUtils.AWS_API_GATEWAY)); } - if (message.getHeaders().containsKey(AWSLambdaUtils.AWS_EVENT) && ((boolean) message.getHeaders().get(AWSLambdaUtils.AWS_EVENT))) { - return true; + if (message.getHeaders().containsKey(AWSLambdaUtils.AWS_EVENT)) { + return ((boolean) message.getHeaders().get(AWSLambdaUtils.AWS_EVENT)); } return false; } diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/resources/META-INF/spring.factories b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/resources/META-INF/spring.factories index b10fc836b..d78111519 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/resources/META-INF/spring.factories @@ -1,4 +1,4 @@ org.springframework.context.ApplicationContextInitializer=\ -org.springframework.cloud.function.adapter.aws.CustomRuntimeInitializer +org.springframework.cloud.function.adapter.aws.CustomRuntimeInitializer,org.springframework.cloud.function.adapter.aws.AWSCompanionAutoConfiguration org.springframework.boot.env.EnvironmentPostProcessor=\ org.springframework.cloud.function.adapter.aws.CustomRuntimeEnvironmentPostProcessor \ No newline at end of file diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/SpringBootStreamHandlerTests.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/SpringBootStreamHandlerTests.java deleted file mode 100644 index c9aa2d935..000000000 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/SpringBootStreamHandlerTests.java +++ /dev/null @@ -1,229 +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 org.springframework.cloud.function.adapter.aws; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.InputStream; -import java.util.Map; -import java.util.function.Function; - -import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import reactor.core.publisher.Flux; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; -import org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; -import org.springframework.util.Assert; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * @author Dave Syer - * @author Oleg Zhurakousky - */ -public class SpringBootStreamHandlerTests { - - private SpringBootStreamHandler handler; - - @BeforeEach - public void before() { - System.clearProperty("function.name"); - } - - @Test - public void functionBeanWithJacksonConfig() throws Exception { - this.handler = new SpringBootStreamHandler(FunctionConfigWithJackson.class); - this.handler.initialize(null); - ByteArrayOutputStream output = new ByteArrayOutputStream(); - this.handler.handleRequest( - new ByteArrayInputStream("{\"value\":\"foo\"}".getBytes()), output, null); - assertThat(output.toString()).isEqualTo("{\"value\":\"FOO\"}"); - } - - @Test - public void functionBeanWithoutJacksonConfig() throws Exception { - this.handler = new SpringBootStreamHandler(FunctionConfigWithoutJackson.class); - this.handler.initialize(null); - ByteArrayOutputStream output = new ByteArrayOutputStream(); - this.handler.handleRequest( - new ByteArrayInputStream("{\"value\":\"foo\"}".getBytes()), output, null); - assertThat(output.toString()).isEqualTo("{\"value\":\"FOO\"}"); - } - - @Test - public void functionNonFluxBeanNoCatalog() throws Exception { - this.handler = new SpringBootStreamHandler(NoCatalogNonFluxFunctionConfig.class); - this.handler.initialize(null); - ByteArrayOutputStream output = new ByteArrayOutputStream(); - this.handler.handleRequest( - new ByteArrayInputStream("{\"value\":\"foo\"}".getBytes()), output, null); - assertThat(output.toString()).isEqualTo("{\"value\":\"FOO\"}"); - } - - @Test - public void functionFluxBeanNoCatalog() throws Exception { - this.handler = new SpringBootStreamHandler(NoCatalogFluxFunctionConfig.class); - this.handler.initialize(null); - ByteArrayOutputStream output = new ByteArrayOutputStream(); - this.handler.handleRequest( - new ByteArrayInputStream("{\"value\":\"foo\"}".getBytes()), output, null); - assertThat(output.toString()).isEqualTo("{\"value\":\"FOO\"}"); - } - - @Test - public void typelessFunctionConfig() throws Exception { - this.handler = new SpringBootStreamHandler(TypelessFunctionConfig.class); - this.handler.initialize(null); - ByteArrayOutputStream output = new ByteArrayOutputStream(); - this.handler.handleRequest( - new ByteArrayInputStream("{\"value\":\"foo\"}".getBytes()), output, null); - assertThat(output.toString()).isEqualTo("{\"value\":\"foo\"}"); - } - - @Test - public void inputStreamFunctionConfig() throws Exception { - this.handler = new SpringBootStreamHandler(InputStreamFunctionConfig.class); - this.handler.initialize(null); - ByteArrayOutputStream output = new ByteArrayOutputStream(); - this.handler.handleRequest( - new ByteArrayInputStream("{\"value\":\"foo\"}".getBytes()), output, null); - assertThat(output.toString()).isEqualTo("{\"value\":\"FOO\"}"); - } - - @Configuration - protected static class NoCatalogNonFluxFunctionConfig { - - @Bean - public Function function() { - return foo -> new Bar(foo.getValue().toUpperCase()); - } - - } - - @Configuration - protected static class NoCatalogFluxFunctionConfig { - - @Bean - public Function, Flux> function() { - return flux -> flux.map(foo -> new Bar(foo.getValue().toUpperCase())); - } - - } - - @Configuration - @Import({ ContextFunctionCatalogAutoConfiguration.class, - JacksonAutoConfiguration.class }) - protected static class FunctionConfigWithJackson { - - @Bean - public Function function() { - return foo -> new Bar(foo.getValue().toUpperCase()); - } - - } - - @Configuration - @Import({ ContextFunctionCatalogAutoConfiguration.class }) - protected static class FunctionConfigWithoutJackson { - - @Bean - public Function function() { - return foo -> new Bar(foo.getValue().toUpperCase()); - } - - } - - @Configuration - @Import({ ContextFunctionCatalogAutoConfiguration.class, - JacksonAutoConfiguration.class }) - protected static class TypelessFunctionConfig { - - @Bean - public Function function() { - return value -> { - Assert.isTrue(value instanceof Map, "Expected value should be Map"); - return value; - }; - } - - } - - @Configuration - @Import({ ContextFunctionCatalogAutoConfiguration.class, - JacksonAutoConfiguration.class }) - protected static class InputStreamFunctionConfig { - - @Autowired - private ObjectMapper mapper; - - @Bean - public Function function() { - return value -> { - try { - Foo foo = this.mapper.readValue((InputStream) value, Foo.class); - return new Bar(foo.getValue().toUpperCase()); - } - catch (Exception e) { - throw new IllegalStateException("Failed test", e); - } - }; - } - - } - - protected static class Foo { - - private String value; - - public String getValue() { - return this.value; - } - - public void setValue(String value) { - this.value = value; - } - - } - - protected static class Bar { - - private String value; - - public Bar() { - } - - public Bar(String value) { - this.value = value; - } - - public String getValue() { - return this.value; - } - - public void setValue(String value) { - this.value = value; - } - - } - -} diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionalSpringApplication.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionalSpringApplication.java index eebf2f0d2..ed59e7e6f 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionalSpringApplication.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionalSpringApplication.java @@ -96,6 +96,7 @@ protected void postProcessApplicationContext(ConfigurableApplicationContext cont Assert.isInstanceOf(GenericApplicationContext.class, context, "ApplicationContext must be an instanceof GenericApplicationContext"); for (Object source : getAllSources()) { + System.out.println("======> SOURCE: " + source); Class type = null; Object handler = null; if (source instanceof String) { diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java index 209b5ee7e..450e06101 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java @@ -926,6 +926,7 @@ else if (value instanceof Mono) { if (inputValue instanceof Message && !this.isInputTypeMessage()) { inputValue = ((Message) inputValue).getPayload(); } + System.out.println("Invoking function: " + this + "with input type: " + this.getInputType()); Object result = ((Function) this.target).apply(inputValue); if (result instanceof Publisher && functionInvocationHelper != null) { @@ -1096,7 +1097,8 @@ else if (input instanceof Message) { : convertedInput; } if (convertedInput != null && logger.isDebugEnabled()) { - logger.debug("Converted Message: " + input + " to: " + convertedInput); + logger.debug("Converted Message: " + input + " to: " + + (convertedInput instanceof OriginalMessageHolder ? ((OriginalMessageHolder) convertedInput).value.getClass() : convertedInput)); } } else { diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogInitializer.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogInitializer.java index 31832ff54..dd8700ffd 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogInitializer.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogInitializer.java @@ -176,6 +176,7 @@ && new ClassPathResource(basePackage.replace(".", "/")).exists()) { List messageConverters = new ArrayList<>(); JsonMapper jsonMapper = this.context.getBean(JsonMapper.class); + messageConverters.addAll(context.getBeansOfType(MessageConverter.class).values()); messageConverters.add(new JsonMessageConverter(jsonMapper)); messageConverters.add(new ByteArrayMessageConverter()); messageConverters.add(new StringMessageConverter()); diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/JsonMessageConverter.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/JsonMessageConverter.java index 9746ee983..dc78a68c3 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/JsonMessageConverter.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/JsonMessageConverter.java @@ -92,7 +92,13 @@ else if (logger.isDebugEnabled()) { if (payload instanceof byte[]) { payload = new String((byte[]) payload, StandardCharsets.UTF_8); } - logger.warn("Failed to convert value: " + payload, e); + + if (logger.isDebugEnabled()) { + logger.debug("Failed to convert value: " + payload + " to: " + targetClass, e); + } + else { + logger.warn("Failed to convert value: " + payload + " to: " + targetClass); + } } } } diff --git a/spring-cloud-function-samples/function-functional-sample-aws/src/main/java/example/FunctionConfiguration.java b/spring-cloud-function-samples/function-functional-sample-aws/src/main/java/example/FunctionConfiguration.java index 34ff8b4d4..eca9968fe 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/src/main/java/example/FunctionConfiguration.java +++ b/spring-cloud-function-samples/function-functional-sample-aws/src/main/java/example/FunctionConfiguration.java @@ -8,6 +8,9 @@ import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.support.GenericApplicationContext; +import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent; +import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent; + @SpringBootConfiguration public class FunctionConfiguration implements ApplicationContextInitializer { @@ -26,5 +29,9 @@ public void initialize(GenericApplicationContext context) { context.registerBean("uppercase", FunctionRegistration.class, () -> new FunctionRegistration<>(function).type( FunctionType.from(String.class).to(String.class))); + + context.registerBean("testFunction", FunctionRegistration.class, + () -> new FunctionRegistration<>(new TestFunction()).type( + FunctionType.from(APIGatewayProxyRequestEvent.class).to(APIGatewayProxyResponseEvent.class))); } } diff --git a/spring-cloud-function-samples/function-functional-sample-aws/src/main/java/example/TestFunction.java b/spring-cloud-function-samples/function-functional-sample-aws/src/main/java/example/TestFunction.java new file mode 100644 index 000000000..b097d0ad5 --- /dev/null +++ b/spring-cloud-function-samples/function-functional-sample-aws/src/main/java/example/TestFunction.java @@ -0,0 +1,13 @@ +package example; + +import java.util.function.Function; + +import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent; +import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent; + +public class TestFunction implements Function { + @Override + public APIGatewayProxyResponseEvent apply(APIGatewayProxyRequestEvent apiGatewayProxyRequestEvent) { + return new APIGatewayProxyResponseEvent().withStatusCode(200).withBody("ok"); + } +} From 4273d86f5c21c9ef19a466b0708f57de60388c53 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Mon, 14 Nov 2022 15:01:19 +0100 Subject: [PATCH 157/210] GH-939 & GH-956 Fix Kotlin function registration regression Resolves #939 Resolves #956 polishing --- .../context/FunctionRegistration.java | 93 +--- .../AbstractComposableFunctionRegistry.java | 439 ------------------ .../context/catalog/FunctionTypeUtils.java | 13 +- .../context/FunctionRegistrationTests.java | 10 - ...onCatalogAutoConfigurationKotlinTests.java | 22 +- .../function/kotlin/ComponentUppercase.kt | 10 + .../kotlin/KotlinLambdasConfiguration.kt | 3 + 7 files changed, 59 insertions(+), 531 deletions(-) delete mode 100644 spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/AbstractComposableFunctionRegistry.java create mode 100644 spring-cloud-function-kotlin/src/test/kotlin/org/springframework/cloud/function/kotlin/ComponentUppercase.kt diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionRegistration.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionRegistration.java index 536ce9ac2..b28a9c0b2 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionRegistration.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionRegistration.java @@ -29,20 +29,11 @@ import net.jodah.typetools.TypeResolver; import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; - import org.springframework.beans.factory.BeanNameAware; import org.springframework.cloud.function.context.catalog.FunctionTypeUtils; -import org.springframework.cloud.function.context.config.RoutingFunction; -import org.springframework.cloud.function.core.FluxConsumer; -import org.springframework.cloud.function.core.FluxFunction; -import org.springframework.cloud.function.core.FluxSupplier; -import org.springframework.cloud.function.core.FluxToMonoFunction; -import org.springframework.cloud.function.core.FluxedConsumer; -import org.springframework.cloud.function.core.FluxedFunction; -import org.springframework.cloud.function.core.MonoSupplier; -import org.springframework.cloud.function.core.MonoToFluxFunction; +import org.springframework.cloud.function.context.config.KotlinLambdaToFunctionAutoConfiguration; +import org.springframework.core.KotlinDetector; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; @@ -123,7 +114,10 @@ public FunctionRegistration type(Type type) { } public FunctionRegistration type(FunctionType type) { - + this.type = type; + if (KotlinDetector.isKotlinPresent() && this.target instanceof KotlinLambdaToFunctionAutoConfiguration.KotlinFunctionWrapper) { + return this; + } Type t = FunctionTypeUtils.discoverFunctionTypeFromClass(this.target.getClass()); if (t == null) { // only valid for Kafka Stream KStream[] return type. return null; @@ -137,7 +131,6 @@ public FunctionRegistration type(FunctionType type) { throw new IllegalStateException("Discovered function type does not match provided function type. Discovered: " + discoveredFunctionType + "; Provided: " + type); } - this.type = type; return this; } @@ -166,6 +159,13 @@ public FunctionRegistration names(String... names) { return this.names(Arrays.asList(names)); } + @Override + public void setBeanName(String name) { + if (CollectionUtils.isEmpty(this.names)) { + this.name(name); + } + } + /** * Transforms (wraps) function identified by the 'target' to its {@code Flux} * equivalent unless it already is. For example, {@code Function} @@ -175,66 +175,11 @@ public FunctionRegistration names(String... names) { * */ - @SuppressWarnings({ "unchecked", "rawtypes" }) - public FunctionRegistration wrap() { - this.isFunctionSignatureSupported(); - FunctionRegistration result; - if (this.type == null) { - result = (FunctionRegistration) this; - } - else if (this.target instanceof RoutingFunction) { - S target = (S) this.target; - result = new FunctionRegistration(target); - result.type(this.type.getType()); - result = result.target(target).names(this.names) - .type(result.type.wrap(Flux.class)).properties(this.properties); - } - else { - S target = (S) this.target; - result = new FunctionRegistration(target); - result.type(this.type.getType()); - - if (!this.type.isWrapper()) { - target = target instanceof Supplier - ? (S) new FluxSupplier((Supplier) target) - : target instanceof Function - ? (S) new FluxFunction((Function) target) - : (S) new FluxConsumer((Consumer) target); - } - else if (Mono.class.isAssignableFrom(this.type.getOutputWrapper())) { - target = target instanceof Supplier - ? (S) new MonoSupplier((Supplier) target) - : (S) new FluxToMonoFunction((Function) target); - } - else if (Mono.class.isAssignableFrom(this.type.getInputWrapper())) { - target = (S) new MonoToFluxFunction((Function) target); - } - else if (target instanceof Consumer) { - target = (S) new FluxedConsumer((Consumer) target); - } - else if (target instanceof Function) { - target = (S) new FluxedFunction((Function) target); - } - result = result.target(target).names(this.names) - .type(result.type.wrap(Flux.class)).properties(this.properties); - } - - return result; - } - - @Override - public void setBeanName(String name) { - if (CollectionUtils.isEmpty(this.names)) { - this.name(name); - } - } - - private void isFunctionSignatureSupported() { - if (type != null) { - Assert.isTrue(!(Mono.class.isAssignableFrom(this.type.getOutputWrapper()) - && Mono.class.isAssignableFrom(this.type.getInputWrapper())), - "Function is not supported."); - } - } +// @Override +// public void setBeanName(String name) { +// if (CollectionUtils.isEmpty(this.names)) { +// this.name(name); +// } +// } } diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/AbstractComposableFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/AbstractComposableFunctionRegistry.java deleted file mode 100644 index f0b934c9f..000000000 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/AbstractComposableFunctionRegistry.java +++ /dev/null @@ -1,439 +0,0 @@ -/* - * Copyright 2019-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 org.springframework.cloud.function.context.catalog; - -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.function.Consumer; -import java.util.function.Function; -import java.util.function.Supplier; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import reactor.core.publisher.Flux; - -import org.springframework.cloud.function.context.FunctionRegistration; -import org.springframework.cloud.function.context.FunctionRegistry; -import org.springframework.cloud.function.context.FunctionType; -import org.springframework.cloud.function.context.config.RoutingFunction; -import org.springframework.cloud.function.core.FluxToMonoFunction; -import org.springframework.cloud.function.core.IsolatedConsumer; -import org.springframework.cloud.function.core.IsolatedFunction; -import org.springframework.cloud.function.core.IsolatedSupplier; -import org.springframework.cloud.function.core.MonoToFluxFunction; -import org.springframework.context.ApplicationEventPublisher; -import org.springframework.context.ApplicationEventPublisherAware; -import org.springframework.context.EnvironmentAware; -import org.springframework.core.env.Environment; -import org.springframework.core.env.StandardEnvironment; -import org.springframework.util.Assert; -import org.springframework.util.CollectionUtils; -import org.springframework.util.StringUtils; - -/** - * Base implementation of {@link FunctionRegistry} which supports function composition - * during lookups. For example if this registry contains function 'a' and 'b' you can - * compose them into a single function by simply piping two names together during the - * lookup {@code this.lookup(Function.class, "a|b")}. - * - * Comma ',' is also supported as composition delimiter (e.g., {@code "a,b"}). - * - * @author Oleg Zhurakousky - * @author Dave Syer - * @since 2.1 - * - */ -public abstract class AbstractComposableFunctionRegistry implements FunctionRegistry, - ApplicationEventPublisherAware, EnvironmentAware { - - private final Map functions = new ConcurrentHashMap<>(); - - private final Map names = new ConcurrentHashMap<>(); - - private final Map types = new ConcurrentHashMap<>(); - - private Environment environment = new StandardEnvironment(); - - protected ApplicationEventPublisher applicationEventPublisher; - - @SuppressWarnings("unchecked") - @Override - public T lookup(Class type, String name) { - String functionDefinitionName = !StringUtils.hasText(name) - && this.environment.containsProperty("spring.cloud.function.definition") - ? this.environment.getProperty("spring.cloud.function.definition") - : name; - return (T) this.doLookup(type, functionDefinitionName); - } - - @SuppressWarnings("serial") - @Override - public Set getNames(Class type) { - if (type == null) { - return new HashSet(getSupplierNames()) { - { - addAll(getFunctionNames()); - } - }; - } - if (Supplier.class.isAssignableFrom(type)) { - return this.getSupplierNames(); - } - if (Function.class.isAssignableFrom(type)) { - return this.getFunctionNames(); - } - return Collections.emptySet(); - } - - /** - * Returns the names of available Suppliers. - * @return immutable {@link Set} of available {@link Supplier} names. - */ - public Set getSupplierNames() { - return this.functions.entrySet().stream() - .filter(entry -> entry.getValue() instanceof Supplier) - .map(entry -> entry.getKey()) - .collect(Collectors.toSet()); - } - - /** - * Returns the names of available Functions. - * @return immutable {@link Set} of available {@link Function} names. - */ - public Set getFunctionNames() { - return this.functions.entrySet().stream() - .filter(entry -> !(entry.getValue() instanceof Supplier)) - .map(entry -> entry.getKey()) - .collect(Collectors.toSet()); - } - - public boolean hasSuppliers() { - return !CollectionUtils.isEmpty(getSupplierNames()); - } - - public boolean hasFunctions() { - return !CollectionUtils.isEmpty(getFunctionNames()); - } - - /** - * The size of this catalog, which is the count of all Suppliers, - * Function and Consumers currently registered. - * - * @return the count of all Suppliers, Function and Consumers currently registered. - */ - @Override - public int size() { - return this.functions.size(); - } - - public FunctionType getFunctionType(String name) { - return this.types.get(name); - } - - /** - * A reverse lookup where one can determine the actual name of the function reference. - * @param function should be an instance of {@link Supplier}, {@link Function} or - * {@link Consumer}; - * @return the name of the function or null. - */ - public String lookupFunctionName(Object function) { - return this.names.containsKey(function) ? this.names.get(function) : null; - } - - @Override - public void setApplicationEventPublisher( - ApplicationEventPublisher applicationEventPublisher) { - this.applicationEventPublisher = applicationEventPublisher; - } - - @Override - public void setEnvironment(Environment environment) { - this.environment = environment; - } - - - public FunctionRegistration getRegistration(Object function) { - String functionName = function == null ? null - : this.lookupFunctionName(function); - if (StringUtils.hasText(functionName)) { - FunctionRegistration registration = new FunctionRegistration( - function, functionName); - FunctionType functionType = this.findType(registration, functionName); - return registration.type(functionType.getType()); - } - return null; - } - - @Override - public void register(FunctionRegistration functionRegistration) { - Assert.notEmpty(functionRegistration.getNames(), - "'registration' must contain at least one name before it is registered in catalog."); - register(functionRegistration, functionRegistration.getNames().iterator().next()); - } - - - - /** - * Registers function wrapped by the provided FunctionRegistration with - * this FunctionRegistry. - * - * @param registration instance of {@link FunctionRegistration} - * @param key the name of the function - */ - protected void register(FunctionRegistration registration, String key) { - Object target = registration.getTarget(); - if (registration.getType() != null) { - this.addType(key, registration.getType()); - } - else { - FunctionType functionType = findType(registration, key); - if (functionType == null) { - return; // TODO fixme - } - this.addType(key, functionType); - registration.type(functionType.getType()); - } - Class type; - registration = isolated(registration).wrap(); - target = registration.getTarget(); - if (target instanceof Supplier) { - type = Supplier.class; - for (String name : registration.getNames()) { - this.addSupplier(name, (Supplier) registration.getTarget()); - } - } - else if (target instanceof Function) { - type = Function.class; - for (String name : registration.getNames()) { - this.addFunction(name, (Function) registration.getTarget()); - } - } - else { - return; - } - this.addName(registration.getTarget(), key); - if (this.applicationEventPublisher != null) { - this.applicationEventPublisher.publishEvent(new FunctionRegistrationEvent( - registration.getTarget(), type, registration.getNames())); - } - } - - protected FunctionType findType(FunctionRegistration functionRegistration, String name) { - return functionRegistration.getType() != null - ? functionRegistration.getType() - : this.getFunctionType(name); - } - - - protected void addSupplier(String name, Supplier supplier) { - this.functions.put(name, supplier); - } - - protected void addFunction(String name, Function function) { - this.functions.put(name, function); - } - - protected void addType(String name, FunctionType functionType) { - this.types.computeIfAbsent(name, str -> functionType); - } - - protected void addName(Object function, String name) { - this.names.put(function, name); - } - - @SuppressWarnings({ "rawtypes", "unchecked" }) - private FunctionRegistration isolated(FunctionRegistration input) { - FunctionRegistration registration = (FunctionRegistration) input; - Object target = registration.getTarget(); - boolean isolated = getClass().getClassLoader() != target.getClass() - .getClassLoader(); - if (isolated) { - if (target instanceof Supplier && isolated) { - target = new IsolatedSupplier((Supplier) target); - } - else if (target instanceof Function) { - target = new IsolatedFunction((Function) target); - } - else if (target instanceof Consumer) { - target = new IsolatedConsumer((Consumer) target); - } - } - - registration.target(target); - return registration; - } - - private Object compose(String name, Map lookup) { - - name = name.replaceAll(",", "|").trim(); - Object composedFunction = null; - - if (lookup.containsKey(name)) { - composedFunction = lookup.get(name); - } - else if (name.equals("") && lookup.size() >= 1 && lookup.size() <= 2) { // we may have RoutingFunction function - String functionName = lookup.keySet().stream() - .filter(fName -> !fName.equals(RoutingFunction.FUNCTION_NAME)) - .findFirst().orElseGet(() -> null); - composedFunction = lookup.get(functionName); - } - else { - String[] stages = StringUtils.delimitedListToStringArray(name, "|"); - - AtomicBoolean supplierPresent = new AtomicBoolean(); - List> composableFunctions = Stream.of(stages) - .map(funcName -> find(funcName, supplierPresent.get())) - .filter(x -> x != null) - .peek(f -> supplierPresent.set(f.getTarget() instanceof Supplier)) - .collect(Collectors.toList()); - FunctionRegistration composedRegistration = composableFunctions - .stream().reduce((a, z) -> composeFunctions(a, z)) - .orElseGet(() -> null); - - if (composedRegistration != null - && composedRegistration.getTarget() != null - && !this.types.containsKey(name)) { - - composedFunction = composedRegistration.getTarget(); - this.addType(name, composedRegistration.getType()); - this.addName(composedFunction, name); - if (composedFunction instanceof Function || composedFunction instanceof Consumer) { - this.addFunction(name, (Function) composedFunction); - } - else if (composedFunction instanceof Supplier) { - this.addSupplier(name, (Supplier) composedFunction); - } - } - - } - - return composedFunction; - } - - private FunctionRegistration find(String name, boolean supplierFound) { - Object result = this.functions.get(name); - if (result == null && !StringUtils.hasText(name)) { - if (supplierFound && this.getFunctionNames().size() == 1) { - result = this.functions.get(this.getFunctionNames().iterator().next()); - } - else if (!supplierFound && this.getSupplierNames().size() == 1) { - result = this.functions.get(this.getSupplierNames().iterator().next()); - } - } - - return getRegistration(result); - } - - @SuppressWarnings("unchecked") - private FunctionRegistration composeFunctions(FunctionRegistration aReg, - FunctionRegistration bReg) { - FunctionType aType = aReg.getType(); - FunctionType bType = bReg.getType(); - Object a = aReg.getTarget(); - Object b = bReg.getTarget(); - if (aType != null && bType != null) { - if (aType.isMessage() && !bType.isMessage()) { - bType = bType.message(); - b = message(b); - } - } - Object composedFunction = null; -// if (a instanceof Supplier && b instanceof Function) { -// Supplier> supplier = (Supplier>) a; -// if (b instanceof FluxConsumer) { -// if (supplier instanceof FluxSupplier) { -// FluxConsumer fConsumer = ((FluxConsumer) b); -// composedFunction = (Supplier>) () -> Mono.from( -// supplier.get().compose(v -> fConsumer.apply(supplier.get()))); -// } -// else { -// throw new IllegalStateException( -// "The provided supplier is finite (i.e., already composed with Consumer) " -// + "therefore it can not be composed with another consumer"); -// } -// } -// else { -// Function function = (Function) b; -// composedFunction = (Supplier) () -> function -// .apply(supplier.get()); -// } -// } -// else - if (a instanceof Function && b instanceof Function) { - Function function1 = (Function) a; - Function function2 = (Function) b; - if (function1 instanceof FluxToMonoFunction) { - if (function2 instanceof MonoToFluxFunction) { - composedFunction = function1.andThen(function2); - } - else { - throw new IllegalStateException( - "The provided function is finite (i.e., returns Mono) " - + "therefore it can *only* be composed with compatible function (i.e., Function"); - } - } - else if (function2 instanceof FluxToMonoFunction) { - composedFunction = new FluxToMonoFunction( - ((Function, Flux>) a).andThen( - ((FluxToMonoFunction) b).getTarget())); - } - else { - composedFunction = function1.andThen(function2); - } - } - else if (a instanceof Function && b instanceof Consumer) { - Function function = (Function) a; - Consumer consumer = (Consumer) b; - composedFunction = (Consumer) v -> consumer.accept(function.apply(v)); - } - else { - throw new IllegalArgumentException(String - .format("Could not compose %s and %s", a.getClass(), b.getClass())); - } - String name = aReg.getNames().iterator().next() + "|" - + bReg.getNames().iterator().next(); - return new FunctionRegistration<>(composedFunction, name) - .type(FunctionType.compose(aType, bType)); - } - - private Object message(Object input) { - if (input instanceof Supplier) { - return new MessageSupplier((Supplier) input); - } - if (input instanceof Consumer) { - return new MessageConsumer((Consumer) input); - } - if (input instanceof Function) { - return new MessageFunction((Function) input); - } - return input; - } - - private Object doLookup(Class type, String name) { - Object function = this.compose(name, this.functions); - if (function != null && type != null && !type.isAssignableFrom(function.getClass())) { - function = null; - } - return function; - } - -} diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtils.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtils.java index 58581746c..ff58b449a 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtils.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtils.java @@ -32,6 +32,8 @@ import java.util.stream.Stream; import com.fasterxml.jackson.databind.JsonNode; +import kotlin.jvm.functions.Function0; +import kotlin.jvm.functions.Function1; import net.jodah.typetools.TypeResolver; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -46,6 +48,7 @@ import org.springframework.cloud.function.context.config.FunctionContextUtils; import org.springframework.cloud.function.context.config.RoutingFunction; import org.springframework.context.support.GenericApplicationContext; +import org.springframework.core.KotlinDetector; import org.springframework.core.ResolvableType; import org.springframework.messaging.Message; import org.springframework.util.Assert; @@ -171,6 +174,14 @@ else if (Function.class.isAssignableFrom(pojoFunctionClass) || BiFunction.class. @SuppressWarnings("unchecked") public static Type discoverFunctionTypeFromClass(Class functionalClass) { + if (KotlinDetector.isKotlinPresent()) { + if (Function1.class.isAssignableFrom(functionalClass)) { + return TypeResolver.reify(Function1.class, (Class>) functionalClass); + } + else if (Function0.class.isAssignableFrom(functionalClass)) { + return TypeResolver.reify(Function0.class, (Class>) functionalClass); + } + } if (Function.class.isAssignableFrom(functionalClass)) { for (Type superInterface : functionalClass.getGenericInterfaces()) { if (superInterface != null && !superInterface.equals(Object.class)) { @@ -187,7 +198,7 @@ else if (Consumer.class.isAssignableFrom(functionalClass)) { else if (Supplier.class.isAssignableFrom(functionalClass)) { return TypeResolver.reify(Supplier.class, (Class>) functionalClass); } - return null; + return TypeResolver.reify(functionalClass); } public static Type discoverFunctionTypeFromFunctionMethod(Method functionMethod) { diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/FunctionRegistrationTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/FunctionRegistrationTests.java index 10f755f55..1e2e31387 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/FunctionRegistrationTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/FunctionRegistrationTests.java @@ -36,16 +36,6 @@ public void noTypeByDefault() { assertThat(registration.getNames()).contains("foos"); } - @Test - public void wrap() { - FunctionRegistration registration = new FunctionRegistration<>(new Foos(), - "foos").type(FunctionType.of(Foos.class).getType()); - FunctionRegistration other = registration.wrap(); - assertThat(registration.getType().isWrapper()).isFalse(); - assertThat(other.getType().isWrapper()).isTrue(); - assertThat(other.getTarget()).isNotEqualTo(registration.getTarget()); - } - private static class Foos implements Function { @Override diff --git a/spring-cloud-function-kotlin/src/test/java/org/springframework/cloud/function/kotlin/ContextFunctionCatalogAutoConfigurationKotlinTests.java b/spring-cloud-function-kotlin/src/test/java/org/springframework/cloud/function/kotlin/ContextFunctionCatalogAutoConfigurationKotlinTests.java index ee37442d5..5954bf4c8 100644 --- a/spring-cloud-function-kotlin/src/test/java/org/springframework/cloud/function/kotlin/ContextFunctionCatalogAutoConfigurationKotlinTests.java +++ b/spring-cloud-function-kotlin/src/test/java/org/springframework/cloud/function/kotlin/ContextFunctionCatalogAutoConfigurationKotlinTests.java @@ -56,7 +56,8 @@ public void close() { public void typeDiscoveryTests() { create(new Class[] { KotlinLambdasConfiguration.class, SimpleConfiguration.class, - KotlinComponentFunction.class}); + KotlinComponentFunction.class, + ComponentUppercase.class}); FunctionCatalog functionCatalog = this.context.getBean(FunctionCatalog.class); @@ -89,12 +90,19 @@ public void typeDiscoveryTests() { assertThat(kotlinListPojoFunction.getInputType().getTypeName()).isEqualTo("java.util.List"); assertThat(kotlinListPojoFunction.getOutputType()).isEqualTo(String.class); -// function = this.context.getBean("kotlinListPojoFunction"); -// functionType = (ParameterizedType) FunctionTypeUtils.discoverFunctionType(function, "kotlinListPojoFunction", this.context); -// assertThat(functionType.getRawType().getTypeName()).isEqualTo(Function.class.getName()); -// assertThat(functionType.getActualTypeArguments().length).isEqualTo(2); -// assertThat(functionType.getActualTypeArguments()[0].getTypeName()).isEqualTo("java.util.List"); -// assertThat(functionType.getActualTypeArguments()[1].getTypeName()).isEqualTo(String.class.getName()); + FunctionInvocationWrapper componentUppercase = functionCatalog.lookup("componentUppercase"); + assertThat(componentUppercase.isFunction()).isTrue(); + assertThat(componentUppercase.getInputType()).isEqualTo(String.class); + assertThat(componentUppercase.getOutputType()).isEqualTo(String.class); + + assertThat(componentUppercase.apply("hello")).isEqualTo("HELLO"); + + FunctionInvocationWrapper uppercaseBean = functionCatalog.lookup("uppercase"); + assertThat(uppercaseBean.isFunction()).isTrue(); + assertThat(uppercaseBean.getInputType()).isEqualTo(String.class); + assertThat(uppercaseBean.getOutputType()).isEqualTo(String.class); + + assertThat(uppercaseBean.apply("hello")).isEqualTo("HELLO"); } @Test diff --git a/spring-cloud-function-kotlin/src/test/kotlin/org/springframework/cloud/function/kotlin/ComponentUppercase.kt b/spring-cloud-function-kotlin/src/test/kotlin/org/springframework/cloud/function/kotlin/ComponentUppercase.kt new file mode 100644 index 000000000..574b6aa48 --- /dev/null +++ b/spring-cloud-function-kotlin/src/test/kotlin/org/springframework/cloud/function/kotlin/ComponentUppercase.kt @@ -0,0 +1,10 @@ +package org.springframework.cloud.function.kotlin + +import org.springframework.stereotype.Component + +@Component +class ComponentUppercase : (String) -> String { + override fun invoke(p1: String): String { + return p1.uppercase() + } +} diff --git a/spring-cloud-function-kotlin/src/test/kotlin/org/springframework/cloud/function/kotlin/KotlinLambdasConfiguration.kt b/spring-cloud-function-kotlin/src/test/kotlin/org/springframework/cloud/function/kotlin/KotlinLambdasConfiguration.kt index 9e85d664b..ef4583d39 100644 --- a/spring-cloud-function-kotlin/src/test/kotlin/org/springframework/cloud/function/kotlin/KotlinLambdasConfiguration.kt +++ b/spring-cloud-function-kotlin/src/test/kotlin/org/springframework/cloud/function/kotlin/KotlinLambdasConfiguration.kt @@ -29,6 +29,9 @@ import java.util.List @EnableAutoConfiguration @Configuration class KotlinLambdasConfiguration { + + @Bean + fun uppercase(): Function = KotlinComponentFunction() @Bean fun kotlinFunction(): (String) -> String { return { it.toUpperCase() } From 3c87e00d8ecca093a6491fed84729de30594e609 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 17 Nov 2022 11:27:32 +0100 Subject: [PATCH 158/210] GH-958 Add support for default routing Resolves #958 --- .../main/asciidoc/spring-cloud-function.adoc | 21 ++++++++ .../context/DefaultMessageRoutingHandler.java | 51 +++++++++++++++++++ .../function/context/FunctionProperties.java | 17 ++++--- .../catalog/SimpleFunctionRegistry.java | 1 + ...ntextFunctionCatalogAutoConfiguration.java | 12 ++++- .../context/config/RoutingFunction.java | 46 +++++++++++------ .../context/config/RoutingFunctionTests.java | 47 +++++++++++++++++ 7 files changed, 172 insertions(+), 23 deletions(-) create mode 100644 spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/DefaultMessageRoutingHandler.java diff --git a/docs/src/main/asciidoc/spring-cloud-function.adoc b/docs/src/main/asciidoc/spring-cloud-function.adoc index aa1e2ceec..a336498e9 100644 --- a/docs/src/main/asciidoc/spring-cloud-function.adoc +++ b/docs/src/main/asciidoc/spring-cloud-function.adoc @@ -251,6 +251,27 @@ conflict resolutions in the event multiple mechanisms are used at the same time, 2. Message Headers (If function is imperative and no `MessageRoutingCallback` provided) 3. Application Properties (Any function) +*Unroutable Messages* + +In the event route-to function is not available in catalog you will get an exception stating that. + +There are cases when such behavior is not desired and you may want to have some "catch-all" type function which can handle such messages. +To accomplish that, framework provides `org.springframework.cloud.function.context.DefaultMessageRoutingHandler` strategy. All you need to do is register it as a bean. +Its default implementation will simply log the fact that the message is un-routable, but will allow message flow to proceed without the exception, effectively dropping the un-routable message. +If you want something more sophisticated all you need to do is provide your own implementation of this strategy and register it as a bean. + +[source, java] +---- +@Bean +public DefaultMessageRoutingHandler defaultRoutingHandler() { + return new DefaultMessageRoutingHandler() { + @Override + public void accept(Message message) { + // do something really cool + } + }; +} +---- ==== Function Filtering Filtering is the type of routing where there are only two paths - 'go' or 'discard'. In terms of functions it mean diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/DefaultMessageRoutingHandler.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/DefaultMessageRoutingHandler.java new file mode 100644 index 000000000..87c1b7ec7 --- /dev/null +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/DefaultMessageRoutingHandler.java @@ -0,0 +1,51 @@ +/* + * Copyright 2016-2022 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 org.springframework.cloud.function.context; + +import java.util.function.Consumer; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import org.springframework.cloud.function.context.config.RoutingFunction; +import org.springframework.messaging.Message; + +/** + * Strategy for implementing a handler for un-routable messages. + * Works in parallel with {@link RoutingFunction}. When registered as a bean, RoutingFunction will not throw + * an exception if it can not route message and instead such message will be routed to this function. + * Its default implementation simply logs the un-routable event. + * Users are encouraged to provide their own implementation of this class. + * + * @author Oleg Zhurakousky + * @since 3.2.9 + * + */ +public class DefaultMessageRoutingHandler implements Consumer> { + + Log logger = LogFactory.getLog(DefaultMessageRoutingHandler.class); + + @Override + public void accept(Message message) { + if (logger.isDebugEnabled()) { + logger.debug("Route-to function can not be located in FunctionCatalog. Dropping unroutable message: " + message + ""); + } + else { + logger.warn("Route-to function can not be located in FunctionCatalog. Droping message"); + } + } +} diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionProperties.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionProperties.java index db6ba6feb..e9727d508 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionProperties.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionProperties.java @@ -57,6 +57,11 @@ public class FunctionProperties implements EnvironmentAware, ApplicationContextA */ public final static String EXPECT_CONTENT_TYPE_HEADER = "expected-content-type"; + /** + * SpEL expression to be used with RoutingFunction. + */ + public final static String ROUTING_EXPRESSION = PREFIX + ".routing-expression"; + /** * The name of function definition property. */ @@ -68,6 +73,12 @@ public class FunctionProperties implements EnvironmentAware, ApplicationContextA */ private String definition; + /** + * SpEL expression which should result in function definition (e.g., function name or composition instruction). + * NOTE: SpEL evaluation context's root object is the input argument (e.g., Message). + */ + private String routingExpression; + /** * List of functions that are not eligible to be registered in Function Catalog. */ @@ -102,12 +113,6 @@ public Map getConfiguration() { return configuration; } - /** - * SpEL expression which should result in function definition (e.g., function name or composition instruction). - * NOTE: SpEL evaluation context's root object is the input argument (e.g., Message). - */ - private String routingExpression; - @SuppressWarnings({ "unchecked", "rawtypes" }) public void setConfiguration(Map configuration) { for (Entry entry : configuration.entrySet()) { diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java index 450e06101..8984704ae 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java @@ -254,6 +254,7 @@ String normalizeFunctionDefinition(String functionDefinition) { if (!names.contains(functionDefinition)) { List eligibleFunction = names.stream() .filter(name -> !RoutingFunction.FUNCTION_NAME.equals(name)) + .filter(name -> !RoutingFunction.DEFAULT_ROUTE_HANDLER.equals(name)) .collect(Collectors.toList()); if (eligibleFunction.size() == 1 && !eligibleFunction.get(0).equals(functionDefinition) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java index f2c68b11b..934e6991e 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java @@ -35,8 +35,10 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cloud.function.cloudevent.CloudEventsFunctionInvocationHelper; +import org.springframework.cloud.function.context.DefaultMessageRoutingHandler; import org.springframework.cloud.function.context.FunctionCatalog; import org.springframework.cloud.function.context.FunctionProperties; +import org.springframework.cloud.function.context.FunctionRegistration; import org.springframework.cloud.function.context.FunctionRegistry; import org.springframework.cloud.function.context.MessageRoutingCallback; import org.springframework.cloud.function.context.catalog.BeanFactoryAwareFunctionRegistry; @@ -56,6 +58,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.FilterType; import org.springframework.context.expression.BeanFactoryResolver; +import org.springframework.core.ResolvableType; import org.springframework.core.convert.converter.GenericConverter; import org.springframework.core.convert.support.ConfigurableConversionService; import org.springframework.core.convert.support.DefaultConversionService; @@ -137,9 +140,16 @@ public FunctionRegistry functionCatalog(List messageConverters return new BeanFactoryAwareFunctionRegistry(conversionService, messageConverter, jsonMapper, functionProperties, functionInvocationHelper); } + @SuppressWarnings({ "unchecked", "rawtypes" }) @Bean(RoutingFunction.FUNCTION_NAME) public RoutingFunction functionRouter(FunctionCatalog functionCatalog, FunctionProperties functionProperties, - BeanFactory beanFactory, @Nullable MessageRoutingCallback routingCallback) { + BeanFactory beanFactory, @Nullable MessageRoutingCallback routingCallback, + @Nullable DefaultMessageRoutingHandler defaultMessageRoutingHandler) { + if (defaultMessageRoutingHandler != null) { + FunctionRegistration functionRegistration = new FunctionRegistration(defaultMessageRoutingHandler, RoutingFunction.DEFAULT_ROUTE_HANDLER); + functionRegistration.type(ResolvableType.forClassWithGenerics(Consumer.class, ResolvableType.forClassWithGenerics(Message.class, Object.class)).getType()); + ((FunctionRegistry) functionCatalog).register(functionRegistration); + } return new RoutingFunction(functionCatalog, functionProperties, new BeanFactoryResolver(beanFactory), routingCallback); } diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/RoutingFunction.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/RoutingFunction.java index 7d7a4a207..f26467716 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/RoutingFunction.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/RoutingFunction.java @@ -58,6 +58,11 @@ public class RoutingFunction implements Function { */ public static final String FUNCTION_NAME = "functionRouter"; + /** + * The name of this function for routing of un-routable messages. + */ + public static final String DEFAULT_ROUTE_HANDLER = "defaultMessageRoutingHandler"; + private static Log logger = LogFactory.getLog(RoutingFunction.class); private final StandardEvaluationContext evalContext = new StandardEvaluationContext(); @@ -82,13 +87,6 @@ public RoutingFunction(FunctionCatalog functionCatalog, Map prop this(functionCatalog, extractIntoFunctionProperties(propertiesMap), beanResolver, routingCallback); } - private static FunctionProperties extractIntoFunctionProperties(Map propertiesMap) { - FunctionProperties functionProperties = new FunctionProperties(); - functionProperties.setDefinition(propertiesMap.get(FunctionProperties.FUNCTION_DEFINITION)); - functionProperties.setRoutingExpression(propertiesMap.get(FunctionProperties.PREFIX + ".routing-expression")); - return functionProperties; - } - public RoutingFunction(FunctionCatalog functionCatalog, FunctionProperties functionProperties, BeanResolver beanResolver, MessageRoutingCallback routingCallback) { this.functionCatalog = functionCatalog; @@ -98,6 +96,13 @@ public RoutingFunction(FunctionCatalog functionCatalog, FunctionProperties funct evalContext.setBeanResolver(beanResolver); } + private static FunctionProperties extractIntoFunctionProperties(Map propertiesMap) { + FunctionProperties functionProperties = new FunctionProperties(); + functionProperties.setDefinition(propertiesMap.get(FunctionProperties.FUNCTION_DEFINITION)); + functionProperties.setRoutingExpression(propertiesMap.get(FunctionProperties.ROUTING_EXPRESSION)); + return functionProperties; + } + @Override public Object apply(Object input) { return this.route(input, input instanceof Publisher); @@ -134,14 +139,14 @@ private Object route(Object input, boolean originalInputIsPublisher) { } } if (function == null) { - if (StringUtils.hasText((String) message.getHeaders().get("spring.cloud.function.definition"))) { - function = functionFromDefinition((String) message.getHeaders().get("spring.cloud.function.definition")); + if (StringUtils.hasText((String) message.getHeaders().get(FunctionProperties.FUNCTION_DEFINITION))) { + function = functionFromDefinition((String) message.getHeaders().get(FunctionProperties.FUNCTION_DEFINITION)); if (function.isInputTypePublisher()) { this.assertOriginalInputIsNotPublisher(originalInputIsPublisher); } } - else if (StringUtils.hasText((String) message.getHeaders().get("spring.cloud.function.routing-expression"))) { - function = this.functionFromExpression((String) message.getHeaders().get("spring.cloud.function.routing-expression"), message, true); + else if (StringUtils.hasText((String) message.getHeaders().get(FunctionProperties.ROUTING_EXPRESSION))) { + function = this.functionFromExpression((String) message.getHeaders().get(FunctionProperties.ROUTING_EXPRESSION), message, true); if (function.isInputTypePublisher()) { this.assertOriginalInputIsNotPublisher(originalInputIsPublisher); } @@ -198,7 +203,7 @@ private void assertOriginalInputIsNotPublisher(boolean originalInputIsPublisher) } private FunctionInvocationWrapper functionFromDefinition(String definition) { - FunctionInvocationWrapper function = functionCatalog.lookup(definition); + FunctionInvocationWrapper function = this.resolveFunction(definition); Assert.notNull(function, "Failed to lookup function to route based on the value of 'spring.cloud.function.definition' property '" + functionProperties.getDefinition() + "'"); if (logger.isInfoEnabled()) { @@ -217,14 +222,23 @@ private FunctionInvocationWrapper functionFromExpression(String routingExpressio input = MessageUtils.toCaseInsensitiveHeadersStructure((Message) input); } - String functionName = isViaHeader ? expression.getValue(this.headerEvalContext, input, String.class) : expression.getValue(this.evalContext, input, String.class); - Assert.hasText(functionName, "Failed to resolve function name based on routing expression '" + functionProperties.getRoutingExpression() + "'"); - FunctionInvocationWrapper function = functionCatalog.lookup(functionName); + String definition = isViaHeader ? expression.getValue(this.headerEvalContext, input, String.class) : expression.getValue(this.evalContext, input, String.class); + Assert.hasText(definition, "Failed to resolve function name based on routing expression '" + functionProperties.getRoutingExpression() + "'"); + FunctionInvocationWrapper function = this.resolveFunction(definition); Assert.notNull(function, "Failed to lookup function to route to based on the expression '" - + functionProperties.getRoutingExpression() + "' which resolved to '" + functionName + "' function name."); + + functionProperties.getRoutingExpression() + "' which resolved to '" + definition + "' function definition."); if (logger.isInfoEnabled()) { logger.info("Resolved function from provided [routing-expression] " + routingExpression); } return function; } + + private FunctionInvocationWrapper resolveFunction(String definition) { + FunctionInvocationWrapper function = functionCatalog.lookup(definition); + if (function == null) { + function = functionCatalog.lookup(RoutingFunction.DEFAULT_ROUTE_HANDLER); + } + return function; + } + } diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/RoutingFunctionTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/RoutingFunctionTests.java index c577b66f3..efe47e310 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/RoutingFunctionTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/RoutingFunctionTests.java @@ -29,6 +29,7 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.cloud.function.context.DefaultMessageRoutingHandler; import org.springframework.cloud.function.context.FunctionCatalog; import org.springframework.cloud.function.context.FunctionProperties; import org.springframework.cloud.function.context.MessageRoutingCallback; @@ -70,6 +71,31 @@ private FunctionCatalog configureCatalog() { return configureCatalog(RoutingFunctionConfiguration.class); } + @SuppressWarnings({ "unchecked", "rawtypes" }) + @Test + public void testDefaultRouting() { + Message message = MessageBuilder.withPayload("hello") + .setHeader(FunctionProperties.PREFIX + ".definition", "blah").build(); + + FunctionCatalog functionCatalog = this.configureCatalog(EmptyConfiguration.class); + Function function = functionCatalog.lookup(RoutingFunction.FUNCTION_NAME); + assertThat(function).isNotNull(); + try { + function.apply(message); + fail(); + } + catch (Exception e) { + // Good + } + // + functionCatalog = this.configureCatalog(ConfigurationWithDefaultMessageRoutingHandler.class); + function = functionCatalog.lookup(RoutingFunction.FUNCTION_NAME); + assertThat(function).isNotNull(); + function.apply(message); + ConfigurationWithDefaultMessageRoutingHandler config = this.context.getBean(ConfigurationWithDefaultMessageRoutingHandler.class); + assertThat(config.defaultHandlerInvoked).isTrue(); + } + @SuppressWarnings({ "unchecked", "rawtypes" }) @Test public void testInvocationWithMessageAndHeader() { @@ -281,4 +307,25 @@ public Function uppercase() { return String::toUpperCase; } } + + @EnableAutoConfiguration + @Configuration + protected static class EmptyConfiguration { + } + + @EnableAutoConfiguration + @Configuration + protected static class ConfigurationWithDefaultMessageRoutingHandler { + public boolean defaultHandlerInvoked; + @Bean + public DefaultMessageRoutingHandler defaultRoutingHandler() { + return new DefaultMessageRoutingHandler() { + @Override + public void accept(Message message) { + super.accept(message); + defaultHandlerInvoked = true; + } + }; + } + } } From 48957b24efbf14fc1ef1c2d821f8df8af0ba882d Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 29 Nov 2022 11:34:58 -0800 Subject: [PATCH 159/210] polish --- .../cloud/function/context/config/RoutingFunctionTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/RoutingFunctionTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/RoutingFunctionTests.java index efe47e310..0f87cabca 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/RoutingFunctionTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/RoutingFunctionTests.java @@ -82,7 +82,7 @@ public void testDefaultRouting() { assertThat(function).isNotNull(); try { function.apply(message); - fail(); + fail("Should not be here"); } catch (Exception e) { // Good From 3a297051e5db752a2b4969a5822af533c0c4162b Mon Sep 17 00:00:00 2001 From: Christian Tzolov Date: Tue, 13 Dec 2022 15:44:51 +0100 Subject: [PATCH 160/210] GH-968 Support Azure Functions DI hook - Extend spring-cloud-function-adapter-azure with AzureFunctionInstanceInjector registered through the META-INF/services/com.microsoft.azure.functions.spi.inject.FunctionInstanceInjector - Add DI demos for HttpTrigger and TimeTrigger functions. Resolves #968 Resolves #969 Add FunctionInvoker backward compatibiity document the time trigger DI sample Add generic instructions to implement Azure Function with the help of the DI hook Add generic instructions to implement Azure Function with the help of the DI hook Minor Fix injector backward compatibility and add blob demo disable the azure di samples maven module builds --- .../pom.xml | 12 +- .../azure/AzureFunctionInstanceInjector.java | 99 ++++++ ...ctions.spi.inject.FunctionInstanceInjector | 1 + .../function-azure-di-samples/README.md | 197 +++++++++++ .../azure-blob-trigger-demo/.gitignore | 33 ++ .../.mvn/wrapper/maven-wrapper.jar | Bin 0 -> 58727 bytes .../.mvn/wrapper/maven-wrapper.properties | 2 + .../azure-blob-trigger-demo/README.md | 6 + .../azure-blob-trigger-demo/mvnw | 316 ++++++++++++++++++ .../azure-blob-trigger-demo/mvnw.cmd | 188 +++++++++++ .../azure-blob-trigger-demo/pom.xml | 106 ++++++ .../AzureBlobTriggerDemoApplication.java | 36 ++ .../azureblobtriggerdemo/MyBlobFunction.java | 65 ++++ .../src/main/resources/application.properties | 1 + .../src/main/resources/host.json | 7 + .../src/main/resources/local.settings.json | 8 + .../AzureBlobTriggerDemoApplicationTests.java | 13 + .../azure-httptrigger-demo/.gitignore | 33 ++ .../.mvn/wrapper/maven-wrapper.jar | Bin 0 -> 58727 bytes .../.mvn/wrapper/maven-wrapper.properties | 2 + .../azure-httptrigger-demo/mvnw | 316 ++++++++++++++++++ .../azure-httptrigger-demo/mvnw.cmd | 188 +++++++++++ .../azure-httptrigger-demo/pom.xml | 104 ++++++ .../HttpTriggerDemoApplication.java | 42 +++ .../di/httptriggerdemo/MyAzureFunction.java | 49 +++ .../src/main/resources/application.properties | 1 + .../src/main/resources/host.json | 7 + .../HttptriggerDemoApplicationTests.java | 13 + .../azure-timetrigger-demo/.gitignore | 33 ++ .../.mvn/wrapper/maven-wrapper.jar | Bin 0 -> 58727 bytes .../.mvn/wrapper/maven-wrapper.properties | 2 + .../azure-timetrigger-demo/README.md | 110 ++++++ .../azure-timetrigger-demo/mvnw | 316 ++++++++++++++++++ .../azure-timetrigger-demo/mvnw.cmd | 188 +++++++++++ .../azure-timetrigger-demo/pom.xml | 107 ++++++ .../TimeTriggerDemoApplication.java | 55 +++ .../di/timetriggerdemo/UppercaseHandler.java | 49 +++ .../src/main/resources/application.properties | 1 + .../src/main/resources/host.json | 7 + .../src/main/resources/local.settings.json | 8 + .../TimetriggerDemoApplicationTests.java | 13 + .../function-sample-azure/pom.xml | 1 + spring-cloud-function-samples/pom.xml | 3 + 43 files changed, 2735 insertions(+), 3 deletions(-) create mode 100644 spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/AzureFunctionInstanceInjector.java create mode 100644 spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/resources/META-INF/services/com.microsoft.azure.functions.spi.inject.FunctionInstanceInjector create mode 100644 spring-cloud-function-samples/function-azure-di-samples/README.md create mode 100644 spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/.gitignore create mode 100644 spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/.mvn/wrapper/maven-wrapper.jar create mode 100644 spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/.mvn/wrapper/maven-wrapper.properties create mode 100644 spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/README.md create mode 100755 spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/mvnw create mode 100644 spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/mvnw.cmd create mode 100644 spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml create mode 100644 spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/src/main/java/com/example/azure/di/azureblobtriggerdemo/AzureBlobTriggerDemoApplication.java create mode 100644 spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/src/main/java/com/example/azure/di/azureblobtriggerdemo/MyBlobFunction.java create mode 100644 spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/src/main/resources/application.properties create mode 100644 spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/src/main/resources/host.json create mode 100644 spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/src/main/resources/local.settings.json create mode 100644 spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/src/test/java/com/example/azure/di/azureblobtriggerdemo/AzureBlobTriggerDemoApplicationTests.java create mode 100644 spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/.gitignore create mode 100644 spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/.mvn/wrapper/maven-wrapper.jar create mode 100644 spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/.mvn/wrapper/maven-wrapper.properties create mode 100755 spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/mvnw create mode 100644 spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/mvnw.cmd create mode 100644 spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml create mode 100644 spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/src/main/java/com/example/azure/di/httptriggerdemo/HttpTriggerDemoApplication.java create mode 100644 spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/src/main/java/com/example/azure/di/httptriggerdemo/MyAzureFunction.java create mode 100644 spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/src/main/resources/application.properties create mode 100644 spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/src/main/resources/host.json create mode 100644 spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/src/test/java/com/example/azure/di/httptriggerdemo/HttptriggerDemoApplicationTests.java create mode 100644 spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/.gitignore create mode 100644 spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/.mvn/wrapper/maven-wrapper.jar create mode 100644 spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/.mvn/wrapper/maven-wrapper.properties create mode 100644 spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/README.md create mode 100755 spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/mvnw create mode 100644 spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/mvnw.cmd create mode 100644 spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml create mode 100644 spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/src/main/java/com/example/azure/di/timetriggerdemo/TimeTriggerDemoApplication.java create mode 100644 spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/src/main/java/com/example/azure/di/timetriggerdemo/UppercaseHandler.java create mode 100644 spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/src/main/resources/application.properties create mode 100644 spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/src/main/resources/host.json create mode 100644 spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/src/main/resources/local.settings.json create mode 100644 spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/src/test/java/com/example/azure/di/timetriggerdemo/TimetriggerDemoApplicationTests.java diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index c620c90a7..8cf50aafb 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -1,7 +1,6 @@ + xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-cloud-function-adapter-azure @@ -20,7 +19,8 @@ UTF-8 UTF-8 1.8 - 1.2.2 + 3.0.0 + 1.0.0 @@ -48,6 +48,12 @@ ${azure.functions.java.core.version} + + com.microsoft.azure.functions + azure-functions-java-spi + ${azure.functions.java.spi.version} + + diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/AzureFunctionInstanceInjector.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/AzureFunctionInstanceInjector.java new file mode 100644 index 000000000..3b35c923a --- /dev/null +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/AzureFunctionInstanceInjector.java @@ -0,0 +1,99 @@ +/* + * Copyright 2021-2022 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 org.springframework.cloud.function.adapter.azure; + +import java.util.Map; + +import com.microsoft.azure.functions.spi.inject.FunctionInstanceInjector; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.WebApplicationType; +import org.springframework.cloud.function.utils.FunctionClassUtils; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.util.ClassUtils; +import org.springframework.util.CollectionUtils; + +/** + * The instance factory used by the Spring framework to initialize Azure function instance. It is waived with the Azure + * Java Worker through the META-INFO/services/com.microsoft.azure.functions.spi.inject.FunctionInstanceInjector service + * hook. The Azure Java Worker delegates scans the classpath for service definition and delegates the function class + * creation to this instance factory. + * @author Christian Tzolov + * @since 3.2.9 + */ +public class AzureFunctionInstanceInjector implements FunctionInstanceInjector { + + private static Log logger = LogFactory.getLog(AzureFunctionInstanceInjector.class); + + private static ConfigurableApplicationContext APPLICATION_CONTEXT; + + /** + * This method is called by the Azure Java Worker on every function invocation. The Worker sends in the classes + * annotated with @FunctionName annotations and allows the Spring framework to initialize the function instance as a + * Spring Bean and return the instance. Then the Worker uses the created instance to invoke the function. + * @param functionClass the class that contains customer Azure functions (e.g. @FunctionName annotated ) + * @param customer Azure functions class type + * @return the instance that will be invoked on by azure functions java worker + * @throws Exception any exception that is thrown by the Spring framework during instance creation + */ + @Override + public T getInstance(Class functionClass) throws Exception { + try { + // Backward compatibility workaround. If the function class is of type FunctionInvoker then create plain + // Java instance and delegate to FunctionInvoker adaptor approach. + if (ClassUtils.isAssignable(FunctionInvoker.class, functionClass)) { + return functionClass.newInstance(); + } + + initialize(FunctionClassUtils.getStartClass()); + Map azureFunctionBean = APPLICATION_CONTEXT.getBeansOfType(functionClass); + if (CollectionUtils.isEmpty(azureFunctionBean)) { + throw new IllegalStateException( + "Failed to retrieve Bean instance for: " + functionClass + + ". The class should be annotated with @Component to let the Spring framework initialize it!"); + } + return azureFunctionBean.entrySet().iterator().next().getValue(); + } + catch (Exception e) { + if (APPLICATION_CONTEXT != null) { + APPLICATION_CONTEXT.close(); + } + throw new IllegalStateException("Failed to initialize", e); + } + } + + /** + * Create a static Application Context instance shared between multiple function invocations. + */ + private static void initialize(Class springConfigurationClass) { + synchronized (AzureFunctionInstanceInjector.class.getName()) { + if (APPLICATION_CONTEXT == null) { + logger.info("Initializing: " + springConfigurationClass); + APPLICATION_CONTEXT = springApplication(springConfigurationClass).run(); + } + } + } + + private static SpringApplication springApplication(Class configurationClass) { + SpringApplication application = new org.springframework.cloud.function.context.FunctionalSpringApplication( + configurationClass); + application.setWebApplicationType(WebApplicationType.NONE); + return application; + } +} diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/resources/META-INF/services/com.microsoft.azure.functions.spi.inject.FunctionInstanceInjector b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/resources/META-INF/services/com.microsoft.azure.functions.spi.inject.FunctionInstanceInjector new file mode 100644 index 000000000..247910e32 --- /dev/null +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/resources/META-INF/services/com.microsoft.azure.functions.spi.inject.FunctionInstanceInjector @@ -0,0 +1 @@ +org.springframework.cloud.function.adapter.azure.AzureFunctionInstanceInjector \ No newline at end of file diff --git a/spring-cloud-function-samples/function-azure-di-samples/README.md b/spring-cloud-function-samples/function-azure-di-samples/README.md new file mode 100644 index 000000000..0a1c6b77f --- /dev/null +++ b/spring-cloud-function-samples/function-azure-di-samples/README.md @@ -0,0 +1,197 @@ +# Azure Functions with DI adapter + +## Common instructions to integrate Azure Functions with Spring Framework + +* Use the [Spring Initializer](https://start.spring.io/) to generate a pain, java Spring Boot project without additional dependencies. Set the boot version to `2.7.x`, the build to `Maven` and the packaging to `Jar`. + +* Add the `spring-cloud-function-adapter-azure` POM dependency: + + ```xml + + org.springframework.cloud + spring-cloud-function-adapter-azure + 3.2.9 or higher + + ``` + Having the adapter on the classpath activates the Azure Java Worker integration. + +* Implement the [Azure Java Functions](https://learn.microsoft.com/en-us/azure/azure-functions/functions-reference-java?tabs=bash%2Cconsumption#java-function-basics) as `@FunctionName` annotated methods: + + ```java + import java.util.Optional; + import java.util.function.Function; + + import com.microsoft.azure.functions.ExecutionContext; + import com.microsoft.azure.functions.HttpMethod; + import com.microsoft.azure.functions.HttpRequestMessage; + import com.microsoft.azure.functions.annotation.AuthorizationLevel; + import com.microsoft.azure.functions.annotation.FunctionName; + import com.microsoft.azure.functions.annotation.HttpTrigger; + + import org.springframework.beans.factory.annotation.Autowired; + import org.springframework.stereotype.Component; + + @Component + public class MyAzureFunction { + + @Autowired + private Function uppercase; + + @FunctionName("ditest") + public String execute( + @HttpTrigger(name = "req", methods = { HttpMethod.GET, + HttpMethod.POST }, authLevel = AuthorizationLevel.ANONYMOUS) HttpRequestMessage> request, + ExecutionContext context) { + + return this.uppercase.apply(request.getBody().get()); + } + } + ``` + - The `@FunctionName` annotated methods represent the Azure Function implementations. + - The class must be marked with the Spring `@Component` annotation. + - You can use any Spring mechanism to auto-wire the Spring beans used for the function implementation. + +* Add the `host.json` configuration under the `src/main/resources` folder: + + ```json + { + "version": "2.0", + "extensionBundle": { + "id": "Microsoft.Azure.Functions.ExtensionBundle", + "version": "[3.*, 4.0.0)" + } + } + ``` + +* When bootstrapped as Spring Boot project make sure to either disable the `spring-boot-maven-plugin` plugin or cover it into `thin-layout`: + + ```xml + + org.springframework.boot + spring-boot-maven-plugin + + + org.springframework.boot.experimental + spring-boot-thin-layout + ${spring-boot-thin-layout.version} + + + + ``` + Since Azure Functions requires a specific, custom, Jar packaging we have to disable SpringBoot one. + +* Add the `azure-functions-maven-plugin` to your POM configuration. A sample configuration would look like this. + + ```xml + + com.microsoft.azure + azure-functions-maven-plugin + 1.22.0 or higher + + + YOUR-AZURE-FUNCTION-APP-NAME + YOUR-AZURE-FUNCTION-RESOURCE-GROUP + YOUR-AZURE-FUNCTION-APP-REGION + YOUR-AZURE-FUNCTION-APP-SERVICE-PLANE-NAME + YOUR-AZURE-FUNCTION-PRICING-TIER + + ${project.basedir}/src/main/resources/host.json + + + linux + 11 + + + 7072 + + + + FUNCTIONS_EXTENSION_VERSION + ~4 + + + + + + package-functions + + package + + + + + ``` + - Set the AZURE subscription configuration such as app name, resource group, region, service plan, pricing Tier + - Runtime configuration: + - [Java Versions](https://learn.microsoft.com/en-us/azure/azure-functions/functions-reference-java?tabs=bash%2Cconsumption#java-versions) + - Specify [Deployment OS](https://learn.microsoft.com/en-us/azure/azure-functions/functions-reference-java?tabs=bash%2Cconsumption#specify-the-deployment-os) + +* Build the project: + + ``` + ./mvnw clean package + ``` + +## Running Locally + +NOTE: To run locally on top of `Azure Functions`, and to deploy to your live Azure environment, you will need `Azure Functions Core Tools` installed along with the Azure CLI (see [here](https://docs.microsoft.com/en-us/azure/azure-functions/create-first-function-cli-java?tabs=bash%2Cazure-cli%2Cbrowser#configure-your-local-environment)). +For some configuration you would need the [Azurite emulator](https://learn.microsoft.com/en-us/azure/storage/common/storage-use-emulator) as well. + +Then build and run the sample: + +``` +./mvnw clean package +./mvnw azure-functions:run +``` + +## Running on Azure + +Make sure you are logged in your Azure account. +``` +az login +``` + +Build and deploy + +``` +./mvnw clean package +./mvnw azure-functions:deploy +``` + +## Debug locally + +Run the function in debug mode. +``` +./mvnw azure-functions:deploy -DenableDebug +``` + +Alternatively and the `JAVA_OPTS` value to your `local.settings.json` like this: + +```json +{ + "IsEncrypted": false, + "Values": { + ... + "FUNCTIONS_WORKER_RUNTIME": "java", + "JAVA_OPTS": "-Djava.net.preferIPv4Stack=true -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=127.0.0.1:5005" + } +} +``` + + +VS Code remote debug configuration: + + ```json + { + "version": "0.2.0", + "configurations": [ + { + "type": "java", + "name": "Attach to Remote Program", + "request": "attach", + "hostName": "localhost", + "port": "5005" + }, + } + + ``` \ No newline at end of file diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/.gitignore b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/.gitignore new file mode 100644 index 000000000..549e00a2a --- /dev/null +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/.mvn/wrapper/maven-wrapper.jar b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..c1dd12f17644411d6e840bd5a10c6ecda0175f18 GIT binary patch literal 58727 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%0ANsA|A3-jj|r`KAo%oTajX3>^E` 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 YM{}PByk10KD_nuQ4E7Du?}+~TKh4V)`~Uy| literal 0 HcmV?d00001 diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/.mvn/wrapper/maven-wrapper.properties b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 000000000..b74bf7fcd --- /dev/null +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/README.md b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/README.md new file mode 100644 index 000000000..37bb86dc6 --- /dev/null +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/README.md @@ -0,0 +1,6 @@ + + +The Blob storage binding is part of an [extension bundle](https://learn.microsoft.com/en-us/azure/azure-functions/functions-bindings-register#extension-bundles), which is specified in your [host.json](https://learn.microsoft.com/en-us/azure/azure-functions/functions-bindings-storage-blob?tabs=in-process%2Cextensionv5%2Cextensionv3&pivots=programming-language-java#install-bundle) project file. + + +The Blob storage trigger starts a function when a new or updated blob is detected. The blob contents are provided as [input](https://learn.microsoft.com/en-us/azure/azure-functions/functions-bindings-storage-blob-input?tabs=in-process%2Cextensionv5&pivots=programming-language-java) to the function. \ No newline at end of file diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/mvnw b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/mvnw new file mode 100755 index 000000000..8a8fb2282 --- /dev/null +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/mvnw @@ -0,0 +1,316 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`\\unset -f command; \\command -v java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/mvnw.cmd b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/mvnw.cmd new file mode 100644 index 000000000..1d8ab018e --- /dev/null +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/mvnw.cmd @@ -0,0 +1,188 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml new file mode 100644 index 000000000..abe5b855f --- /dev/null +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml @@ -0,0 +1,106 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.7.6 + + + + com.example.azure.di + azure-blob-trigger-demo + 0.0.1-SNAPSHOT + azure-blob-trigger-demo + Demo project for Spring Boot + + 11 + 1.0.28.RELEASE + + com.example.azure.di.azureblobtriggerdemo.AzureBlobTriggerDemoApplication + + + 1.22.0 + spring-cloud-function-samples + westus + java-functions-group + java-functions-app-service-plan + EP1 + + + + + org.springframework.cloud + spring-cloud-function-adapter-azure + 3.2.9-SNAPSHOT + + + + org.springframework.boot + spring-boot-starter + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + com.microsoft.azure + azure-functions-maven-plugin + ${azure.functions.maven.plugin.version} + + + ${functionAppName} + ${functionResourceGroup} + ${functionAppRegion} + ${functionAppServicePlanName} + ${functionPricingTier} + + ${project.basedir}/src/main/resources/host.json + ${project.basedir}/src/main/resources/local.settings.json + + + linux + 11 + + + 7072 + + + + FUNCTIONS_EXTENSION_VERSION + ~4 + + + + + + package-functions + + package + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.springframework.boot.experimental + spring-boot-thin-layout + ${spring-boot-thin-layout.version} + + + + + + + diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/src/main/java/com/example/azure/di/azureblobtriggerdemo/AzureBlobTriggerDemoApplication.java b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/src/main/java/com/example/azure/di/azureblobtriggerdemo/AzureBlobTriggerDemoApplication.java new file mode 100644 index 000000000..fe209a965 --- /dev/null +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/src/main/java/com/example/azure/di/azureblobtriggerdemo/AzureBlobTriggerDemoApplication.java @@ -0,0 +1,36 @@ +/* + * Copyright 2021-2022 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 com.example.azure.di.azureblobtriggerdemo; + +import java.util.function.Function; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; + +@SpringBootApplication +public class AzureBlobTriggerDemoApplication { + + public static void main(String[] args) { + SpringApplication.run(AzureBlobTriggerDemoApplication.class, args); + } + + @Bean + public Function uppercase() { + return payload -> payload.toUpperCase(); + } +} diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/src/main/java/com/example/azure/di/azureblobtriggerdemo/MyBlobFunction.java b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/src/main/java/com/example/azure/di/azureblobtriggerdemo/MyBlobFunction.java new file mode 100644 index 000000000..302e07e34 --- /dev/null +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/src/main/java/com/example/azure/di/azureblobtriggerdemo/MyBlobFunction.java @@ -0,0 +1,65 @@ +/* + * Copyright 2021-2022 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 com.example.azure.di.azureblobtriggerdemo; + +import java.util.function.Function; + +import com.microsoft.azure.functions.ExecutionContext; +import com.microsoft.azure.functions.OutputBinding; +import com.microsoft.azure.functions.annotation.BindingName; +import com.microsoft.azure.functions.annotation.BlobInput; +import com.microsoft.azure.functions.annotation.BlobOutput; +import com.microsoft.azure.functions.annotation.BlobTrigger; +import com.microsoft.azure.functions.annotation.FunctionName; +import com.microsoft.azure.functions.annotation.StorageAccount; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * Azure Functions with Azure Storage Blob. + * https://docs.microsoft.com/en-us/azure/azure-functions/functions-bindings-storage-blob-trigger?tabs=java + * + * The Blob storage binding is part of an extension bundle, which is specified in your host.json project file. + */ + +@Component +public class MyBlobFunction { + + + @Autowired + private Function uppercase; + + /** + * This function will be invoked when a new or updated blob is detected at the specified path. The blob contents are + * provided as input to this function. The location of the blob is provided in the path parameter. Example - + * test-triggerinput-java/{name} below + */ + @FunctionName("BlobTrigger") + @StorageAccount("AzureWebJobsStorage") + public void BlobTriggerToBlobTest( + @BlobTrigger(name = "triggerBlob", path = "test-triggerinput-java/{name}", dataType = "binary") byte[] triggerBlob, + @BindingName("name") String fileName, + @BlobInput(name = "inputBlob", path = "test-input-java/{name}", dataType = "binary") byte[] inputBlob, + @BlobOutput(name = "outputBlob", path = "test-output-java/{name}", dataType = "binary") OutputBinding outputBlob, + final ExecutionContext context) { + + context.getLogger().info("Java Blob trigger function BlobTriggerToBlobTest processed a blob.\n Name: " + + fileName + "\n Size: " + triggerBlob.length + " Bytes"); + outputBlob.setValue(inputBlob); + } +} diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/src/main/resources/application.properties b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/src/main/resources/application.properties new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/src/main/resources/host.json b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/src/main/resources/host.json new file mode 100644 index 000000000..10d0c0748 --- /dev/null +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/src/main/resources/host.json @@ -0,0 +1,7 @@ +{ + "version": "2.0", + "extensionBundle": { + "id": "Microsoft.Azure.Functions.ExtensionBundle", + "version": "[3.*, 4.0.0)" + } +} \ No newline at end of file diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/src/main/resources/local.settings.json b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/src/main/resources/local.settings.json new file mode 100644 index 000000000..adce8b884 --- /dev/null +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/src/main/resources/local.settings.json @@ -0,0 +1,8 @@ +{ + "IsEncrypted": false, + "Values": { + "AzureWebJobsStorage": "UseDevelopmentStorage=true", + "AzureWebJobsDashboard": "", + "FUNCTIONS_WORKER_RUNTIME": "java" + } +} \ No newline at end of file diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/src/test/java/com/example/azure/di/azureblobtriggerdemo/AzureBlobTriggerDemoApplicationTests.java b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/src/test/java/com/example/azure/di/azureblobtriggerdemo/AzureBlobTriggerDemoApplicationTests.java new file mode 100644 index 000000000..2b9b92ad5 --- /dev/null +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/src/test/java/com/example/azure/di/azureblobtriggerdemo/AzureBlobTriggerDemoApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.azure.di.azureblobtriggerdemo; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class AzureBlobTriggerDemoApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/.gitignore b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/.gitignore new file mode 100644 index 000000000..549e00a2a --- /dev/null +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/.mvn/wrapper/maven-wrapper.jar b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..c1dd12f17644411d6e840bd5a10c6ecda0175f18 GIT binary patch literal 58727 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%0ANsA|A3-jj|r`KAo%oTajX3>^E` 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 YM{}PByk10KD_nuQ4E7Du?}+~TKh4V)`~Uy| literal 0 HcmV?d00001 diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/.mvn/wrapper/maven-wrapper.properties b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 000000000..b74bf7fcd --- /dev/null +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/mvnw b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/mvnw new file mode 100755 index 000000000..8a8fb2282 --- /dev/null +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/mvnw @@ -0,0 +1,316 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`\\unset -f command; \\command -v java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/mvnw.cmd b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/mvnw.cmd new file mode 100644 index 000000000..1d8ab018e --- /dev/null +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/mvnw.cmd @@ -0,0 +1,188 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml new file mode 100644 index 000000000..4314f8734 --- /dev/null +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml @@ -0,0 +1,104 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.7.6 + + + + com.example.azure.di + azure-httptrigger-demo + 0.0.1-SNAPSHOT + azure-httptrigger-demo + + Demo Spring Boot, Azure Function - HttpTrigger (DI adapter) + + + 11 + 1.0.28.RELEASE + + + com.example.azure.di.httptriggerdemo.HttpTriggerDemoApplication + + + 1.22.0 + spring-cloud-function-samples + westus + java-functions-group + java-functions-app-service-plan + EP1 + + + + + org.springframework.cloud + spring-cloud-function-adapter-azure + 3.2.9-SNAPSHOT + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + + com.microsoft.azure + azure-functions-maven-plugin + ${azure.functions.maven.plugin.version} + + + ${functionAppName} + ${functionResourceGroup} + ${functionAppRegion} + ${functionAppServicePlanName} + ${functionPricingTier} + + ${project.basedir}/src/main/resources/host.json + + + linux + 11 + + + 7072 + + + + FUNCTIONS_EXTENSION_VERSION + ~4 + + + + + + package-functions + + package + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.springframework.boot.experimental + spring-boot-thin-layout + ${spring-boot-thin-layout.version} + + + + + + + diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/src/main/java/com/example/azure/di/httptriggerdemo/HttpTriggerDemoApplication.java b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/src/main/java/com/example/azure/di/httptriggerdemo/HttpTriggerDemoApplication.java new file mode 100644 index 000000000..d462f8c97 --- /dev/null +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/src/main/java/com/example/azure/di/httptriggerdemo/HttpTriggerDemoApplication.java @@ -0,0 +1,42 @@ +/* + * Copyright 2021-2022 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 com.example.azure.di.httptriggerdemo; + +import java.util.function.Function; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; + +@SpringBootApplication +public class HttpTriggerDemoApplication { + + @Bean + public Function echo() { + return payload -> payload; + } + + @Bean + public Function uppercase() { + return payload -> payload.toUpperCase(); + } + + public static void main(String[] args) { + SpringApplication.run(HttpTriggerDemoApplication.class, args); + } + +} diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/src/main/java/com/example/azure/di/httptriggerdemo/MyAzureFunction.java b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/src/main/java/com/example/azure/di/httptriggerdemo/MyAzureFunction.java new file mode 100644 index 000000000..0bcf1879d --- /dev/null +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/src/main/java/com/example/azure/di/httptriggerdemo/MyAzureFunction.java @@ -0,0 +1,49 @@ +/* + * Copyright 2021-2022 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 com.example.azure.di.httptriggerdemo; + +import java.util.Optional; +import java.util.function.Function; + +import com.microsoft.azure.functions.ExecutionContext; +import com.microsoft.azure.functions.HttpMethod; +import com.microsoft.azure.functions.HttpRequestMessage; +import com.microsoft.azure.functions.annotation.AuthorizationLevel; +import com.microsoft.azure.functions.annotation.FunctionName; +import com.microsoft.azure.functions.annotation.HttpTrigger; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +@Component +public class MyAzureFunction { + + @Autowired + private Function echo; + + @Autowired + private Function uppercase; + + @FunctionName("ditest") + public String execute( + @HttpTrigger(name = "req", methods = { HttpMethod.GET, + HttpMethod.POST }, authLevel = AuthorizationLevel.ANONYMOUS) HttpRequestMessage> request, + ExecutionContext context) { + + return echo.andThen(uppercase).apply(request.getBody().get()); + } +} diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/src/main/resources/application.properties b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/src/main/resources/application.properties new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/src/main/resources/host.json b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/src/main/resources/host.json new file mode 100644 index 000000000..10d0c0748 --- /dev/null +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/src/main/resources/host.json @@ -0,0 +1,7 @@ +{ + "version": "2.0", + "extensionBundle": { + "id": "Microsoft.Azure.Functions.ExtensionBundle", + "version": "[3.*, 4.0.0)" + } +} \ No newline at end of file diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/src/test/java/com/example/azure/di/httptriggerdemo/HttptriggerDemoApplicationTests.java b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/src/test/java/com/example/azure/di/httptriggerdemo/HttptriggerDemoApplicationTests.java new file mode 100644 index 000000000..dbc76d294 --- /dev/null +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/src/test/java/com/example/azure/di/httptriggerdemo/HttptriggerDemoApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.azure.di.httptriggerdemo; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class HttptriggerDemoApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/.gitignore b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/.gitignore new file mode 100644 index 000000000..549e00a2a --- /dev/null +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/.mvn/wrapper/maven-wrapper.jar b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..c1dd12f17644411d6e840bd5a10c6ecda0175f18 GIT binary patch literal 58727 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%0ANsA|A3-jj|r`KAo%oTajX3>^E` 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 YM{}PByk10KD_nuQ4E7Du?}+~TKh4V)`~Uy| literal 0 HcmV?d00001 diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/.mvn/wrapper/maven-wrapper.properties b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 000000000..b74bf7fcd --- /dev/null +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/README.md b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/README.md new file mode 100644 index 000000000..5b459e447 --- /dev/null +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/README.md @@ -0,0 +1,110 @@ +# Azure TimerTrigger Function + +Spring Cloud Function example for implementing [Timer trigger for Azure Functions](https://learn.microsoft.com/en-us/azure/azure-functions/functions-bindings-timer?tabs=in-process&pivots=programming-language-java). + +## Running Locally + +NOTE: To run locally on top of `Azure Functions`, and to deploy to your live Azure environment, you will need `Azure Functions Core Tools` installed along with the Azure CLI (see [here](https://docs.microsoft.com/en-us/azure/azure-functions/create-first-function-cli-java?tabs=bash%2Cazure-cli%2Cbrowser#configure-your-local-environment)) as well as the Use [Azurite emulator](https://learn.microsoft.com/en-us/azure/storage/common/storage-use-emulator) for local Azure Storage development. For the emulator you can run a docker container (see below) or use the [Visual-Studio-Code extension](https://learn.microsoft.com/en-us/azure/storage/common/storage-use-azurite?tabs=visual-studio-code). + +Here is how ot start the `Azure emulator` as docker container: + +``` +docker run --name azurite --rm -p 10000:10000 -p 10001:10001 -p 10002:10002 mcr.microsoft.com/azure-storage/azurite +``` + +Then build and run the sample: + +``` +./mvnw clean package +./mvnw azure-functions:run +``` + +The timer triggers the function every minute. +In result the the `uppercase` Spring Cloud Function is called and uppercase the timeInfo and logs it into the context. + +``` +[2022-10-11T08:53:00.011Z] Execution Context Log - TimeInfo: {"Schedule":{"AdjustForDST":true},"ScheduleStatus":{"Last":"2022-10-11T10:52:00.003967+02:00","Next":"2022-10-11T10:53:00+02:00","LastUpdated":"2022-10-11T10:52:00.003967+02:00"},"IsPastDue":false} +``` + +## Running on Azure + +Make sure you are logged in your Azure account. +``` +az login +``` + +Build and deploy + +``` +./mvnw clean package +./mvnw azure-functions:deploy +``` + +## Implementation details + +The `spring-cloud-function-adapter-azure` dependency activates the AzureFunctionInstanceInjector: + +```xml + + org.springframework.cloud + spring-cloud-function-adapter-azure + 3.2.9-SNAPSHOT + +``` + +(Version 3.2.9 or higher) + + +The `uppercase` function with signature `Function, Void> uppercase()` is defined as `@Bean` in the TimeTriggerDemoApplication context. + + +```java + @Bean + public Consumer> uppercase() { + return message -> { + String timeInfo = message.getPayload(); + String value = timeInfo.toUpperCase(); + + logger.info("Timer is triggered with TimeInfo: " + value); + + // (Optionally) access and use the Azure function context. + ExecutionContext context = (ExecutionContext) message.getHeaders().get(UppercaseHandler.EXECUTION_CONTEXT); + context.getLogger().info("Execution Context Log - TimeInfo: " + value); + + // No response. + }; + } +``` + +TIP: The uppercase function does not return value (e.g. Void output type) and is backed by `java.util.Consumer`. + +The `UppercaseHandler` (marked as Spring `@Component`) implements the Azure function using the Azure Function Java API. Furthermore as Spring component the UppercaseHandler leverages the Spring configuration and programming model to inject the necessary services required by the functions. + +```java +@Component +public class UppercaseHandler { + + public static String EXECUTION_CONTEXT = "executionContext"; + + @Autowired + private Consumer> uppercase; + + @FunctionName("uppercase") + public void execute(@TimerTrigger(name = "keepAliveTrigger", schedule = "0 */1 * * * *") String timerInfo, + ExecutionContext context) { + + Message message = MessageBuilder + .withPayload(timerInfo) + .setHeader(EXECUTION_CONTEXT, context) + .build(); + + this.uppercase.accept(message); + } +} +``` + + +## Notes + +* Change the `spring-boot-maven-plugin` to `tiny` in favor of the `azure-functions-maven-plugin` jar packaging. +* Add `"AzureWebJobsStorage": "UseDevelopmentStorage=true"` to the `local.settings.json`. diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/mvnw b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/mvnw new file mode 100755 index 000000000..8a8fb2282 --- /dev/null +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/mvnw @@ -0,0 +1,316 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`\\unset -f command; \\command -v java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/mvnw.cmd b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/mvnw.cmd new file mode 100644 index 000000000..1d8ab018e --- /dev/null +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/mvnw.cmd @@ -0,0 +1,188 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml new file mode 100644 index 000000000..3eb823915 --- /dev/null +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml @@ -0,0 +1,107 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.7.6 + + + + com.example.azure.di + azure-timetrigger-demo + 0.0.1-SNAPSHOT + azure-timetrigger-demo + Demo project for Spring Boot + + 11 + 1.0.28.RELEASE + + + com.example.azure.di.timetriggerdemo.TimeTriggerDemoApplication + + + 1.22.0 + spring-cloud-function-samples + westus + java-functions-group + java-functions-app-service-plan + EP1 + + + + + org.springframework.cloud + spring-cloud-function-adapter-azure + 3.2.9-SNAPSHOT + + + + org.springframework.boot + spring-boot-starter + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + com.microsoft.azure + azure-functions-maven-plugin + ${azure.functions.maven.plugin.version} + + + ${functionAppName} + ${functionResourceGroup} + ${functionAppRegion} + ${functionAppServicePlanName} + ${functionPricingTier} + + ${project.basedir}/src/main/resources/host.json + ${project.basedir}/src/main/resources/local.settings.json + + + linux + 11 + + + 7072 + + + + FUNCTIONS_EXTENSION_VERSION + ~4 + + + + + + package-functions + + package + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.springframework.boot.experimental + spring-boot-thin-layout + ${spring-boot-thin-layout.version} + + + + + + + diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/src/main/java/com/example/azure/di/timetriggerdemo/TimeTriggerDemoApplication.java b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/src/main/java/com/example/azure/di/timetriggerdemo/TimeTriggerDemoApplication.java new file mode 100644 index 000000000..e3e10ddc8 --- /dev/null +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/src/main/java/com/example/azure/di/timetriggerdemo/TimeTriggerDemoApplication.java @@ -0,0 +1,55 @@ +/* + * Copyright 2021-2022 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 com.example.azure.di.timetriggerdemo; + +import java.util.function.Consumer; + +import com.microsoft.azure.functions.ExecutionContext; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; +import org.springframework.messaging.Message; + +@SpringBootApplication +public class TimeTriggerDemoApplication { + + private static Log logger = LogFactory.getLog(TimeTriggerDemoApplication.class); + + public static void main(String[] args) { + SpringApplication.run(TimeTriggerDemoApplication.class, args); + } + + @Bean + public Consumer> uppercase() { + return message -> { + String timeInfo = message.getPayload(); + String value = timeInfo.toUpperCase(); + + logger.info("Timer is triggered with TimeInfo: " + value); + + // (Optionally) access and use the Azure function context. + ExecutionContext context = (ExecutionContext) message.getHeaders().get(UppercaseHandler.EXECUTION_CONTEXT); + context.getLogger().info("Execution Context Log - TimeInfo: " + value); + + // No response. + }; + } + +} diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/src/main/java/com/example/azure/di/timetriggerdemo/UppercaseHandler.java b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/src/main/java/com/example/azure/di/timetriggerdemo/UppercaseHandler.java new file mode 100644 index 000000000..4e217edf6 --- /dev/null +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/src/main/java/com/example/azure/di/timetriggerdemo/UppercaseHandler.java @@ -0,0 +1,49 @@ +/* + * Copyright 2021-2022 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 com.example.azure.di.timetriggerdemo; + +import java.util.function.Consumer; + +import com.microsoft.azure.functions.ExecutionContext; +import com.microsoft.azure.functions.annotation.FunctionName; +import com.microsoft.azure.functions.annotation.TimerTrigger; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.messaging.Message; +import org.springframework.messaging.support.MessageBuilder; +import org.springframework.stereotype.Component; + +@Component +public class UppercaseHandler { + + public static String EXECUTION_CONTEXT = "executionContext"; + + @Autowired + private Consumer> uppercase; + + @FunctionName("uppercase") + public void execute(@TimerTrigger(name = "keepAliveTrigger", schedule = "0 */1 * * * *") String timerInfo, + ExecutionContext context) { + + Message message = MessageBuilder + .withPayload(timerInfo) + .setHeader(EXECUTION_CONTEXT, context) + .build(); + + this.uppercase.accept(message); + } +} diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/src/main/resources/application.properties b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/src/main/resources/application.properties new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/src/main/resources/host.json b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/src/main/resources/host.json new file mode 100644 index 000000000..10d0c0748 --- /dev/null +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/src/main/resources/host.json @@ -0,0 +1,7 @@ +{ + "version": "2.0", + "extensionBundle": { + "id": "Microsoft.Azure.Functions.ExtensionBundle", + "version": "[3.*, 4.0.0)" + } +} \ No newline at end of file diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/src/main/resources/local.settings.json b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/src/main/resources/local.settings.json new file mode 100644 index 000000000..adce8b884 --- /dev/null +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/src/main/resources/local.settings.json @@ -0,0 +1,8 @@ +{ + "IsEncrypted": false, + "Values": { + "AzureWebJobsStorage": "UseDevelopmentStorage=true", + "AzureWebJobsDashboard": "", + "FUNCTIONS_WORKER_RUNTIME": "java" + } +} \ No newline at end of file diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/src/test/java/com/example/azure/di/timetriggerdemo/TimetriggerDemoApplicationTests.java b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/src/test/java/com/example/azure/di/timetriggerdemo/TimetriggerDemoApplicationTests.java new file mode 100644 index 000000000..d78399a12 --- /dev/null +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/src/test/java/com/example/azure/di/timetriggerdemo/TimetriggerDemoApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.azure.di.timetriggerdemo; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class TimetriggerDemoApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index d6cc1f827..be83968c7 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -34,6 +34,7 @@ org.springframework.cloud spring-cloud-function-adapter-azure + 3.2.9-SNAPSHOT org.springframework.cloud diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 2c3f4f74e..52c738e9b 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -15,6 +15,9 @@ + function-sample-pof function-sample-pojo function-sample-aws From e63d0d734f3e9120b202a3f240bf139ccfa4feb2 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 15 Dec 2022 12:40:23 +0100 Subject: [PATCH 161/210] GH-964, GH-959 Fix Kotlin type discovery Resolves #964 Resolves #959 --- .../context/config/FunctionContextUtils.java | 38 +++++++++---------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/FunctionContextUtils.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/FunctionContextUtils.java index 83ec0d4b5..81b0ec29f 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/FunctionContextUtils.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/FunctionContextUtils.java @@ -30,8 +30,6 @@ import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.cloud.function.context.catalog.FunctionTypeUtils; -import org.springframework.cloud.function.core.FunctionFactoryMetadata; -import org.springframework.context.annotation.ScannedGenericBeanDefinition; import org.springframework.core.ResolvableType; import org.springframework.core.io.Resource; import org.springframework.core.type.MethodMetadata; @@ -62,12 +60,17 @@ else if (registry.containsBean(name)) { } } + Class beanClass = null; + + if (definition == null) { return null; } - else if (definition instanceof ScannedGenericBeanDefinition) { + + if (definition instanceof AbstractBeanDefinition) { try { - return FunctionTypeUtils.discoverFunctionTypeFromClass(definition.getBeanClass()); + beanClass = resolveBeanClass(definition); + return FunctionTypeUtils.discoverFunctionTypeFromClass(beanClass); } catch (Exception e) { // ignore since name may not be actually resolved to a class in some cases @@ -89,24 +92,10 @@ else if (source instanceof Resource) { if (type != null) { param = type.getType(); } - else { - Class beanClass = definition.hasBeanClass() ? definition.getBeanClass() : null; - if (beanClass != null - && !FunctionFactoryMetadata.class.isAssignableFrom(beanClass)) { - param = beanClass; - } - else { - Object bean = registry.getBean(actualName); - // could be FunctionFactoryMetadata. . . TODO investigate and fix - if (bean instanceof FunctionFactoryMetadata) { - param = ((FunctionFactoryMetadata) bean).getFactoryMethod().getGenericReturnType(); - } - } - } } - if (!(param instanceof ParameterizedType) && definition.hasBeanClass()) { - return FunctionTypeUtils.discoverFunctionTypeFromClass(definition.getBeanClass()); + if (!(param instanceof ParameterizedType) && beanClass != null) { + return FunctionTypeUtils.discoverFunctionTypeFromClass(beanClass); } return param; } @@ -129,6 +118,15 @@ public static Class[] getParamTypesFromBeanDefinitionFactory(Class factory return params.toArray(new Class[0]); } + private static Class resolveBeanClass(AbstractBeanDefinition beanDefinition) { + try { + return beanDefinition.hasBeanClass() ? beanDefinition.getBeanClass() : ClassUtils.getDefaultClassLoader().loadClass(beanDefinition.getBeanClassName()); + } + catch (Exception e) { + throw new IllegalStateException("Can't resolve class", e); + } + } + private static Type findBeanType(AbstractBeanDefinition definition, String declaringClassName, String methodName) { Class factory = ClassUtils.resolveClassName(declaringClassName, null); Class[] params = getParamTypesFromBeanDefinitionFactory(factory, definition); From 452b8107c5e34ae53427e31678bade0e741f7c22 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 15 Dec 2022 23:13:26 +0000 Subject: [PATCH 162/210] Bumping versions --- .../function-azure-di-samples/azure-blob-trigger-demo/pom.xml | 2 +- .../function-azure-di-samples/azure-httptrigger-demo/pom.xml | 2 +- .../function-azure-di-samples/azure-timetrigger-demo/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml index abe5b855f..2ff94e02d 100644 --- a/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.6 + 2.6.13 diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml index 4314f8734..c15b45225 100644 --- a/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.6 + 2.6.13 diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml index 3eb823915..e85374760 100644 --- a/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.6 + 2.6.13 From d8c9b9066241e760c97f510ec0dcd3e3ab9180ed Mon Sep 17 00:00:00 2001 From: amond Date: Tue, 17 Jan 2023 03:01:45 +0900 Subject: [PATCH 163/210] GH-987 feat: propagate aws x-ray tracing header Resolves #987 Resolves #988 --- .../adapter/aws/CustomRuntimeEventLoop.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoop.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoop.java index d67a2edea..33c43d1d3 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoop.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoop.java @@ -146,6 +146,21 @@ private void eventLoop(ConfigurableApplicationContext context) { String invocationUrl = MessageFormat .format(LAMBDA_INVOCATION_URL_TEMPLATE, runtimeApi, LAMBDA_VERSION_DATE, requestId); + String traceId = response.getHeaders().getFirst("Lambda-Runtime-Trace-Id"); + if (traceId != null) { + if (logger.isDebugEnabled()) { + logger.debug("Lambda-Runtime-Trace-Id: " + traceId); + } + try { + // The X-Ray SDK uses this value to connect trace data between services. + System.setProperty("com.amazonaws.xray.traceHeader", traceId); + } catch (Exception e) { + if (logger.isDebugEnabled()) { + logger.debug("Failed to set amazon x-ray trace id", e); + } + } + } + try { Message responseMessage = (Message) function.apply(eventMessage); From 182c4886877ed527e6da1b0d7c7eec8193d961ad Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 17 Jan 2023 11:09:54 +0100 Subject: [PATCH 164/210] polishing previous commit --- .../cloud/function/adapter/aws/CustomRuntimeEventLoop.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoop.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoop.java index 33c43d1d3..95672c38c 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoop.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoop.java @@ -43,6 +43,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.messaging.Message; import org.springframework.util.Assert; +import org.springframework.util.StringUtils; import org.springframework.web.client.RestTemplate; @@ -147,20 +148,20 @@ private void eventLoop(ConfigurableApplicationContext context) { .format(LAMBDA_INVOCATION_URL_TEMPLATE, runtimeApi, LAMBDA_VERSION_DATE, requestId); String traceId = response.getHeaders().getFirst("Lambda-Runtime-Trace-Id"); - if (traceId != null) { + if (StringUtils.hasText(traceId)) { if (logger.isDebugEnabled()) { logger.debug("Lambda-Runtime-Trace-Id: " + traceId); } try { // The X-Ray SDK uses this value to connect trace data between services. System.setProperty("com.amazonaws.xray.traceHeader", traceId); - } catch (Exception e) { + } + catch (Exception e) { if (logger.isDebugEnabled()) { logger.debug("Failed to set amazon x-ray trace id", e); } } } - try { Message responseMessage = (Message) function.apply(eventMessage); From b554d52359716457b57f1188ebb0489fafedc9c6 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 17 Jan 2023 14:15:10 +0100 Subject: [PATCH 165/210] GH-986 Fix regression to NOT attempt output conversion of Message Resolves #986 --- .../adapter/aws/FunctionInvokerTests.java | 27 +++++++++++++++++++ .../catalog/SimpleFunctionRegistry.java | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java index 9dba9ec95..2158addcf 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java @@ -52,6 +52,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.messaging.Message; import org.springframework.messaging.converter.AbstractMessageConverter; +import org.springframework.messaging.support.MessageBuilder; import org.springframework.util.MimeType; import static org.assertj.core.api.Assertions.assertThat; @@ -764,6 +765,24 @@ public void testLBEvent() throws Exception { assertThat(result.get("body")).isEqualTo("\"Hello from ELB\""); } + @Test + public void testLBEventReturningMessage() throws Exception { + System.setProperty("MAIN_CLASS", LBConfiguration.class.getName()); + System.setProperty("spring.cloud.function.definition", "inputOutputLBEventAsMessage"); + FunctionInvoker invoker = new FunctionInvoker(); + + InputStream targetStream = new ByteArrayInputStream(this.sampleLBEvent.getBytes()); + ByteArrayOutputStream output = new ByteArrayOutputStream(); + invoker.handleRequest(targetStream, output, null); + + Map result = mapper.readValue(output.toByteArray(), Map.class); + System.out.println("RESULT: " + result); + assertThat(result.get("body")).isEqualTo("\"Hello\""); + assertThat((boolean) result.get("isBase64Encoded")).isFalse(); + assertThat(((Map) result.get("headers")).get("foo")).isEqualTo("bar"); + assertThat(result.get("statusCode")).isEqualTo(200); + } + @Test public void testLBEventAsMessage() throws Exception { System.setProperty("MAIN_CLASS", LBConfiguration.class.getName()); @@ -1298,6 +1317,14 @@ public Function inputLBEvent() { }; } + @Bean + public Function> inputOutputLBEventAsMessage() { + return v -> { + Message message = MessageBuilder.withPayload("\"Hello\"".getBytes(StandardCharsets.UTF_8)).setHeader("foo", "bar").build(); + return message; + }; + } + @Bean public Function inputOutputLBEvent() { return v -> { diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java index 8984704ae..2f66d6236 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java @@ -1172,7 +1172,7 @@ private Object convertOutputIfNecessary(Object output, Type type, String[] conte } if (convertedOutput instanceof Message) { - if (((Message) convertedOutput).getPayload() instanceof byte[] && ObjectUtils.isEmpty(contentType)) { + if (((Message) convertedOutput).getPayload() instanceof byte[]) { return convertedOutput; } else if (isExtractPayload((Message) convertedOutput, type)) { From 61f3ce42c8b71bb2a0347a0fa63fd8ec7093de36 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Mon, 23 Jan 2023 13:00:37 +0100 Subject: [PATCH 166/210] GH-980 Ensure reactive types are supported by AWS adapter Resolves #980 --- .../function/adapter/aws/AWSLambdaUtils.java | 2 +- .../adapter/aws/FunctionInvokerTests.java | 25 ++++++++++++++----- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java index fdb099255..3f3da31e7 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java @@ -56,7 +56,7 @@ private AWSLambdaUtils() { } static boolean isSupportedAWSType(Type inputType) { - if (FunctionTypeUtils.isMessage(inputType)) { + if (FunctionTypeUtils.isMessage(inputType) || FunctionTypeUtils.isPublisher(inputType)) { inputType = FunctionTypeUtils.getImmediateGenericType(inputType, 0); } String typeName = inputType.getTypeName(); diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java index 2158addcf..3c41663a3 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java @@ -690,12 +690,6 @@ public void testS3StringEvent() throws Exception { @Test public void testS3Event() throws Exception { - -// S3EventSerializer ser = new S3EventSerializer().withClass(S3Event.class).withClassLoader(S3Event.class.getClassLoader()); -// InputStream targetStream = new ByteArrayInputStream(this.s3Event.getBytes()); -// S3Event event = ser.fromJson(targetStream); -// System.out.println(event); - System.setProperty("MAIN_CLASS", S3Configuration.class.getName()); System.setProperty("spring.cloud.function.definition", "inputS3Event"); FunctionInvoker invoker = new FunctionInvoker(); @@ -751,6 +745,20 @@ public void testLBEventStringInOut() throws Exception { assertThat(result.get("body")).isEqualTo("\"Hello from ELB\""); } + @Test + public void testS3EventReactive() throws Exception { + System.setProperty("MAIN_CLASS", S3Configuration.class.getName()); + System.setProperty("spring.cloud.function.definition", "echoStringFlux"); + FunctionInvoker invoker = new FunctionInvoker(); + + InputStream targetStream = new ByteArrayInputStream(this.s3Event.getBytes()); + ByteArrayOutputStream output = new ByteArrayOutputStream(); + invoker.handleRequest(targetStream, output, null); + + String result = new String(output.toByteArray(), StandardCharsets.UTF_8); + assertThat(result).contains("s3SchemaVersion"); + } + @Test public void testLBEvent() throws Exception { System.setProperty("MAIN_CLASS", LBConfiguration.class.getName()); @@ -1276,6 +1284,11 @@ public Function echoString() { return v -> v; } + @Bean + public Function, Flux> echoStringFlux() { + return v -> v; + } + @Bean public Function inputS3Event(JsonMapper jsonMapper) { return v -> { From 205b6174ccf31f5df797ca712ec489eb0dbce009 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Mon, 23 Jan 2023 14:55:46 +0100 Subject: [PATCH 167/210] GH-973 Ensure that AWS isBase64Encoded is set dynamically Resolves #973 --- .../function/adapter/aws/AWSLambdaUtils.java | 22 +++++++++----- .../adapter/aws/AWSTypesMessageConverter.java | 4 +++ .../adapter/aws/FunctionInvokerTests.java | 29 +++++++++++++++++++ 3 files changed, 48 insertions(+), 7 deletions(-) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java index 3f3da31e7..c9b4f5704 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java @@ -46,6 +46,14 @@ public final class AWSLambdaUtils { static final String AWS_EVENT = "aws-event"; + static final String IS_BASE64_ENCODED = "isBase64Encoded"; + + static final String STATUS_CODE = "statusCode"; + + static final String BODY = "body"; + + static final String HEADERS = "headers"; + /** * The name of the headers that stores AWS Context object. */ @@ -130,18 +138,19 @@ public static byte[] generateOutput(Message requestMessage, Message responseM byte[] responseBytes = responseMessage == null ? "\"OK\"".getBytes() : extractPayload((Message) responseMessage, objectMapper); if (requestMessage.getHeaders().containsKey(AWS_API_GATEWAY) && ((boolean) requestMessage.getHeaders().get(AWS_API_GATEWAY))) { Map response = new HashMap(); - response.put("isBase64Encoded", false); + response.put(IS_BASE64_ENCODED, responseMessage != null && responseMessage.getHeaders().containsKey(IS_BASE64_ENCODED) + ? responseMessage.getHeaders().get(IS_BASE64_ENCODED) : false); AtomicReference headers = new AtomicReference<>(); int statusCode = HttpStatus.OK.value(); if (responseMessage != null) { headers.set(responseMessage.getHeaders()); - statusCode = headers.get().containsKey("statusCode") - ? (int) headers.get().get("statusCode") + statusCode = headers.get().containsKey(STATUS_CODE) + ? (int) headers.get().get(STATUS_CODE) : HttpStatus.OK.value(); } - response.put("statusCode", statusCode); + response.put(STATUS_CODE, statusCode); if (isRequestKinesis(requestMessage)) { HttpStatus httpStatus = HttpStatus.valueOf(statusCode); response.put("statusDescription", httpStatus.toString()); @@ -149,12 +158,11 @@ public static byte[] generateOutput(Message requestMessage, Message responseM String body = responseMessage == null ? "\"OK\"" : new String(extractPayload((Message) responseMessage, objectMapper), StandardCharsets.UTF_8); - response.put("body", body); - + response.put(BODY, body); if (responseMessage != null) { Map responseHeaders = new HashMap<>(); headers.get().keySet().forEach(key -> responseHeaders.put(key, headers.get().get(key).toString())); - response.put("headers", responseHeaders); + response.put(HEADERS, responseHeaders); } try { diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSTypesMessageConverter.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSTypesMessageConverter.java index 4c73054d2..5d3e88bc6 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSTypesMessageConverter.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSTypesMessageConverter.java @@ -17,6 +17,7 @@ package org.springframework.cloud.function.adapter.aws; import java.io.ByteArrayInputStream; +import java.nio.charset.StandardCharsets; import java.util.Map; import com.amazonaws.services.lambda.runtime.serialization.PojoSerializer; @@ -100,6 +101,9 @@ protected boolean canConvertTo(Object payload, @Nullable MessageHeaders headers) @Override protected Object convertToInternal(Object payload, @Nullable MessageHeaders headers, @Nullable Object conversionHint) { + if (payload instanceof String && headers.containsKey(AWSLambdaUtils.IS_BASE64_ENCODED) && (boolean) headers.get(AWSLambdaUtils.IS_BASE64_ENCODED)) { + return ((String) payload).getBytes(StandardCharsets.UTF_8); + } return jsonMapper.toJson(payload); } diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java index 3c41663a3..99701a9ca 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java @@ -22,6 +22,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.nio.charset.StandardCharsets; +import java.util.Base64; import java.util.Collections; import java.util.Map; import java.util.function.Consumer; @@ -47,6 +48,7 @@ import reactor.core.publisher.Mono; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.cloud.function.json.JacksonMapper; import org.springframework.cloud.function.json.JsonMapper; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -948,6 +950,25 @@ public void testApiGatewayV2Event() throws Exception { assertThat(result.get("body")).isEqualTo("\"Hello from Lambda\""); } + @Test + public void testResponseBase64Encoded() throws Exception { + System.setProperty("MAIN_CLASS", ApiGatewayConfiguration.class.getName()); + System.setProperty("spring.cloud.function.definition", "echoStringMessage"); + FunctionInvoker invoker = new FunctionInvoker(); + + InputStream targetStream = new ByteArrayInputStream(this.apiGatewayEvent.getBytes()); + ByteArrayOutputStream output = new ByteArrayOutputStream(); + invoker.handleRequest(targetStream, output, null); + + JsonMapper mapper = new JacksonMapper(new ObjectMapper()); + + String result = new String(output.toByteArray(), StandardCharsets.UTF_8); + Map resultMap = mapper.fromJson(result, Map.class); + assertThat((boolean) resultMap.get(AWSLambdaUtils.IS_BASE64_ENCODED)).isTrue(); + String body = new String(Base64.getDecoder().decode((String) resultMap.get(AWSLambdaUtils.BODY)), StandardCharsets.UTF_8); + assertThat(body).isEqualTo("hello"); + } + @SuppressWarnings("rawtypes") @Test public void testApiGatewayAsSupplier() throws Exception { @@ -1373,6 +1394,14 @@ public Supplier supply() { return () -> "boom"; } + @Bean + public Function, Message> echoStringMessage() { + return m -> { + String encodedPayload = Base64.getEncoder().encodeToString(m.getPayload().getBytes(StandardCharsets.UTF_8)); + return MessageBuilder.withPayload(encodedPayload).setHeader("isBase64Encoded", true).build(); + }; + } + @Bean public Consumer consume() { From b2a64e801084c87c4e591db1a414341726bee062 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 8 Feb 2023 12:18:18 +0100 Subject: [PATCH 168/210] Cleanup --- .../function-sample-kotlin-web/pom.xml | 6 +++--- .../src/main/resources/META-INF/spring.factories | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index 4e5ce6224..9b69ef7d0 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -38,17 +38,17 @@ org.springframework.cloud spring-cloud-function-kotlin - 3.2.6-SNAPSHOT + 3.2.9-SNAPSHOT org.springframework.cloud spring-cloud-function-web - 3.2.6-SNAPSHOT + 3.2.9-SNAPSHOT org.springframework.cloud spring-cloud-function-context - 3.2.6-SNAPSHOT + 3.2.9-SNAPSHOT org.springframework.boot diff --git a/spring-cloud-function-web/src/main/resources/META-INF/spring.factories b/spring-cloud-function-web/src/main/resources/META-INF/spring.factories index 62f7b592b..8657bf5ac 100644 --- a/spring-cloud-function-web/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-function-web/src/main/resources/META-INF/spring.factories @@ -3,8 +3,7 @@ org.springframework.cloud.function.web.flux.ReactorAutoConfiguration,\ org.springframework.cloud.function.web.mvc.ReactorAutoConfiguration,\ org.springframework.cloud.function.web.source.FunctionExporterAutoConfiguration org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc=\ -org.springframework.cloud.function.web.flux.ReactorAutoConfiguration,\ -org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration +org.springframework.cloud.function.web.flux.ReactorAutoConfiguration org.springframework.context.ApplicationContextInitializer=\ org.springframework.cloud.function.web.function.FunctionEndpointInitializer,\ org.springframework.cloud.function.web.source.FunctionExporterInitializer From 1962f6b27e600047c32a1fc16c28921600cca8ee Mon Sep 17 00:00:00 2001 From: nagarro-nikhiljagtiani Date: Thu, 26 Jan 2023 01:21:20 +0530 Subject: [PATCH 169/210] Avoiding classCast exception Resolves #991 When messageconverters list has CloudEventMessageConverter before AvroSchemaRegisteryClientMessageConverter, and message has header contentType = application/*+avro It results in ClassCastException hence fixing the same. --- .../SmartCompositeMessageConverter.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java index 0c32f8c9d..12c3bdf0a 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java @@ -136,15 +136,17 @@ public Message toMessage(Object payload, @Nullable MessageHeaders headers) { String[] contentTypes = StringUtils.delimitedListToStringArray((String) value, ","); for (String contentType : contentTypes) { if (!MimeType.valueOf(contentType).isConcrete()) { - List supportedMimeTypes = ((AbstractMessageConverter) converter).getSupportedMimeTypes(); - for (MimeType supportedMimeType : supportedMimeTypes) { - if (supportedMimeType.isCompatibleWith(MimeType.valueOf(contentType))) { - MessageHeaderAccessor h = new MessageHeaderAccessor(); - h.copyHeaders(headers); - h.setHeader(MessageHeaders.CONTENT_TYPE, supportedMimeType); - Message result = converter.toMessage(payload, h.getMessageHeaders()); - if (result != null) { - return result; + if (converter instanceof AbstractMessageConverter) { + List supportedMimeTypes = ((AbstractMessageConverter) converter).getSupportedMimeTypes(); + for (MimeType supportedMimeType : supportedMimeTypes) { + if (supportedMimeType.isCompatibleWith(MimeType.valueOf(contentType))) { + MessageHeaderAccessor h = new MessageHeaderAccessor(); + h.copyHeaders(headers); + h.setHeader(MessageHeaders.CONTENT_TYPE, supportedMimeType); + Message result = converter.toMessage(payload, h.getMessageHeaders()); + if (result != null) { + return result; + } } } } From 4679de8a611a8851690b5cdab03f55f5263fd348 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 23 Feb 2023 15:06:11 +0100 Subject: [PATCH 170/210] Update pom.xml --- .../function-azure-di-samples/azure-timetrigger-demo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml index e85374760..5b4198ae7 100644 --- a/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml @@ -11,7 +11,7 @@ com.example.azure.di azure-timetrigger-demo - 0.0.1-SNAPSHOT + 1.0.0 azure-timetrigger-demo Demo project for Spring Boot From 63f08751394755eea20d858443326c88cee9d0d6 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 23 Feb 2023 15:06:39 +0100 Subject: [PATCH 171/210] Update pom.xml --- .../function-azure-di-samples/azure-httptrigger-demo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml index c15b45225..08a46c209 100644 --- a/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml @@ -11,7 +11,7 @@ com.example.azure.di azure-httptrigger-demo - 0.0.1-SNAPSHOT + 1.0.0 azure-httptrigger-demo Demo Spring Boot, Azure Function - HttpTrigger (DI adapter) From c95686911bb18c66c1f4c1f6164387087358e6d3 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 23 Feb 2023 15:06:59 +0100 Subject: [PATCH 172/210] Update pom.xml --- .../function-azure-di-samples/azure-blob-trigger-demo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml index 2ff94e02d..0321bb70d 100644 --- a/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml @@ -11,7 +11,7 @@ com.example.azure.di azure-blob-trigger-demo - 0.0.1-SNAPSHOT + 1.0.0 azure-blob-trigger-demo Demo project for Spring Boot From 05491ac7db06d0650387dc90d24a138b66aeae42 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 23 Feb 2023 15:15:06 +0100 Subject: [PATCH 173/210] Update pom.xml --- .../function-azure-di-samples/azure-timetrigger-demo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml index 5b4198ae7..2dde5c20e 100644 --- a/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml @@ -34,7 +34,7 @@ org.springframework.cloud spring-cloud-function-adapter-azure - 3.2.9-SNAPSHOT + 3.2.9 From 2e132e9daa69f6d6d45445fe0acfaabc033c1581 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 23 Feb 2023 15:15:28 +0100 Subject: [PATCH 174/210] Update pom.xml --- .../function-azure-di-samples/azure-httptrigger-demo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml index 08a46c209..e02d28098 100644 --- a/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml @@ -36,7 +36,7 @@ org.springframework.cloud spring-cloud-function-adapter-azure - 3.2.9-SNAPSHOT + 3.2.9 From 37e81c4c7f90ef65701769ddc882d06078b90788 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 23 Feb 2023 15:15:51 +0100 Subject: [PATCH 175/210] Update pom.xml --- .../function-azure-di-samples/azure-blob-trigger-demo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml index 0321bb70d..8623d2056 100644 --- a/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml @@ -33,7 +33,7 @@ org.springframework.cloud spring-cloud-function-adapter-azure - 3.2.9-SNAPSHOT + 3.2.9 From 66c871c797c8c48f6bdfbe35c8381320b1494663 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 23 Feb 2023 22:11:47 +0000 Subject: [PATCH 176/210] Update SNAPSHOT to 3.2.9 --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-azure-di-samples/azure-blob-trigger-demo/pom.xml | 2 +- .../function-azure-di-samples/azure-httptrigger-demo/pom.xml | 2 +- .../function-azure-di-samples/azure-timetrigger-demo/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- .../function-sample-azure-timer-trigger/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 53 files changed, 81 insertions(+), 81 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index ca9c06f47..1e21f3687 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.9 pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index 33bcf3d9c..5d3385c96 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.9-SNAPSHOT + 3.2.9 pom org.springframework.cloud spring-cloud-build - 3.1.6-SNAPSHOT + 3.1.6 diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index d49e185d5..95598306f 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.9 spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index 102147ed7..b22497dce 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.9-SNAPSHOT + 3.2.9 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index 8cf50aafb..ff76119a2 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.9-SNAPSHOT + 3.2.9 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index 7eb49b6d1..43498de98 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.9-SNAPSHOT + 3.2.9 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 431149991..15fe45998 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.9-SNAPSHOT + 3.2.9 diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 0e41eecaa..ee942515d 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.9-SNAPSHOT + 3.2.9 spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index fff97dd76..c378405b9 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.9-SNAPSHOT + 3.2.9 diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index 528122bc2..1fbd1fe84 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.9 diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 0a741a363..d51825a7e 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.9 diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index d124cd706..b7d62858d 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.9 diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index fe24d0f92..43ecef357 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.6-SNAPSHOT + 3.1.6 spring-cloud-function-dependencies - 3.2.9-SNAPSHOT + 3.2.9 pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 49ac63152..df62fabab 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.9 diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index 8d608545b..bc12ca7e3 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.9 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index ded4e0a41..55e453c86 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.9 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 2cd8ae934..c29edf7c2 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.9 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index 166035150..305da4d4a 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.9 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index a07ed6709..7cbac693d 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.9 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 16f55b453..73ac028b7 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.9 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 975f9d238..afedb06de 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.9 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index 0085acc01..71f357b6f 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.9 diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 7a343c051..764cca574 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.9 diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml index 8623d2056..2461768af 100644 --- a/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml index e02d28098..ae54834b8 100644 --- a/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml index 2dde5c20e..504d81c26 100644 --- a/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index ee8ae7982..69233bda5 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.9-SNAPSHOT + 3.2.9 diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index aca50160d..1aec4cf67 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.9-SNAPSHOT + 3.2.9 diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index b2b6f879d..f420e528d 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.9-SNAPSHOT + 3.2.9 diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index e59297e2d..8dbdb2317 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.9-SNAPSHOT + 3.2.9 diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index f78e47cc1..1cd20c068 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.9-SNAPSHOT + 3.2.9 diff --git a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml index 3d7318a6b..fde33d585 100644 --- a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 @@ -16,7 +16,7 @@ Demo project for Spring Boot 1.8 - 2021.0.6-SNAPSHOT + 2021.0.6 2.1.0 example.TimerTriggerDemoApplication diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index be83968c7..9adccb766 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 19ecd30b4..38b1aadac 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.9 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index 97a0323e7..94ca9ab0f 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.9 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 00d8df1d5..78db1ab9f 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.9 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index f445f0fa3..f0b69c4e9 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.9 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index a561e8b5a..f678661d1 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.9-SNAPSHOT + 3.2.9 diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index 28404449e..08f310238 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index 5038b2c81..2e07b0084 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 - 3.2.9-SNAPSHOT + 3.2.9 diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index 12971ce3c..90e3e61a8 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.9-SNAPSHOT + 3.2.9 diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index 9b69ef7d0..4829561f5 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index a33f62f50..16d994f3f 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.9-SNAPSHOT + 3.2.9 diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index f785716f0..dead0e40e 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.9 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 7e8f5ac74..e6a064584 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.9-SNAPSHOT + 3.2.9 diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index f1d63a806..7d4ae22f1 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.9 diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 8cf9b9d8e..acbf91635 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.9 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index b120e2dba..3b052aaf4 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.9 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 52c738e9b..e8109ffc3 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.9 diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index b44a1ac5f..8e601b7a6 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.9 diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index 5d5e1e4a9..5c1013833 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.9 diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index 7e822fe07..9717ca0f4 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.9 .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index 9db824193..21b19cfce 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.9 spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From 11f02aea474dc0c7741958c25d55188024fc09d5 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 23 Feb 2023 22:16:04 +0000 Subject: [PATCH 177/210] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-azure-di-samples/azure-blob-trigger-demo/pom.xml | 2 +- .../function-azure-di-samples/azure-httptrigger-demo/pom.xml | 2 +- .../function-azure-di-samples/azure-timetrigger-demo/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- .../function-sample-azure-timer-trigger/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 53 files changed, 81 insertions(+), 81 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 1e21f3687..ca9c06f47 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9 + 3.2.9-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index 5d3385c96..33bcf3d9c 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.9 + 3.2.9-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 3.1.6 + 3.1.6-SNAPSHOT diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index 95598306f..d49e185d5 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9 + 3.2.9-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index b22497dce..102147ed7 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.9 + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index ff76119a2..8cf50aafb 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.9 + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index 43498de98..7eb49b6d1 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.9 + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 15fe45998..431149991 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.9 + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index ee942515d..0e41eecaa 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.9 + 3.2.9-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index c378405b9..fff97dd76 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.9 + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index 1fbd1fe84..528122bc2 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9 + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index d51825a7e..0a741a363 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9 + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index b7d62858d..d124cd706 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9 + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 43ecef357..fe24d0f92 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.6 + 3.1.6-SNAPSHOT spring-cloud-function-dependencies - 3.2.9 + 3.2.9-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index df62fabab..49ac63152 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9 + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index bc12ca7e3..8d608545b 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 1.8 - 3.2.9 + 3.2.9-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index 55e453c86..ded4e0a41 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 1.8 - 3.2.9 + 3.2.9-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index c29edf7c2..2cd8ae934 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 1.8 - 3.2.9 + 3.2.9-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index 305da4d4a..166035150 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 1.8 - 3.2.9 + 3.2.9-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index 7cbac693d..a07ed6709 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 1.8 - 3.2.9 + 3.2.9-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 73ac028b7..16f55b453 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 1.8 - 3.2.9 + 3.2.9-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index afedb06de..975f9d238 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 1.8 - 3.2.9 + 3.2.9-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index 71f357b6f..0085acc01 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9 + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 764cca574..7a343c051 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9 + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml index 2461768af..8623d2056 100644 --- a/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml index ae54834b8..e02d28098 100644 --- a/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml index 504d81c26..2dde5c20e 100644 --- a/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index 69233bda5..ee8ae7982 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.9 + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 1aec4cf67..aca50160d 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.9 + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index f420e528d..b2b6f879d 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.9 + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 8dbdb2317..e59297e2d 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.9 + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 1cd20c068..f78e47cc1 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.9 + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml index fde33d585..3d7318a6b 100644 --- a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 @@ -16,7 +16,7 @@ Demo project for Spring Boot 1.8 - 2021.0.6 + 2021.0.6-SNAPSHOT 2.1.0 example.TimerTriggerDemoApplication diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index 9adccb766..be83968c7 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 38b1aadac..19ecd30b4 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 1.8 - 3.2.9 + 3.2.9-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index 94ca9ab0f..97a0323e7 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 1.8 - 3.2.9 + 3.2.9-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 78db1ab9f..00d8df1d5 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 1.8 - 3.2.9 + 3.2.9-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index f0b69c4e9..f445f0fa3 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 1.8 - 3.2.9 + 3.2.9-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index f678661d1..a561e8b5a 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.9 + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index 08f310238..28404449e 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index 2e07b0084..5038b2c81 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 - 3.2.9 + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index 90e3e61a8..12971ce3c 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.9 + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index 4829561f5..9b69ef7d0 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index 16d994f3f..a33f62f50 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.9 + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index dead0e40e..f785716f0 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 1.8 - 3.2.9 + 3.2.9-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index e6a064584..7e8f5ac74 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.9 + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index 7d4ae22f1..f1d63a806 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 1.8 - 3.2.9 + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index acbf91635..8cf9b9d8e 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 1.8 - 3.2.9 + 3.2.9-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index 3b052aaf4..b120e2dba 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 1.8 - 3.2.9 + 3.2.9-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index e8109ffc3..52c738e9b 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9 + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index 8e601b7a6..b44a1ac5f 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9 + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index 5c1013833..5d5e1e4a9 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9 + 3.2.9-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index 9717ca0f4..7e822fe07 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9 + 3.2.9-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index 21b19cfce..9db824193 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9 + 3.2.9-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From 3635f9eb5c6d47961174b1d469cb64041d64071b Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 23 Feb 2023 22:16:05 +0000 Subject: [PATCH 178/210] Bumping versions to 3.2.10-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-azure-di-samples/azure-blob-trigger-demo/pom.xml | 2 +- .../function-azure-di-samples/azure-httptrigger-demo/pom.xml | 2 +- .../function-azure-di-samples/azure-timetrigger-demo/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- .../function-sample-azure-timer-trigger/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 53 files changed, 81 insertions(+), 81 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index ca9c06f47..97192d500 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index 33bcf3d9c..c8397d5b0 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 3.1.6-SNAPSHOT + 3.1.7-SNAPSHOT diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index d49e185d5..f5b7a58ee 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index 102147ed7..22644d1b2 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index 8cf50aafb..e8fc5af4b 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index 7eb49b6d1..3f92d42f2 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 431149991..0fa3f7348 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 0e41eecaa..0d38faaac 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index fff97dd76..b93f07e0a 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index 528122bc2..e981ba05e 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 0a741a363..916bdaa0c 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index d124cd706..2955dc60f 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index fe24d0f92..958500768 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.6-SNAPSHOT + 3.1.7-SNAPSHOT spring-cloud-function-dependencies - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 49ac63152..992599fc0 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index 8d608545b..f132dd773 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index ded4e0a41..bedf349bc 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 2cd8ae934..45a6edb87 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index 166035150..f1dc6923d 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index a07ed6709..bc68fea76 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 16f55b453..159f9fa20 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 975f9d238..e75c6d5d0 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index 0085acc01..4f807aa5d 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 7a343c051..6e3d3cad8 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml index 8623d2056..2461768af 100644 --- a/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml index e02d28098..ae54834b8 100644 --- a/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml index 2dde5c20e..504d81c26 100644 --- a/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index ee8ae7982..9a84ff034 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index aca50160d..52640f3b4 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index b2b6f879d..80c65860c 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index e59297e2d..313e6501e 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index f78e47cc1..308942963 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml index 3d7318a6b..a89bf85e8 100644 --- a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 @@ -16,7 +16,7 @@ Demo project for Spring Boot 1.8 - 2021.0.6-SNAPSHOT + 2021.0.7-SNAPSHOT 2.1.0 example.TimerTriggerDemoApplication diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index be83968c7..9adccb766 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 19ecd30b4..7f009f300 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index 97a0323e7..9a0751c97 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 00d8df1d5..3ce7666af 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index f445f0fa3..23e84768d 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index a561e8b5a..09955d938 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index 28404449e..08f310238 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index 5038b2c81..eb452555c 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index 12971ce3c..e5a33221b 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index 9b69ef7d0..4829561f5 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index a33f62f50..80bc39318 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index f785716f0..92626eb7c 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 7e8f5ac74..8b7699965 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index f1d63a806..5ab6df52f 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 8cf9b9d8e..329a7d5b7 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index b120e2dba..33be962e6 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 52c738e9b..941c1a203 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index b44a1ac5f..fc4f90efb 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index 5d5e1e4a9..7080ea583 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index 7e822fe07..7ce6ce59b 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index 9db824193..d9e77f34f 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From c530762a296d8f0678c0d063b0a83ac13b2fd453 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 23 Feb 2023 23:13:22 +0000 Subject: [PATCH 179/210] Bumping versions --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-azure-di-samples/azure-blob-trigger-demo/pom.xml | 2 +- .../function-azure-di-samples/azure-httptrigger-demo/pom.xml | 2 +- .../function-azure-di-samples/azure-timetrigger-demo/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- .../function-sample-azure-timer-trigger/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 53 files changed, 81 insertions(+), 81 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 97192d500..ca9c06f47 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index c8397d5b0..33bcf3d9c 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 3.1.7-SNAPSHOT + 3.1.6-SNAPSHOT diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index f5b7a58ee..d49e185d5 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index 22644d1b2..102147ed7 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index e8fc5af4b..8cf50aafb 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index 3f92d42f2..7eb49b6d1 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 0fa3f7348..431149991 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 0d38faaac..0e41eecaa 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index b93f07e0a..fff97dd76 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index e981ba05e..528122bc2 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 916bdaa0c..0a741a363 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 2955dc60f..d124cd706 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 958500768..fe24d0f92 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.7-SNAPSHOT + 3.1.6-SNAPSHOT spring-cloud-function-dependencies - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 992599fc0..49ac63152 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index f132dd773..8d608545b 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 1.8 - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index bedf349bc..ded4e0a41 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 1.8 - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 45a6edb87..2cd8ae934 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 1.8 - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index f1dc6923d..166035150 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 1.8 - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index bc68fea76..a07ed6709 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 1.8 - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 159f9fa20..16f55b453 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 1.8 - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index e75c6d5d0..975f9d238 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 1.8 - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index 4f807aa5d..0085acc01 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 6e3d3cad8..7a343c051 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml index 2461768af..8623d2056 100644 --- a/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml index ae54834b8..e02d28098 100644 --- a/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml index 504d81c26..2dde5c20e 100644 --- a/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index 9a84ff034..ee8ae7982 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 52640f3b4..aca50160d 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index 80c65860c..b2b6f879d 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 313e6501e..e59297e2d 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 308942963..f78e47cc1 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml index a89bf85e8..3d7318a6b 100644 --- a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 @@ -16,7 +16,7 @@ Demo project for Spring Boot 1.8 - 2021.0.7-SNAPSHOT + 2021.0.6-SNAPSHOT 2.1.0 example.TimerTriggerDemoApplication diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index 9adccb766..be83968c7 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 7f009f300..19ecd30b4 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 1.8 - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index 9a0751c97..97a0323e7 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 1.8 - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 3ce7666af..00d8df1d5 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 1.8 - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index 23e84768d..f445f0fa3 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 1.8 - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index 09955d938..a561e8b5a 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index 08f310238..28404449e 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index eb452555c..5038b2c81 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index e5a33221b..12971ce3c 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index 4829561f5..9b69ef7d0 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index 80bc39318..a33f62f50 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index 92626eb7c..f785716f0 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 1.8 - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 8b7699965..7e8f5ac74 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index 5ab6df52f..f1d63a806 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 1.8 - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 329a7d5b7..8cf9b9d8e 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 1.8 - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index 33be962e6..b120e2dba 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.13 1.8 - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 941c1a203..52c738e9b 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index fc4f90efb..b44a1ac5f 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index 7080ea583..5d5e1e4a9 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index 7ce6ce59b..7e822fe07 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index d9e77f34f..9db824193 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.9-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From 60debb2262a8d393b24cda0f2fbdce25f5b923eb Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 24 Feb 2023 19:35:00 +0000 Subject: [PATCH 180/210] Bumping versions --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-azure-di-samples/azure-blob-trigger-demo/pom.xml | 2 +- .../function-azure-di-samples/azure-httptrigger-demo/pom.xml | 2 +- .../function-azure-di-samples/azure-timetrigger-demo/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- .../function-sample-azure-timer-trigger/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 53 files changed, 81 insertions(+), 81 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index ca9c06f47..97192d500 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index 33bcf3d9c..c8397d5b0 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 3.1.6-SNAPSHOT + 3.1.7-SNAPSHOT diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index d49e185d5..f5b7a58ee 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index 102147ed7..22644d1b2 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index 8cf50aafb..e8fc5af4b 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index 7eb49b6d1..3f92d42f2 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 431149991..0fa3f7348 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 0e41eecaa..0d38faaac 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index fff97dd76..b93f07e0a 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index 528122bc2..e981ba05e 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 0a741a363..916bdaa0c 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index d124cd706..2955dc60f 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index fe24d0f92..958500768 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.6-SNAPSHOT + 3.1.7-SNAPSHOT spring-cloud-function-dependencies - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 49ac63152..992599fc0 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index 8d608545b..f132dd773 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index ded4e0a41..bedf349bc 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 2cd8ae934..45a6edb87 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index 166035150..f1dc6923d 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index a07ed6709..bc68fea76 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 16f55b453..159f9fa20 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 975f9d238..e75c6d5d0 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index 0085acc01..4f807aa5d 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 7a343c051..6e3d3cad8 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml index 8623d2056..2461768af 100644 --- a/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml index e02d28098..ae54834b8 100644 --- a/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml index 2dde5c20e..504d81c26 100644 --- a/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index ee8ae7982..9a84ff034 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index aca50160d..52640f3b4 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index b2b6f879d..80c65860c 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index e59297e2d..313e6501e 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index f78e47cc1..308942963 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml index 3d7318a6b..a89bf85e8 100644 --- a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 @@ -16,7 +16,7 @@ Demo project for Spring Boot 1.8 - 2021.0.6-SNAPSHOT + 2021.0.7-SNAPSHOT 2.1.0 example.TimerTriggerDemoApplication diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index be83968c7..9adccb766 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 19ecd30b4..7f009f300 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index 97a0323e7..9a0751c97 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 00d8df1d5..3ce7666af 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index f445f0fa3..23e84768d 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index a561e8b5a..09955d938 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index 28404449e..08f310238 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index 5038b2c81..eb452555c 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index 12971ce3c..e5a33221b 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index 9b69ef7d0..4829561f5 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index a33f62f50..80bc39318 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index f785716f0..92626eb7c 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 7e8f5ac74..8b7699965 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index f1d63a806..5ab6df52f 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 8cf9b9d8e..329a7d5b7 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index b120e2dba..33be962e6 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.13 + 2.6.14 1.8 - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 52c738e9b..941c1a203 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index b44a1ac5f..fc4f90efb 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index 5d5e1e4a9..7080ea583 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index 7e822fe07..7ce6ce59b 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index 9db824193..d9e77f34f 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.9-SNAPSHOT + 3.2.10-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From 6a8aae3c20becbee52080c1e0da91d389fc458d2 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 28 Feb 2023 16:22:48 +0100 Subject: [PATCH 181/210] GH-1003 Remove date configuration code when configuring insensitive properties of ObjectMapper Resolves #1003 --- .../function/adapter/aws/FunctionInvoker.java | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/FunctionInvoker.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/FunctionInvoker.java index 183b082f1..e1e706477 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/FunctionInvoker.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/FunctionInvoker.java @@ -20,19 +20,12 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; import java.util.List; import java.util.Set; import com.amazonaws.services.lambda.runtime.Context; import com.amazonaws.services.lambda.runtime.RequestStreamHandler; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.MapperFeature; -import com.fasterxml.jackson.databind.module.SimpleModule; -import com.fasterxml.jackson.datatype.joda.JodaModule; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.reactivestreams.Publisher; @@ -146,18 +139,6 @@ private void start() { if (this.jsonMapper instanceof JacksonMapper) { ((JacksonMapper) this.jsonMapper).configureObjectMapper(objectMapper -> { if (!objectMapper.isEnabled(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)) { - SimpleModule module = new SimpleModule(); - module.addDeserializer(Date.class, new JsonDeserializer() { - @Override - public Date deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) - throws IOException { - Calendar calendar = Calendar.getInstance(); - calendar.setTimeInMillis(jsonParser.getValueAsLong()); - return calendar.getTime(); - } - }); - objectMapper.registerModule(module); - objectMapper.registerModule(new JodaModule()); objectMapper.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true); } }); From 21387e8cee740894f68e427983bf5f5af1b07565 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 28 Feb 2023 18:29:30 +0100 Subject: [PATCH 182/210] GH-1000 Add suport for propagating more errors to AWS Error reporting mechanism Resolves #1000 --- .../adapter/aws/CustomRuntimeEventLoop.java | 89 +++++++++---------- 1 file changed, 43 insertions(+), 46 deletions(-) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoop.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoop.java index 95672c38c..eb932b259 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoop.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoop.java @@ -1,5 +1,5 @@ /* - * Copyright 2021-2022 the original author or authors. + * Copyright 2021-2023 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. @@ -134,35 +134,28 @@ private void eventLoop(ConfigurableApplicationContext context) { } if (response != null) { - FunctionInvocationWrapper function = locateFunction(environment, functionCatalog, response.getHeaders()); - - Message eventMessage = AWSLambdaUtils - .generateMessage(response.getBody().getBytes(StandardCharsets.UTF_8), function.getInputType(), function.isSupplier(), mapper); - - if (logger.isDebugEnabled()) { - logger.debug("Event message: " + eventMessage); - } - String requestId = response.getHeaders().getFirst("Lambda-Runtime-Aws-Request-Id"); - String invocationUrl = MessageFormat - .format(LAMBDA_INVOCATION_URL_TEMPLATE, runtimeApi, LAMBDA_VERSION_DATE, requestId); + try { + FunctionInvocationWrapper function = locateFunction(environment, functionCatalog, response.getHeaders()); + + Message eventMessage = AWSLambdaUtils + .generateMessage(response.getBody().getBytes(StandardCharsets.UTF_8), function.getInputType(), function.isSupplier(), mapper); - String traceId = response.getHeaders().getFirst("Lambda-Runtime-Trace-Id"); - if (StringUtils.hasText(traceId)) { if (logger.isDebugEnabled()) { - logger.debug("Lambda-Runtime-Trace-Id: " + traceId); + logger.debug("Event message: " + eventMessage); } - try { - // The X-Ray SDK uses this value to connect trace data between services. - System.setProperty("com.amazonaws.xray.traceHeader", traceId); - } - catch (Exception e) { + + String invocationUrl = MessageFormat + .format(LAMBDA_INVOCATION_URL_TEMPLATE, runtimeApi, LAMBDA_VERSION_DATE, requestId); + + String traceId = response.getHeaders().getFirst("Lambda-Runtime-Trace-Id"); + if (StringUtils.hasText(traceId)) { if (logger.isDebugEnabled()) { - logger.debug("Failed to set amazon x-ray trace id", e); + logger.debug("Lambda-Runtime-Trace-Id: " + traceId); } + System.setProperty("com.amazonaws.xray.traceHeader", traceId); } - } - try { + Message responseMessage = (Message) function.apply(eventMessage); if (responseMessage != null && logger.isDebugEnabled()) { @@ -179,34 +172,38 @@ private void eventLoop(ConfigurableApplicationContext context) { } } catch (Exception e) { - String errorMessage = e.getMessage(); - String errorType = e.getClass().getSimpleName(); - StringWriter sw = new StringWriter(); - PrintWriter pw = new PrintWriter(sw); - e.printStackTrace(pw); - String stackTrace = sw.toString(); - Map em = new HashMap<>(); - em.put("errorMessage", errorMessage); - em.put("errorType", errorType); - em.put("stackTrace", stackTrace); - byte[] outputBody = mapper.toJson(em); - try { - String errorUrl = MessageFormat.format(LAMBDA_ERROR_URL_TEMPLATE, runtimeApi, LAMBDA_VERSION_DATE, requestId); - ResponseEntity result = rest.exchange(RequestEntity.post(URI.create(errorUrl)) - .header(USER_AGENT, USER_AGENT_VALUE) - .body(outputBody), Object.class); - if (logger.isInfoEnabled()) { - logger.info("Result ERROR status: " + result.getStatusCode()); - } - } - catch (Exception e2) { - throw new IllegalArgumentException("Failed to report error", e2); - } + this.propagateAwsError(requestId, e, mapper, runtimeApi, rest); } } } } + private void propagateAwsError(String requestId, Exception e, JsonMapper mapper, String runtimeApi, RestTemplate rest) { + String errorMessage = e.getMessage(); + String errorType = e.getClass().getSimpleName(); + StringWriter sw = new StringWriter(); + PrintWriter pw = new PrintWriter(sw); + e.printStackTrace(pw); + String stackTrace = sw.toString(); + Map em = new HashMap<>(); + em.put("errorMessage", errorMessage); + em.put("errorType", errorType); + em.put("stackTrace", stackTrace); + byte[] outputBody = mapper.toJson(em); + try { + String errorUrl = MessageFormat.format(LAMBDA_ERROR_URL_TEMPLATE, runtimeApi, LAMBDA_VERSION_DATE, requestId); + ResponseEntity result = rest.exchange(RequestEntity.post(URI.create(errorUrl)) + .header(USER_AGENT, USER_AGENT_VALUE) + .body(outputBody), Object.class); + if (logger.isInfoEnabled()) { + logger.info("Result ERROR status: " + result.getStatusCode()); + } + } + catch (Exception e2) { + throw new IllegalArgumentException("Failed to report error", e2); + } + } + private ResponseEntity pollForData(RestTemplate rest, RequestEntity requestEntity) { try { return rest.exchange(requestEntity, String.class); From 25243ff4729a44b3368e685d137b794e13f51d71 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 1 Mar 2023 11:27:16 +0100 Subject: [PATCH 183/210] GH-1006 Remove dependency on Joda module Developers would have to add it themselves with custom instance of ObjectMapper Resolves #1006 --- .../spring-cloud-function-adapter-aws/pom.xml | 4 ---- .../adapter/aws/FunctionInvokerTests.java | 15 +++++++++------ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index 22644d1b2..087518fa9 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -35,10 +35,6 @@ org.springframework.boot spring-boot-starter - - com.fasterxml.jackson.datatype - jackson-datatype-joda - com.amazonaws aws-lambda-java-log4j diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java index 99701a9ca..3c67693a0 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java @@ -512,6 +512,7 @@ public void testKinesisEvent() throws Exception { System.setProperty("MAIN_CLASS", KinesisConfiguration.class.getName()); System.setProperty("spring.cloud.function.definition", "inputKinesisEvent"); FunctionInvoker invoker = new FunctionInvoker() { + @Override public void handleRequest(InputStream input, OutputStream output, Context context) throws IOException { assertThat(context).isNotNull(); super.handleRequest(input, output, context); @@ -701,7 +702,7 @@ public void testS3Event() throws Exception { invoker.handleRequest(targetStream, output, null); String result = new String(output.toByteArray(), StandardCharsets.UTF_8); - assertThat(result).contains("s3SchemaVersion"); + assertThat(result).contains("ObjectCreated:Put"); } @Test @@ -715,7 +716,7 @@ public void testS3EventAsMessage() throws Exception { invoker.handleRequest(targetStream, output, null); String result = new String(output.toByteArray(), StandardCharsets.UTF_8); - assertThat(result).contains("s3SchemaVersion"); + assertThat(result).contains("ObjectCreated:Put"); } @Test @@ -812,6 +813,7 @@ public void testLBEventInOut() throws Exception { System.setProperty("MAIN_CLASS", LBConfiguration.class.getName()); System.setProperty("spring.cloud.function.definition", "inputOutputLBEvent"); FunctionInvoker invoker = new FunctionInvoker() { + @Override public void handleRequest(InputStream input, OutputStream output, Context context) throws IOException { assertThat(context).isNotNull(); super.handleRequest(input, output, context); @@ -899,6 +901,7 @@ public void testApiGatewayEvent() throws Exception { System.setProperty("MAIN_CLASS", ApiGatewayConfiguration.class.getName()); System.setProperty("spring.cloud.function.definition", "inputApiEvent"); FunctionInvoker invoker = new FunctionInvoker() { + @Override public void handleRequest(InputStream input, OutputStream output, Context context) throws IOException { assertThat(context).isNotNull(); super.handleRequest(input, output, context); @@ -1314,15 +1317,15 @@ public Function, Flux> echoStringFlux() { public Function inputS3Event(JsonMapper jsonMapper) { return v -> { System.out.println("Received: " + v); - return jsonMapper.toString(v); + return v.getRecords().get(0).getEventName(); }; } @Bean public Function, String> inputS3EventAsMessage(JsonMapper jsonMapper) { - return v -> { - System.out.println("Received: " + v); - return jsonMapper.toString(v); + return m -> { + System.out.println("Received: " + m); + return m.getPayload().getRecords().get(0).getEventName(); }; } From bb9fda2fc0df08f13d80545909d28f59461c5a1e Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 1 Mar 2023 12:36:27 +0100 Subject: [PATCH 184/210] GH-997 Adding test to validate AWS Context set as header Resolves #997 --- .../adapter/aws/FunctionInvokerTests.java | 30 ++++--------------- 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java index 3c67693a0..504aeb42e 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java @@ -44,6 +44,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.mockito.Mockito; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -802,7 +803,7 @@ public void testLBEventAsMessage() throws Exception { InputStream targetStream = new ByteArrayInputStream(this.sampleLBEvent.getBytes()); ByteArrayOutputStream output = new ByteArrayOutputStream(); - invoker.handleRequest(targetStream, output, null); + invoker.handleRequest(targetStream, output, Mockito.mock(Context.class)); Map result = mapper.readValue(output.toByteArray(), Map.class); assertThat(result.get("body")).isEqualTo("\"Hello from ELB\""); @@ -1022,26 +1023,6 @@ public void testApiGatewayInAndOutV2() throws Exception { assertThat(headers.get("foo")).isEqualTo("bar"); } -// @SuppressWarnings("rawtypes") -// @Test -// public void testApiGatewayInAndOutWithException() throws Exception { -// System.setProperty("MAIN_CLASS", ApiGatewayConfiguration.class.getName()); -// System.setProperty("spring.cloud.function.definition", "inputOutputApiEventException"); -// FunctionInvoker invoker = new FunctionInvoker(); -// -// InputStream targetStream = new ByteArrayInputStream(this.apiGatewayEvent.getBytes()); -// ByteArrayOutputStream output = new ByteArrayOutputStream(); -// invoker.handleRequest(targetStream, output, null); -// -// Map result = mapper.readValue(output.toByteArray(), Map.class); -// assertThat(result.get("body")).isEqualTo("Intentional"); -// -// Map headers = (Map) result.get("headers"); -// assertThat(headers.get("foo")).isEqualTo("bar"); -// } - - - @SuppressWarnings("rawtypes") @Test public void testApiGatewayEventAsMessage() throws Exception { @@ -1373,9 +1354,10 @@ public Function, String> inputLBEventAsMessage(JsonMapper jsonMapper) { - return v -> { - System.out.println("Received: " + v); - return v.getPayload().getBody(); + return message -> { + System.out.println("Received: " + message); + assertThat(message.getHeaders().get(AWSLambdaUtils.AWS_CONTEXT)).isNotNull(); + return message.getPayload().getBody(); }; } From 38411d424b7a585244eb8a2f703ccd70a707263d Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 1 Mar 2023 13:01:02 +0100 Subject: [PATCH 185/210] GH-995 Wrapped SCF version discovery in AWS Custom Runtime with try/catch Resolves #995 --- .../adapter/aws/CustomRuntimeEventLoop.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoop.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoop.java index eb932b259..ce35d1508 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoop.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoop.java @@ -266,17 +266,19 @@ private FunctionInvocationWrapper locateFunction(Environment environment, Functi } private static String extractVersion() { - String path = CustomRuntimeEventLoop.class.getProtectionDomain().getCodeSource().getLocation().toString(); - int endIndex = path.lastIndexOf('.'); - if (endIndex < 0) { - return "UNKNOWN-VERSION"; - } - int startIndex = path.lastIndexOf("/") + 1; try { + String path = CustomRuntimeEventLoop.class.getProtectionDomain().getCodeSource().getLocation().toString(); + int endIndex = path.lastIndexOf('.'); + if (endIndex < 0) { + return "UNKNOWN-VERSION"; + } + int startIndex = path.lastIndexOf("/") + 1; return path.substring(startIndex, endIndex).replace("spring-cloud-function-adapter-aws-", ""); } - catch (Throwable e) { - logger.info("Failed to deterimine framework version"); + catch (Exception e) { + if (logger.isDebugEnabled()) { + logger.debug("Failed to detect version", e); + } return "UNKNOWN-VERSION"; } } From 28cef69ea39db5eeeb9b53a9c3a918f4f1594243 Mon Sep 17 00:00:00 2001 From: groat-mike Date: Fri, 3 Mar 2023 19:49:04 -0500 Subject: [PATCH 186/210] Use logger instead of System.out; Fixes gh-1005 --- .../function/context/catalog/SimpleFunctionRegistry.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java index 2f66d6236..40414c871 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java @@ -927,7 +927,11 @@ else if (value instanceof Mono) { if (inputValue instanceof Message && !this.isInputTypeMessage()) { inputValue = ((Message) inputValue).getPayload(); } - System.out.println("Invoking function: " + this + "with input type: " + this.getInputType()); + + if (logger.isDebugEnabled()) { + logger.debug("Invoking function: " + this + "with input type: " + this.getInputType()); + } + Object result = ((Function) this.target).apply(inputValue); if (result instanceof Publisher && functionInvocationHelper != null) { From 7f6fbc3ee868846725e55ed4e39c4fdc9680f890 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 14 Mar 2023 15:33:49 +0100 Subject: [PATCH 187/210] Update AWS basic sample and add README Add README --- .../function-functional-sample-aws/pom.xml | 1 - .../function-sample-aws/README.md | 49 +++++++++++++++++++ .../java/example/FunctionConfiguration.java | 9 +--- 3 files changed, 50 insertions(+), 9 deletions(-) create mode 100644 spring-cloud-function-samples/function-sample-aws/README.md diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index 9a84ff034..a53ce6e76 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -91,7 +91,6 @@ org.apache.maven.plugins maven-shade-plugin - 3.2.4 false true diff --git a/spring-cloud-function-samples/function-sample-aws/README.md b/spring-cloud-function-samples/function-sample-aws/README.md new file mode 100644 index 000000000..f303d911c --- /dev/null +++ b/spring-cloud-function-samples/function-sample-aws/README.md @@ -0,0 +1,49 @@ +### Introduction + +Spring Cloud Function is a framework that promotes the notion that any business requirement could be realized as one of the `java.util.Supplier`, `java.util.Function` or `java.util.Consumer` while providing a set of abstractions to execute such functions in different context using provided set of Spring Boot adapter auto-configurations. For example, the same function implementation could be realized as Message Handler or REST endpoint or AWS Lambda and many more without touching its code, by simply adding one of the provided dependencies to your POM or Gradle script. + +While you can find more details on Spring Cloud Function and all of its features [here](https://spring.io/projects/spring-cloud-function), this example is about AWS Lambdas and Spring support for it. + +While AWS provides a set of interfaces to implement various type of handlers (`RequestHandler`, `RequestStreamHandler` etc), you may want to keep your implementations POJO-like or you may have an existing legacy code that you would want to turn into AWS lambda. Regardless of the case Spring Cloud Function AWS adapter can help. +This example demonstrates how a simple Java Function managed as Spring Bean can be easily turned into and deployed as AWS Lambda. + +#### Basic Example + +The example is very trivial, so here is the code: + +``` +@SpringBootApplication +public class FunctionConfiguration { + + @Bean + public Function uppercase() { + return value -> value.toUpperCase(); + } +} +``` + +As you can see it's a standard Spring Boot application that has no code-level dependencies on AWS. In fact outside of Spring configuration annotations such as `@Bean` and `@SpringBootApplication`, it has no code-level dependencies on Spring either. While implementation of this function is trivial, you can imagine a more involved example with complex types, callbacks to legacy code etc (see next section for references to such samples). + +So, once deployed as AWS Lambda you can send a String and receive the uppercased version of it back. + +** Build ** + +``` +./mvnw clean package +``` + +** Deploy ** + +Combination of pre-configured [Spring Boot maven plugin](https://docs.spring.io/spring-boot/docs/current/maven-plugin/reference/htmlsingle/) and [Apache Maven Shade plugin](https://maven.apache.org/plugins/maven-shade-plugin/) will produce a deployable JAR file. + + +NOTE: _Since the intention of this example to be as trivial as possible we do not provide a deploy script (i.e., [SAM](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-cli-command-reference-sam-deploy.html)) to ensure there is nothing else that needs to be learned if this is read by a new AWS user, and instead recommend using AWS Dashboard functionality to deploy and test it. Some of the more complex examples listed in the next section have deploy scripts to simplify the process._ + +Now all you need to do is deploy (upload) the JAR file located in the `target` directory of the project to AWS. + +NOTE: You will find two JAR files (actually three where one has additional extension `.original`). The AWS deployable artifact is the one that ends with `-aws.jar`. For example, in our case it's `function-sample-aws-2.0.0.RELEASE-aws.jar`. + +When ask about _handler_ you specify `org.springframework.cloud.function.adapter.aws.FunctionInvoker::handleRequest` which is a generic request handler provided by the Spring Cloud Function. +You can also find more details deployment procedures in this quick [getting started](https://docs.spring.io/spring-cloud-function/docs/3.2.9/reference/html/aws.html#_getting_started) paragraph available in Spring Cloud Function documentation. + +#### Other Examples \ No newline at end of file diff --git a/spring-cloud-function-samples/function-sample-aws/src/main/java/example/FunctionConfiguration.java b/spring-cloud-function-samples/function-sample-aws/src/main/java/example/FunctionConfiguration.java index ade13c608..eb9e08254 100644 --- a/spring-cloud-function-samples/function-sample-aws/src/main/java/example/FunctionConfiguration.java +++ b/spring-cloud-function-samples/function-sample-aws/src/main/java/example/FunctionConfiguration.java @@ -19,13 +19,6 @@ public static void main(String[] args) { @Bean public Function uppercase() { - return value -> { - if (value.equals("exception")) { - throw new RuntimeException("Intentional exception"); - } - else { - return value.toUpperCase(); - } - }; + return value -> value.toUpperCase(); } } From 925ddffc19b694c88c0a04d25854a3bdca3ac439 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 14 Mar 2023 15:35:53 +0100 Subject: [PATCH 188/210] Update README.md --- spring-cloud-function-samples/function-sample-aws/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-function-samples/function-sample-aws/README.md b/spring-cloud-function-samples/function-sample-aws/README.md index f303d911c..25a576038 100644 --- a/spring-cloud-function-samples/function-sample-aws/README.md +++ b/spring-cloud-function-samples/function-sample-aws/README.md @@ -26,7 +26,7 @@ As you can see it's a standard Spring Boot application that has no code-level de So, once deployed as AWS Lambda you can send a String and receive the uppercased version of it back. -** Build ** +* Build * ``` ./mvnw clean package @@ -46,4 +46,4 @@ NOTE: You will find two JAR files (actually three where one has additional exten When ask about _handler_ you specify `org.springframework.cloud.function.adapter.aws.FunctionInvoker::handleRequest` which is a generic request handler provided by the Spring Cloud Function. You can also find more details deployment procedures in this quick [getting started](https://docs.spring.io/spring-cloud-function/docs/3.2.9/reference/html/aws.html#_getting_started) paragraph available in Spring Cloud Function documentation. -#### Other Examples \ No newline at end of file +#### Other Examples From 178523431c7e4eb8da07725426648b2697683873 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 14 Mar 2023 15:36:18 +0100 Subject: [PATCH 189/210] Update README.md --- spring-cloud-function-samples/function-sample-aws/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-function-samples/function-sample-aws/README.md b/spring-cloud-function-samples/function-sample-aws/README.md index 25a576038..bc240bb65 100644 --- a/spring-cloud-function-samples/function-sample-aws/README.md +++ b/spring-cloud-function-samples/function-sample-aws/README.md @@ -26,13 +26,13 @@ As you can see it's a standard Spring Boot application that has no code-level de So, once deployed as AWS Lambda you can send a String and receive the uppercased version of it back. -* Build * +**Build** ``` ./mvnw clean package ``` -** Deploy ** +**Deploy** Combination of pre-configured [Spring Boot maven plugin](https://docs.spring.io/spring-boot/docs/current/maven-plugin/reference/htmlsingle/) and [Apache Maven Shade plugin](https://maven.apache.org/plugins/maven-shade-plugin/) will produce a deployable JAR file. From ba2b37b665126890db3f0e904bb278a953c982b3 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 14 Mar 2023 15:51:51 +0100 Subject: [PATCH 190/210] Add additional sample links to the README --- .../function-sample-aws/README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/spring-cloud-function-samples/function-sample-aws/README.md b/spring-cloud-function-samples/function-sample-aws/README.md index bc240bb65..77523bf02 100644 --- a/spring-cloud-function-samples/function-sample-aws/README.md +++ b/spring-cloud-function-samples/function-sample-aws/README.md @@ -47,3 +47,11 @@ When ask about _handler_ you specify `org.springframework.cloud.function.adapter You can also find more details deployment procedures in this quick [getting started](https://docs.spring.io/spring-cloud-function/docs/3.2.9/reference/html/aws.html#_getting_started) paragraph available in Spring Cloud Function documentation. #### Other Examples + +Below is a set of additional examples showcasing more complex scenarios + +- [Functional Bean registration](https://github.com/spring-cloud/spring-cloud-function/tree/main/spring-cloud-function-samples/function-functional-sample-aws). This example is similar to the basic example provided above wit the exception that it demonstrates [functional bean registration](https://docs.spring.io/spring-cloud-function/docs/3.2.9/reference/html/spring-cloud-function.html#_functional_bean_definitions) instead of classic which greatly improves startup time. +- [AWS Custom Runtime - classic Spring bean registration](https://github.com/spring-cloud/spring-cloud-function/tree/main/spring-cloud-function-samples/function-sample-aws-custom-bean). This example demonstrates usage of AWS custom runtime with classic bean registration. +- [AWS Custom Runtime - functional Spring bean registration](https://github.com/spring-cloud/spring-cloud-function/tree/main/spring-cloud-function-samples/function-sample-aws-custom). This example demonstrates usage of AWS custom runtime with functional bean registration. +- [GraalVM Native in AWS](https://github.com/spring-cloud/spring-cloud-function/tree/main/spring-cloud-function-samples/function-sample-aws-native). This example demonstrates Spring Cloud Function support for GraalVM Native deployment. +- [Function Routing with AWS](https://github.com/spring-cloud/spring-cloud-function/tree/main/spring-cloud-function-samples/function-sample-aws-routing). This example demonstrates routing capabilities of Spring Cloud Function when deployed as AWS Lambdas From 7b17c4f503e58308cfb41c4d3f4411814da0333a Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 14 Mar 2023 16:07:15 +0100 Subject: [PATCH 191/210] Rename README to adoc --- .../function-sample-aws/README.adoc | 59 +++++++++++++++++++ .../function-sample-aws/README.md | 57 ------------------ 2 files changed, 59 insertions(+), 57 deletions(-) create mode 100644 spring-cloud-function-samples/function-sample-aws/README.adoc delete mode 100644 spring-cloud-function-samples/function-sample-aws/README.md diff --git a/spring-cloud-function-samples/function-sample-aws/README.adoc b/spring-cloud-function-samples/function-sample-aws/README.adoc new file mode 100644 index 000000000..d38ac21f8 --- /dev/null +++ b/spring-cloud-function-samples/function-sample-aws/README.adoc @@ -0,0 +1,59 @@ +== Introduction + +Spring Cloud Function is a framework that promotes the notion that any business requirement could be realized as one of the `java.util.Supplier`, `java.util.Function` or `java.util.Consumer` while providing a set of abstractions to execute such functions in different context using provided set of Spring Boot adapter auto-configurations. For example, the same function implementation could be realized as Message Handler or REST endpoint or AWS Lambda and many more without touching its code, by simply adding one of the provided dependencies to your POM or Gradle script. + +While you can find more details on Spring Cloud Function and all of its features https://spring.io/projects/spring-cloud-function[here], this example is about AWS Lambdas and Spring support for it. + +While AWS provides a set of interfaces to implement various type of handlers (`RequestHandler`, `RequestStreamHandler` etc), you may want to keep your implementations POJO-like or you may have an existing legacy code that you would want to turn into AWS lambda. Regardless of the case Spring Cloud Function AWS adapter can help. +This example demonstrates how a simple Java Function managed as Spring Bean can be easily turned into and deployed as AWS Lambda. + +=== Basic Example + +The example is very trivial, so here is the code: + +[source, java] +---- +@SpringBootApplication +public class FunctionConfiguration { + + @Bean + public Function uppercase() { + return value -> value.toUpperCase(); + } +} +---- + +As you can see it's a standard Spring Boot application that has no code-level dependencies on AWS. In fact outside of Spring configuration annotations such as `@Bean` and `@SpringBootApplication`, it has no code-level dependencies on Spring either. While implementation of this function is trivial, you can imagine a more involved example with complex types, callbacks to legacy code etc (see <> for references to such samples). + +So, once deployed as AWS Lambda you can send a String and receive the uppercased version of it back. + +**Build** + +[source, text] +---- +./mvnw clean package +---- + +**Deploy** + +Combination of pre-configured https://docs.spring.io/spring-boot/docs/current/maven-plugin/reference/htmlsingle/[Spring Boot maven plugin] and https://maven.apache.org/plugins/maven-shade-plugin/[Apache Maven Shade plugin] will produce a deployable JAR file. + + +NOTE: _Since the intention of this example to be as trivial as possible we do not provide a deploy script (i.e., https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-cli-command-reference-sam-deploy.html[SAM]) to ensure there is nothing else that needs to be learned if this is read by a new AWS user, and instead recommend using AWS Dashboard functionality to deploy and test it. Some of the more complex examples listed in the next section have deploy scripts to simplify the process._ + +Now all you need to do is deploy (upload) the JAR file located in the `target` directory of the project to AWS. + +NOTE: You will find two JAR files (actually three where one has additional extension `.original`). The AWS deployable artifact is the one that ends with `-aws.jar`. For example, in our case it's `function-sample-aws-2.0.0.RELEASE-aws.jar`. + +When ask about _handler_ you specify `org.springframework.cloud.function.adapter.aws.FunctionInvoker::handleRequest` which is a generic request handler provided by the Spring Cloud Function. +You can also find more details deployment procedures in this quick https://docs.spring.io/spring-cloud-function/docs/3.2.9/reference/html/aws.html#_getting_started[getting started] paragraph available in Spring Cloud Function documentation. + +=== Other Examples + +Below is a set of additional examples showcasing more complex scenarios + +- https://github.com/spring-cloud/spring-cloud-function/tree/main/spring-cloud-function-samples/function-functional-sample-aws[Functional Bean registration]. This example is similar to the basic example provided above with the exception that it demonstrates https://docs.spring.io/spring-cloud-function/docs/3.2.9/reference/html/spring-cloud-function.html#_functional_bean_definitions[functional bean registration] instead of classic which greatly improves startup time. +- https://github.com/spring-cloud/spring-cloud-function/tree/main/spring-cloud-function-samples/function-sample-aws-custom-bean[AWS Custom Runtime - classic Spring bean registration]. This example demonstrates usage of AWS custom runtime with classic bean registration. +- https://github.com/spring-cloud/spring-cloud-function/tree/main/spring-cloud-function-samples/function-sample-aws-custom[AWS Custom Runtime - functional Spring bean registration]. This example demonstrates usage of AWS custom runtime with functional bean registration. +- https://github.com/spring-cloud/spring-cloud-function/tree/main/spring-cloud-function-samples/function-sample-aws-native[GraalVM Native in AWS]. This example demonstrates Spring Cloud Function support for GraalVM Native deployment. +- https://github.com/spring-cloud/spring-cloud-function/tree/main/spring-cloud-function-samples/function-sample-aws-routing[Function Routing with AWS]. This example demonstrates routing capabilities of Spring Cloud Function when deployed as AWS Lambdas diff --git a/spring-cloud-function-samples/function-sample-aws/README.md b/spring-cloud-function-samples/function-sample-aws/README.md deleted file mode 100644 index 77523bf02..000000000 --- a/spring-cloud-function-samples/function-sample-aws/README.md +++ /dev/null @@ -1,57 +0,0 @@ -### Introduction - -Spring Cloud Function is a framework that promotes the notion that any business requirement could be realized as one of the `java.util.Supplier`, `java.util.Function` or `java.util.Consumer` while providing a set of abstractions to execute such functions in different context using provided set of Spring Boot adapter auto-configurations. For example, the same function implementation could be realized as Message Handler or REST endpoint or AWS Lambda and many more without touching its code, by simply adding one of the provided dependencies to your POM or Gradle script. - -While you can find more details on Spring Cloud Function and all of its features [here](https://spring.io/projects/spring-cloud-function), this example is about AWS Lambdas and Spring support for it. - -While AWS provides a set of interfaces to implement various type of handlers (`RequestHandler`, `RequestStreamHandler` etc), you may want to keep your implementations POJO-like or you may have an existing legacy code that you would want to turn into AWS lambda. Regardless of the case Spring Cloud Function AWS adapter can help. -This example demonstrates how a simple Java Function managed as Spring Bean can be easily turned into and deployed as AWS Lambda. - -#### Basic Example - -The example is very trivial, so here is the code: - -``` -@SpringBootApplication -public class FunctionConfiguration { - - @Bean - public Function uppercase() { - return value -> value.toUpperCase(); - } -} -``` - -As you can see it's a standard Spring Boot application that has no code-level dependencies on AWS. In fact outside of Spring configuration annotations such as `@Bean` and `@SpringBootApplication`, it has no code-level dependencies on Spring either. While implementation of this function is trivial, you can imagine a more involved example with complex types, callbacks to legacy code etc (see next section for references to such samples). - -So, once deployed as AWS Lambda you can send a String and receive the uppercased version of it back. - -**Build** - -``` -./mvnw clean package -``` - -**Deploy** - -Combination of pre-configured [Spring Boot maven plugin](https://docs.spring.io/spring-boot/docs/current/maven-plugin/reference/htmlsingle/) and [Apache Maven Shade plugin](https://maven.apache.org/plugins/maven-shade-plugin/) will produce a deployable JAR file. - - -NOTE: _Since the intention of this example to be as trivial as possible we do not provide a deploy script (i.e., [SAM](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-cli-command-reference-sam-deploy.html)) to ensure there is nothing else that needs to be learned if this is read by a new AWS user, and instead recommend using AWS Dashboard functionality to deploy and test it. Some of the more complex examples listed in the next section have deploy scripts to simplify the process._ - -Now all you need to do is deploy (upload) the JAR file located in the `target` directory of the project to AWS. - -NOTE: You will find two JAR files (actually three where one has additional extension `.original`). The AWS deployable artifact is the one that ends with `-aws.jar`. For example, in our case it's `function-sample-aws-2.0.0.RELEASE-aws.jar`. - -When ask about _handler_ you specify `org.springframework.cloud.function.adapter.aws.FunctionInvoker::handleRequest` which is a generic request handler provided by the Spring Cloud Function. -You can also find more details deployment procedures in this quick [getting started](https://docs.spring.io/spring-cloud-function/docs/3.2.9/reference/html/aws.html#_getting_started) paragraph available in Spring Cloud Function documentation. - -#### Other Examples - -Below is a set of additional examples showcasing more complex scenarios - -- [Functional Bean registration](https://github.com/spring-cloud/spring-cloud-function/tree/main/spring-cloud-function-samples/function-functional-sample-aws). This example is similar to the basic example provided above wit the exception that it demonstrates [functional bean registration](https://docs.spring.io/spring-cloud-function/docs/3.2.9/reference/html/spring-cloud-function.html#_functional_bean_definitions) instead of classic which greatly improves startup time. -- [AWS Custom Runtime - classic Spring bean registration](https://github.com/spring-cloud/spring-cloud-function/tree/main/spring-cloud-function-samples/function-sample-aws-custom-bean). This example demonstrates usage of AWS custom runtime with classic bean registration. -- [AWS Custom Runtime - functional Spring bean registration](https://github.com/spring-cloud/spring-cloud-function/tree/main/spring-cloud-function-samples/function-sample-aws-custom). This example demonstrates usage of AWS custom runtime with functional bean registration. -- [GraalVM Native in AWS](https://github.com/spring-cloud/spring-cloud-function/tree/main/spring-cloud-function-samples/function-sample-aws-native). This example demonstrates Spring Cloud Function support for GraalVM Native deployment. -- [Function Routing with AWS](https://github.com/spring-cloud/spring-cloud-function/tree/main/spring-cloud-function-samples/function-sample-aws-routing). This example demonstrates routing capabilities of Spring Cloud Function when deployed as AWS Lambdas From 6f521fb38f910283dd8c4092a7e135d1f2ea10dd Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 28 Mar 2023 09:43:42 +0200 Subject: [PATCH 192/210] GH-1017 Ensure conversionHint is properly interpreted Resolves #1017 --- .../context/config/JsonMessageConverter.java | 27 ++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/JsonMessageConverter.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/JsonMessageConverter.java index dc78a68c3..3993a475b 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/JsonMessageConverter.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/JsonMessageConverter.java @@ -16,11 +16,15 @@ package org.springframework.cloud.function.context.config; +import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; import org.springframework.cloud.function.cloudevent.CloudEventMessageUtils; import org.springframework.cloud.function.json.JsonMapper; +import org.springframework.core.GenericTypeResolver; +import org.springframework.core.MethodParameter; +import org.springframework.core.ParameterizedTypeReference; import org.springframework.lang.Nullable; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; @@ -75,7 +79,10 @@ protected boolean canConvertFrom(Message message, @Nullable Class targetCl @Override protected Object convertFromInternal(Message message, Class targetClass, @Nullable Object conversionHint) { - Type convertToType = conversionHint == null ? targetClass : (Type) conversionHint; + if (conversionHint instanceof ParameterizedTypeReference) { + conversionHint = ((ParameterizedTypeReference) conversionHint).getType(); + } + Type convertToType = this.getResolvedType(targetClass, conversionHint); if (targetClass == byte[].class && message.getPayload() instanceof String) { return ((String) message.getPayload()).getBytes(StandardCharsets.UTF_8); } @@ -112,4 +119,22 @@ protected Object convertToInternal(Object payload, @Nullable MessageHeaders head return jsonMapper.toJson(payload); } + + private Type getResolvedType(Class targetClass, @Nullable Object conversionHint) { + if (conversionHint instanceof MethodParameter) { + MethodParameter param = (MethodParameter) conversionHint; + param = param.nestedIfOptional(); + if (Message.class.isAssignableFrom(param.getParameterType())) { + param = param.nested(); + } + Type genericParameterType = param.getNestedGenericParameterType(); + Class contextClass = param.getContainingClass(); + return GenericTypeResolver.resolveType(genericParameterType, contextClass); + } + else if (conversionHint instanceof ParameterizedType) { + return (Type) conversionHint; + } + return targetClass; + } + } From 03e19d7302814f712d3b92aa5850c95f1387fad0 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 29 Mar 2023 17:56:40 +0200 Subject: [PATCH 193/210] Update README.adoc --- .../function-sample-aws/README.adoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-cloud-function-samples/function-sample-aws/README.adoc b/spring-cloud-function-samples/function-sample-aws/README.adoc index d38ac21f8..44ec0fb3e 100644 --- a/spring-cloud-function-samples/function-sample-aws/README.adoc +++ b/spring-cloud-function-samples/function-sample-aws/README.adoc @@ -1,11 +1,11 @@ == Introduction -Spring Cloud Function is a framework that promotes the notion that any business requirement could be realized as one of the `java.util.Supplier`, `java.util.Function` or `java.util.Consumer` while providing a set of abstractions to execute such functions in different context using provided set of Spring Boot adapter auto-configurations. For example, the same function implementation could be realized as Message Handler or REST endpoint or AWS Lambda and many more without touching its code, by simply adding one of the provided dependencies to your POM or Gradle script. +Spring Cloud Function is a framework that promotes the notion that any business requirement could be realized as one of the `java.util.Supplier`, `java.util.Function` or `java.util.Consumer` while providing a set of abstractions to execute such functions in different context using provided set of Spring Boot adapter auto-configurations. For example, the same function implementation could be realized as Message Handler or REST endpoint or AWS Lambda function and many more without touching its code, by simply adding one of the provided dependencies to your POM or Gradle script. -While you can find more details on Spring Cloud Function and all of its features https://spring.io/projects/spring-cloud-function[here], this example is about AWS Lambdas and Spring support for it. +While you can find more details on Spring Cloud Function and all of its features https://spring.io/projects/spring-cloud-function[here], this example is about AWS Lambda functions and Spring support for it. While AWS provides a set of interfaces to implement various type of handlers (`RequestHandler`, `RequestStreamHandler` etc), you may want to keep your implementations POJO-like or you may have an existing legacy code that you would want to turn into AWS lambda. Regardless of the case Spring Cloud Function AWS adapter can help. -This example demonstrates how a simple Java Function managed as Spring Bean can be easily turned into and deployed as AWS Lambda. +This example demonstrates how a simple Java Function managed as Spring Bean can be easily turned into and deployed as AWS Lambda function. === Basic Example From b2c6564f10aca1e8210d712b068a49f687f53c72 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 30 Mar 2023 14:53:29 +0200 Subject: [PATCH 194/210] GH-1018 Ensure AWS adapter can pass raw InputStream Resolves #1018 --- .../function/adapter/aws/AWSLambdaUtils.java | 22 +++++++ .../function/adapter/aws/FunctionInvoker.java | 2 +- .../adapter/aws/FunctionInvokerTests.java | 63 +++++++++++++++++++ 3 files changed, 86 insertions(+), 1 deletion(-) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java index c9b4f5704..a7908b5ee 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java @@ -16,6 +16,8 @@ package org.springframework.cloud.function.adapter.aws; +import java.io.IOException; +import java.io.InputStream; import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; import java.util.HashMap; @@ -31,7 +33,9 @@ import org.springframework.http.HttpStatus; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; +import org.springframework.messaging.support.GenericMessage; import org.springframework.messaging.support.MessageBuilder; +import org.springframework.util.StreamUtils; /** * @@ -77,6 +81,23 @@ static boolean isSupportedAWSType(Type inputType) { || typeName.equals("com.amazonaws.services.lambda.runtime.events.KinesisEvent"); } + @SuppressWarnings("rawtypes") + public static Message generateMessage(InputStream payload, Type inputType, boolean isSupplier, JsonMapper jsonMapper, Context context) throws IOException { + if (inputType != null && FunctionTypeUtils.isMessage(inputType)) { + inputType = FunctionTypeUtils.getImmediateGenericType(inputType, 0); + } + if (inputType != null && InputStream.class.isAssignableFrom(FunctionTypeUtils.getRawType(inputType))) { + MessageBuilder msgBuilder = MessageBuilder.withPayload(payload); + if (context != null) { + msgBuilder.setHeader(AWSLambdaUtils.AWS_CONTEXT, context); + } + return msgBuilder.build(); + } + else { + return generateMessage(StreamUtils.copyToByteArray(payload), inputType, isSupplier, jsonMapper, context); + } + } + public static Message generateMessage(byte[] payload, Type inputType, boolean isSupplier, JsonMapper jsonMapper) { return generateMessage(payload, inputType, isSupplier, jsonMapper, null); } @@ -87,6 +108,7 @@ public static Message generateMessage(byte[] payload, Type inputType, bo logger.info("Received: " + new String(payload, StandardCharsets.UTF_8)); } + Object structMessage = jsonMapper.fromJson(payload, Object.class); boolean isApiGateway = structMessage instanceof Map && (((Map) structMessage).containsKey("httpMethod") || diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/FunctionInvoker.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/FunctionInvoker.java index e1e706477..54ea419aa 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/FunctionInvoker.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/FunctionInvoker.java @@ -80,7 +80,7 @@ public FunctionInvoker() { @Override public void handleRequest(InputStream input, OutputStream output, Context context) throws IOException { Message requestMessage = AWSLambdaUtils - .generateMessage(StreamUtils.copyToByteArray(input), this.function.getInputType(), this.function.isSupplier(), jsonMapper, context); + .generateMessage(input, this.function.getInputType(), this.function.isSupplier(), jsonMapper, context); Object response = this.function.apply(requestMessage); byte[] responseBytes = this.buildResult(requestMessage, response); diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java index 504aeb42e..b743a26b0 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java @@ -57,6 +57,7 @@ import org.springframework.messaging.converter.AbstractMessageConverter; import org.springframework.messaging.support.MessageBuilder; import org.springframework.util.MimeType; +import org.springframework.util.StreamUtils; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.fail; @@ -989,6 +990,40 @@ public void testApiGatewayAsSupplier() throws Exception { assertThat(result.get("body")).isEqualTo("\"boom\""); } + @SuppressWarnings({ "rawtypes", "unchecked" }) + @Test + public void testApiGatewayInAndOutInputStream() throws Exception { + System.setProperty("MAIN_CLASS", ApiGatewayConfiguration.class.getName()); + System.setProperty("spring.cloud.function.definition", "echoInputStreamToString"); + FunctionInvoker invoker = new FunctionInvoker(); + + InputStream targetStream = new ByteArrayInputStream(this.apiGatewayEvent.getBytes()); + ByteArrayOutputStream output = new ByteArrayOutputStream(); + invoker.handleRequest(targetStream, output, null); + + Map result = mapper.readValue(output.toByteArray(), Map.class); + assertThat(result.get("body")).isEqualTo("hello"); + Map headers = (Map) result.get("headers"); + assertThat(headers).isNotEmpty(); + } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + @Test + public void testApiGatewayInAndOutInputStreamMsg() throws Exception { + System.setProperty("MAIN_CLASS", ApiGatewayConfiguration.class.getName()); + System.setProperty("spring.cloud.function.definition", "echoInputStreamMsgToString"); + FunctionInvoker invoker = new FunctionInvoker(); + + InputStream targetStream = new ByteArrayInputStream(this.apiGatewayEvent.getBytes()); + ByteArrayOutputStream output = new ByteArrayOutputStream(); + invoker.handleRequest(targetStream, output, null); + + Map result = mapper.readValue(output.toByteArray(), Map.class); + assertThat(result.get("body")).isEqualTo("hello"); + Map headers = (Map) result.get("headers"); + assertThat(headers).isNotEmpty(); + } + @SuppressWarnings("rawtypes") @Test public void testApiGatewayInAndOut() throws Exception { @@ -1426,6 +1461,34 @@ public Function inputApiEvent() { }; } + @Bean + + public Function echoInputStreamToString() { + return is -> { + try { + String result = StreamUtils.copyToString(is, StandardCharsets.UTF_8); + return result; + } + catch (Exception e) { + throw new RuntimeException(e); + } + }; + } + + @Bean + + public Function, String> echoInputStreamMsgToString() { + return msg -> { + try { + String result = StreamUtils.copyToString(msg.getPayload(), StandardCharsets.UTF_8); + return result; + } + catch (Exception e) { + throw new RuntimeException(e); + } + }; + } + @Bean public Function inputOutputApiEvent() { return v -> { From eec09cafd5e15bd27f4873dae4ef539f72f05ed6 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 18 Apr 2023 13:39:49 +0200 Subject: [PATCH 195/210] Remove unused import --- .../cloud/function/adapter/aws/AWSLambdaUtils.java | 1 - 1 file changed, 1 deletion(-) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java index a7908b5ee..16282a9e0 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java @@ -33,7 +33,6 @@ import org.springframework.http.HttpStatus; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; -import org.springframework.messaging.support.GenericMessage; import org.springframework.messaging.support.MessageBuilder; import org.springframework.util.StreamUtils; From 2d473e7642aa1fa05b4e9d74edd0751e56c924c2 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 25 Apr 2023 13:21:25 +0200 Subject: [PATCH 196/210] Ensure RoutingFuunction can't route to itself --- .../cloud/function/context/config/RoutingFunction.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/RoutingFunction.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/RoutingFunction.java index f26467716..8a5b66569 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/RoutingFunction.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/RoutingFunction.java @@ -193,6 +193,12 @@ else if (StringUtils.hasText(functionProperties.getRoutingExpression())) { } } + if (function.getTarget().equals(this)) { + throw new IllegalStateException("Failed to establish route, and routing to itself is not allowed as it creates a loop. Please provide: " + + "'spring.cloud.function.definition' as Message header or as application property or " + + "'spring.cloud.function.routing-expression' as application property."); + } + return function.apply(input); } From 5b97d426645b60bdb71d36f4de963ff9837e184f Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 27 Apr 2023 14:14:54 +0000 Subject: [PATCH 197/210] Update SNAPSHOT to 3.2.10 --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 2 +- .../src/it/bootapp-with-javax/pom.xml | 2 +- .../src/it/bootapp-with-scf/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 2 +- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 2 +- .../function-sample-aws-custom-bean/pom.xml | 2 +- .../function-sample-aws-custom/pom.xml | 2 +- .../function-sample-aws-routing/pom.xml | 2 +- spring-cloud-function-samples/function-sample-aws/pom.xml | 2 +- .../function-sample-azure-timer-trigger/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 2 +- .../function-sample-cloudevent-stream/pom.xml | 2 +- .../function-sample-cloudevent/pom.xml | 2 +- .../function-sample-compiler/pom.xml | 2 +- .../function-sample-functional-aws-routing/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 2 +- .../function-sample-grpc-cloudevent/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pojo/pom.xml | 2 +- .../function-sample-spring-integration/pom.xml | 2 +- .../function-sample-supplier-exporter/pom.xml | 2 +- spring-cloud-function-samples/function-sample-task/pom.xml | 2 +- spring-cloud-function-samples/function-sample/pom.xml | 2 +- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 47 files changed, 49 insertions(+), 49 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 97192d500..63761a49f 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.10 pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index c8397d5b0..0d32a74bf 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.10-SNAPSHOT + 3.2.10 pom org.springframework.cloud spring-cloud-build - 3.1.7-SNAPSHOT + 3.1.7 diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index f5b7a58ee..1905f8e2a 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.10 spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index 087518fa9..89ba17551 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.10-SNAPSHOT + 3.2.10 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index e8fc5af4b..5de3909f4 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.10-SNAPSHOT + 3.2.10 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index 3f92d42f2..e49aa5316 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.10-SNAPSHOT + 3.2.10 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 0fa3f7348..8620ed7f9 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.10-SNAPSHOT + 3.2.10 diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 0d38faaac..e3a3aac91 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.10-SNAPSHOT + 3.2.10 spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index b93f07e0a..1185f57e2 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.10-SNAPSHOT + 3.2.10 diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index e981ba05e..cbe08e679 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.10 diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 916bdaa0c..c8754455c 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.10 diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 2955dc60f..4c0189226 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.10 diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 958500768..e03c3cb44 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.7-SNAPSHOT + 3.1.7 spring-cloud-function-dependencies - 3.2.10-SNAPSHOT + 3.2.10 pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 992599fc0..75ceaccf4 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.10 diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index f132dd773..b8ac20d3d 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.10-SNAPSHOT + 3.2.10 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index bedf349bc..8d8afe015 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.10-SNAPSHOT + 3.2.10 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 45a6edb87..0110eb96b 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.10-SNAPSHOT + 3.2.10 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index f1dc6923d..f24e29dc8 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.10-SNAPSHOT + 3.2.10 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index bc68fea76..1fe5c4fba 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.10-SNAPSHOT + 3.2.10 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 159f9fa20..8ba4517c4 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.10-SNAPSHOT + 3.2.10 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index e75c6d5d0..86a00762f 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.10-SNAPSHOT + 3.2.10 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index 4f807aa5d..ec5bdb256 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.10 diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 6e3d3cad8..5626e2344 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.10 diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index a53ce6e76..fac4815ec 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.10-SNAPSHOT + 3.2.10 diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 52640f3b4..046015489 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.10-SNAPSHOT + 3.2.10 diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index 80c65860c..a7b4a221e 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.10-SNAPSHOT + 3.2.10 diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 313e6501e..112a148ed 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.10-SNAPSHOT + 3.2.10 diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 308942963..4fbe1fda7 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.10-SNAPSHOT + 3.2.10 diff --git a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml index a89bf85e8..c5a59c845 100644 --- a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml @@ -16,7 +16,7 @@ Demo project for Spring Boot 1.8 - 2021.0.7-SNAPSHOT + 2021.0.7 2.1.0 example.TimerTriggerDemoApplication diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 7f009f300..7a3fd9aa5 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.10-SNAPSHOT + 3.2.10 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index 9a0751c97..7cecaf01b 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -17,7 +17,7 @@ 1.8 - 3.2.10-SNAPSHOT + 3.2.10 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 3ce7666af..8b7b93bb7 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -17,7 +17,7 @@ 1.8 - 3.2.10-SNAPSHOT + 3.2.10 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index 23e84768d..3d6002fe3 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.10-SNAPSHOT + 3.2.10 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index 09955d938..6f7ed5750 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.10-SNAPSHOT + 3.2.10 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index eb452555c..6b600b612 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -20,7 +20,7 @@ - 3.2.10-SNAPSHOT + 3.2.10 diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index e5a33221b..898d55c15 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.10-SNAPSHOT + 3.2.10 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index 80bc39318..9bdff3723 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.10-SNAPSHOT + 3.2.10 diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index 92626eb7c..a57c5bf06 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.10-SNAPSHOT + 3.2.10 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 8b7699965..a429cdae7 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.10-SNAPSHOT + 3.2.10 diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index 5ab6df52f..d72fcd4c5 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.10-SNAPSHOT + 3.2.10 diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 329a7d5b7..c5432b26b 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.10-SNAPSHOT + 3.2.10 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index 33be962e6..a594801fc 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.10-SNAPSHOT + 3.2.10 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 941c1a203..fb746d1ea 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.10 diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index fc4f90efb..40c422bbd 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.10 diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index 7080ea583..eadc89c54 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.10 diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index 7ce6ce59b..c4229d6c7 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.10 .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index d9e77f34f..aa7dc9b9f 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.10 spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From c0abeb74b626e670ddc2d22a6d4bfd091febd628 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 27 Apr 2023 14:19:35 +0000 Subject: [PATCH 198/210] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 2 +- .../src/it/bootapp-with-javax/pom.xml | 2 +- .../src/it/bootapp-with-scf/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 2 +- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 2 +- .../function-sample-aws-custom-bean/pom.xml | 2 +- .../function-sample-aws-custom/pom.xml | 2 +- .../function-sample-aws-routing/pom.xml | 2 +- spring-cloud-function-samples/function-sample-aws/pom.xml | 2 +- .../function-sample-azure-timer-trigger/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 2 +- .../function-sample-cloudevent-stream/pom.xml | 2 +- .../function-sample-cloudevent/pom.xml | 2 +- .../function-sample-compiler/pom.xml | 2 +- .../function-sample-functional-aws-routing/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 2 +- .../function-sample-grpc-cloudevent/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pojo/pom.xml | 2 +- .../function-sample-spring-integration/pom.xml | 2 +- .../function-sample-supplier-exporter/pom.xml | 2 +- spring-cloud-function-samples/function-sample-task/pom.xml | 2 +- spring-cloud-function-samples/function-sample/pom.xml | 2 +- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 47 files changed, 49 insertions(+), 49 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 63761a49f..97192d500 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10 + 3.2.10-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index 0d32a74bf..c8397d5b0 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.10 + 3.2.10-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 3.1.7 + 3.1.7-SNAPSHOT diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index 1905f8e2a..f5b7a58ee 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10 + 3.2.10-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index 89ba17551..087518fa9 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.10 + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index 5de3909f4..e8fc5af4b 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.10 + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index e49aa5316..3f92d42f2 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.10 + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 8620ed7f9..0fa3f7348 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.10 + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index e3a3aac91..0d38faaac 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.10 + 3.2.10-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index 1185f57e2..b93f07e0a 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.10 + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index cbe08e679..e981ba05e 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10 + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index c8754455c..916bdaa0c 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10 + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 4c0189226..2955dc60f 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10 + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index e03c3cb44..958500768 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.7 + 3.1.7-SNAPSHOT spring-cloud-function-dependencies - 3.2.10 + 3.2.10-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 75ceaccf4..992599fc0 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10 + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index b8ac20d3d..f132dd773 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.10 + 3.2.10-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index 8d8afe015..bedf349bc 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.10 + 3.2.10-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 0110eb96b..45a6edb87 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.10 + 3.2.10-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index f24e29dc8..f1dc6923d 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.10 + 3.2.10-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index 1fe5c4fba..bc68fea76 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.10 + 3.2.10-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 8ba4517c4..159f9fa20 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.10 + 3.2.10-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 86a00762f..e75c6d5d0 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.10 + 3.2.10-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index ec5bdb256..4f807aa5d 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10 + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 5626e2344..6e3d3cad8 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10 + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index fac4815ec..a53ce6e76 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.10 + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 046015489..52640f3b4 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.10 + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index a7b4a221e..80c65860c 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.10 + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 112a148ed..313e6501e 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.10 + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 4fbe1fda7..308942963 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.10 + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml index c5a59c845..a89bf85e8 100644 --- a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml @@ -16,7 +16,7 @@ Demo project for Spring Boot 1.8 - 2021.0.7 + 2021.0.7-SNAPSHOT 2.1.0 example.TimerTriggerDemoApplication diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 7a3fd9aa5..7f009f300 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.10 + 3.2.10-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index 7cecaf01b..9a0751c97 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -17,7 +17,7 @@ 1.8 - 3.2.10 + 3.2.10-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 8b7b93bb7..3ce7666af 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -17,7 +17,7 @@ 1.8 - 3.2.10 + 3.2.10-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index 3d6002fe3..23e84768d 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.10 + 3.2.10-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index 6f7ed5750..09955d938 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.10 + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index 6b600b612..eb452555c 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -20,7 +20,7 @@ - 3.2.10 + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index 898d55c15..e5a33221b 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.10 + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index 9bdff3723..80bc39318 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.10 + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index a57c5bf06..92626eb7c 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.10 + 3.2.10-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index a429cdae7..8b7699965 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.10 + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index d72fcd4c5..5ab6df52f 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.10 + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index c5432b26b..329a7d5b7 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.10 + 3.2.10-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index a594801fc..33be962e6 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.10 + 3.2.10-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index fb746d1ea..941c1a203 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10 + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index 40c422bbd..fc4f90efb 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10 + 3.2.10-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index eadc89c54..7080ea583 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10 + 3.2.10-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index c4229d6c7..7ce6ce59b 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10 + 3.2.10-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index aa7dc9b9f..d9e77f34f 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10 + 3.2.10-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From eb8cc76108acd95b1505deebf9e0e4067bd95a97 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 27 Apr 2023 14:19:36 +0000 Subject: [PATCH 199/210] Bumping versions to 3.2.11-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 2 +- .../src/it/bootapp-with-javax/pom.xml | 2 +- .../src/it/bootapp-with-scf/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 2 +- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 2 +- .../function-sample-aws-custom-bean/pom.xml | 2 +- .../function-sample-aws-custom/pom.xml | 2 +- .../function-sample-aws-routing/pom.xml | 2 +- spring-cloud-function-samples/function-sample-aws/pom.xml | 2 +- .../function-sample-azure-timer-trigger/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 2 +- .../function-sample-cloudevent-stream/pom.xml | 2 +- .../function-sample-cloudevent/pom.xml | 2 +- .../function-sample-compiler/pom.xml | 2 +- .../function-sample-functional-aws-routing/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 2 +- .../function-sample-grpc-cloudevent/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pojo/pom.xml | 2 +- .../function-sample-spring-integration/pom.xml | 2 +- .../function-sample-supplier-exporter/pom.xml | 2 +- spring-cloud-function-samples/function-sample-task/pom.xml | 2 +- spring-cloud-function-samples/function-sample/pom.xml | 2 +- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 47 files changed, 49 insertions(+), 49 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 97192d500..4bf39bf42 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index c8397d5b0..c008ea64d 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 3.1.7-SNAPSHOT + 3.1.8-SNAPSHOT diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index f5b7a58ee..4a207808e 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index 087518fa9..284aeb520 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index e8fc5af4b..95f315d58 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index 3f92d42f2..5685508dc 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 0fa3f7348..9c2e890e2 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 0d38faaac..843b762f5 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index b93f07e0a..2d5e42434 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index e981ba05e..5ae259603 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 916bdaa0c..42676f97f 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 2955dc60f..527b7164a 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 958500768..2b2bcb4db 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.7-SNAPSHOT + 3.1.8-SNAPSHOT spring-cloud-function-dependencies - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 992599fc0..7d3a1ef65 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index f132dd773..ff828291c 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index bedf349bc..bd8182162 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 45a6edb87..9117ff01e 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index f1dc6923d..231bd2438 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index bc68fea76..1f58c074b 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 159f9fa20..2b2df95b5 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index e75c6d5d0..5610c8b62 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index 4f807aa5d..3fc4cb025 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 6e3d3cad8..316fddbf1 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index a53ce6e76..f8622aad1 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 52640f3b4..2e911b206 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index 80c65860c..c58f34b6b 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 313e6501e..3c2028816 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 308942963..668e22671 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml index a89bf85e8..8afc2c0ba 100644 --- a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml @@ -16,7 +16,7 @@ Demo project for Spring Boot 1.8 - 2021.0.7-SNAPSHOT + 2021.0.8-SNAPSHOT 2.1.0 example.TimerTriggerDemoApplication diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 7f009f300..3e328712a 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index 9a0751c97..dd07896aa 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -17,7 +17,7 @@ 1.8 - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 3ce7666af..c82459a84 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -17,7 +17,7 @@ 1.8 - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index 23e84768d..074ed934e 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index 09955d938..01b967f5b 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index eb452555c..c3e601b14 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -20,7 +20,7 @@ - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index e5a33221b..9330a16a1 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index 80bc39318..4fb78744a 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index 92626eb7c..29e27f5a8 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 8b7699965..08f277f8b 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index 5ab6df52f..dbed64bdb 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 329a7d5b7..4f3dfcdd8 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index 33be962e6..ca39a1a92 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 941c1a203..14776c063 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index fc4f90efb..21ad1804c 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index 7080ea583..9d8c7ee2e 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index 7ce6ce59b..e065b99b5 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index d9e77f34f..ca39a85f9 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.10-SNAPSHOT + 3.2.11-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From db3c8f71a5bff582d9c1f3a27659290e83c0251f Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 6 Apr 2022 17:23:48 +0200 Subject: [PATCH 200/210] Fix handling of collections by non-reactive Consumers --- .../cloud/function/context/catalog/SimpleFunctionRegistry.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java index 40414c871..d90d92ee5 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java @@ -815,6 +815,9 @@ private Map sanitizeHeaders(MessageHeaders headers) { */ @SuppressWarnings("unchecked") private Object fluxifyInputIfNecessary(Object input) { + if (input instanceof Message && !((Message) input).getHeaders().containsKey("user-agent") && this.isConsumer() && !this.isInputTypePublisher()) { + return input; + } if (FunctionTypeUtils.isMultipleArgumentType(this.inputType)) { return input; } From 56b41bf2889b51757ff3d97d8031e738585d8aae Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 29 Jun 2023 10:41:01 +0000 Subject: [PATCH 201/210] Update SNAPSHOT to 3.2.11 --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-azure-di-samples/azure-blob-trigger-demo/pom.xml | 2 +- .../function-azure-di-samples/azure-httptrigger-demo/pom.xml | 2 +- .../function-azure-di-samples/azure-timetrigger-demo/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- .../function-sample-azure-timer-trigger/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 53 files changed, 81 insertions(+), 81 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 4bf39bf42..9f78621f5 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11-SNAPSHOT + 3.2.11 pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index c008ea64d..90e9ce0d5 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.11-SNAPSHOT + 3.2.11 pom org.springframework.cloud spring-cloud-build - 3.1.8-SNAPSHOT + 3.1.8 diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index 4a207808e..4add3a638 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11-SNAPSHOT + 3.2.11 spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index 284aeb520..cfdb7e9db 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.11-SNAPSHOT + 3.2.11 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index 95f315d58..d0388e6d3 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.11-SNAPSHOT + 3.2.11 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index 5685508dc..7a2951674 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.11-SNAPSHOT + 3.2.11 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 9c2e890e2..4ef51e8d1 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.11-SNAPSHOT + 3.2.11 diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 843b762f5..47daaf4cd 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.11-SNAPSHOT + 3.2.11 spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index 2d5e42434..b8c069287 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.11-SNAPSHOT + 3.2.11 diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index 5ae259603..7bd34699c 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11-SNAPSHOT + 3.2.11 diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 42676f97f..2008f3a08 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11-SNAPSHOT + 3.2.11 diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 527b7164a..e4d15e0e7 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11-SNAPSHOT + 3.2.11 diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 2b2bcb4db..98aa0d84c 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.8-SNAPSHOT + 3.1.8 spring-cloud-function-dependencies - 3.2.11-SNAPSHOT + 3.2.11 pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 7d3a1ef65..f1b80aaca 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11-SNAPSHOT + 3.2.11 diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index ff828291c..23c488c5e 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 1.8 - 3.2.11-SNAPSHOT + 3.2.11 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index bd8182162..32ba3003b 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 1.8 - 3.2.11-SNAPSHOT + 3.2.11 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 9117ff01e..c23f90a5c 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 1.8 - 3.2.11-SNAPSHOT + 3.2.11 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index 231bd2438..8c9636693 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 1.8 - 3.2.11-SNAPSHOT + 3.2.11 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index 1f58c074b..766093d53 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 1.8 - 3.2.11-SNAPSHOT + 3.2.11 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 2b2df95b5..b7526d8cf 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 1.8 - 3.2.11-SNAPSHOT + 3.2.11 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 5610c8b62..10d62a67c 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 1.8 - 3.2.11-SNAPSHOT + 3.2.11 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index 3fc4cb025..544894022 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11-SNAPSHOT + 3.2.11 diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 316fddbf1..14cdd1214 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11-SNAPSHOT + 3.2.11 diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml index 2461768af..096a1a27a 100644 --- a/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml index ae54834b8..0da27bbe8 100644 --- a/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml index 504d81c26..87b3f00fb 100644 --- a/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index f8622aad1..20f7d16de 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.11-SNAPSHOT + 3.2.11 diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 2e911b206..4cae851f1 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.11-SNAPSHOT + 3.2.11 diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index c58f34b6b..5b37a151e 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.11-SNAPSHOT + 3.2.11 diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 3c2028816..c1bdc6012 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.11-SNAPSHOT + 3.2.11 diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 668e22671..7604de939 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.11-SNAPSHOT + 3.2.11 diff --git a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml index 8afc2c0ba..5b3198ee1 100644 --- a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 @@ -16,7 +16,7 @@ Demo project for Spring Boot 1.8 - 2021.0.8-SNAPSHOT + 2021.0.8 2.1.0 example.TimerTriggerDemoApplication diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index 9adccb766..55b65f9ce 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 3e328712a..f4399d65b 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 1.8 - 3.2.11-SNAPSHOT + 3.2.11 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index dd07896aa..1b72c5d4e 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 1.8 - 3.2.11-SNAPSHOT + 3.2.11 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index c82459a84..157223787 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 1.8 - 3.2.11-SNAPSHOT + 3.2.11 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index 074ed934e..7e9c2aafa 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 1.8 - 3.2.11-SNAPSHOT + 3.2.11 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index 01b967f5b..5efbf4fb3 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.11-SNAPSHOT + 3.2.11 diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index 08f310238..3e20e59ab 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index c3e601b14..5eaf96e59 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 - 3.2.11-SNAPSHOT + 3.2.11 diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index 9330a16a1..dda261087 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.11-SNAPSHOT + 3.2.11 diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index 4829561f5..eaac47351 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index 4fb78744a..1afc5ed21 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.11-SNAPSHOT + 3.2.11 diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index 29e27f5a8..7fd075137 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 1.8 - 3.2.11-SNAPSHOT + 3.2.11 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 08f277f8b..101d6fcab 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.11-SNAPSHOT + 3.2.11 diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index dbed64bdb..cc83095c9 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 1.8 - 3.2.11-SNAPSHOT + 3.2.11 diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 4f3dfcdd8..fc285becd 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 1.8 - 3.2.11-SNAPSHOT + 3.2.11 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index ca39a1a92..38fd9aee4 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 1.8 - 3.2.11-SNAPSHOT + 3.2.11 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 14776c063..9d243df89 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11-SNAPSHOT + 3.2.11 diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index 21ad1804c..6f345839f 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11-SNAPSHOT + 3.2.11 diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index 9d8c7ee2e..93dd77c96 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11-SNAPSHOT + 3.2.11 diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index e065b99b5..8f028fb89 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11-SNAPSHOT + 3.2.11 .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index ca39a85f9..336bcfe01 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11-SNAPSHOT + 3.2.11 spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From 88b7f09062ce5a389f0ed25769def36a3797f448 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 29 Jun 2023 10:45:36 +0000 Subject: [PATCH 202/210] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-azure-di-samples/azure-blob-trigger-demo/pom.xml | 2 +- .../function-azure-di-samples/azure-httptrigger-demo/pom.xml | 2 +- .../function-azure-di-samples/azure-timetrigger-demo/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- .../function-sample-azure-timer-trigger/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 53 files changed, 81 insertions(+), 81 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 9f78621f5..4bf39bf42 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11 + 3.2.11-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index 90e9ce0d5..c008ea64d 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.11 + 3.2.11-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 3.1.8 + 3.1.8-SNAPSHOT diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index 4add3a638..4a207808e 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11 + 3.2.11-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index cfdb7e9db..284aeb520 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.11 + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index d0388e6d3..95f315d58 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.11 + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index 7a2951674..5685508dc 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.11 + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 4ef51e8d1..9c2e890e2 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.11 + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 47daaf4cd..843b762f5 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.11 + 3.2.11-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index b8c069287..2d5e42434 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.11 + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index 7bd34699c..5ae259603 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11 + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 2008f3a08..42676f97f 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11 + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index e4d15e0e7..527b7164a 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11 + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 98aa0d84c..2b2bcb4db 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.8 + 3.1.8-SNAPSHOT spring-cloud-function-dependencies - 3.2.11 + 3.2.11-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index f1b80aaca..7d3a1ef65 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11 + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index 23c488c5e..ff828291c 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.15 + 2.6.14 1.8 - 3.2.11 + 3.2.11-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index 32ba3003b..bd8182162 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.15 + 2.6.14 1.8 - 3.2.11 + 3.2.11-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index c23f90a5c..9117ff01e 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.15 + 2.6.14 1.8 - 3.2.11 + 3.2.11-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index 8c9636693..231bd2438 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.15 + 2.6.14 1.8 - 3.2.11 + 3.2.11-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index 766093d53..1f58c074b 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.15 + 2.6.14 1.8 - 3.2.11 + 3.2.11-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index b7526d8cf..2b2df95b5 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.15 + 2.6.14 1.8 - 3.2.11 + 3.2.11-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 10d62a67c..5610c8b62 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.15 + 2.6.14 1.8 - 3.2.11 + 3.2.11-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index 544894022..3fc4cb025 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11 + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 14cdd1214..316fddbf1 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11 + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml index 096a1a27a..2461768af 100644 --- a/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.15 + 2.6.14 diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml index 0da27bbe8..ae54834b8 100644 --- a/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.15 + 2.6.14 diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml index 87b3f00fb..504d81c26 100644 --- a/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.15 + 2.6.14 diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index 20f7d16de..f8622aad1 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.15 + 2.6.14 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.11 + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 4cae851f1..2e911b206 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.15 + 2.6.14 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.11 + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index 5b37a151e..c58f34b6b 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.15 + 2.6.14 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.11 + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index c1bdc6012..3c2028816 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.15 + 2.6.14 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.11 + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 7604de939..668e22671 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.15 + 2.6.14 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.11 + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml index 5b3198ee1..8afc2c0ba 100644 --- a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.15 + 2.6.14 @@ -16,7 +16,7 @@ Demo project for Spring Boot 1.8 - 2021.0.8 + 2021.0.8-SNAPSHOT 2.1.0 example.TimerTriggerDemoApplication diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index 55b65f9ce..9adccb766 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.15 + 2.6.14 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index f4399d65b..3e328712a 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.15 + 2.6.14 1.8 - 3.2.11 + 3.2.11-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index 1b72c5d4e..dd07896aa 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.15 + 2.6.14 1.8 - 3.2.11 + 3.2.11-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 157223787..c82459a84 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.15 + 2.6.14 1.8 - 3.2.11 + 3.2.11-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index 7e9c2aafa..074ed934e 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.15 + 2.6.14 1.8 - 3.2.11 + 3.2.11-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index 5efbf4fb3..01b967f5b 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.15 + 2.6.14 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.11 + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index 3e20e59ab..08f310238 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.15 + 2.6.14 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index 5eaf96e59..c3e601b14 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.15 + 2.6.14 - 3.2.11 + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index dda261087..9330a16a1 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.15 + 2.6.14 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.11 + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index eaac47351..4829561f5 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.15 + 2.6.14 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index 1afc5ed21..4fb78744a 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.15 + 2.6.14 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.11 + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index 7fd075137..29e27f5a8 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.15 + 2.6.14 1.8 - 3.2.11 + 3.2.11-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 101d6fcab..08f277f8b 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.15 + 2.6.14 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.11 + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index cc83095c9..dbed64bdb 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.15 + 2.6.14 1.8 - 3.2.11 + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index fc285becd..4f3dfcdd8 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.15 + 2.6.14 1.8 - 3.2.11 + 3.2.11-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index 38fd9aee4..ca39a1a92 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.15 + 2.6.14 1.8 - 3.2.11 + 3.2.11-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 9d243df89..14776c063 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11 + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index 6f345839f..21ad1804c 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11 + 3.2.11-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index 93dd77c96..9d8c7ee2e 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11 + 3.2.11-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index 8f028fb89..e065b99b5 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11 + 3.2.11-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index 336bcfe01..ca39a85f9 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11 + 3.2.11-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From cc4488cf0aab520addcccd2a67bbe13854ef7a46 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 29 Jun 2023 10:45:36 +0000 Subject: [PATCH 203/210] Bumping versions to 3.2.12-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 4 ++-- .../src/it/bootapp-with-javax/pom.xml | 4 ++-- .../src/it/bootapp-with-scf/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 4 ++-- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 4 ++-- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-azure-di-samples/azure-blob-trigger-demo/pom.xml | 2 +- .../function-azure-di-samples/azure-httptrigger-demo/pom.xml | 2 +- .../function-azure-di-samples/azure-timetrigger-demo/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 4 ++-- .../function-sample-aws-custom-bean/pom.xml | 4 ++-- .../function-sample-aws-custom/pom.xml | 4 ++-- .../function-sample-aws-routing/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 4 ++-- .../function-sample-azure-timer-trigger/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-azure/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 4 ++-- .../function-sample-cloudevent-stream/pom.xml | 4 ++-- .../function-sample-cloudevent/pom.xml | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-functional-aws-routing/pom.xml | 4 ++-- .../function-sample-gcp-background/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 4 ++-- .../function-sample-grpc-cloudevent/pom.xml | 4 ++-- .../function-sample-kotlin-web/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-pojo/pom.xml | 4 ++-- .../function-sample-spring-integration/pom.xml | 4 ++-- .../function-sample-supplier-exporter/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample-task/pom.xml | 4 ++-- spring-cloud-function-samples/function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 53 files changed, 81 insertions(+), 81 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 4bf39bf42..d881038da 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index c008ea64d..b3b214134 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 3.1.8-SNAPSHOT + 3.1.9-SNAPSHOT diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index 4a207808e..dafa0be21 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index 284aeb520..ae1077306 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index 95f315d58..813c40d7c 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index 5685508dc..e5b0a0f3e 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 9c2e890e2..56baf8b52 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 843b762f5..28a155e4a 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index 2d5e42434..6e871dfcc 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index 5ae259603..ea215f561 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 42676f97f..17009d106 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 527b7164a..b68f6ea0d 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 2b2bcb4db..bb9963204 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.8-SNAPSHOT + 3.1.9-SNAPSHOT spring-cloud-function-dependencies - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 7d3a1ef65..f4de69f41 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index ff828291c..c918ef25b 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 1.8 - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index bd8182162..189002d9d 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 1.8 - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 9117ff01e..8e83a9b74 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 1.8 - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index 231bd2438..39982fddd 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 1.8 - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index 1f58c074b..e557c9fde 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 1.8 - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 2b2df95b5..3af3a2600 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 1.8 - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 5610c8b62..86e0c92b9 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 1.8 - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index 3fc4cb025..d2afc001e 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 316fddbf1..dc1ed7649 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml index 2461768af..096a1a27a 100644 --- a/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-blob-trigger-demo/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml index ae54834b8..0da27bbe8 100644 --- a/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-httptrigger-demo/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 diff --git a/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml index 504d81c26..87b3f00fb 100644 --- a/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml +++ b/spring-cloud-function-samples/function-azure-di-samples/azure-timetrigger-demo/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index f8622aad1..162f3ee40 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 2e911b206..6fac69e50 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index c58f34b6b..979b5a66c 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 io.spring.sample @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 3c2028816..82b150d33 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 668e22671..8e95f5e4e 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml index 8afc2c0ba..98fbc91c4 100644 --- a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 @@ -16,7 +16,7 @@ Demo project for Spring Boot 1.8 - 2021.0.8-SNAPSHOT + 2021.0.9-SNAPSHOT 2.1.0 example.TimerTriggerDemoApplication diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index 9adccb766..55b65f9ce 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 3e328712a..b79b28507 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -12,13 +12,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 1.8 - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index dd07896aa..f2d67a70d 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 1.8 - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index c82459a84..5a55c755d 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 1.8 - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index 074ed934e..b6110f76d 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 1.8 - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index 01b967f5b..b44744d85 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml index 08f310238..3e20e59ab 100644 --- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index c3e601b14..9a91b5aa6 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -15,12 +15,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index 9330a16a1..7cfdd424d 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 com.example.grpc @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index 4829561f5..eaac47351 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index 4fb78744a..fb6f5d029 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index 29e27f5a8..3fa9889e5 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 1.8 - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 08f277f8b..9c68b41d9 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index dbed64bdb..3ce1a92ca 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 1.8 - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 4f3dfcdd8..8475d3429 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 1.8 - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index ca39a1a92..800c02fb0 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot spring-boot-starter-parent - 2.6.14 + 2.6.15 1.8 - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 14776c063..592da7321 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index 21ad1804c..712206030 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index 9d8c7ee2e..5be96b4e8 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index e065b99b5..a571c0509 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index ca39a85f9..8a699b860 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.11-SNAPSHOT + 3.2.12-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From ee1328588524d366b7cb35bbe1534ed9945de384 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Thu, 2 Nov 2023 15:54:52 -0400 Subject: [PATCH 204/210] Fixing includes --- README.adoc | 2 +- docs/src/main/asciidoc/README.adoc | 4 ++-- docs/src/main/asciidoc/spring-cloud-function.adoc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.adoc b/README.adoc index 1f3c627b1..a96231d59 100644 --- a/README.adoc +++ b/README.adoc @@ -102,7 +102,7 @@ string like that.) == Building -:jdkversion: 17 +:jdkversion: 1.8 === Basic Compile and Test diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc index 6d0f4cf8d..f5eb5c158 100644 --- a/docs/src/main/asciidoc/README.adoc +++ b/docs/src/main/asciidoc/README.adoc @@ -12,8 +12,8 @@ include::getting-started.adoc[] == Building -include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/building.adoc[] +include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/docs/src/main/asciidoc/building.adoc[] == Contributing -include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/contributing.adoc[] +include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/docs/src/main/asciidoc/contributing.adoc[] diff --git a/docs/src/main/asciidoc/spring-cloud-function.adoc b/docs/src/main/asciidoc/spring-cloud-function.adoc index a336498e9..a297c9475 100644 --- a/docs/src/main/asciidoc/spring-cloud-function.adoc +++ b/docs/src/main/asciidoc/spring-cloud-function.adoc @@ -16,7 +16,7 @@ Mark Fisher, Dave Syer, Oleg Zhurakousky, Anshul Mehra, Dan Dobrin include::_intro.adoc[] -include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/contributing-docs.adoc[] +include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/docs/src/main/asciidoc/contributing-docs.adoc[] == Getting Started From a0474f71e6335952e0ec98827405a499595d0b47 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 18 Dec 2023 22:27:49 +0000 Subject: [PATCH 205/210] Update SNAPSHOT to 3.2.12 --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 2 +- .../src/it/bootapp-with-javax/pom.xml | 2 +- .../src/it/bootapp-with-scf/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 2 +- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 2 +- .../function-sample-aws-custom-bean/pom.xml | 2 +- .../function-sample-aws-custom/pom.xml | 2 +- .../function-sample-aws-routing/pom.xml | 2 +- spring-cloud-function-samples/function-sample-aws/pom.xml | 2 +- .../function-sample-azure-timer-trigger/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 2 +- .../function-sample-cloudevent-stream/pom.xml | 2 +- .../function-sample-cloudevent/pom.xml | 2 +- .../function-sample-compiler/pom.xml | 2 +- .../function-sample-functional-aws-routing/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 2 +- .../function-sample-grpc-cloudevent/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pojo/pom.xml | 2 +- .../function-sample-spring-integration/pom.xml | 2 +- .../function-sample-supplier-exporter/pom.xml | 2 +- spring-cloud-function-samples/function-sample-task/pom.xml | 2 +- spring-cloud-function-samples/function-sample/pom.xml | 2 +- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 47 files changed, 49 insertions(+), 49 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index d881038da..d8c3fade7 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.12 pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index b3b214134..e5453a4a2 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.12-SNAPSHOT + 3.2.12 pom org.springframework.cloud spring-cloud-build - 3.1.9-SNAPSHOT + 3.1.9 diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index dafa0be21..557f48490 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.12 spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index ae1077306..a356cd0ad 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.12-SNAPSHOT + 3.2.12 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index 813c40d7c..b428a1d92 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.12-SNAPSHOT + 3.2.12 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index e5b0a0f3e..fd2ece762 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.12-SNAPSHOT + 3.2.12 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 56baf8b52..9ef6130e8 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.12-SNAPSHOT + 3.2.12 diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 28a155e4a..ee5c563bc 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.12-SNAPSHOT + 3.2.12 spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index 6e871dfcc..f9ee613c8 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.12-SNAPSHOT + 3.2.12 diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index ea215f561..2eb88c3f7 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.12 diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 17009d106..aa93b21c2 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.12 diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index b68f6ea0d..9e96b8a0f 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.12 diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index bb9963204..1252901ad 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.9-SNAPSHOT + 3.1.9 spring-cloud-function-dependencies - 3.2.12-SNAPSHOT + 3.2.12 pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index f4de69f41..d0ad56397 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.12 diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index c918ef25b..0ff93b1d8 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.12 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index 189002d9d..5ea49ee69 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.12 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 8e83a9b74..92b3df6df 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.12 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index 39982fddd..7529e7bb6 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.12 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index e557c9fde..04dcda460 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.12 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 3af3a2600..3c51da1a4 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.12 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 86e0c92b9..ea0a54fa4 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.12 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index d2afc001e..8aa014ae1 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.12 diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index dc1ed7649..3431977bd 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.12 diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index 162f3ee40..947e351d1 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.12-SNAPSHOT + 3.2.12 diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 6fac69e50..4edb50b06 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.12-SNAPSHOT + 3.2.12 diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index 979b5a66c..ba42312cc 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.12-SNAPSHOT + 3.2.12 diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 82b150d33..d5c609100 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.12-SNAPSHOT + 3.2.12 diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 8e95f5e4e..352166126 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.12-SNAPSHOT + 3.2.12 diff --git a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml index 98fbc91c4..7de7f49b7 100644 --- a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml @@ -16,7 +16,7 @@ Demo project for Spring Boot 1.8 - 2021.0.9-SNAPSHOT + 2021.0.9 2.1.0 example.TimerTriggerDemoApplication diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index b79b28507..7ff3ff0d2 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.12 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index f2d67a70d..d7ca81bf3 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -17,7 +17,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.12 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 5a55c755d..533a7631b 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -17,7 +17,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.12 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index b6110f76d..7a4f7657c 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.12 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index b44744d85..e9160516c 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.12-SNAPSHOT + 3.2.12 diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index 9a91b5aa6..9eb7344c9 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -20,7 +20,7 @@ - 3.2.12-SNAPSHOT + 3.2.12 diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index 7cfdd424d..3dd16a94e 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.12-SNAPSHOT + 3.2.12 diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index fb6f5d029..24587bfa2 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.12-SNAPSHOT + 3.2.12 diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index 3fa9889e5..34872decc 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.12 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 9c68b41d9..e067965ab 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.12-SNAPSHOT + 3.2.12 diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index 3ce1a92ca..5bbb0a0a3 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.12 diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 8475d3429..49fc86c78 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.12 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index 800c02fb0..5ae563208 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.12 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 592da7321..369a5dc21 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.12 diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index 712206030..5387a828c 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.12 diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index 5be96b4e8..2b37a08a0 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.12 diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index a571c0509..bcff41949 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.12 .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index 8a699b860..17cfa72d8 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.12 spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From 65b80f6faef820679df8913d3bcc9756d816fe95 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 18 Dec 2023 22:34:52 +0000 Subject: [PATCH 206/210] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 2 +- .../src/it/bootapp-with-javax/pom.xml | 2 +- .../src/it/bootapp-with-scf/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 2 +- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 2 +- .../function-sample-aws-custom-bean/pom.xml | 2 +- .../function-sample-aws-custom/pom.xml | 2 +- .../function-sample-aws-routing/pom.xml | 2 +- spring-cloud-function-samples/function-sample-aws/pom.xml | 2 +- .../function-sample-azure-timer-trigger/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 2 +- .../function-sample-cloudevent-stream/pom.xml | 2 +- .../function-sample-cloudevent/pom.xml | 2 +- .../function-sample-compiler/pom.xml | 2 +- .../function-sample-functional-aws-routing/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 2 +- .../function-sample-grpc-cloudevent/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pojo/pom.xml | 2 +- .../function-sample-spring-integration/pom.xml | 2 +- .../function-sample-supplier-exporter/pom.xml | 2 +- spring-cloud-function-samples/function-sample-task/pom.xml | 2 +- spring-cloud-function-samples/function-sample/pom.xml | 2 +- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 47 files changed, 49 insertions(+), 49 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index d8c3fade7..d881038da 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12 + 3.2.12-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index e5453a4a2..b3b214134 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.12 + 3.2.12-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 3.1.9 + 3.1.9-SNAPSHOT diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index 557f48490..dafa0be21 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12 + 3.2.12-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index a356cd0ad..ae1077306 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.12 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index b428a1d92..813c40d7c 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.12 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index fd2ece762..e5b0a0f3e 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.12 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 9ef6130e8..56baf8b52 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.12 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index ee5c563bc..28a155e4a 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.12 + 3.2.12-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index f9ee613c8..6e871dfcc 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.12 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index 2eb88c3f7..ea215f561 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index aa93b21c2..17009d106 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 9e96b8a0f..b68f6ea0d 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 1252901ad..bb9963204 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.9 + 3.1.9-SNAPSHOT spring-cloud-function-dependencies - 3.2.12 + 3.2.12-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index d0ad56397..f4de69f41 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index 0ff93b1d8..c918ef25b 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.12 + 3.2.12-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index 5ea49ee69..189002d9d 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.12 + 3.2.12-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 92b3df6df..8e83a9b74 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.12 + 3.2.12-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index 7529e7bb6..39982fddd 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.12 + 3.2.12-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index 04dcda460..e557c9fde 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.12 + 3.2.12-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 3c51da1a4..3af3a2600 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.12 + 3.2.12-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index ea0a54fa4..86e0c92b9 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.12 + 3.2.12-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index 8aa014ae1..d2afc001e 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 3431977bd..dc1ed7649 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index 947e351d1..162f3ee40 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.12 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 4edb50b06..6fac69e50 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.12 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index ba42312cc..979b5a66c 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.12 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index d5c609100..82b150d33 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.12 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 352166126..8e95f5e4e 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.12 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml index 7de7f49b7..98fbc91c4 100644 --- a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml @@ -16,7 +16,7 @@ Demo project for Spring Boot 1.8 - 2021.0.9 + 2021.0.9-SNAPSHOT 2.1.0 example.TimerTriggerDemoApplication diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 7ff3ff0d2..b79b28507 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.12 + 3.2.12-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index d7ca81bf3..f2d67a70d 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -17,7 +17,7 @@ 1.8 - 3.2.12 + 3.2.12-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 533a7631b..5a55c755d 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -17,7 +17,7 @@ 1.8 - 3.2.12 + 3.2.12-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index 7a4f7657c..b6110f76d 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.12 + 3.2.12-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index e9160516c..b44744d85 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.12 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index 9eb7344c9..9a91b5aa6 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -20,7 +20,7 @@ - 3.2.12 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index 3dd16a94e..7cfdd424d 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.12 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index 24587bfa2..fb6f5d029 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.12 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index 34872decc..3fa9889e5 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.12 + 3.2.12-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index e067965ab..9c68b41d9 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.12 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index 5bbb0a0a3..3ce1a92ca 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.12 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 49fc86c78..8475d3429 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.12 + 3.2.12-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index 5ae563208..800c02fb0 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.12 + 3.2.12-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 369a5dc21..592da7321 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index 5387a828c..712206030 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index 2b37a08a0..5be96b4e8 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index bcff41949..a571c0509 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12 + 3.2.12-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index 17cfa72d8..8a699b860 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12 + 3.2.12-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From abefae2607af6c37a03a81cc6d75c85e4b692bc5 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 18 Dec 2023 22:34:53 +0000 Subject: [PATCH 207/210] Bumping versions to 3.2.13-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 2 +- .../src/it/bootapp-with-javax/pom.xml | 2 +- .../src/it/bootapp-with-scf/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 2 +- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 2 +- .../function-sample-aws-custom-bean/pom.xml | 2 +- .../function-sample-aws-custom/pom.xml | 2 +- .../function-sample-aws-routing/pom.xml | 2 +- spring-cloud-function-samples/function-sample-aws/pom.xml | 2 +- .../function-sample-azure-timer-trigger/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 2 +- .../function-sample-cloudevent-stream/pom.xml | 2 +- .../function-sample-cloudevent/pom.xml | 2 +- .../function-sample-compiler/pom.xml | 2 +- .../function-sample-functional-aws-routing/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 2 +- .../function-sample-grpc-cloudevent/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pojo/pom.xml | 2 +- .../function-sample-spring-integration/pom.xml | 2 +- .../function-sample-supplier-exporter/pom.xml | 2 +- spring-cloud-function-samples/function-sample-task/pom.xml | 2 +- spring-cloud-function-samples/function-sample/pom.xml | 2 +- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 47 files changed, 49 insertions(+), 49 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index d881038da..91cd38422 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index b3b214134..3d3dce786 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 3.1.9-SNAPSHOT + 3.1.10-SNAPSHOT diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index dafa0be21..cfbd18d20 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index ae1077306..e1fcf5e4f 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index 813c40d7c..6ae5c8e24 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index e5b0a0f3e..41df7e6e1 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 56baf8b52..d3a32847d 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 28a155e4a..a8969e044 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index 6e871dfcc..7f7d94bdd 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index ea215f561..3c47d5d3f 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 17009d106..ed49e6f0e 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index b68f6ea0d..5f1a674d0 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index bb9963204..b2d04a903 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.9-SNAPSHOT + 3.1.10-SNAPSHOT spring-cloud-function-dependencies - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index f4de69f41..f02bb89f1 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index c918ef25b..ba12eda08 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index 189002d9d..c5a375665 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 8e83a9b74..c00c535b3 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index 39982fddd..4994c90cb 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index e557c9fde..2e138aa50 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 3af3a2600..24cd94119 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 86e0c92b9..44f6d6f8b 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index d2afc001e..e34e8fbc6 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index dc1ed7649..46c0ed23b 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index 162f3ee40..5bdb68a6f 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 6fac69e50..76955b941 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index 979b5a66c..415c36bbe 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 82b150d33..8e5ec30fd 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 8e95f5e4e..9abaa9c54 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml index 98fbc91c4..c891357a7 100644 --- a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml @@ -16,7 +16,7 @@ Demo project for Spring Boot 1.8 - 2021.0.9-SNAPSHOT + 2021.0.10-SNAPSHOT 2.1.0 example.TimerTriggerDemoApplication diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index b79b28507..26e1dbdc0 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index f2d67a70d..53934ea26 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -17,7 +17,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 5a55c755d..3fbb38d8c 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -17,7 +17,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index b6110f76d..de03d519b 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index b44744d85..f9f9d5eb5 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index 9a91b5aa6..60b52c0fd 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -20,7 +20,7 @@ - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index 7cfdd424d..3f37e76a3 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index fb6f5d029..a14bbb0ad 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index 3fa9889e5..d37702656 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 9c68b41d9..b1cd5e636 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index 3ce1a92ca..1cb3bf56c 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 8475d3429..63a4ad719 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index 800c02fb0..4d20ed162 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 592da7321..93a50a0a6 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index 712206030..e426b5733 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index 5be96b4e8..01fb55aeb 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index a571c0509..6e1ea0c5d 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index 8a699b860..f82ab7a2b 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From 93dccf7a493302bc160544f126b66c3509ca0ae9 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 18 Dec 2023 23:15:06 +0000 Subject: [PATCH 208/210] Bumping versions --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- .../spring-cloud-function-grpc-cloudevent-ext/pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml | 2 +- .../src/it/bootapp-with-javax/pom.xml | 2 +- .../src/it/bootapp-with-scf/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootapp/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjar/pom.xml | 2 +- spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml | 2 +- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 2 +- .../function-sample-aws-custom-bean/pom.xml | 2 +- .../function-sample-aws-custom/pom.xml | 2 +- .../function-sample-aws-routing/pom.xml | 2 +- spring-cloud-function-samples/function-sample-aws/pom.xml | 2 +- .../function-sample-azure-timer-trigger/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 2 +- .../function-sample-cloudevent-stream/pom.xml | 2 +- .../function-sample-cloudevent/pom.xml | 2 +- .../function-sample-compiler/pom.xml | 2 +- .../function-sample-functional-aws-routing/pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 2 +- .../function-sample-grpc-cloudevent/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pof/pom.xml | 2 +- spring-cloud-function-samples/function-sample-pojo/pom.xml | 2 +- .../function-sample-spring-integration/pom.xml | 2 +- .../function-sample-supplier-exporter/pom.xml | 2 +- spring-cloud-function-samples/function-sample-task/pom.xml | 2 +- spring-cloud-function-samples/function-sample/pom.xml | 2 +- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 47 files changed, 49 insertions(+), 49 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 91cd38422..d881038da 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index 3d3dce786..b3b214134 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 3.1.10-SNAPSHOT + 3.1.9-SNAPSHOT diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index cfbd18d20..dafa0be21 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index e1fcf5e4f..ae1077306 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index 6ae5c8e24..813c40d7c 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index 41df7e6e1..e5b0a0f3e 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index d3a32847d..56baf8b52 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index a8969e044..28a155e4a 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index 7f7d94bdd..6e871dfcc 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index 3c47d5d3f..ea215f561 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index ed49e6f0e..17009d106 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 5f1a674d0..b68f6ea0d 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index b2d04a903..bb9963204 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.10-SNAPSHOT + 3.1.9-SNAPSHOT spring-cloud-function-dependencies - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index f02bb89f1..f4de69f41 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index ba12eda08..c918ef25b 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index c5a375665..189002d9d 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index c00c535b3..8e83a9b74 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index 4994c90cb..39982fddd 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index 2e138aa50..e557c9fde 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 24cd94119..3af3a2600 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 44f6d6f8b..86e0c92b9 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index e34e8fbc6..d2afc001e 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 46c0ed23b..dc1ed7649 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index 5bdb68a6f..162f3ee40 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 76955b941..6fac69e50 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index 415c36bbe..979b5a66c 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 8e5ec30fd..82b150d33 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 9abaa9c54..8e95f5e4e 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml index c891357a7..98fbc91c4 100644 --- a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml @@ -16,7 +16,7 @@ Demo project for Spring Boot 1.8 - 2021.0.10-SNAPSHOT + 2021.0.9-SNAPSHOT 2.1.0 example.TimerTriggerDemoApplication diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index 26e1dbdc0..b79b28507 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index 53934ea26..f2d67a70d 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -17,7 +17,7 @@ 1.8 - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 3fbb38d8c..5a55c755d 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -17,7 +17,7 @@ 1.8 - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index de03d519b..b6110f76d 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index f9f9d5eb5..b44744d85 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index 60b52c0fd..9a91b5aa6 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -20,7 +20,7 @@ - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index 3f37e76a3..7cfdd424d 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index a14bbb0ad..fb6f5d029 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index d37702656..3fa9889e5 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index b1cd5e636..9c68b41d9 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index 1cb3bf56c..3ce1a92ca 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 63a4ad719..8475d3429 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index 4d20ed162..800c02fb0 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 93a50a0a6..592da7321 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index e426b5733..712206030 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index 01fb55aeb..5be96b4e8 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index 6e1ea0c5d..a571c0509 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index f82ab7a2b..8a699b860 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.13-SNAPSHOT + 3.2.12-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From 2b4eb2dee5809ba5b9fa451af94c4a28cf9f7370 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 19 Dec 2023 23:14:50 +0000 Subject: [PATCH 209/210] Bumping versions --- README.adoc | 16 ++++++++-------- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../spring-cloud-function-adapter-gcp/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../spring-cloud-function-grpc/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 4 ++-- spring-cloud-function-deployer/pom.xml | 2 +- .../src/it/bootapp-multi/pom.xml | 2 +- .../src/it/bootapp-with-javax/pom.xml | 2 +- .../src/it/bootapp-with-scf/pom.xml | 2 +- .../src/it/bootapp/pom.xml | 2 +- .../src/it/bootjar-multi/pom.xml | 2 +- .../src/it/bootjar/pom.xml | 2 +- .../src/it/bootjarnostart/pom.xml | 2 +- spring-cloud-function-kotlin/pom.xml | 2 +- spring-cloud-function-rsocket/pom.xml | 2 +- .../function-functional-sample-aws/pom.xml | 2 +- .../function-sample-aws-custom-bean/pom.xml | 2 +- .../function-sample-aws-custom/pom.xml | 2 +- .../function-sample-aws-routing/pom.xml | 2 +- .../function-sample-aws/pom.xml | 2 +- .../function-sample-azure-timer-trigger/pom.xml | 2 +- .../function-sample-cloudevent-rsocket/pom.xml | 2 +- .../function-sample-cloudevent-stream/pom.xml | 2 +- .../function-sample-cloudevent/pom.xml | 2 +- .../function-sample-compiler/pom.xml | 2 +- .../pom.xml | 2 +- .../function-sample-gcp-http/pom.xml | 2 +- .../function-sample-grpc-cloudevent/pom.xml | 2 +- .../function-sample-pof/pom.xml | 2 +- .../function-sample-pojo/pom.xml | 2 +- .../function-sample-spring-integration/pom.xml | 2 +- .../function-sample-supplier-exporter/pom.xml | 2 +- .../function-sample-task/pom.xml | 2 +- .../function-sample/pom.xml | 2 +- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 48 files changed, 57 insertions(+), 57 deletions(-) diff --git a/README.adoc b/README.adoc index a96231d59..2ec9c385b 100644 --- a/README.adoc +++ b/README.adoc @@ -184,7 +184,7 @@ from the `file` menu. == Contributing -:spring-cloud-build-branch: master +:spring-cloud-build-branch: 3.1.x Spring Cloud is released under the non-restrictive Apache 2.0 license, and follows a very standard Github development process, using Github @@ -201,7 +201,7 @@ author credit if we do. Active contributors might be asked to join the core tea given the ability to merge pull requests. === Code of Conduct -This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/master/docs/src/main/asciidoc/code-of-conduct.adoc[code of +This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/3.1.x/docs/src/main/asciidoc/code-of-conduct.adoc[code of conduct]. By participating, you are expected to uphold this code. Please report unacceptable behavior to spring-code-of-conduct@pivotal.io. @@ -212,7 +212,7 @@ added after the original pull request but before a merge. * Use the Spring Framework code format conventions. If you use Eclipse you can import formatter settings using the `eclipse-code-formatter.xml` file from the - https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring + https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring Cloud Build] project. If using IntelliJ, you can use the https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter Plugin] to import the same file. @@ -308,7 +308,7 @@ If you need to suppress some rules (e.g. line length needs to be longer), then i It's advisable to copy the `${spring-cloud-build.rootFolder}/.editorconfig` and `${spring-cloud-build.rootFolder}/.springformat` to your project. That way, some default formatting rules will be applied. You can do so by running this script: ```bash -$ curl https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/.editorconfig -o .editorconfig +$ curl https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/.editorconfig -o .editorconfig $ touch .springformat ``` @@ -317,7 +317,7 @@ $ touch .springformat ==== Intellij IDEA In order to setup Intellij you should import our coding conventions, inspection profiles and set up the checkstyle plugin. -The following files can be found in the https://github.com/spring-cloud/spring-cloud-build/tree/master/spring-cloud-build-tools[Spring Cloud Build] project. +The following files can be found in the https://github.com/spring-cloud/spring-cloud-build/tree/3.1.x/spring-cloud-build-tools[Spring Cloud Build] project. .spring-cloud-build-tools/ ---- @@ -356,10 +356,10 @@ To have Intellij work with Checkstyle, you have to install the `Checkstyle` plug image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-checkstyle.png[Checkstyle] -Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on the `+` icon in the `Configuration file` section. There, you'll have to define where the checkstyle rules should be picked from. In the image above, we've picked the rules from the cloned Spring Cloud Build repository. However, you can point to the Spring Cloud Build's GitHub repository (e.g. for the `checkstyle.xml` : `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle.xml`). We need to provide the following variables: +Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on the `+` icon in the `Configuration file` section. There, you'll have to define where the checkstyle rules should be picked from. In the image above, we've picked the rules from the cloned Spring Cloud Build repository. However, you can point to the Spring Cloud Build's GitHub repository (e.g. for the `checkstyle.xml` : `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/spring-cloud-build-tools/src/main/resources/checkstyle.xml`). We need to provide the following variables: -- `checkstyle.header.file` - please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` URL. -- `checkstyle.suppressions.file` - default suppressions. Please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` URL. +- `checkstyle.header.file` - please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` URL. +- `checkstyle.suppressions.file` - default suppressions. Please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` URL. - `checkstyle.additional.suppressions.file` - this variable corresponds to suppressions in your local project. E.g. you're working on `spring-cloud-contract`. Then point to the `project-root/src/checkstyle/checkstyle-suppressions.xml` folder. Example for `spring-cloud-contract` would be: `/home/username/spring-cloud-contract/src/checkstyle/checkstyle-suppressions.xml`. IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources. diff --git a/docs/pom.xml b/docs/pom.xml index d881038da..91cd38422 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index b3b214134..3d3dce786 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 3.1.9-SNAPSHOT + 3.1.10-SNAPSHOT diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index dafa0be21..cfbd18d20 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index ae1077306..e1fcf5e4f 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index 813c40d7c..6ae5c8e24 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index e5b0a0f3e..41df7e6e1 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-adapter-parent org.springframework.cloud - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index 56baf8b52..d3a32847d 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index 28a155e4a..a8969e044 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT spring-cloud-function-grpc-cloudevent-ext spring-cloud-function-grpc-cloudevent-ext diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index 6e871dfcc..7f7d94bdd 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index ea215f561..3c47d5d3f 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 17009d106..ed49e6f0e 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index b68f6ea0d..5f1a674d0 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index bb9963204..b2d04a903 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.9-SNAPSHOT + 3.1.10-SNAPSHOT spring-cloud-function-dependencies - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index f4de69f41..f02bb89f1 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index c918ef25b..ba12eda08 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index 189002d9d..c5a375665 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 8e83a9b74..c00c535b3 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index 39982fddd..4994c90cb 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index e557c9fde..2e138aa50 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index 3af3a2600..24cd94119 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 86e0c92b9..44f6d6f8b 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index d2afc001e..e34e8fbc6 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index dc1ed7649..46c0ed23b 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml index 162f3ee40..5bdb68a6f 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml index 6fac69e50..76955b941 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index 979b5a66c..415c36bbe 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -17,7 +17,7 @@ 1.8 1.0.27.RELEASE - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml index 82b150d33..8e5ec30fd 100644 --- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 8e95f5e4e..9abaa9c54 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 3.9.0 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml index 98fbc91c4..c891357a7 100644 --- a/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure-timer-trigger/pom.xml @@ -16,7 +16,7 @@ Demo project for Spring Boot 1.8 - 2021.0.9-SNAPSHOT + 2021.0.10-SNAPSHOT 2.1.0 example.TimerTriggerDemoApplication diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml index b79b28507..26e1dbdc0 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml index f2d67a70d..53934ea26 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml @@ -17,7 +17,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml index 5a55c755d..3fbb38d8c 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml @@ -17,7 +17,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index b6110f76d..de03d519b 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml index b44744d85..f9f9d5eb5 100644 --- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.27.RELEASE 2.0.2 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml index 9a91b5aa6..60b52c0fd 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml +++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml @@ -20,7 +20,7 @@ - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index 7cfdd424d..3f37e76a3 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -17,7 +17,7 @@ Demo project for Spring Boot 1.8 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index fb6f5d029..a14bbb0ad 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index 3fa9889e5..d37702656 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index 9c68b41d9..b1cd5e636 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml index 3ce1a92ca..1cb3bf56c 100644 --- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml +++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 8475d3429..63a4ad719 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index 800c02fb0..4d20ed162 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT 1.0.27.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 592da7321..93a50a0a6 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index 712206030..e426b5733 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index 5be96b4e8..01fb55aeb 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index a571c0509..6e1ea0c5d 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index 8a699b860..f82ab7a2b 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.2.12-SNAPSHOT + 3.2.13-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux From e2073b2d363ea61ef8c8a435e5242339b4b13d52 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Mon, 18 Aug 2025 15:23:03 +0200 Subject: [PATCH 210/210] Green build --- pom.xml | 4 +- .../pom.xml | 59 ++++-------- .../spring-cloud-function-grpc/pom.xml | 93 ++++++++++--------- spring-cloud-function-context/pom.xml | 4 +- spring-cloud-function-kotlin/pom.xml | 2 +- .../function-sample-grpc-cloudevent/pom.xml | 2 +- .../function-sample-kotlin-web/pom.xml | 6 +- 7 files changed, 77 insertions(+), 93 deletions(-) diff --git a/pom.xml b/pom.xml index 3d3dce786..a89461181 100644 --- a/pom.xml +++ b/pom.xml @@ -152,11 +152,11 @@ spring-cloud-function-web spring-cloud-starter-function-web spring-cloud-starter-function-webflux - spring-cloud-function-samples + spring-cloud-function-deployer spring-cloud-function-adapters spring-cloud-function-rsocket - spring-cloud-function-kotlin + docs diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml index a8969e044..5735ac26d 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml @@ -11,7 +11,7 @@ spring-cloud-function-grpc-cloudevent-ext CloudEvent extension for spring-cloud-function-grpc - 1.8 + 1.55.1 @@ -23,7 +23,11 @@ spring-cloud-function-grpc ${project.version} - + + io.grpc + grpc-stub + ${grpc.version} + org.springframework.boot spring-boot-starter-test @@ -41,16 +45,26 @@ + org.apache.maven.plugins + maven-checkstyle-plugin + + + checkstyle-validation + none + + + + org.xolstice.maven.plugins protobuf-maven-plugin 0.6.1 - com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier} + com.google.protobuf:protoc:3.23.0:exe:${os.detected.classifier} grpc-java - io.grpc:protoc-gen-grpc-java:1.4.0:exe:${os.detected.classifier} + io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier} @@ -64,41 +78,4 @@ - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - false - - - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - false - - - - diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml index 7f7d94bdd..067b318fc 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml @@ -16,30 +16,34 @@ - 1.16.1 + 1.55.1 true - - io.grpc - grpc-netty - ${grpc.version} + javax.annotation + javax.annotation-api + 1.3.2 + + + io.grpc + grpc-netty + ${grpc.version} - io.grpc - grpc-protobuf - ${grpc.version} + io.grpc + grpc-protobuf + ${grpc.version} - io.grpc - grpc-services - ${grpc.version} + io.grpc + grpc-services + ${grpc.version} - io.grpc - grpc-stub - ${grpc.version} + io.grpc + grpc-stub + ${grpc.version} org.springframework.cloud @@ -55,44 +59,47 @@ spring-boot-starter-test test + + org.awaitility + awaitility + test + - - - kr.motd.maven - os-maven-plugin - 1.6.1 - + + kr.motd.maven + os-maven-plugin + 1.6.1 + - - org.apache.maven.plugins - maven-checkstyle-plugin - + org.apache.maven.plugins + maven-checkstyle-plugin + - org.xolstice.maven.plugins - protobuf-maven-plugin - 0.6.1 - - - com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier} + org.xolstice.maven.plugins + protobuf-maven-plugin + 0.6.1 + + + com.google.protobuf:protoc:3.23.0:exe:${os.detected.classifier} - grpc-java - - io.grpc:protoc-gen-grpc-java:1.4.0:exe:${os.detected.classifier} + grpc-java + + io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier} - - - - - compile - compile-custom - - - - + + + + + compile + compile-custom + + + + diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index ed49e6f0e..b3a5fd172 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -127,7 +127,7 @@ kotlin-maven-plugin org.jetbrains.kotlin - 1.6.0 + 2.2.0 -Xjsr305=strict @@ -166,7 +166,7 @@ org.jetbrains.kotlin kotlin-maven-allopen - 1.6.0 + 2.2.0 diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index e34e8fbc6..39f55c59c 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -64,7 +64,7 @@ kotlin-maven-plugin org.jetbrains.kotlin - 1.6.0 + 2.2.0 -Xjsr305=strict diff --git a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml index 3f37e76a3..4db3ea4fd 100644 --- a/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml +++ b/spring-cloud-function-samples/function-sample-grpc-cloudevent/pom.xml @@ -86,7 +86,7 @@ 0.6.1 - com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier} + com.google.protobuf:protoc:4.32.0:exe:${os.detected.classifier} grpc-java diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml index eaac47351..b84dd6810 100644 --- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml +++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml @@ -38,17 +38,17 @@ org.springframework.cloud spring-cloud-function-kotlin - 3.2.9-SNAPSHOT + 3.2.13-SNAPSHOT org.springframework.cloud spring-cloud-function-web - 3.2.9-SNAPSHOT + 3.2.13-SNAPSHOT org.springframework.cloud spring-cloud-function-context - 3.2.9-SNAPSHOT + 3.2.13-SNAPSHOT org.springframework.boot