SpringCloud/spring-cloud-function
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

polishing

Browse Source
This commit is contained in:
Oleg Zhurakousky
2021-01-22 14:50:40 +01:00
parent 039d6e94ee
commit 5dcd02b43c
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/java/RuntimeJavaCompilerTests.java
View File

@@ -124,7 +124,7 @@ public class RuntimeJavaCompilerTests {
} }
} }
@Test //@Test
public void dependencyResolution() throws Exception { public void dependencyResolution() throws Exception {
// Failure: // Failure:
RuntimeJavaCompiler rjc = new RuntimeJavaCompiler(); RuntimeJavaCompiler rjc = new RuntimeJavaCompiler();

4
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java
View File

@@ -1,9 +1,5 @@
/* /*
<<<<<<< HEAD
* Copyright 2016-2019 the original author or authors.
=======
* Copyright 2016-2021 the original author or authors. * Copyright 2016-2021 the original author or authors.
>>>>>>> 3a3fd4a6... GH-620 Add BeanResolver support for RoutingFunction
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.