Skip to content

Commit e7ab951

Browse files
patriot1burkepatriot1burke
committed
Upgrade and fix version mismatches
Fix Java version Readd files deleted Remove Jetbrains annotations
1 parent e19d60e commit e7ab951

File tree

9 files changed

+98
-62
lines changed

9 files changed

+98
-62
lines changed

‎bom/application/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
<kotlin.version>2.1.21</kotlin.version>
155155
<kotlin.coroutine.version>1.10.2</kotlin.coroutine.version>
156156
<kotlin-serialization.version>1.8.1</kotlin-serialization.version>
157-
<azure.toolkit-lib.version>0.27.0</azure.toolkit-lib.version>
157+
<azure.toolkit-lib.version>0.53.0</azure.toolkit-lib.version>
158158
<dekorate.version>4.1.5</dekorate.version> <!-- Please check with Java Operator SDK team before updating -->
159159
<maven-invoker.version>3.2.0</maven-invoker.version>
160160
<awaitility.version>4.3.0</awaitility.version>

‎extensions/azure-functions/deployment/pom.xml

Lines changed: 59 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,26 @@
5252
<groupId>com.azure</groupId>
5353
<artifactId>azure-core</artifactId>
5454
</exclusion>
55+
<exclusion>
56+
<groupId>com.azure</groupId>
57+
<artifactId>azure-core</artifactId>
58+
</exclusion>
59+
<exclusion>
60+
<groupId>com.azure.resourcemanager</groupId>
61+
<artifactId>azure-resourcemanager-appservice</artifactId>
62+
</exclusion>
63+
<exclusion>
64+
<groupId>com.azure</groupId>
65+
<artifactId>azure-json</artifactId>
66+
</exclusion>
5567
<exclusion>
5668
<groupId>com.azure</groupId>
5769
<artifactId>azure-core-management</artifactId>
5870
</exclusion>
71+
<exclusion>
72+
<groupId>com.azure</groupId>
73+
<artifactId>azure-core-http-netty</artifactId>
74+
</exclusion>
5975
<exclusion>
6076
<groupId>com.microsoft.azure</groupId>
6177
<artifactId>msal4j</artifactId>
@@ -82,12 +98,23 @@
8298
<dependency>
8399
<groupId>com.azure</groupId>
84100
<artifactId>azure-core</artifactId>
85-
<version>1.33.0</version>
101+
<version>1.55.3</version>
102+
<exclusions>
103+
<exclusion>
104+
<groupId>io.projectreactor</groupId>
105+
<artifactId>reactor-core</artifactId>
106+
</exclusion>
107+
</exclusions>
86108
</dependency>
87109
<dependency>
88110
<groupId>com.azure</groupId>
89-
<artifactId>azure-core-management</artifactId>
90-
<version>1.8.0</version>
111+
<artifactId>azure-json</artifactId>
112+
<version>1.5.0</version>
113+
</dependency>
114+
<dependency>
115+
<groupId>com.azure</groupId>
116+
<artifactId>azure-core-http-netty</artifactId>
117+
<version>1.15.11</version>
91118
<exclusions>
92119
<exclusion>
93120
<groupId>com.azure</groupId>
@@ -96,47 +123,42 @@
96123
</exclusions>
97124
</dependency>
98125
<dependency>
99-
<groupId>com.microsoft.azure</groupId>
100-
<artifactId>msal4j</artifactId>
101-
<version>1.13.3</version>
126+
<groupId>com.azure.resourcemanager</groupId>
127+
<artifactId>azure-resourcemanager-appservice</artifactId>
128+
<version>2.45.0</version>
102129
<exclusions>
103130
<exclusion>
104-
<groupId>net.minidev</groupId>
105-
<artifactId>json-smart</artifactId>
131+
<groupId>com.azure</groupId>
132+
<artifactId>azure-json</artifactId>
106133
</exclusion>
107134
<exclusion>
108-
<groupId>javax.activation</groupId>
109-
<artifactId>activation</artifactId>
135+
<groupId>com.azure</groupId>
136+
<artifactId>azure-core</artifactId>
110137
</exclusion>
111138
</exclusions>
112139
</dependency>
113-
<dependency>
114-
<groupId>net.minidev</groupId>
115-
<artifactId>json-smart</artifactId>
116-
<version>2.4.8</version>
117-
</dependency>
118-
</dependencies>
140+
</dependencies>
119141

120-
<build>
121-
<plugins>
122-
<plugin>
123-
<artifactId>maven-compiler-plugin</artifactId>
124-
<executions>
125-
<execution>
126-
<id>default-compile</id>
127-
<configuration>
128-
<annotationProcessorPaths>
129-
<path>
130-
<groupId>io.quarkus</groupId>
131-
<artifactId>quarkus-extension-processor</artifactId>
132-
<version>${project.version}</version>
133-
</path>
134-
</annotationProcessorPaths>
135-
</configuration>
136-
</execution>
137-
</executions>
138-
</plugin>
142+
<build>
143+
<plugins>
144+
<plugin>
145+
<artifactId>maven-compiler-plugin</artifactId>
146+
<executions>
147+
<execution>
148+
<id>default-compile</id>
149+
<configuration>
150+
<annotationProcessorPaths>
151+
<path>
152+
<groupId>io.quarkus</groupId>
153+
<artifactId>quarkus-extension-processor</artifactId>
154+
<version>${project.version}</version>
155+
</path>
156+
</annotationProcessorPaths>
157+
</configuration>
158+
</execution>
159+
</executions>
160+
</plugin>
139161

140-
</plugins>
141-
</build>
162+
</plugins>
163+
</build>
142164
</project>

‎extensions/azure-functions/deployment/src/main/java/io/quarkus/azure/functions/deployment/AzureFunctionsConfig.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,8 @@
1414
import com.microsoft.azure.toolkit.lib.Azure;
1515
import com.microsoft.azure.toolkit.lib.appservice.AzureAppService;
1616
import com.microsoft.azure.toolkit.lib.appservice.config.FunctionAppConfig;
17-
import com.microsoft.azure.toolkit.lib.appservice.model.JavaVersion;
1817
import com.microsoft.azure.toolkit.lib.appservice.model.OperatingSystem;
1918
import com.microsoft.azure.toolkit.lib.appservice.model.PricingTier;
20-
import com.microsoft.azure.toolkit.lib.appservice.model.WebContainer;
2119
import com.microsoft.azure.toolkit.lib.appservice.plan.AppServicePlan;
2220
import com.microsoft.azure.toolkit.lib.auth.AuthConfiguration;
2321
import com.microsoft.azure.toolkit.lib.auth.AuthType;
@@ -127,9 +125,9 @@ interface RuntimeConfig {
127125
String os();
128126

129127
/**
130-
* Valid values are 8, 11, and 17
128+
* Should be set to at least the minimum Quarkus compatible version
131129
*/
132-
@WithDefault("11")
130+
@WithDefault("17")
133131
String javaVersion();
134132

135133
/**
@@ -188,10 +186,9 @@ private com.microsoft.azure.toolkit.lib.appservice.config.RuntimeConfig getRunti
188186
.orElseGet(
189187
() -> Optional.ofNullable(getServicePlan(subscriptionId)).map(AppServicePlan::getOperatingSystem)
190188
.orElse(null));
191-
final JavaVersion javaVersion = Optional.ofNullable(runtime.javaVersion()).map(JavaVersion::fromString).orElse(null);
192189
final com.microsoft.azure.toolkit.lib.appservice.config.RuntimeConfig result = new com.microsoft.azure.toolkit.lib.appservice.config.RuntimeConfig()
193190
.os(os)
194-
.javaVersion(javaVersion).webContainer(WebContainer.JAVA_OFF)
191+
.javaVersion(runtime.javaVersion())
195192
.image(runtime.image().orElse(null)).registryUrl(runtime.registryUrl().orElse(null));
196193
return result;
197194
}

‎extensions/azure-functions/deployment/src/main/java/io/quarkus/azure/functions/deployment/AzureFunctionsDeployCommand.java

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import org.apache.commons.collections4.CollectionUtils;
1919
import org.apache.commons.lang3.StringUtils;
2020
import org.jboss.logging.Logger;
21-
import org.jetbrains.annotations.NotNull;
2221

2322
import com.azure.core.http.policy.HttpLogDetailLevel;
2423
import com.azure.core.management.AzureEnvironment;
@@ -30,20 +29,17 @@
3029
import com.microsoft.azure.toolkit.lib.appservice.function.AzureFunctions;
3130
import com.microsoft.azure.toolkit.lib.appservice.function.FunctionApp;
3231
import com.microsoft.azure.toolkit.lib.appservice.function.FunctionAppBase;
33-
import com.microsoft.azure.toolkit.lib.appservice.model.JavaVersion;
3432
import com.microsoft.azure.toolkit.lib.appservice.model.OperatingSystem;
3533
import com.microsoft.azure.toolkit.lib.appservice.model.PricingTier;
3634
import com.microsoft.azure.toolkit.lib.appservice.task.CreateOrUpdateFunctionAppTask;
3735
import com.microsoft.azure.toolkit.lib.appservice.task.DeployFunctionAppTask;
38-
import com.microsoft.azure.toolkit.lib.appservice.utils.AppServiceConfigUtils;
3936
import com.microsoft.azure.toolkit.lib.auth.Account;
4037
import com.microsoft.azure.toolkit.lib.auth.AuthConfiguration;
4138
import com.microsoft.azure.toolkit.lib.auth.AuthType;
4239
import com.microsoft.azure.toolkit.lib.auth.AzureAccount;
4340
import com.microsoft.azure.toolkit.lib.auth.AzureCloud;
4441
import com.microsoft.azure.toolkit.lib.auth.AzureEnvironmentUtils;
4542
import com.microsoft.azure.toolkit.lib.common.bundle.AzureString;
46-
import com.microsoft.azure.toolkit.lib.common.logging.Log;
4743
import com.microsoft.azure.toolkit.lib.common.messager.AzureMessager;
4844
import com.microsoft.azure.toolkit.lib.common.messager.IAzureMessage;
4945
import com.microsoft.azure.toolkit.lib.common.messager.IAzureMessager;
@@ -52,7 +48,6 @@
5248
import com.microsoft.azure.toolkit.lib.common.operation.Operation;
5349
import com.microsoft.azure.toolkit.lib.common.operation.OperationBase;
5450
import com.microsoft.azure.toolkit.lib.common.operation.OperationThreadContext;
55-
import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
5651
import com.microsoft.azure.toolkit.lib.common.utils.TextUtils;
5752

5853
import io.quarkus.builder.BuildException;
@@ -62,6 +57,7 @@
6257
import io.quarkus.deployment.cmd.DeployCommandDeclarationBuildItem;
6358
import io.quarkus.deployment.cmd.DeployConfig;
6459
import io.quarkus.deployment.pkg.builditem.OutputTargetBuildItem;
60+
import io.quarkus.logging.Log;
6561

6662
public class AzureFunctionsDeployCommand {
6763
private static final Logger log = Logger.getLogger(AzureFunctionsDeployCommand.class);
@@ -110,8 +106,6 @@ public void deploy(DeployConfig deployConfig, AzureFunctionsConfig config,
110106
setCurrentOperation();
111107
AzureMessager.setDefaultMessager(new QuarkusAzureMessager());
112108
Azure.az().config().setLogLevel(HttpLogDetailLevel.NONE.name());
113-
QuarkusActionManager.register();
114-
AzureTaskManager.register(new QuarkusAzureTaskManager());
115109
initAzureAppServiceClient(config);
116110

117111
final FunctionAppBase<?, ?, ?> target = createOrUpdateResource(
@@ -131,7 +125,11 @@ private void setCurrentOperation() {
131125
Method push = OperationThreadContext.class.getDeclaredMethod("pushOperation", Operation.class);
132126
push.setAccessible(true);
133127
OperationBase dummy = new OperationBase() {
134-
@NotNull
128+
@Override
129+
public Object getSource() {
130+
return null;
131+
}
132+
135133
@Override
136134
public String getId() {
137135
return "Quarkus";
@@ -142,13 +140,11 @@ public Callable<?> getBody() {
142140
throw new RuntimeException("Not Implmented");
143141
}
144142

145-
@NotNull
146143
@Override
147144
public String getType() {
148145
return "Quarkus";
149146
}
150147

151-
@org.jetbrains.annotations.Nullable
152148
@Override
153149
public AzureString getDescription() {
154150
return AzureString.fromString("Quarkus");
@@ -206,8 +202,7 @@ protected void validateParameters(AzureFunctionsConfig config, String appName) t
206202
throw new BuildException(INVALID_OS);
207203
}
208204
// java version
209-
if (StringUtils.isNotEmpty(config.runtime().javaVersion())
210-
&& JavaVersion.fromString(config.runtime().javaVersion()).isExpandedValue()) {
205+
if (StringUtils.isNotEmpty(config.runtime().javaVersion())) {
211206
log.warn(format(EXPANDABLE_JAVA_VERSION_WARNING, config.runtime().javaVersion()));
212207
}
213208
// pricing tier
@@ -349,7 +344,7 @@ protected void printCurrentSubscription(AzureAppService appServiceClient) {
349344
}
350345

351346
private AppServiceConfig buildDefaultConfig(String subscriptionId, String resourceGroup, String appName) {
352-
return AppServiceConfigUtils.buildDefaultFunctionConfig(subscriptionId, resourceGroup, appName, JavaVersion.JAVA_11);
347+
return AppServiceConfig.buildDefaultFunctionConfig(resourceGroup, appName);
353348
}
354349

355350
private void deployArtifact(Path functionStagingDir, final FunctionAppBase<?, ?, ?> target) {

‎extensions/azure-functions/deployment/src/main/java/io/quarkus/azure/functions/deployment/QuarkusActionManager.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@
66

77
public class QuarkusActionManager extends AzureActionManager {
88

9-
public static void register() {
10-
final QuarkusActionManager am = new QuarkusActionManager();
11-
register(am);
12-
}
13-
149
@Override
1510
public <D> void registerAction(Action<D> action) {
1611
}

‎extensions/azure-functions/deployment/src/main/java/io/quarkus/azure/functions/deployment/QuarkusAzureActionManagerProvider.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package io.quarkus.azure.functions.deployment;
2+
3+
import com.microsoft.azure.toolkit.lib.common.action.AzureActionManager;
4+
import com.microsoft.azure.toolkit.lib.common.action.AzureActionManagerProvider;
5+
6+
public class QuarkusAzureActionManagerProvider implements AzureActionManagerProvider {
7+
@Override
8+
public AzureActionManager getActionManager() {
9+
return new QuarkusActionManager();
10+
}
11+
}

‎extensions/azure-functions/deployment/src/main/java/io/quarkus/azure/functions/deployment/QuarkusAzureTaskManagerProvider.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package io.quarkus.azure.functions.deployment;
2+
3+
import org.jetbrains.annotations.NotNull;
4+
5+
import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
6+
import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManagerProvider;
7+
8+
public class QuarkusAzureTaskManagerProvider implements AzureTaskManagerProvider {
9+
@NotNull
10+
@Override
11+
public AzureTaskManager getTaskManager() {
12+
return new QuarkusAzureTaskManager();
13+
}
14+
}

‎extensions/azure-functions/deployment/src/main/resources/META-INF/services/com.microsoft.azure.toolkit.lib.common.action.AzureActionManagerProvider

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
io.quarkus.azure.functions.deployment.QuarkusAzureActionManagerProvider

‎extensions/azure-functions/deployment/src/main/resources/META-INF/services/com.microsoft.azure.toolkit.lib.common.task.AzureTaskManagerProvider

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
io.quarkus.azure.functions.deployment.QuarkusAzureTaskManagerProvider

0 commit comments

Comments
 (0)