Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
osef-api
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Conduite de projet
osef
osef-api
Commits
8cbc2a2e
Commit
8cbc2a2e
authored
2 months ago
by
Leo Puyastier
Browse files
Options
Downloads
Plain Diff
Merge branch 'release/0.2.0' into 'main'
Release/0.2.0 See merge request
!10
parents
0c352176
d93203d0
No related branches found
Branches containing commit
Tags
0.2.0
Tags containing commit
2 merge requests
!11
Rebase on main
,
!10
Release/0.2.0
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.lefthook/commit-msg/pre-commit.sh
+2
-2
2 additions, 2 deletions
.lefthook/commit-msg/pre-commit.sh
CHANGELOG.md
+7
-2
7 additions, 2 deletions
CHANGELOG.md
Dockerfile
+1
-1
1 addition, 1 deletion
Dockerfile
pom.xml
+1
-1
1 addition, 1 deletion
pom.xml
with
11 additions
and
6 deletions
.lefthook/commit-msg/pre-commit.sh
+
2
−
2
View file @
8cbc2a2e
...
...
@@ -15,8 +15,8 @@ if [[ $COMMIT_MSG =~ $BUMP_REGEX ]]; then
CHANGED_FILES
=
$(
git diff
--cached
--name-only
)
EXPECTED_FILES
=(
"pom.xml"
"CHANGELOG.md"
"Dockerfile"
)
if
[[
$(
echo
"
$CHANGED_FILES
"
|
wc
-l
)
-ne
2
]]
;
then
echo
"Erreur : Le commit de version ne doit contenir que les fichiers pom.xml et CHANGELOG.md."
if
[[
$(
echo
"
$CHANGED_FILES
"
|
wc
-l
)
-ne
3
]]
;
then
echo
"Erreur : Le commit de version ne doit contenir que les fichiers pom.xml et CHANGELOG.md
et Dockerfile
."
echo
"Fichiers trouvés :"
echo
"
$CHANGED_FILES
"
exit
1
...
...
This diff is collapsed.
Click to expand it.
CHANGELOG.md
+
7
−
2
View file @
8cbc2a2e
...
...
@@ -7,14 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
## [0.2.0] - 2024-12-02
### Added
-
Initialized Spotless, Checkstyle
-
Created data model for teams, organizations, roles and pivot models
-
Created repositories for teams, organizations, roles and pivot models
-
Created routes for teams
and
organizations
-
Created routes for teams
,
organizations
and roles
-
Created seeders for teams, organizations and roles
-
Relation between user and team
-
Relation between team and organizations
-
Relation between user, organization and role
### Changed
...
...
@@ -32,4 +36,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
-
Created routes for users
[
unreleased
]:
https://gitlab.emi.u-bordeaux.fr/conduite-de-projet/osef/osef-api/
[
0.1.0
]:
https://gitlab.emi.u-bordeaux.fr/conduite-de-projet/osef/osef-api/-/tags/0.1.0
\ No newline at end of file
[
0.1.0
]:
https://gitlab.emi.u-bordeaux.fr/conduite-de-projet/osef/osef-api/-/tags/0.1.0
[
0.1.0
]:
https://gitlab.emi.u-bordeaux.fr/conduite-de-projet/osef/osef-api/-/tags/0.2.0
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Dockerfile
+
1
−
1
View file @
8cbc2a2e
...
...
@@ -17,7 +17,7 @@ RUN apt-get update && apt-get install -y curl
WORKDIR
/app
COPY
--from=container-builder /app/target/osef-0.
1
.0.jar /app/app.jar
COPY
--from=container-builder /app/target/osef-0.
2
.0.jar /app/app.jar
EXPOSE
8080
...
...
This diff is collapsed.
Click to expand it.
pom.xml
+
1
−
1
View file @
8cbc2a2e
...
...
@@ -3,7 +3,7 @@
<groupId>
com.osef
</groupId>
<artifactId>
osef
</artifactId>
<packaging>
jar
</packaging>
<version>
0.
1
.0
</version>
<version>
0.
2
.0
</version>
<name>
osef
</name>
<url>
http://maven.apache.org
</url>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment