smarthut/backend
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into swagger-feature

Browse source
This commit is contained in:
Claudio Maggioni 2020-03-01 13:56:06 +01:00
commit 54168a4261
11 changed files with 1 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -1,4 +1,4 @@
.idea/misc.xml
.idea/**
**/.DS_Store

1
.idea/.name
View file

@ -1 +0,0 @@
smarthut

5
.idea/codeStyles/codeStyleConfig.xml
View file

@ -1,5 +0,0 @@
<component name="ProjectCodeStyleConfiguration">
<state>
<option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
</state>
</component>

9
.idea/compiler.xml
View file

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<bytecodeTargetLevel>
<module name="smarthut.main" target="11" />
<module name="smarthut.test" target="11" />
</bytecodeTargetLevel>
</component>
</project>

20
.idea/jarRepositories.xml
View file

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
<remote-repository>
<option name="id" value="MavenRepo" />
<option name="name" value="MavenRepo" />
<option name="url" value="https://repo.maven.apache.org/maven2/" />
</remote-repository>
</component>
</project>

11
.idea/misc.xml
View file

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<<<<<<< HEAD
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="12.0.1" project-jdk-type="JavaSDK">
=======
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="11.0.5" project-jdk-type="JavaSDK">
>>>>>>> 5d1549cfa20b7d50b7f27f915d1169ace5253c70
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>

10
.idea/modules.xml
View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/modules/smarthut.iml" filepath="$PROJECT_DIR$/.idea/modules/smarthut.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/smarthut.main.iml" filepath="$PROJECT_DIR$/.idea/modules/smarthut.main.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/smarthut.test.iml" filepath="$PROJECT_DIR$/.idea/modules/smarthut.test.iml" />
</modules>
</component>
</project>

4
.idea/modules/smarthut.iml
View file

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module version="4">
<component name="ExternalSystem" externalSystem="GRADLE" externalSystemModuleGroup="ch.usi.inf.sa4.sanmarinoes." externalSystemModuleVersion="0.0.1-SNAPSHOT" linkedProjectId="smarthut" linkedProjectPath="$MODULE_DIR$/../.." rootProjectPath="$MODULE_DIR$/../.." />
</module>

19
.idea/modules/smarthut.main.iml
View file

@ -1,19 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module version="4">
<component name="ExternalSystem" externalSystem="GRADLE" externalSystemModuleGroup="ch.usi.inf.sa4.sanmarinoes." externalSystemModuleType="sourceSet" externalSystemModuleVersion="0.0.1-SNAPSHOT" linkedProjectId="smarthut:main" linkedProjectPath="$MODULE_DIR$/../.." rootProjectPath="$MODULE_DIR$/../.." />
<component name="FacetManager">
<facet type="Spring" name="Spring">
<configuration>
<fileset id="fileset" name="SecurityConfig" removed="false">
<file>file://$MODULE_DIR$/../../src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/SecurityConfig.java</file>
<file>file://$MODULE_DIR$/../../src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmarthutApplication.java</file>
</fileset>
</configuration>
</facet>
<facet type="web" name="Web">
<configuration>
<webroots />
</configuration>
</facet>
</component>
</module>

16
.idea/modules/smarthut.test.iml
View file

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module version="4">
<component name="ExternalSystem" externalSystem="GRADLE" externalSystemModuleGroup="ch.usi.inf.sa4.sanmarinoes." externalSystemModuleType="sourceSet" externalSystemModuleVersion="0.0.1-SNAPSHOT" linkedProjectId="smarthut:test" linkedProjectPath="$MODULE_DIR$/../.." rootProjectPath="$MODULE_DIR$/../.." />
<component name="FacetManager">
<facet type="Spring" name="Spring">
<configuration />
</facet>
<facet type="web" name="Web">
<configuration>
<webroots />
<sourceRoots />
</configuration>
</facet>
</component>
<component name="TestModuleProperties" production-module="smarthut.main" />
</module>

6
.idea/vcs.xml
View file

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>