Skip to content

Commit 51fafec

Browse files
authored
Upgrade to Halo 2.0.0 (#2)
* Upgrade to Halo 2.0.0
1 parent 83739c7 commit 51fafec

File tree

6 files changed

+13
-27
lines changed

6 files changed

+13
-27
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
with:
3333
name: plugin-sitemap
3434
path: |
35-
build/libs/*-plain.jar
35+
build/libs/*.jar
3636
retention-days: 1
3737

3838
github-release:

build.gradle

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
plugins {
2-
id 'org.springframework.boot' version '3.0.0'
3-
id 'io.spring.dependency-management' version '1.1.0'
42
id "io.github.guqing.plugin-development" version "0.0.5-SNAPSHOT"
53
id 'java'
64
}
@@ -14,10 +12,6 @@ repositories {
1412
mavenCentral()
1513
}
1614

17-
bootJar {
18-
enabled = false
19-
}
20-
2115
jar {
2216
enabled = true
2317
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
@@ -31,28 +25,20 @@ jar {
3125
}
3226
}
3327

34-
ext {
35-
guava = "31.1-jre"
36-
}
3728
dependencies {
38-
compileOnly "io.swagger.core.v3:swagger-core-jakarta:2.2.0"
39-
compileOnly 'org.springframework.boot:spring-boot-starter-webflux'
40-
compileOnly "com.google.guava:guava:$guava"
29+
compileOnly platform('run.halo.dependencies:halo-dependencies:1.0.0')
4130

42-
compileOnly 'org.pf4j:pf4j:3.8.0'
43-
compileOnly files("lib/halo-2.0.0-SNAPSHOT-plain.jar")
31+
compileOnly files("lib/halo-2.0.0-plain.jar")
4432

4533
compileOnly 'org.projectlombok:lombok'
46-
annotationProcessor 'org.projectlombok:lombok'
34+
annotationProcessor 'org.projectlombok:lombok:1.18.22'
4735

48-
testImplementation "com.google.guava:guava:$guava"
49-
testImplementation 'org.apache.commons:commons-lang3:3.12.0'
36+
testImplementation "com.google.guava:guava"
37+
testImplementation 'org.apache.commons:commons-lang3'
5038
testImplementation 'org.springframework.boot:spring-boot-starter-webflux'
5139
testImplementation 'org.springframework.boot:spring-boot-starter-test'
5240
testImplementation 'io.projectreactor:reactor-test'
53-
testImplementation files("lib/halo-2.0.0-SNAPSHOT-plain.jar")
54-
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
55-
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
41+
testImplementation files("lib/halo-2.0.0-plain.jar")
5642
}
5743

5844
test {

lib/halo-2.0.0-SNAPSHOT-plain.jar

-1.17 MB
Binary file not shown.

lib/halo-2.0.0-plain.jar

2.96 MB
Binary file not shown.

src/main/java/run/halo/sitemap/DefaultSitemapEntryLister.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
import org.apache.commons.lang3.StringUtils;
1111
import org.springframework.stereotype.Component;
1212
import reactor.core.publisher.Flux;
13-
import run.halo.app.core.extension.Category;
14-
import run.halo.app.core.extension.Post;
15-
import run.halo.app.core.extension.SinglePage;
16-
import run.halo.app.core.extension.Tag;
13+
import run.halo.app.core.extension.content.Category;
14+
import run.halo.app.core.extension.content.Post;
15+
import run.halo.app.core.extension.content.SinglePage;
16+
import run.halo.app.core.extension.content.Tag;
1717
import run.halo.app.extension.ConfigMap;
1818
import run.halo.app.extension.ExtensionOperator;
1919
import run.halo.app.extension.ReactiveExtensionClient;

src/main/resources/plugin.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ metadata:
44
name: PluginSitemap
55
spec:
66
enabled: true
7-
version: 1.0.0-alpha.3
8-
requires: ">=2.0.0-beta.2"
7+
version: 1.0.0
8+
requires: ">=2.0.0"
99
author:
1010
name: Halo OSS Team
1111
website: https://github.com/halo-dev

0 commit comments

Comments
 (0)