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

chore(deps): update dependency com.mycila:license-maven-plugin-git to v4.6 - abandoned #21

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ target/
!**/src/main/**
!**/src/test/**
logs
**/application-*.yml
!**/application-ci.yml
**.orig

### STS ###
.apt_generated
Expand Down
3 changes: 3 additions & 0 deletions .sdkmanrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Enable auto-env through the sdkman_auto_env config
# Add key=value pairs of SDKs to use below
java=11.0.22-tem
25 changes: 11 additions & 14 deletions NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,20 @@ under the License.

This project includes:
Apache Commons Codec under Apache License, Version 2.0
Apache HttpClient under Apache License, Version 2.0
Apache HttpCore under Apache License, Version 2.0
Apache Log4j API under Apache License, Version 2.0
Apache Log4j to SLF4J Adapter under Apache License, Version 2.0
asm under BSD-3-Clause
ASM based accessors helper used by json-smart under The Apache Software License, Version 2.0
ASM Core under BSD
AspectJ weaver under Eclipse Public License - v 1.0
AssertJ fluent assertions under Apache License, Version 2.0
Byte Buddy (without dependencies) under Apache License, Version 2.0
Byte Buddy agent under Apache License, Version 2.0
ClassMate under Apache License, Version 2.0
esco-pronote-ws under Apache License, Version 2.0
esco-si-ent-api under Apache License, Version 2.0
Hamcrest under BSD License 3
Hibernate Validator Engine under Apache License 2.0
Jackson datatype: jdk8 under The Apache Software License, Version 2.0
Jackson datatype: JSR310 under The Apache Software License, Version 2.0
Jackson module: JAXB Annotations under The Apache Software License, Version 2.0
Jackson module: Jakarta XML Bind Annotations (jakarta.xml.bind) under The Apache Software License, Version 2.0
Jackson-annotations under The Apache Software License, Version 2.0
Jackson-core under The Apache Software License, Version 2.0
jackson-databind under The Apache Software License, Version 2.0
Expand All @@ -42,8 +39,8 @@ This project includes:
Jakarta Activation API jar under EDL 1.0
Jakarta Annotations API under EPL 2.0 or GPL2 w/ CPE
Jakarta Bean Validation API under Apache License 2.0
Jakarta Expression Language 3.0 under EPL 2.0 or GPL2 w/ CPE
Jakarta XML Binding API under Eclipse Distribution License - v 1.0
Java Servlet API under CDDL + GPLv2 with classpath exception
JBoss Logging 3 under Apache License, version 2.0
JSON library from Android SDK under Apache License 2.0
JSON Small and Fast Parser under The Apache Software License, Version 2.0
Expand Down Expand Up @@ -81,10 +78,7 @@ This project includes:
Spring Web MVC under Apache License, Version 2.0
spring-boot under Apache License, Version 2.0
spring-boot-autoconfigure under Apache License, Version 2.0
spring-boot-configuration-processor under Apache License, Version 2.0
spring-boot-devtools under Apache License, Version 2.0
spring-boot-starter under Apache License, Version 2.0
spring-boot-starter-aop under Apache License, Version 2.0
spring-boot-starter-data-ldap under Apache License, Version 2.0
spring-boot-starter-json under Apache License, Version 2.0
spring-boot-starter-logging under Apache License, Version 2.0
Expand All @@ -95,12 +89,15 @@ This project includes:
spring-boot-starter-web under Apache License, Version 2.0
spring-boot-test under Apache License, Version 2.0
spring-boot-test-autoconfigure under Apache License, Version 2.0
spring-ldap-core under The Apache Software License, Version 2.0
spring-security-config under The Apache Software License, Version 2.0
spring-security-core under The Apache Software License, Version 2.0
spring-security-web under The Apache Software License, Version 2.0
spring-ldap-core under Apache License, Version 2.0
spring-security-config under Apache License, Version 2.0
spring-security-core under Apache License, Version 2.0
spring-security-crypto under Apache License, Version 2.0
spring-security-test under Apache License, Version 2.0
spring-security-web under Apache License, Version 2.0
Stax2 API under The BSD License
tomcat-embed-core under Apache License, Version 2.0
tomcat-embed-el under Apache License, Version 2.0
tomcat-embed-websocket under Apache License, Version 2.0
Woodstox under The Apache License, Version 2.0

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Pronote-WS
Application serveur REST produisant les flux XML d'alimentation de pronote
# SI-ENT-API
Application serveur REST fournissant des accès API sur les données du SI ENT
22 changes: 14 additions & 8 deletions doc/dev.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,24 @@
# to add NOTICE
## to add NOTICE
'mvn notice:check' Checks that a NOTICE file exists and that its content match what would be generated.
'mvn notice:generate' Generates a new NOTICE file, replacing any existing NOTICE file.

# to add licence headers
## to add licence headers
'mvn license:check' verify if some files miss license header
'mvn license:format' add the license header when missing. If a header is existing, it is updated to the new one.
'mvn license:remove' remove existing license header

