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

GH-2255 Drop discontinued 3.x sources #2256

Merged
merged 6 commits into from
Oct 27, 2024
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
3 changes: 0 additions & 3 deletions .github/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,6 @@ Recommended tool to develop backend module is IntelliJ IDE, for frontend it migh
# Run only backend through CLI
$ ./gradlew run

# Run only frontend
$ cd reposilite-frontend && npm i && npm run full

# Run only Reposilite site
$ cd reposilite-site/website && npm i && npm run start
```
Expand Down
4 changes: 0 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ updates:
directory: "/reposilite-backend"
schedule:
interval: "monthly"
- package-ecosystem: "npm"
directory: "/reposilite-frontend"
schedule:
interval: "monthly"
- package-ecosystem: "npm"
directory: "/reposilite-site"
schedule:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ name: "Reposilite CI"

on:
push:
branches: [ "main", "3.0" ]
branches: [ "main", "3.0", "4.x" ]
pull_request:
branches: [ "main", "3.0" ]
branches: [ "main", "3.0", "4.x" ]

jobs:
build:
Expand Down
2 changes: 0 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
FROM openjdk:21-slim AS build
COPY . /home/reposilite-build
WORKDIR /home/reposilite-build
RUN \
rm -rf reposilite-frontend/node_modules
RUN \
apt-get update; apt-get install -y curl
RUN \
Expand Down
2 changes: 0 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ scmVersion {
fileUpdate(".github/README.md") { version -> "dzikoysk/reposilite:$version" }
fileUpdate("docker-compose.yml") { version -> "image: reposilite:$version" }
fileUpdate("reposilite-backend/src/main/kotlin/com/reposilite/Reposilite.kt") { version -> "const val VERSION = \"$version\"" }
fileUpdate("reposilite-frontend/package.json") { version -> "\"version\": \"$version\"" }
fileUpdate("reposilite-frontend/package-lock.json") { version -> "\"version\": \"$version\"" }
fileUpdate("reposilite-site/data/guides/developers/endpoints.md") { version -> "\"version\": \"$version\"" }
fileUpdate("reposilite-site/data/guides/developers/plugin-api.md") { version -> "\"com.reposilite:reposilite:$version\"" }
fileUpdate("reposilite-site/data/guides/installation/docker.md") { version -> version }
Expand Down
10 changes: 0 additions & 10 deletions reposilite-backend/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ application {
}

dependencies {
implementation(project(":reposilite-frontend"))

// val detekt = "1.23.5"
// detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:$detekt")

Expand All @@ -45,7 +43,6 @@ dependencies {

val javalin = "6.3.0"
api("io.javalin:javalin:$javalin")
api("io.javalin.community.ssl:ssl-plugin:$javalin")

val javalinOpenApi = "6.3.0"
api("io.javalin.community.openapi:javalin-openapi-plugin:$javalinOpenApi")
Expand All @@ -71,21 +68,15 @@ dependencies {
api("info.picocli:picocli:$picocli")

val awssdk = "2.28.16"
implementation(platform("software.amazon.awssdk:bom:$awssdk"))
implementation("software.amazon.awssdk:s3:$awssdk")

val awsSdkV1 = "1.12.773"
testImplementation("com.amazonaws:aws-java-sdk-s3:$awsSdkV1")

val exposed = "0.55.0"
api("org.jetbrains.exposed:exposed-core:$exposed")
api("org.jetbrains.exposed:exposed-dao:$exposed")
api("org.jetbrains.exposed:exposed-jdbc:$exposed")
api("org.jetbrains.exposed:exposed-java-time:$exposed")
// Drivers
implementation("com.zaxxer:HikariCP:6.0.0")
implementation("org.xerial:sqlite-jdbc:3.46.1.3")
implementation("mysql:mysql-connector-java:8.0.33")
implementation("org.mariadb.jdbc:mariadb-java-client:3.4.1")
implementation("org.postgresql:postgresql:42.7.4")
implementation("com.h2database:h2:2.3.232")
Expand Down Expand Up @@ -142,7 +133,6 @@ tasks.withType<ShadowJar> {
exclude(dependency("org.eclipse.jetty:.*"))
exclude(dependency("org.eclipse.jetty.http2:.*"))
exclude(dependency("org.eclipse.jetty.websocket:.*"))
exclude(dependency("org.bouncycastle:.*"))
exclude(dependency("com.fasterxml.woodstox:woodstox-core:.*"))
exclude(dependency("commons-logging:commons-logging:.*"))
exclude(dependency("org.jetbrains.kotlin:kotlin-reflect:.*"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import com.reposilite.auth.application.AuthenticationSettings
import com.reposilite.auth.application.LdapSettings
import com.reposilite.configuration.shared.SharedConfigurationFacade
import com.reposilite.configuration.specification.SettingsIntegrationSpecification
import com.reposilite.frontend.application.FrontendSettings
import com.reposilite.maven.application.MavenSettings
import com.reposilite.shared.ErrorResponse
import com.reposilite.statistics.api.ResolvedRequestsInterval.YEARLY
Expand All @@ -51,7 +50,6 @@ internal abstract class SettingsIntegrationTest : SettingsIntegrationSpecificati
"web" to WebSettings::class,
"authentication" to AuthenticationSettings::class,
"statistics" to StatisticsSettings::class,
"frontend" to FrontendSettings::class,
"maven" to MavenSettings::class
)
}
Expand Down Expand Up @@ -120,7 +118,6 @@ internal abstract class SettingsIntegrationTest : SettingsIntegrationSpecificati
"web" to WebSettings(forwardedIp = "test"),
"authentication" to AuthenticationSettings(ldap = LdapSettings(enabled = true)),
"statistics" to StatisticsSettings(resolvedRequestsInterval = YEARLY),
"frontend" to FrontendSettings(id = "test"),
"maven" to MavenSettings(repositories = emptyList())
)

Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading