Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/statistics #37

Merged
merged 50 commits into from
Jan 16, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
ab330e9
Edit statistics
dtrouillet Jan 7, 2020
7a3f50f
Norms predicate
dtrouillet Jan 7, 2020
9ebf0d2
fix unit test
dtrouillet Jan 7, 2020
0e6a02c
add concat
dtrouillet Jan 7, 2020
214aa7e
csrf and cors
dtrouillet Jan 8, 2020
d3381d1
csrf and cors
dtrouillet Jan 8, 2020
e42d488
csrf and cors
dtrouillet Jan 8, 2020
0c3ef34
csrf and cors
dtrouillet Jan 8, 2020
4032b93
Pageable on typeFichier
dtrouillet Jan 8, 2020
05dc1dc
Merge remote-tracking branch 'origin/feature/statistics' into feature…
dtrouillet Jan 8, 2020
1a00f9a
Pageable on directory
dtrouillet Jan 8, 2020
56d5bc7
Pageable on log and chains
dtrouillet Jan 9, 2020
275c4fe
fix unit test
dtrouillet Jan 9, 2020
78a03ff
add logresource unit test
dtrouillet Jan 9, 2020
cc01f0b
add logresource unit test
dtrouillet Jan 9, 2020
19ad94e
edit chain mapping
dtrouillet Jan 9, 2020
fa77cb6
typefichier unit test
dtrouillet Jan 9, 2020
b9112c1
TypeFichierService unit test
dtrouillet Jan 9, 2020
7794ea9
Directory resources unit test
dtrouillet Jan 9, 2020
fdc6882
User pageable
dtrouillet Jan 10, 2020
637cb07
fix unit test
dtrouillet Jan 10, 2020
a7ba365
unit test users
dtrouillet Jan 10, 2020
6fd94c9
remove unused class
dtrouillet Jan 10, 2020
8960579
unit test
dtrouillet Jan 10, 2020
cde2106
Update cache use jcache
dtrouillet Jan 15, 2020
672151d
Fix files and directories issues
dtrouillet Jan 16, 2020
68e1fa7
Fixe unit test
dtrouillet Jan 16, 2020
d640450
Fixe unit test
dtrouillet Jan 16, 2020
582644c
use sonarqube actions
dtrouillet Jan 16, 2020
a67e956
use sonarqube actions
dtrouillet Jan 16, 2020
c92d1c6
edit sonarcloud conf
dtrouillet Jan 16, 2020
665096d
edit sonarcloud conf
dtrouillet Jan 16, 2020
6c89af4
delete maven sonar
dtrouillet Jan 16, 2020
67f3016
delete maven sonar
dtrouillet Jan 16, 2020
06cf22d
delete maven sonar
dtrouillet Jan 16, 2020
842b8b7
delete maven sonar
dtrouillet Jan 16, 2020
9f6dbd6
delete maven sonar
dtrouillet Jan 16, 2020
1cd5699
delete maven sonar
dtrouillet Jan 16, 2020
76d46aa
delete maven sonar
dtrouillet Jan 16, 2020
b71323c
delete maven sonar
dtrouillet Jan 16, 2020
fd20b0b
delete maven sonar
dtrouillet Jan 16, 2020
329bd7a
delete maven sonar
dtrouillet Jan 16, 2020
c228b96
delete maven sonar
dtrouillet Jan 16, 2020
3d8fbcf
delete maven sonar
dtrouillet Jan 16, 2020
5116b81
delete maven sonar
dtrouillet Jan 16, 2020
79cb2fc
delete maven sonar
dtrouillet Jan 16, 2020
b2333d3
Merge branch 'master' into feature/statistics
dtrouillet Jan 16, 2020
eecd9e5
delete maven sonar
dtrouillet Jan 16, 2020
e99bf65
Merge remote-tracking branch 'origin/feature/statistics' into feature…
dtrouillet Jan 16, 2020
1960471
delete maven sonar
dtrouillet Jan 16, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
delete maven sonar
  • Loading branch information
dtrouillet committed Jan 16, 2020
commit 06cf22dc4369ffcee15b8819c8b960cf03b53f76
10 changes: 4 additions & 6 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ jobs:
with:
java-version: ${{ matrix.java }}
- name: Build with Maven
run: mvn -B org.jacoco:jacoco-maven-plugin:prepare-agent package --file pom.xml
- name: SonarCloud Scan
uses: SonarSource/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: mvn -B org.jacoco:jacoco-maven-plugin:prepare-agent package --file pom.xml
- name: Sonarqube analysis
run: mvn -B org.sonarsource.scanner.maven:sonar --file pom.xml

34 changes: 24 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
<metrics-spark-reporter.version>1.2</metrics-spark-reporter.version>
<metrics-spring.version>3.1.3</metrics-spring.version>
<run.addResources>false</run.addResources>
<sonar-maven-plugin.version>3.6.0.1398</sonar-maven-plugin.version>
<spring-security-oauth2.version>2.2.5.RELEASE</spring-security-oauth2.version>
<usertype-core.version>6.0.1.GA</usertype-core.version>
<project.testresult.directory>${project.build.directory}/test-results</project.testresult.directory>
Expand Down Expand Up @@ -175,16 +176,6 @@
<version>${assertj-core.version}</version>
<scope>test</scope>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.hibernate</groupId>-->
<!-- <artifactId>hibernate-ehcache</artifactId>-->
<!-- <exclusions>-->
<!-- <exclusion>-->
<!-- <artifactId>ehcache-core</artifactId>-->
<!-- <groupId>net.sf.ehcache</groupId>-->
<!-- </exclusion>-->
<!-- </exclusions>-->
<!-- </dependency>-->
<dependency>
<groupId>org.ehcache</groupId>
<artifactId>ehcache</artifactId>
Expand Down Expand Up @@ -469,6 +460,24 @@
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<version>1.0.0</version>
<executions>
<execution>
<phase>initialize</phase>
<goals>
<goal>read-project-properties</goal>
</goals>
<configuration>
<files>
<file>sonar-project.properties</file>
</files>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
Expand Down Expand Up @@ -518,6 +527,11 @@
<packagingExcludes>WEB-INF/lib/tomcat-*.jar</packagingExcludes>
</configuration>
</plugin>
<plugin>
<groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId>
<version>${sonar-maven-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
Expand Down