# Actions on RSA public key provided by Index Education
# Le certificat fourni est au format SSH2 et sans doute généré par Putty - une conversion permet de le rendre lisible plus facilement
ssh-keygen -i -f /PATH/ClePubIndexEducation.pub -m RFC4716> /PATH/ClePubIndexEducation.id_rsa.pub

# in production mainly set in system properties the property for log directory else it will log in $catalina_base
## in production mainly set in system properties the property for log directory else it will log in $catalina_base
-Dlogback.logfileDirectory=/PATH/

# using local profile
'./mvnw clean -Dspring.profiles.active=local -Dspring.config.import="./src/main/resources/application-local.yml" clean package'
## Compile and Deploy
'./mvnw clean package deploy -Dspring.profiles.active=local -Dspring.config.import="$PATH/application-local.yml"'

## Running with spring-boot locally
'./mvnw clean compile spring-boot:run -Dspring-boot.run.profiles=local -Dspring.config.import="$PATH/application-local.yml"'

## Exemples de commandes
### curl pour test
`curl --location --request GET 'http://127.0.0.1:8080/si-ent-api/api/childrensOf/ID' --header 'X-API-KEY: xxxxxxxxxxx' -H "Accept: application/json"`
### génération d'une clé
`node -e "console.log(require('node:crypto').randomBytes(128).toString('hex'))"`
4 changes: 2 additions & 2 deletions etc/header.template
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Copyright (C) 2020 GIP-RECIA https://www.recia.fr/
@Author (C) 2020 Julien Gribonvald <julien.gribonvald@recia.fr>
Copyright (C) ${license.git.copyrightExistenceYears} GIP-RECIA https://www.recia.fr/
@Author (C) ${license.git.copyrightCreationYear} Julien Gribonvald <julien.gribonvald@recia.fr>

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
48 changes: 38 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,17 @@
<version>2.7.18</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>fr.recia.pronote.ws</groupId>
<artifactId>esco-pronote-ws</artifactId>
<version>0.0.5-SNAPSHOT</version>
<groupId>fr.recia.api</groupId>
<artifactId>esco-si-ent-api</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>war</packaging>
<name>esco-pronote-ws</name>
<description>Application REST Web-service permettant de transmettre un export utile à l'alimentation des identifiants ENT dans pronote</description>
<name>esco-si-ent-api</name>
<description>API REST permettant de fournir des données issues du SI ENT, configurable par properties et accès sécurisés</description>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>11</java.version>
<license-maven-plugin.version>4.6</license-maven-plugin.version>
</properties>

<distributionManagement>
Expand All @@ -31,9 +32,9 @@
</distributionManagement>

<scm>
<connection>scm:git:ssh://git@github.com/GIP-RECIA/Pronote-WS.git</connection>
<developerConnection>scm:git:ssh://git@github.com/GIP-RECIA/Pronote-WS.git</developerConnection>
<url>https://github.com/GIP-RECIA/Pronote-WS.git</url>
<connection>scm:git:ssh://git@github.com/GIP-RECIA/SI-ENT-API.git</connection>
<developerConnection>scm:git:ssh://git@github.com/GIP-RECIA/SI-ENT-API.git</developerConnection>
<url>https://github.com/GIP-RECIA/SI-ENT-API.git</url>
<tag>HEAD</tag>
</scm>

Expand Down Expand Up @@ -95,6 +96,11 @@
<artifactId>spring-boot-starter-tomcat</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-el</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
Expand All @@ -107,6 +113,7 @@
</dependency>
</dependencies>


<build>
<resources>
<resource>
Expand Down Expand Up @@ -157,6 +164,9 @@
<artifactId>license-maven-plugin</artifactId>
<version>4.5</version>
<configuration>
<properties>
<project.inceptionYear>2020</project.inceptionYear>
</properties>
<licenseSets>
<licenseSet>
<header>etc/header.template</header>
Expand All @@ -174,11 +184,18 @@
</licenseSets>
<strictCheck>true</strictCheck>
</configuration>
<dependencies>
<dependency>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin-git</artifactId>
<version>${license-maven-plugin.version}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.jasig.maven</groupId>
<artifactId>maven-notice-plugin</artifactId>
<version>1.1.0</version>
<artifactId>notice-maven-plugin</artifactId>
<version>2.0.0</version>
<configuration>
<noticeTemplate>etc/NOTICE.template</noticeTemplate>
<licenseMapping>
Expand All @@ -198,6 +215,7 @@
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>3.4.0</version>
<configuration>
<packagingExcludes>**/application-*.yml</packagingExcludes>
<attachClasses>true</attachClasses>
Expand All @@ -206,6 +224,16 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<jvmArguments>-Djava.rmi.server.hostname=localhost -Xdebug -Duser.timezone="Europe/Paris"
-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -Xms2G -Xmx3G</jvmArguments>
<excludes>
<exclude>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
154 changes: 0 additions & 154 deletions src/main/java/fr/recia/pronote/ws/config/PronoteWSConfiguration.java

This file was deleted.

Loading
Loading