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: updated dependencies, included alternative commandline start o… #50

Merged
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
171 changes: 85 additions & 86 deletions DEPENDENCIES_BACKEND

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion DEPENDENCIES_FRONTEND
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ npm/npmjs/-/glob/7.2.3, ISC, approved, clearlydefined
npm/npmjs/-/globals/13.16.0, MIT, approved, clearlydefined
npm/npmjs/-/good-listener/1.2.2, MIT, approved, clearlydefined
npm/npmjs/-/has-flag/4.0.0, MIT, approved, clearlydefined
npm/npmjs/-/has/1.0.3, MIT, approved, clearlydefined
npm/npmjs/-/has/1.0.3, MIT, approved, #10930
npm/npmjs/-/ignore/5.2.0, MIT, approved, #5907
npm/npmjs/-/import-fresh/3.3.0, MIT, approved, clearlydefined
npm/npmjs/-/imurmurhash/0.1.4, MIT, approved, clearlydefined
Expand Down
171 changes: 85 additions & 86 deletions backend/DEPENDENCIES

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions backend/INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ mvn install

# run for demo or development puroposes
# customer role
mvn spring-boot:run -Dspring-boot.run.arguments=--spring.profiles.active=customer
mvn spring-boot:run -Dspring-boot.run.arguments=--spring.config.location="./src/main/resources/application-customer.properties"

# supplier role
mvn spring-boot:run -Dspring-boot.run.arguments=--spring.profiles.active=supplier
mvn spring-boot:run -Dspring-boot.run.arguments=--spring.config.location="./src/main/resources/application-supplier.properties"
```
5. Done! The Swagger UI should be available at
- (Java & Docker) `http://YOURIP:8081/catena/swagger-ui/index.html`
Expand Down
Empty file modified backend/mvnw
100644 → 100755
Empty file.
29 changes: 14 additions & 15 deletions backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.0.2</version>
<version>3.1.4</version>
<relativePath/>
</parent>
<groupId>org.eclipse.tractusx.puris</groupId>
Expand All @@ -41,6 +41,7 @@
<springdoc.version>2.1.0</springdoc.version>
<okhttp3.version>2.7.5</okhttp3.version>
<hibernate-validator.version>8.0.0.Final</hibernate-validator.version>
<snakeyaml.version>2.2</snakeyaml.version>
</properties>
<dependencies>
<dependency>
Expand All @@ -59,12 +60,6 @@
<groupId>org.springframework.session</groupId>
<artifactId>spring-session-core</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
Expand Down Expand Up @@ -116,21 +111,25 @@
</dependencies>

<pluginRepositories>
<pluginRepository>
<id>dash-licenses-snapshots</id>
<url>https://repo.eclipse.org/content/repositories/dash-licenses-snapshots/</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
<!-- <pluginRepository>-->
<!-- <id>dash-licenses-snapshots</id>-->
<!-- <url>https://repo.eclipse.org/content/repositories/dash-licenses-snapshots/</url>-->
<!-- <snapshots>-->
<!-- <enabled>true</enabled>-->
<!-- </snapshots>-->
<!-- </pluginRepository>-->
<pluginRepository>
<id>dash-licenses</id>
<url>https://repo.eclipse.org/content/repositories/dash-licenses</url>
</pluginRepository>
</pluginRepositories>

<build>
<plugins>
<plugin>
<groupId>org.eclipse.dash</groupId>
<artifactId>license-tool-plugin</artifactId>
<version>1.0.3-SNAPSHOT</version>
<version>1.0.2</version>
<configuration>
<projectId>automotive.tractusx</projectId>
<!-- name of dependencies file -->
Expand Down
12 changes: 6 additions & 6 deletions backend/src/main/resources/application-customer.properties
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,12 @@ own.bpnl=${OWN_BPNL:BPNL4444444444XX}
own.name=${OWN_NAME:Scenario Customer}

# Own BPNS (optional: if this is set, then set own.default.site.name as well)
#own.default.bpns=${OWN_BPNS:BPNS4444444444XY}
own.default.bpns=
own.default.bpns=${OWN_BPNS:BPNS4444444444XY}
# Name of Site (see above)
#own.default.site.name=${OWN_SITE:Hauptwerk Musterhausen}
own.default.site.name=
own.default.site.name=${OWN_SITE:Hauptwerk Musterhausen}

