[Builder] Build failed in Jenkins: iam-cloud » asgardeo-api-throttler-hotfix #22

cbuilder at wso2.org cbuilder at wso2.org
Mon Jul 11 23:52:57 PDT 2022 

See <https://wso2.org/jenkins/job/iam-cloud/job/asgardeo-api-throttler-hotfix/22/display/redirect>

Changes:


------------------------------------------
[...truncated 1.75 MB...]
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.core/src/gen/java/com/wso2/identity/asgardeo/subscriptions/service/rpc/subscriptions/DeleteSubscriptionRequest.java
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.core/src/gen/java/com/wso2/identity/asgardeo/limiter/resource/core/rpc/resourcemetadata/ResourceMetadataServiceGrpc.java
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.core/src/gen/java/com/wso2/identity/asgardeo/limiter/resource/core/rpc/resourcemetadata/ResourceMetadataRequest.java
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.core/src/gen/java/com/wso2/identity/asgardeo/limiter/resource/core/rpc/resourcemetadata/ResourceMetadataCount.java
Auto-merging components/tier-request-throttler/com.wso2.identity.asgardeo.throttler.request.valve.mau/src/gen/java/com/wso2/identity/asgardeo/throttler/request/valve/mau/rpc/MAUOverUsageTenantsRequest.java
Auto-merging components/tier-request-throttler/com.wso2.identity.asgardeo.throttler.request.service/src/gen/java/com/wso2/identity/asgardeo/throttler/request/service/rpc/MAUOverUsageTenantsRequest.java
Auto-merging components/tier-request-throttler/com.wso2.identity.asgardeo.throttler.request.core/src/test/resources/application.properties
Auto-merging components/tier-controller-server/com.wso2.identity.asgardeo.tier.controller.server/src/main/resources/tiers.json
Auto-merging components/tier-controller-server/com.wso2.identity.asgardeo.tier.controller.server/src/main/java/com/wso2/identity/asgardeo/tier/controller/server/utils/ConfigBuilder.java
Auto-merging components/tier-controller-server/com.wso2.identity.asgardeo.tier.controller.server/src/main/java/com/wso2/identity/asgardeo/tier/controller/server/models/ServerConfig.java
Auto-merging components/tier-controller-server/com.wso2.identity.asgardeo.tier.controller.server/src/main/java/com/wso2/identity/asgardeo/tier/controller/server/TierControllingServer.java
Auto-merging components/tier-controller-server/com.wso2.identity.asgardeo.tier.controller.server/dockerfiles/ubuntu/tiers.json
Auto-merging components/tier-controller-server/com.wso2.identity.asgardeo.tier.controller.server/dockerfiles/ubuntu/application.properties
Auto-merging components/tier-controller-server/com.wso2.identity.asgardeo.tier.controller.server/dockerfiles/ubuntu/Dockerfile
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/test/resources/tiers.json
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/test/resources/testng.xml
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/test/resources/application.properties
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/test/java/com/wso2/identity/asgardeo/tier/controller/core/util/TestUtils.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/test/java/com/wso2/identity/asgardeo/tier/controller/core/ThrottleManagerImplTest.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/resources/proto/ResourceMetadataService.proto
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/resources/log4j2.properties
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/util/TierDataHolder.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/util/TierBuilder.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/util/JdbcUtils.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/util/CoreUtils.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/util/ConfigUtil.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/models/TierDTO.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/models/Tier.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/models/ThrottlerConfig.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/models/ThrottleDecision.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/models/Rule.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/models/RpcConnectionConfig.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/models/ResourceMetadata.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/models/JdbcConfig.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/models/EvalRule.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/limiters/impl/UserStoreCreationLimiter.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/limiters/impl/TenantCreationLimiter.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/limiters/impl/IdpCreationLimiter.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/limiters/impl/GuestUserCreationLimiter.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/limiters/impl/ConsumerUserCreationLimiter.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/limiters/impl/ApplicationCreationLimiter.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/limiters/ResourceCreationLimiter.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/limiters/AbstractResourceCreationLimiter.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/exception/ThrottlerCoreException.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/datasource/RPCConnection.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/datasource/JDBCDataSourceConfiguration.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/dao/impl/RpcBasedResourceMetadataDAO.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/dao/impl/DefaultRulesDAOImpl.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/dao/impl/DatabaseBasedResourceMetadataDAO.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/dao/RulesDAO.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/dao/ResourceMetadataDAO.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/constants/SQLConstants.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/constants/Constants.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/ThrottlerCoreDataHolder.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/ThrottleManagerImpl.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/ThrottleManager.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/gen/java/com/wso2/identity/asgardeo/tier/controller/core/rpc/resourcemetadata/ResourceMetadataRequest.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/pom.xml
CONFLICT (content): Merge conflict in components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/pom.xml
Removing components/com.wso2.identity.asgardeo.api.throttler.service/src/main/resources/log4j2.properties
Removing components/com.wso2.identity.asgardeo.api.throttler.service/src/main/java/com/wso2/identity/asgardeo/api/throttler/service/interceptor/RequestInterceptor.java
Removing components/com.wso2.identity.asgardeo.api.throttler.service/src/main/java/com/wso2/identity/asgardeo/api/throttler/service/ApiThrottlerServiceImpl.java
Removing components/com.wso2.identity.asgardeo.api.throttler.service/src/gen/java/com/wso2/identity/asgardeo/api/throttler/service/rpc/apithrottler/LimitRulesRequestOrBuilder.java
Removing components/com.wso2.identity.asgardeo.api.throttler.service/src/gen/java/com/wso2/identity/asgardeo/api/throttler/service/rpc/apithrottler/LimitRulesOrBuilder.java
Removing components/com.wso2.identity.asgardeo.api.throttler.service/src/gen/java/com/wso2/identity/asgardeo/api/throttler/service/rpc/apithrottler/LimitRules.java
Removing components/com.wso2.identity.asgardeo.api.throttler.service/src/gen/java/com/wso2/identity/asgardeo/api/throttler/service/rpc/apithrottler/LimitRuleRequestOrBuilder.java
Removing components/com.wso2.identity.asgardeo.api.throttler.service/src/gen/java/com/wso2/identity/asgardeo/api/throttler/service/rpc/apithrottler/LimitRuleOrBuilder.java
Removing components/com.wso2.identity.asgardeo.api.throttler.service/src/gen/java/com/wso2/identity/asgardeo/api/throttler/service/rpc/apithrottler/ApiThrottlerServiceOuterClass.java
Removing components/com.wso2.identity.asgardeo.api.throttler.service/src/gen/java/com/wso2/identity/asgardeo/api/throttler/service/rpc/apithrottler/ApiThrottlerServiceGrpc.java
Removing components/com.wso2.identity.asgardeo.api.throttler.listener/src/main/java/com/wso2/identity/asgardeo/api/throttler/listener/UserCreationThrottleListener.java
Removing components/com.wso2.identity.asgardeo.api.throttler.listener/src/main/java/com/wso2/identity/asgardeo/api/throttler/listener/GuestUserCreationThrottleListener.java
Removing components/com.wso2.identity.asgardeo.api.throttler.listener/src/gen/java/com/wso2/identity/asgardeo/api/throttler/listener/rpc/apithrottler/LimitRulesRequestOrBuilder.java
Removing components/com.wso2.identity.asgardeo.api.throttler.listener/src/gen/java/com/wso2/identity/asgardeo/api/throttler/listener/rpc/apithrottler/LimitRulesOrBuilder.java
Removing components/com.wso2.identity.asgardeo.api.throttler.listener/src/gen/java/com/wso2/identity/asgardeo/api/throttler/listener/rpc/apithrottler/LimitRules.java
Removing components/com.wso2.identity.asgardeo.api.throttler.listener/src/gen/java/com/wso2/identity/asgardeo/api/throttler/listener/rpc/apithrottler/LimitRuleRequestOrBuilder.java
Removing components/com.wso2.identity.asgardeo.api.throttler.listener/src/gen/java/com/wso2/identity/asgardeo/api/throttler/listener/rpc/apithrottler/LimitRuleOrBuilder.java
Removing components/com.wso2.identity.asgardeo.api.throttler.listener/src/gen/java/com/wso2/identity/asgardeo/api/throttler/listener/rpc/apithrottler/LimitRule.java
Removing components/com.wso2.identity.asgardeo.api.throttler.listener/src/gen/java/com/wso2/identity/asgardeo/api/throttler/listener/rpc/apithrottler/ApiThrottlerServiceOuterClass.java
Removing components/com.wso2.identity.asgardeo.api.throttler.listener/src/gen/java/com/wso2/identity/asgardeo/api/throttler/listener/rpc/apithrottler/ApiThrottlerServiceGrpc.java
Removing components/com.wso2.identity.asgardeo.api.throttler.core/src/main/java/com/wso2/identity/asgardeo/api/throttler/core/limiters/impl/UserCreationLimiter.java
Removing components/com.wso2.identity.asgardeo.api.throttler.core/src/gen/java/com/wso2/identity/asgardeo/api/throttler/core/rpc/resourcemetadata/ResourceMetadataServiceOuterClass.java
Removing components/com.wso2.identity.asgardeo.api.throttler.core/src/gen/java/com/wso2/identity/asgardeo/api/throttler/core/rpc/resourcemetadata/ResourceMetadataRequestOrBuilder.java
Removing components/com.wso2.identity.asgardeo.api.throttler.core/src/gen/java/com/wso2/identity/asgardeo/api/throttler/core/rpc/resourcemetadata/ResourceMetadataCountOrBuilder.java
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Removing .trivyignore
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
Also:   hudson.remoting.Channel$CallSiteStackTrace: Remote call to JNLP4-connect connection from 10.0.1.9/10.0.1.9:37184
		at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1743)
		at hudson.remoting.UserResponse.retrieve(UserRequest.java:389)
		at hudson.remoting.Channel.call(Channel.java:957)
		at org.jenkinsci.plugins.gitclient.RemoteGitImpl$CommandInvocationHandler.execute(RemoteGitImpl.java:146)
		at sun.reflect.GeneratedMethodAccessor2252.invoke(Unknown Source)
		at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
		at java.lang.reflect.Method.invoke(Method.java:498)
		at org.jenkinsci.plugins.gitclient.RemoteGitImpl$CommandInvocationHandler.invoke(RemoteGitImpl.java:132)
		at com.sun.proxy.$Proxy159.execute(Unknown Source)
		at org.jvnet.hudson.plugins.m2release.ReleaseEnvironment.finalizeSCMRepo(ReleaseEnvironment.java:293)
		at org.jvnet.hudson.plugins.m2release.ReleaseEnvironment.tearDown(ReleaseEnvironment.java:109)
		at hudson.maven.MavenModuleSetBuild$MavenModuleSetBuildExecution.doRun(MavenModuleSetBuild.java:908)
		at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:504)
		at hudson.model.Run.execute(Run.java:1818)
		at hudson.maven.MavenModuleSetBuild.run(MavenModuleSetBuild.java:543)
		at hudson.model.ResourceController.execute(ResourceController.java:97)
		at hudson.model.Executor.run(Executor.java:429)
