lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' into feature_rollouts_credentials

Browse Source 
Conflicts:
	hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/SecurityAutoConfiguration.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/RepositoryApplicationConfiguration.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/ArtifactManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/DeploymentManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/DistributionSetManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/ReportManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/RolloutGroupManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/RolloutManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/SoftwareManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/SystemManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/TagManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/TargetFilterQueryManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/TargetManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/TenantConfigurationManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/TenantStatsManagement.java


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
This commit is contained in:
SirWayne
2016-06-06 10:35:02 +02:00
parent 8c972a89e3 487cb73caf
commit 9c7f48ded5
468 changed files with 18936 additions and 12963 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/eventbus/EventBusAutoConfiguration.java
View File

@@ -12,7 +12,7 @@ import java.util.concurrent.Executor;
import org.eclipse.hawkbit.eventbus.EventBusSubscriberProcessor;
import org.eclipse.hawkbit.eventbus.EventSubscriber;
import org.eclipse.hawkbit.repository.model.helper.EventBusHolder;
import org.eclipse.hawkbit.repository.jpa.model.helper.EventBusHolder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;

25
hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/repository/JpaRepositoryAutoConfiguration.java Normal file
View File

@@ -0,0 +1,25 @@
/**
* Copyright (c) 2015 Bosch Software Innovations GmbH and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*/
package org.eclipse.hawkbit.autoconfigure.repository;
import org.eclipse.hawkbit.EnableJpaRepository;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
/**
* Auto-Configuration for enabling the REST-Resources.
*
*/
@Configuration
@ConditionalOnClass({ EnableJpaRepository.class })
@Import({ EnableJpaRepository.class })
public class JpaRepositoryAutoConfiguration {
}

1
hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/SecurityAutoConfiguration.java
View File

@@ -10,6 +10,7 @@ package org.eclipse.hawkbit.autoconfigure.security;
import org.eclipse.hawkbit.im.authentication.PermissionService;
import org.eclipse.hawkbit.security.DdiSecurityProperties;
import org.eclipse.hawkbit.security.DdiSecurityProperties;
import org.eclipse.hawkbit.security.SecurityContextTenantAware;
import org.eclipse.hawkbit.security.SpringSecurityAuditorAware;
import org.eclipse.hawkbit.tenancy.TenantAware;