# If a BPNS is set, then this BPNA will be attached to it.
# Otherwise it will be attached immediately to the BPNL (see above)
# Otherwise, it will be attached immediately to the BPNL (see above)
own.default.bpna=${OWN_BPNS:BPNA4444444444ZZ}
own.default.streetandnumber=${OWN_STREETANDNUMBER:Musterstrasse 35b}
own.default.zipcodeandcity=${OWN_ZIPCODEANDCITY:77777 Musterhausen}
Expand All @@ -59,4 +57,6 @@ own.edr.deletiontimer=2
puris.apiversion=1.0.0
puris.demonstrator.role=customer
# run with:
# mvn spring-boot:run -Dspring-boot.run.arguments=--spring.profiles.active=customer
# ./mvnw spring-boot:run -Dspring-boot.run.arguments=--spring.profiles.active=customer
# alternatively:
# ./mvnw spring-boot:run -Dspring-boot.run.arguments=--spring.config.location="./src/main/resources/application-customer.properties"
6 changes: 4 additions & 2 deletions backend/src/main/resources/application-supplier.properties
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ own.default.bpns=${OWN_BPNS:BPNS1234567890ZZ}
own.default.site.name=${OWN_SITE:Konzernzentrale Dudelsdorf}

# If a BPNS is set, then this BPNA will be attached to it.
# Otherwise it will be attached immediately to the BPNL (see above)
# Otherwise, it will be attached immediately to the BPNL (see above)
own.default.bpna=${OWN_BPNS:BPNA1234567890AA}
own.default.streetandnumber=${OWN_STREETANDNUMBER:Heinrich-Supplier-Strasse 1}
own.default.zipcodeandcity=${OWN_ZIPCODEANDCITY:77785 Dudelsdorf}
Expand All @@ -58,4 +58,6 @@ own.edr.deletiontimer=2
puris.apiversion=1.0.0
puris.demonstrator.role=supplier
# run with:
# mvn spring-boot:run -Dspring-boot.run.arguments=--spring.profiles.active=supplier
# ./mvnw spring-boot:run -Dspring-boot.run.arguments=--spring.profiles.active=supplier
# alternatively:
# ./mvnw spring-boot:run -Dspring-boot.run.arguments=--spring.config.location="./src/main/resources/application-supplier.properties"
6 changes: 2 additions & 4 deletions backend/src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,12 @@ own.bpnl=${OWN_BPNL:BPNL4444444444XX}
own.name=${OWN_NAME:Scenario Customer}

# Own BPNS (optional: if this is set, then set own.default.site.name as well)
#own.default.bpns=${OWN_BPNS:BPNS4444444444XY}
own.default.bpns=${OWN_BPNS:BPNS4444444444XY}
# Name of Site (see above)
#own.default.site.name=${OWN_SITE:Hauptwerk Musterhausen}
own.default.site.name=${OWN_SITE:Hauptwerk Musterhausen}

# If a BPNS is set, then this BPNA will be attached to it.
# Otherwise it will be attached immediately to the BPNL (see above)
# Otherwise, it will be attached immediately to the BPNL (see above)
own.default.bpna=${OWN_BPNS:BPNA4444444444ZZ}
own.default.streetandnumber=${OWN_STREETANDNUMBER:Musterstrasse 35b}
own.default.zipcodeandcity=${OWN_ZIPCODEANDCITY:77777 Musterhausen}
Expand All @@ -59,4 +57,4 @@ own.edr.deletiontimer=2
puris.apiversion=1.0.0
puris.demonstrator.role=customer
# run with:
# mvn spring-boot:run -Dspring-boot.run.arguments=--spring.profiles.active=customer
# ./mvnw spring-boot:run -Dspring-boot.run.arguments=--spring.config.location="./src/main/resources/application.properties"
14 changes: 14 additions & 0 deletions backend/docs/dev.md → docs/DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,17 @@ The first line runs the maven license tool with the parameters specified in the
./backend/pom.xml and produces a DEPENDENCIES file in the ./backend folder.
Then this file gets copied to the PURIS-project root folder under the name DEPENDENCIES_BACKEND.
Both files should be updated prior to any pull request.

### Frontend
```
# move to a persistent folder. Could also be ~/jars.
mv org.eclipse.dash.licenses-1.0.2.jar ~/coding/org.eclipse.dash.licenses-1.0.2.jar
vim ~/.bashrc
# add following line using i
alias eclipseDashTool='java -jar ~/coding/org.eclipse.dash.licenses-1.0.2.jar'
# esc, qw -> enter to save and exit
source ~/.bashrc
# cd to puris-frontend
cd frontend
eclipseDashTool package-lock.json -project automotive.tractusx -summary ../DEPENDENCIES_FRONTEND
```
Loading