hudson.plugins.git.GitException: Command "git merge e649b51712ffa2e1fe4148650cc161ce448a5c4a" returned status code 1:
stdout: Removing trivy-docker-scan.yml
Auto-merging pom.xml
CONFLICT (content): Merge conflict in pom.xml
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.service/src/main/resources/proto/ResourceLimiterService.proto
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.service/src/main/java/com/wso2/identity/asgardeo/limiter/resource/service/constants/Constants.java
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.service/src/gen/java/com/wso2/identity/asgardeo/limiter/resource/service/rpc/resourcelimiter/MetadataOrBuilder.java
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.service/src/gen/java/com/wso2/identity/asgardeo/limiter/resource/service/rpc/resourcelimiter/Metadata.java
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.service/src/gen/java/com/wso2/identity/asgardeo/limiter/resource/service/rpc/resourcelimiter/LimitCheckRequestOrBuilder.java
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.service/src/gen/java/com/wso2/identity/asgardeo/limiter/resource/service/rpc/resourcelimiter/LimitCheckRequest.java
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.service/src/gen/java/com/wso2/identity/asgardeo/limiter/resource/service/rpc/resourcelimiter/LimitCheckOrBuilder.java
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.service/src/gen/java/com/wso2/identity/asgardeo/limiter/resource/service/rpc/resourcelimiter/LimitCheck.java
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.service/pom.xml
CONFLICT (content): Merge conflict in components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.service/pom.xml
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.listener/src/main/resources/proto/ResourceLimiterService.proto
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.listener/src/main/java/com/wso2/identity/asgardeo/limiter/resource/listener/util/Utils.java
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.listener/src/main/java/com/wso2/identity/asgardeo/limiter/resource/listener/internal/ResourceLimitListenerServiceComponent.java
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.listener/src/main/java/com/wso2/identity/asgardeo/limiter/resource/listener/internal/ResourceLimitListenerDataHolder.java
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.listener/src/main/java/com/wso2/identity/asgardeo/limiter/resource/listener/exception/ResourceLimitListenerException.java
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.listener/src/main/java/com/wso2/identity/asgardeo/limiter/resource/listener/datasource/RPCConnection.java
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.listener/src/main/java/com/wso2/identity/asgardeo/limiter/resource/listener/constants/Constants.java
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.listener/src/main/java/com/wso2/identity/asgardeo/limiter/resource/listener/UserStoreLimitListener.java
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.listener/src/main/java/com/wso2/identity/asgardeo/limiter/resource/listener/TenantCreationLimitListener.java
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.listener/src/main/java/com/wso2/identity/asgardeo/limiter/resource/listener/IdpLimitListener.java
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.listener/src/main/java/com/wso2/identity/asgardeo/limiter/resource/listener/ConsumerUserCreationLimitListener.java
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.listener/src/main/java/com/wso2/identity/asgardeo/limiter/resource/listener/ApplicationLimitListener.java
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.listener/src/gen/java/com/wso2/identity/asgardeo/limiter/resource/listener/rpc/resourcelimiter/MetadataOrBuilder.java
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.listener/src/gen/java/com/wso2/identity/asgardeo/limiter/resource/listener/rpc/resourcelimiter/Metadata.java
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.listener/src/gen/java/com/wso2/identity/asgardeo/limiter/resource/listener/rpc/resourcelimiter/LimitCheckRequestOrBuilder.java
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.listener/src/gen/java/com/wso2/identity/asgardeo/limiter/resource/listener/rpc/resourcelimiter/LimitCheckRequest.java
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.listener/src/gen/java/com/wso2/identity/asgardeo/limiter/resource/listener/rpc/resourcelimiter/LimitCheckOrBuilder.java
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.listener/src/gen/java/com/wso2/identity/asgardeo/limiter/resource/listener/rpc/resourcelimiter/LimitCheck.java
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.listener/pom.xml
CONFLICT (content): Merge conflict in components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.listener/pom.xml
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.core/src/main/resources/log4j2.properties
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.core/src/main/resources/application.properties
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.core/src/gen/java/com/wso2/identity/asgardeo/subscriptions/service/rpc/subscriptions/GetSubscriptionRequest.java
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.core/src/gen/java/com/wso2/identity/asgardeo/subscriptions/service/rpc/subscriptions/DeleteSubscriptionRequest.java
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.core/src/gen/java/com/wso2/identity/asgardeo/limiter/resource/core/rpc/resourcemetadata/ResourceMetadataServiceGrpc.java
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.core/src/gen/java/com/wso2/identity/asgardeo/limiter/resource/core/rpc/resourcemetadata/ResourceMetadataRequest.java
Auto-merging components/tier-resource-limiter/com.wso2.identity.asgardeo.limiter.resource.core/src/gen/java/com/wso2/identity/asgardeo/limiter/resource/core/rpc/resourcemetadata/ResourceMetadataCount.java
Auto-merging components/tier-request-throttler/com.wso2.identity.asgardeo.throttler.request.valve.mau/src/gen/java/com/wso2/identity/asgardeo/throttler/request/valve/mau/rpc/MAUOverUsageTenantsRequest.java
Auto-merging components/tier-request-throttler/com.wso2.identity.asgardeo.throttler.request.service/src/gen/java/com/wso2/identity/asgardeo/throttler/request/service/rpc/MAUOverUsageTenantsRequest.java
Auto-merging components/tier-request-throttler/com.wso2.identity.asgardeo.throttler.request.core/src/test/resources/application.properties
Auto-merging components/tier-controller-server/com.wso2.identity.asgardeo.tier.controller.server/src/main/resources/tiers.json
Auto-merging components/tier-controller-server/com.wso2.identity.asgardeo.tier.controller.server/src/main/java/com/wso2/identity/asgardeo/tier/controller/server/utils/ConfigBuilder.java
Auto-merging components/tier-controller-server/com.wso2.identity.asgardeo.tier.controller.server/src/main/java/com/wso2/identity/asgardeo/tier/controller/server/models/ServerConfig.java
Auto-merging components/tier-controller-server/com.wso2.identity.asgardeo.tier.controller.server/src/main/java/com/wso2/identity/asgardeo/tier/controller/server/TierControllingServer.java
Auto-merging components/tier-controller-server/com.wso2.identity.asgardeo.tier.controller.server/dockerfiles/ubuntu/tiers.json
Auto-merging components/tier-controller-server/com.wso2.identity.asgardeo.tier.controller.server/dockerfiles/ubuntu/application.properties
Auto-merging components/tier-controller-server/com.wso2.identity.asgardeo.tier.controller.server/dockerfiles/ubuntu/Dockerfile
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/test/resources/tiers.json
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/test/resources/testng.xml
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/test/resources/application.properties
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/test/java/com/wso2/identity/asgardeo/tier/controller/core/util/TestUtils.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/test/java/com/wso2/identity/asgardeo/tier/controller/core/ThrottleManagerImplTest.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/resources/proto/ResourceMetadataService.proto
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/resources/log4j2.properties
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/util/TierDataHolder.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/util/TierBuilder.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/util/JdbcUtils.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/util/CoreUtils.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/util/ConfigUtil.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/models/TierDTO.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/models/Tier.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/models/ThrottlerConfig.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/models/ThrottleDecision.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/models/Rule.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/models/RpcConnectionConfig.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/models/ResourceMetadata.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/models/JdbcConfig.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/models/EvalRule.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/limiters/impl/UserStoreCreationLimiter.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/limiters/impl/TenantCreationLimiter.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/limiters/impl/IdpCreationLimiter.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/limiters/impl/GuestUserCreationLimiter.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/limiters/impl/ConsumerUserCreationLimiter.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/limiters/impl/ApplicationCreationLimiter.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/limiters/ResourceCreationLimiter.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/limiters/AbstractResourceCreationLimiter.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/exception/ThrottlerCoreException.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/datasource/RPCConnection.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/datasource/JDBCDataSourceConfiguration.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/dao/impl/RpcBasedResourceMetadataDAO.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/dao/impl/DefaultRulesDAOImpl.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/dao/impl/DatabaseBasedResourceMetadataDAO.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/dao/RulesDAO.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/dao/ResourceMetadataDAO.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/constants/SQLConstants.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/constants/Constants.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/ThrottlerCoreDataHolder.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/ThrottleManagerImpl.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/main/java/com/wso2/identity/asgardeo/tier/controller/core/ThrottleManager.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/src/gen/java/com/wso2/identity/asgardeo/tier/controller/core/rpc/resourcemetadata/ResourceMetadataRequest.java
Auto-merging components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/pom.xml
CONFLICT (content): Merge conflict in components/tier-controller-core/com.wso2.identity.asgardeo.tier.controller.core/pom.xml
Removing components/com.wso2.identity.asgardeo.api.throttler.service/src/main/resources/log4j2.properties
Removing components/com.wso2.identity.asgardeo.api.throttler.service/src/main/java/com/wso2/identity/asgardeo/api/throttler/service/interceptor/RequestInterceptor.java
Removing components/com.wso2.identity.asgardeo.api.throttler.service/src/main/java/com/wso2/identity/asgardeo/api/throttler/service/ApiThrottlerServiceImpl.java
Removing components/com.wso2.identity.asgardeo.api.throttler.service/src/gen/java/com/wso2/identity/asgardeo/api/throttler/service/rpc/apithrottler/LimitRulesRequestOrBuilder.java
Removing components/com.wso2.identity.asgardeo.api.throttler.service/src/gen/java/com/wso2/identity/asgardeo/api/throttler/service/rpc/apithrottler/LimitRulesOrBuilder.java
Removing components/com.wso2.identity.asgardeo.api.throttler.service/src/gen/java/com/wso2/identity/asgardeo/api/throttler/service/rpc/apithrottler/LimitRules.java
Removing components/com.wso2.identity.asgardeo.api.throttler.service/src/gen/java/com/wso2/identity/asgardeo/api/throttler/service/rpc/apithrottler/LimitRuleRequestOrBuilder.java
Removing components/com.wso2.identity.asgardeo.api.throttler.service/src/gen/java/com/wso2/identity/asgardeo/api/throttler/service/rpc/apithrottler/LimitRuleOrBuilder.java
Removing components/com.wso2.identity.asgardeo.api.throttler.service/src/gen/java/com/wso2/identity/asgardeo/api/throttler/service/rpc/apithrottler/ApiThrottlerServiceOuterClass.java
Removing components/com.wso2.identity.asgardeo.api.throttler.service/src/gen/java/com/wso2/identity/asgardeo/api/throttler/service/rpc/apithrottler/ApiThrottlerServiceGrpc.java
Removing components/com.wso2.identity.asgardeo.api.throttler.listener/src/main/java/com/wso2/identity/asgardeo/api/throttler/listener/UserCreationThrottleListener.java
Removing components/com.wso2.identity.asgardeo.api.throttler.listener/src/main/java/com/wso2/identity/asgardeo/api/throttler/listener/GuestUserCreationThrottleListener.java
Removing components/com.wso2.identity.asgardeo.api.throttler.listener/src/gen/java/com/wso2/identity/asgardeo/api/throttler/listener/rpc/apithrottler/LimitRulesRequestOrBuilder.java
Removing components/com.wso2.identity.asgardeo.api.throttler.listener/src/gen/java/com/wso2/identity/asgardeo/api/throttler/listener/rpc/apithrottler/LimitRulesOrBuilder.java
Removing components/com.wso2.identity.asgardeo.api.throttler.listener/src/gen/java/com/wso2/identity/asgardeo/api/throttler/listener/rpc/apithrottler/LimitRules.java
Removing components/com.wso2.identity.asgardeo.api.throttler.listener/src/gen/java/com/wso2/identity/asgardeo/api/throttler/listener/rpc/apithrottler/LimitRuleRequestOrBuilder.java
Removing components/com.wso2.identity.asgardeo.api.throttler.listener/src/gen/java/com/wso2/identity/asgardeo/api/throttler/listener/rpc/apithrottler/LimitRuleOrBuilder.java
Removing components/com.wso2.identity.asgardeo.api.throttler.listener/src/gen/java/com/wso2/identity/asgardeo/api/throttler/listener/rpc/apithrottler/LimitRule.java
Removing components/com.wso2.identity.asgardeo.api.throttler.listener/src/gen/java/com/wso2/identity/asgardeo/api/throttler/listener/rpc/apithrottler/ApiThrottlerServiceOuterClass.java
Removing components/com.wso2.identity.asgardeo.api.throttler.listener/src/gen/java/com/wso2/identity/asgardeo/api/throttler/listener/rpc/apithrottler/ApiThrottlerServiceGrpc.java
Removing components/com.wso2.identity.asgardeo.api.throttler.core/src/main/java/com/wso2/identity/asgardeo/api/throttler/core/limiters/impl/UserCreationLimiter.java
Removing components/com.wso2.identity.asgardeo.api.throttler.core/src/gen/java/com/wso2/identity/asgardeo/api/throttler/core/rpc/resourcemetadata/ResourceMetadataServiceOuterClass.java
Removing components/com.wso2.identity.asgardeo.api.throttler.core/src/gen/java/com/wso2/identity/asgardeo/api/throttler/core/rpc/resourcemetadata/ResourceMetadataRequestOrBuilder.java
Removing components/com.wso2.identity.asgardeo.api.throttler.core/src/gen/java/com/wso2/identity/asgardeo/api/throttler/core/rpc/resourcemetadata/ResourceMetadataCountOrBuilder.java
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Removing .trivyignore
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2372)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2302)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2298)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1857)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:877)
	at org.jenkinsci.plugins.gitclient.RemoteGitImpl$CommandInvocationHandler$GitCommandMasterToSlaveCallable.call(RemoteGitImpl.java:161)
	at org.jenkinsci.plugins.gitclient.RemoteGitImpl$CommandInvocationHandler$GitCommandMasterToSlaveCallable.call(RemoteGitImpl.java:154)
	at hudson.remoting.UserRequest.perform(UserRequest.java:153)
	at hudson.remoting.UserRequest.perform(UserRequest.java:50)
	at hudson.remoting.Request$2.run(Request.java:336)
	at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:68)
	at java.util.concurrent.FutureTask.run(FutureTask.java:266)
	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)
	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)
	at hudson.remoting.Engine$1$1.run(Engine.java:94)
	at java.lang.Thread.run(Thread.java:748)

More information about the Builder mailing list