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

GH-1002 Cleane up non-jackarta dependencies

Browse Source 
Resolves #1002
This commit is contained in:
Oleg Zhurakousky
2023-02-24 11:13:20 +01:00
parent ba1094df63
commit 21dbe4cd1f
4 changed files with 57 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml
View File

@@ -1,45 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0" 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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-function-grpc</artifactId> <artifactId>spring-cloud-function-grpc</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>spring-cloud-function-grpc</name> <name>spring-cloud-function-grpc</name>
<description>Spring Cloud Function gRPC Support</description> <description>Spring Cloud Function gRPC Support</description>
<parent> <parent>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-adapter-parent</artifactId> <artifactId>spring-cloud-function-adapter-parent</artifactId>
<version>4.0.2-SNAPSHOT</version> <version>4.0.2-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>
<grpc.version>1.16.1</grpc.version> <grpc.version>1.16.1</grpc.version>
<disable.checks>true</disable.checks> <disable.checks>true</disable.checks>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>io.grpc</groupId> <groupId>javax.annotation</groupId>
<artifactId>grpc-netty</artifactId> <artifactId>javax.annotation-api</artifactId>
<version>${grpc.version}</version> <version>1.3.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.grpc</groupId> <groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId> <artifactId>grpc-netty</artifactId>
<version>${grpc.version}</version> <version>${grpc.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.grpc</groupId> <groupId>io.grpc</groupId>
<artifactId>grpc-services</artifactId> <artifactId>grpc-protobuf</artifactId>
<version>${grpc.version}</version> <version>${grpc.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.grpc</groupId> <groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId> <artifactId>grpc-services</artifactId>
<version>${grpc.version}</version> <version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>${grpc.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
@@ -61,44 +62,41 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<extensions> <extensions>
<extension> <extension>
<groupId>kr.motd.maven</groupId> <groupId>kr.motd.maven</groupId>
<artifactId>os-maven-plugin</artifactId> <artifactId>os-maven-plugin</artifactId>
<version>1.6.1</version> <version>1.6.1</version>
</extension> </extension>
</extensions> </extensions>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId> <artifactId>maven-checkstyle-plugin</artifactId>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.xolstice.maven.plugins</groupId> <groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId> <artifactId>protobuf-maven-plugin</artifactId>
<version>0.6.1</version> <version>0.6.1</version>
<configuration> <configuration>
<protocArtifact> <protocArtifact>
com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier} com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier}
</protocArtifact> </protocArtifact>
<pluginId>grpc-java</pluginId> <pluginId>grpc-java</pluginId>
<pluginArtifact> <pluginArtifact>
io.grpc:protoc-gen-grpc-java:1.4.0:exe:${os.detected.classifier} io.grpc:protoc-gen-grpc-java:1.4.0:exe:${os.detected.classifier}
</pluginArtifact> </pluginArtifact>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<goals> <goals>
<goal>compile</goal> <goal>compile</goal>
<goal>compile-custom</goal> <goal>compile-custom</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

20
spring-cloud-function-context/pom.xml
View File

@@ -47,16 +47,16 @@
<artifactId>jackson-module-kotlin</artifactId> <artifactId>jackson-module-kotlin</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <!-- <dependency> -->
<groupId>javax.annotation</groupId> <!-- <groupId>javax.annotation</groupId>-->
<artifactId>javax.annotation-api</artifactId> <!-- <artifactId>javax.annotation-api</artifactId>-->
<version>1.3.2</version> <!-- <version>1.3.2</version>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>javax.activation</groupId> <!-- <groupId>javax.activation</groupId>-->
<artifactId>javax.activation-api</artifactId> <!-- <artifactId>javax.activation-api</artifactId>-->
<version>1.2.0</version> <!-- <version>1.2.0</version>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId> <artifactId>spring-boot-configuration-processor</artifactId>

11
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionCatalog.java
View File

@@ -21,8 +21,6 @@ import java.util.function.Consumer;
import java.util.function.Function; import java.util.function.Function;
import java.util.function.Supplier; import java.util.function.Supplier;
import javax.activation.MimeType;
/** /**
* @author Dave Syer * @author Dave Syer
@@ -33,7 +31,6 @@ public interface FunctionCatalog {
/** /**
* Will look up the instance of the functional interface by name only. * Will look up the instance of the functional interface by name only.
* *
* @param <T> instance type
* @param functionDefinition the definition of the functional interface. Must * @param functionDefinition the definition of the functional interface. Must
* not be null; * not be null;
* @return instance of the functional interface registered with this catalog * @return instance of the functional interface registered with this catalog
@@ -87,13 +84,7 @@ public interface FunctionCatalog {
return this.lookup(null, functionDefinition, expectedOutputMimeTypes); return this.lookup(null, functionDefinition, expectedOutputMimeTypes);
} }
<T> T lookup(Class<?> type, String functionDefinition, String... expectedOutputMimeTypes); //{ <T> T lookup(Class<?> type, String functionDefinition, String... expectedOutputMimeTypes);
// throw new UnsupportedOperationException("This instance of FunctionCatalog does not support this operation");
// }
Set<String> getNames(Class<?> type); Set<String> getNames(Class<?> type);

3
spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionDeployerProperties.java
View File

@@ -16,12 +16,13 @@
package org.springframework.cloud.function.deployer; package org.springframework.cloud.function.deployer;
import javax.annotation.PostConstruct; import jakarta.annotation.PostConstruct;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.cloud.function.context.FunctionProperties; import org.springframework.cloud.function.context.FunctionProperties;
import org.springframework.util.Assert; import org.springframework.util.Assert;
/** /**
* Configuration properties for deciding how to locate the functional class to execute. * Configuration properties for deciding how to locate the functional class to execute.
* *