- * This file will be replaced by the real implementation from grpc-java - * as part of the re-packaging process. - */ -public class LoadBalancerProvider { -} diff --git a/grpc/io.grpc/src/main/java/io/grpc/ManagedChannelProvider.java b/grpc/io.grpc/src/main/java/io/grpc/ManagedChannelProvider.java deleted file mode 100644 index 7f23e886eff..00000000000 --- a/grpc/io.grpc/src/main/java/io/grpc/ManagedChannelProvider.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2019, 2021 Oracle and/or its affiliates. - * - * 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 - * - * http://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 io.grpc; - -/** - * A dummy class to allow the re-packaging of grpc-java - * with a module-info.java file to work. - *
- * This file will be replaced by the real implementation from grpc-java - * as part of the re-packaging process. - */ -public class ManagedChannelProvider { -} diff --git a/grpc/io.grpc/src/main/java/io/grpc/NameResolverProvider.java b/grpc/io.grpc/src/main/java/io/grpc/NameResolverProvider.java deleted file mode 100644 index b93bf8f9baa..00000000000 --- a/grpc/io.grpc/src/main/java/io/grpc/NameResolverProvider.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2019, 2021 Oracle and/or its affiliates. - * - * 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 - * - * http://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 io.grpc; - -/** - * A dummy class to allow the re-packaging of grpc-java - * with a module-info.java file to work. - *
- * This file will be replaced by the real implementation from grpc-java - * as part of the re-packaging process. - */ -public interface NameResolverProvider { -} diff --git a/grpc/io.grpc/src/main/java/io/grpc/ServerProvider.java b/grpc/io.grpc/src/main/java/io/grpc/ServerProvider.java deleted file mode 100644 index dbb27ea4f5d..00000000000 --- a/grpc/io.grpc/src/main/java/io/grpc/ServerProvider.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2019, 2021 Oracle and/or its affiliates. - * - * 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 - * - * http://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 io.grpc; - -/** - * A dummy class to allow the re-packaging of grpc-java - * with a module-info.java file to work. - *
- * This file will be replaced by the real implementation from grpc-java - * as part of the re-packaging process. - */ -public class ServerProvider { -} diff --git a/grpc/io.grpc/src/main/java/io/grpc/inprocess/DummyClass.java b/grpc/io.grpc/src/main/java/io/grpc/inprocess/DummyClass.java deleted file mode 100644 index 5d5501234ad..00000000000 --- a/grpc/io.grpc/src/main/java/io/grpc/inprocess/DummyClass.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2019, 2021 Oracle and/or its affiliates. - * - * 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 - * - * http://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 io.grpc.inprocess; - -/** - * A dummy class to allow the re-packaging of grpc-java - * with a module-info.java file to work. - *
- * This file will be replaced by the real implementation from grpc-java - * as part of the re-packaging process. - */ -public class DummyClass { -} diff --git a/grpc/io.grpc/src/main/java/io/grpc/inprocess/package-info.java b/grpc/io.grpc/src/main/java/io/grpc/inprocess/package-info.java deleted file mode 100644 index 535afbc90bf..00000000000 --- a/grpc/io.grpc/src/main/java/io/grpc/inprocess/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2019, 2021 Oracle and/or its affiliates. - * - * 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 - * - * http://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. - */ - -/** - * A dummy package to allow re-packaging of grpc-java to work. - */ -package io.grpc.inprocess; diff --git a/grpc/io.grpc/src/main/java/io/grpc/internal/BinaryLogProvider.java b/grpc/io.grpc/src/main/java/io/grpc/internal/BinaryLogProvider.java deleted file mode 100644 index 7ebdad47727..00000000000 --- a/grpc/io.grpc/src/main/java/io/grpc/internal/BinaryLogProvider.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2019, 2021 Oracle and/or its affiliates. - * - * 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 - * - * http://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 io.grpc.internal; - -import java.io.Closeable; -import java.io.IOException; - -/** - * A dummy class to allow the re-packaging of grpc-java - * with a module-info.java file to work. - *
- * This file will be replaced by the real implementation from grpc-java - * as part of the re-packaging process. - */ -public class BinaryLogProvider - implements Closeable { - @Override - public void close() throws IOException { - } -} diff --git a/grpc/io.grpc/src/main/java/io/grpc/internal/DnsNameResolverProvider.java b/grpc/io.grpc/src/main/java/io/grpc/internal/DnsNameResolverProvider.java deleted file mode 100644 index d37527a9e7f..00000000000 --- a/grpc/io.grpc/src/main/java/io/grpc/internal/DnsNameResolverProvider.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2019, 2021 Oracle and/or its affiliates. - * - * 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 - * - * http://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 io.grpc.internal; - -import io.grpc.NameResolverProvider; - -/** - * A dummy class to allow the re-packaging of grpc-java - * with a module-info.java file to work. - *
- * This file will be replaced by the real implementation from grpc-java - * as part of the re-packaging process. - */ -public class DnsNameResolverProvider - implements NameResolverProvider { -} diff --git a/grpc/io.grpc/src/main/java/io/grpc/internal/PickFirstLoadBalancerProvider.java b/grpc/io.grpc/src/main/java/io/grpc/internal/PickFirstLoadBalancerProvider.java deleted file mode 100644 index edd052a22bb..00000000000 --- a/grpc/io.grpc/src/main/java/io/grpc/internal/PickFirstLoadBalancerProvider.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (c) 2019, 2021 Oracle and/or its affiliates. - * - * 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 - * - * http://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 io.grpc.internal; - -/** - * A dummy class to allow the re-packaging of grpc-java - * with a module-info.java file to work. - *
- * This file will be replaced by the real implementation from grpc-java - * as part of the re-packaging process. - */ -public class PickFirstLoadBalancerProvider - extends io.grpc.LoadBalancerProvider { -} diff --git a/grpc/io.grpc/src/main/java/io/grpc/internal/package-info.java b/grpc/io.grpc/src/main/java/io/grpc/internal/package-info.java deleted file mode 100644 index 9e268067413..00000000000 --- a/grpc/io.grpc/src/main/java/io/grpc/internal/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2019, 2021 Oracle and/or its affiliates. - * - * 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 - * - * http://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. - */ - -/** - * A dummy package to allow re-packaging of grpc-java to work. - */ -package io.grpc.internal; diff --git a/grpc/io.grpc/src/main/java/io/grpc/package-info.java b/grpc/io.grpc/src/main/java/io/grpc/package-info.java deleted file mode 100644 index 84ed9735821..00000000000 --- a/grpc/io.grpc/src/main/java/io/grpc/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2019, 2021 Oracle and/or its affiliates. - * - * 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 - * - * http://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. - */ - -/** - * A dummy package to allow re-packaging of grpc-java to work. - */ -package io.grpc; diff --git a/grpc/io.grpc/src/main/java/io/grpc/stub/DummyClass.java b/grpc/io.grpc/src/main/java/io/grpc/stub/DummyClass.java deleted file mode 100644 index ba1647add91..00000000000 --- a/grpc/io.grpc/src/main/java/io/grpc/stub/DummyClass.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2019, 2021 Oracle and/or its affiliates. - * - * 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 - * - * http://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 io.grpc.stub; - -/** - * A dummy class to allow the re-packaging of grpc-java - * with a module-info.java file to work. - *
- * This file will be replaced by the real implementation from grpc-java - * as part of the re-packaging process. - */ -public class DummyClass { -} diff --git a/grpc/io.grpc/src/main/java/io/grpc/stub/annotations/DummyClass.java b/grpc/io.grpc/src/main/java/io/grpc/stub/annotations/DummyClass.java deleted file mode 100644 index 53405cbddfc..00000000000 --- a/grpc/io.grpc/src/main/java/io/grpc/stub/annotations/DummyClass.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) 2019, 2021 Oracle and/or its affiliates. - * - * 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 - * - * http://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 io.grpc.stub.annotations; - -/** - * A dummy class to allow repackaging of grpc-java to work. - */ -public class DummyClass { -} diff --git a/grpc/io.grpc/src/main/java/io/grpc/stub/annotations/package-info.java b/grpc/io.grpc/src/main/java/io/grpc/stub/annotations/package-info.java deleted file mode 100644 index f8996e2d03c..00000000000 --- a/grpc/io.grpc/src/main/java/io/grpc/stub/annotations/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2019, 2021 Oracle and/or its affiliates. - * - * 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 - * - * http://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. - */ - -/** - * A dummy package to allow re-packaging of grpc-java to work. - */ -package io.grpc.stub.annotations; diff --git a/grpc/io.grpc/src/main/java/io/grpc/stub/package-info.java b/grpc/io.grpc/src/main/java/io/grpc/stub/package-info.java deleted file mode 100644 index 70ff18cda92..00000000000 --- a/grpc/io.grpc/src/main/java/io/grpc/stub/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2019, 2021 Oracle and/or its affiliates. - * - * 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 - * - * http://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. - */ - -/** - * A dummy package to allow re-packaging of grpc-java to work. - */ -package io.grpc.stub; diff --git a/grpc/io.grpc/src/main/java/io/grpc/util/DummyClass.java b/grpc/io.grpc/src/main/java/io/grpc/util/DummyClass.java deleted file mode 100644 index d8564954c9e..00000000000 --- a/grpc/io.grpc/src/main/java/io/grpc/util/DummyClass.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2019, 2021 Oracle and/or its affiliates. - * - * 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 - * - * http://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 io.grpc.util; - -/** - * A dummy class to allow the re-packaging of grpc-java - * with a module-info.java file to work. - *
- * This file will be replaced by the real implementation from grpc-java - * as part of the re-packaging process. - */ -public class DummyClass { -} diff --git a/grpc/io.grpc/src/main/java/io/grpc/util/OutlierDetectionLoadBalancerProvider.java b/grpc/io.grpc/src/main/java/io/grpc/util/OutlierDetectionLoadBalancerProvider.java deleted file mode 100644 index 77a9713ba20..00000000000 --- a/grpc/io.grpc/src/main/java/io/grpc/util/OutlierDetectionLoadBalancerProvider.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2023 Oracle and/or its affiliates. - * - * 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 - * - * http://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 io.grpc.util; - -import io.grpc.LoadBalancerProvider; - -/** - * A dummy class to allow the re-packaging of grpc-java - * with a module-info.java file to work. - *
- * This file will be replaced by the real implementation from grpc-java - * as part of the re-packaging process. - */ -public class OutlierDetectionLoadBalancerProvider - extends LoadBalancerProvider { -} diff --git a/grpc/io.grpc/src/main/java/io/grpc/util/SecretRoundRobinLoadBalancerProvider.java b/grpc/io.grpc/src/main/java/io/grpc/util/SecretRoundRobinLoadBalancerProvider.java deleted file mode 100644 index de2aaecb168..00000000000 --- a/grpc/io.grpc/src/main/java/io/grpc/util/SecretRoundRobinLoadBalancerProvider.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2022 Oracle and/or its affiliates. - * - * 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 - * - * http://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 io.grpc.util; - -import io.grpc.LoadBalancerProvider; - -/** - * A dummy class to allow the re-packaging of grpc-java - * with a module-info.java file to work. - *
- * This file will be replaced by the real implementation from grpc-java - * as part of the re-packaging process. - */ -public class SecretRoundRobinLoadBalancerProvider { - /** - * A dummy {@link LoadBalancerProvider} implementation to allow - * the provides statement to be added to the module-info file. - */ - public static class Provider - extends LoadBalancerProvider { - } -} diff --git a/grpc/io.grpc/src/main/java/io/grpc/util/package-info.java b/grpc/io.grpc/src/main/java/io/grpc/util/package-info.java deleted file mode 100644 index 84d2bcccee3..00000000000 --- a/grpc/io.grpc/src/main/java/io/grpc/util/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2019, 2021 Oracle and/or its affiliates. - * - * 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 - * - * http://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. - */ - -/** - * A dummy package to allow re-packaging of grpc-java to work. - */ -package io.grpc.util; diff --git a/grpc/io.grpc/src/main/java/module-info.java b/grpc/io.grpc/src/main/java/module-info.java deleted file mode 100644 index 42a64e8949a..00000000000 --- a/grpc/io.grpc/src/main/java/module-info.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) 2019, 2023 Oracle and/or its affiliates. - * - * 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 - * - * http://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. - */ - -/** - * Module info for re-packaged gRPC Java module. - */ -module io.grpc { - exports io.grpc; - exports io.grpc.inprocess; - exports io.grpc.internal; - exports io.grpc.util; - - requires com.google.common; - requires com.google.gson; - requires java.logging; - requires java.naming; - requires io.perfmark; - - uses io.grpc.ManagedChannelProvider; - uses io.grpc.NameResolverProvider; - uses io.grpc.ServerProvider; - uses io.grpc.internal.BinaryLogProvider; - uses io.grpc.LoadBalancerProvider; - - provides io.grpc.LoadBalancerProvider - with io.grpc.internal.PickFirstLoadBalancerProvider, - io.grpc.util.SecretRoundRobinLoadBalancerProvider.Provider, - io.grpc.util.OutlierDetectionLoadBalancerProvider; - - provides io.grpc.NameResolverProvider - with io.grpc.internal.DnsNameResolverProvider; -} diff --git a/grpc/server/src/main/java/module-info.java b/grpc/server/src/main/java/module-info.java index c92ae5c618c..4e180ae8803 100644 --- a/grpc/server/src/main/java/module-info.java +++ b/grpc/server/src/main/java/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2022 Oracle and/or its affiliates. + * Copyright (c) 2019, 2023 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,6 +29,7 @@ requires io.helidon.tracing; requires transitive grpc.services; + requires transitive grpc.core; requires transitive microprofile.health.api; requires jakarta.annotation; diff --git a/microprofile/grpc/client/src/main/java/module-info.java b/microprofile/grpc/client/src/main/java/module-info.java index 842e70ca109..5a09aba5eeb 100644 --- a/microprofile/grpc/client/src/main/java/module-info.java +++ b/microprofile/grpc/client/src/main/java/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2022 Oracle and/or its affiliates. + * Copyright (c) 2019, 2023 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,6 +23,7 @@ requires jakarta.cdi; requires jakarta.inject; + requires transitive grpc.core; requires transitive io.helidon.microprofile.grpc.core; exports io.helidon.microprofile.grpc.client; @@ -32,4 +33,4 @@ // needed when running with modules - to make private methods accessible opens io.helidon.microprofile.grpc.client to weld.core.impl, io.helidon.microprofile.cdi; -} \ No newline at end of file +} diff --git a/microprofile/grpc/server/src/main/java/module-info.java b/microprofile/grpc/server/src/main/java/module-info.java index e1c48e2fee9..cdc29dd2b16 100644 --- a/microprofile/grpc/server/src/main/java/module-info.java +++ b/microprofile/grpc/server/src/main/java/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2022 Oracle and/or its affiliates. + * Copyright (c) 2019, 2023 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,7 +27,6 @@ requires io.helidon.microprofile.server; requires io.helidon.config.mp; - requires transitive io.grpc; requires grpc.protobuf.lite; requires com.google.protobuf; diff --git a/security/integration/grpc/src/main/java/module-info.java b/security/integration/grpc/src/main/java/module-info.java index ab34c775096..41547489d2b 100644 --- a/security/integration/grpc/src/main/java/module-info.java +++ b/security/integration/grpc/src/main/java/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2022 Oracle and/or its affiliates. + * Copyright (c) 2019, 2023 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,5 +29,4 @@ requires io.helidon.tracing; requires java.logging; requires io.helidon.webserver; - requires io.grpc; }