Skip to content

Commit 2a434c7

Browse files
berezovskyiberezovskyi
authored
feat: migrate to Bootstrap 5 (#389)
* feat: migrate to Bootstrap 5 - Removes dependency on jQuery - Updates various CSS classes for Bootstrap 5 - Fixes many issues around popover Signed-off-by: Andrew Berezovskyi <andriib@kth.se> * gen: with the latest LyoD * gen: regenerate & clean up POM and old files --------- Signed-off-by: Andrew Berezovskyi <andriib@kth.se>
1 parent ca719ab commit 2a434c7

File tree

111 files changed

+3152
-3112
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+3152
-3112
lines changed

‎src/cleanup-lyod.ps1‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
<#
2+
.SYNOPSIS
3+
Deletes files in a directory that were not modified in the last X minutes and contain the phrase "Start of user code".
4+
5+
.PARAMETER DirectoryPath
6+
The path to the directory to search for files.
7+
8+
.PARAMETER Minutes
9+
The number of minutes to determine if a file is considered old.
10+
11+
.EXAMPLE
12+
.\cleanup-lyod.ps1 -DirectoryPath "server-rm" -Minutes 30
13+
#>
14+
15+
param (
16+
[Parameter(Mandatory=$true)]
17+
[string]$DirectoryPath,
18+
19+
[Parameter(Mandatory=$true)]
20+
[int]$Minutes
21+
)
22+
23+
# Calculate the cutoff time
24+
$cutoffTime = (Get-Date).AddMinutes(-$Minutes)
25+
26+
# Get all files in the directory and its subdirectories
27+
$files = Get-ChildItem -Path $DirectoryPath -File -Recurse
28+
29+
foreach ($file in $files) {
30+
# Check if the file was modified before the cutoff time
31+
if ($file.LastWriteTime -lt $cutoffTime) {
32+
try {
33+
# Read the file content
34+
$content = Get-Content -Path $file.FullName -Raw -ErrorAction Stop
35+
36+
# Check if the file content contains the phrase "Start of user code"
37+
if ($content -like "*Start of user code*") {
38+
# Delete the file
39+
Remove-Item -Path $file.FullName -Force
40+
Write-Host "Deleted file: $($file.FullName)"
41+
}
42+
} catch {
43+
Write-Host "Error processing file: $($file.FullName). $_" -ForegroundColor Red
44+
}
45+
}
46+
}
47+
48+
Write-Host "File deletion process completed."

‎src/client-toolchain/pom.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<maven.compiler.target>17</maven.compiler.target>
1919

2020
<v.kotlin>2.1.20</v.kotlin>
21-
<v.lyo>7.0.0.Alpha3</v.lyo>
2221
<v.jersey>3.1.5</v.jersey>
2322
<v.kotlin.coroutines>1.10.2</v.kotlin.coroutines>
2423
</properties>
@@ -54,12 +53,10 @@
5453
<dependency>
5554
<groupId>org.eclipse.lyo.clients</groupId>
5655
<artifactId>oslc-client</artifactId>
57-
<version>${v.lyo}</version>
5856
</dependency>
5957
<dependency>
6058
<groupId>org.eclipse.lyo</groupId>
6159
<artifactId>oslc-domains</artifactId>
62-
<version>${v.lyo}</version>
6360
</dependency>
6461

6562
<dependency>

‎src/lib-common/pom.xml‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<maven.compiler.source>17</maven.compiler.source>
1919
<maven.compiler.target>17</maven.compiler.target>
2020

21-
<version.lyo>7.0.0.Alpha3</version.lyo>
2221
<v.jakarta.servlet.api>6.0.0</v.jakarta.servlet.api>
2322
<version.jersey>3.1.10</version.jersey>
2423
</properties>
@@ -46,68 +45,46 @@
4645
<dependency>
4746
<groupId>org.eclipse.lyo.oslc4j.core</groupId>
4847
<artifactId>oslc4j-core</artifactId>
49-
<version>${version.lyo}</version>
5048
</dependency>
5149
<dependency>
5250
<groupId>org.eclipse.lyo</groupId>
5351
<artifactId>oslc-domains</artifactId>
54-
<version>${version.lyo}</version>
5552
</dependency>
5653
<dependency>
5754
<groupId>org.eclipse.lyo.oslc4j.core</groupId>
5855
<artifactId>oslc4j-jena-provider</artifactId>
59-
<version>${version.lyo}</version>
6056
</dependency>
6157
<dependency>
6258
<groupId>org.eclipse.lyo.oslc4j.core</groupId>
6359
<artifactId>oslc4j-json4j-provider</artifactId>
64-
<version>${version.lyo}</version>
6560
</dependency>
6661
<dependency>
6762
<groupId>org.eclipse.lyo.clients</groupId>
6863
<artifactId>oslc-client</artifactId>
69-
<version>${version.lyo}</version>
7064
</dependency>
7165

7266
<!-- Servlet-related dependencies -->
7367
<dependency>
7468
<groupId>org.glassfish.jersey.core</groupId>
7569
<artifactId>jersey-server</artifactId>
76-
<version>${version.jersey}</version>
77-
<exclusions>
78-
<exclusion>
79-
<groupId>jakarta.ws.rs</groupId>
80-
<artifactId>jakarta.ws.rs-api</artifactId>
81-
</exclusion>
82-
</exclusions>
8370
</dependency>
8471
<dependency>
8572
<groupId>org.glassfish.jersey.containers</groupId>
8673
<artifactId>jersey-container-servlet</artifactId>
87-
<version>${version.jersey}</version>
88-
<exclusions>
89-
<exclusion>
90-
<groupId>jakarta.ws.rs</groupId>
91-
<artifactId>jakarta.ws.rs-api</artifactId>
92-
</exclusion>
93-
</exclusions>
9474
</dependency>
9575
<dependency>
9676
<groupId>jakarta.servlet</groupId>
9777
<artifactId>jakarta.servlet-api</artifactId>
98-
<version>${v.jakarta.servlet.api}</version>
9978
<scope>provided</scope>
10079
</dependency>
10180
<dependency>
10281
<groupId>jakarta.servlet.jsp.jstl</groupId>
10382
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
104-
<version>3.0.0</version>
10583
<scope>provided</scope>
10684
</dependency>
10785
<dependency>
10886
<groupId>jakarta.ws.rs</groupId>
10987
<artifactId>jakarta.ws.rs-api</artifactId>
110-
<version>4.0.0</version>
11188
<scope>provided</scope>
11289
</dependency>
11390

‎src/pom.xml‎

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0"
2-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55
<name>OSLC 2020 RefImpl (aggregator)</name>
66
<groupId>co.oslc.refimpl</groupId>
@@ -13,6 +13,7 @@
1313
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1414
<maven.compiler.source>17</maven.compiler.source>
1515
<maven.compiler.target>17</maven.compiler.target>
16+
<version.lyo>7.0.0-SNAPSHOT</version.lyo>
1617
</properties>
1718

1819
<modules>
@@ -26,23 +27,19 @@
2627

2728
<dependencyManagement>
2829
<dependencies>
30+
<dependency>
31+
<groupId>org.eclipse.lyo</groupId>
32+
<artifactId>lyo-bom</artifactId>
33+
<version>${version.lyo}</version>
34+
<scope>import</scope>
35+
<type>pom</type>
36+
</dependency>
37+
2938
<dependency>
3039
<groupId>co.oslc.refimpl</groupId>
3140
<artifactId>lib-common</artifactId>
3241
<version>${project.version}</version>
3342
</dependency>
34-
<dependency>
35-
<groupId>io.github.classgraph</groupId>
36-
<artifactId>classgraph</artifactId>
37-
<version>4.8.179</version>
38-
</dependency>
39-
<dependency>
40-
<groupId>com.fasterxml.jackson</groupId>
41-
<artifactId>jackson-bom</artifactId>
42-
<version>2.19.0</version>
43-
<scope>import</scope>
44-
<type>pom</type>
45-
</dependency>
4643
<dependency>
4744
<groupId>org.yaml</groupId>
4845
<artifactId>snakeyaml</artifactId>
@@ -76,4 +73,18 @@
7673
</plugin>
7774
</plugins>
7875
</build>
79-
</project>
76+
77+
<repositories>
78+
<repository>
79+
<name>Central Portal Snapshots</name>
80+
<id>central-portal-snapshots</id>
81+
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
82+
<releases>
83+
<enabled>false</enabled>
84+
</releases>
85+
<snapshots>
86+
<enabled>true</enabled>
87+
</snapshots>
88+
</repository>
89+
</repositories>
90+
</project>

‎src/server-am/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@
151151
-->
152152
<!-- End of user code
153153
-->
154-
<dependencyManagement>
154+
<dependencyManagement>
155155
<dependencies>
156156
<dependency>
157157
<groupId>org.eclipse.lyo</groupId>

‎src/server-am/src/main/java/co/oslc/refimpl/am/gen/AMConstants.java‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)