Skip to content
This repository has been archived by the owner on Nov 3, 2020. It is now read-only.

Commit

Permalink
config
Browse files Browse the repository at this point in the history
  • Loading branch information
@gaetancollaud
gaetancollaud committed Mar 10, 2019
1 parent 8ac9d69 commit 2fd41f1
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 150 deletions.
21 changes: 0 additions & 21 deletions config/application.properties
View file

This file was deleted.

2 changes: 0 additions & 2 deletions docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ services:
web:
image: gaetancollaud/fablab-manager
build: .
volumes:
- ./config/application.properties:/application.properties
ports:
- "8080:8080"
links:
Expand Down
125 changes: 0 additions & 125 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,38 +37,6 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
</dependency>
<!--<dependency>-->
<!--<groupId>org.springframework</groupId>-->
<!--<artifactId>spring-context</artifactId>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.springframework</groupId>-->
<!--<artifactId>spring-web</artifactId>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.springframework</groupId>-->
<!--<artifactId>spring-webmvc</artifactId>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.springframework</groupId>-->
<!--<artifactId>spring-orm</artifactId>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.springframework.security</groupId>-->
<!--<artifactId>spring-security-core</artifactId>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.springframework.security</groupId>-->
<!--<artifactId>spring-security-web</artifactId>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.springframework.security</groupId>-->
<!--<artifactId>spring-security-config</artifactId>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.springframework.data</groupId>-->
<!--<artifactId>spring-data-jpa</artifactId>-->
<!--</dependency>-->

<!-- Jackson -->
<dependency>
Expand All @@ -80,27 +48,6 @@
<artifactId>jackson-datatype-hibernate5</artifactId>
</dependency>

<!-- ORM integration, e.g Hibernate -->
<!--<dependency>-->
<!--<groupId>org.hibernate</groupId>-->
<!--<artifactId>hibernate-core</artifactId>-->
<!--<version>5.0.6.Final</version>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.hibernate</groupId>-->
<!--<artifactId>hibernate-jpamodelgen</artifactId>-->
<!--<version>5.0.6.Final</version>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.hibernate</groupId>-->
<!--<artifactId>hibernate-entitymanager</artifactId>-->
<!--<version>5.0.6.Final</version>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.hibernate</groupId>-->
<!--<artifactId>hibernate-java8</artifactId>-->
<!--<version>5.0.6.Final</version>-->
<!--</dependency>-->
<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-core</artifactId>
Expand All @@ -120,60 +67,19 @@
<artifactId>querydsl-jpa</artifactId>
<version>${querydsl.version}</version>
</dependency>
<!--<dependency>-->
<!--<groupId>com.querydsl</groupId>-->
<!--<artifactId>querydsl-jpa</artifactId>-->
<!--<version>${querydsl.version}</version>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>com.querydsl</groupId>-->
<!--<artifactId>querydsl-core</artifactId>-->
<!--<version>${querydsl.version}</version>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>com.querydsl</groupId>-->
<!--<artifactId>querydsl-apt</artifactId>-->
<!--<version>${querydsl.version}</version>-->
<!--<scope>provided</scope>-->
<!--</dependency>-->

<!-- connect to mysql -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>

<!-- Logging -->
<!--<dependency>-->
<!--<groupId>org.slf4j</groupId>-->
<!--<artifactId>slf4j-api</artifactId>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>ch.qos.logback</groupId>-->
<!--<artifactId>logback-classic</artifactId>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>ch.qos.logback</groupId>-->
<!--<artifactId>logback-core</artifactId>-->
<!--<version>1.2.3</version>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>net.logstash.logback</groupId>-->
<!--<artifactId>logstash-logback-encoder</artifactId>-->
<!--<version>4.11</version>-->
<!--</dependency>-->

<!-- Testing -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<!--<dependency>-->
<!--<groupId>org.springframework</groupId>-->
<!--<artifactId>spring-test</artifactId>-->
<!--<scope>test</scope>-->
<!--</dependency>-->
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
Expand Down Expand Up @@ -222,7 +128,6 @@
<artifactId>h2</artifactId>
</dependency>


<!-- Utils -->
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down Expand Up @@ -253,22 +158,6 @@
<version>0.0.7</version>
</dependency>

<!--&lt;!&ndash; FIxme remove ? &ndash;&gt;-->
<!--<dependency>-->
<!--<groupId>javax.servlet</groupId>-->
<!--<artifactId>javax.servlet-api</artifactId>-->
<!--<type>jar</type>-->
<!--</dependency>-->

<!-- Fixme remove interceptor -->
<!--<dependency>-->
<!--<groupId>javax</groupId>-->
<!--<artifactId>javaee-api</artifactId>-->
<!--<version>7.0</version>-->
<!--<type>jar</type>-->
<!--</dependency>-->


<!-- Spring AOP + AspectJ -->
<dependency>
<groupId>org.springframework</groupId>
Expand Down Expand Up @@ -420,20 +309,6 @@
</plugins>
</build>

<!--<repositories>-->
<!--<repository>-->
<!--<id>spring-releases</id>-->
<!--<url>http://repo.spring.io/libs-release</url>-->
<!--</repository>-->

<!--</repositories>-->
<!--<pluginRepositories>-->
<!--<pluginRepository>-->
<!--<id>spring-releases</id>-->
<!--<url>http://repo.spring.io/libs-release</url>-->
<!--</pluginRepository>-->
<!--</pluginRepositories>-->

<scm>
<url>https://github.com/gaetancollaud/fablab-manager</url>
<connection>scm:git:git://github.com/gaetancollaud/fablab-manager.git</connection>
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/net/collaud/fablab/manager/boot/SecurityBasicAuth.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
/**
* @author Gaetan Collaud
*/
@Order(101)
@Order(1)
@Configuration
public class SecurityBasicAuth extends WebSecurityConfigurerAdapter {

Expand All @@ -21,7 +21,9 @@ public class SecurityBasicAuth extends WebSecurityConfigurerAdapter {
@Override
protected void configure(HttpSecurity http) throws Exception {
http
.regexMatcher("/api/v1/system/door/.*")
.authenticationProvider(authentificationProvider)
.csrf().disable()
.antMatcher("/api/v1/system/door/**")
.httpBasic();

}
Expand Down

0 comments on commit 2fd41f1

Please sign in to comment.