Skip to content

Commit

Permalink
Merge pull request #486 from grails/remove-webjar-versions
Browse files Browse the repository at this point in the history
Back to snapshot versions & remove webjar versions which now come from grails-bom
  • Loading branch information
jamesfredley authored Dec 28, 2024
2 parents ac13723 + 8e8585b commit 009ccf4
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
env:
DEVELOCITY_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
DEVELOCITY_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
run: ./gradlew build
run: ./gradlew build --refresh-dependencies
- name: "✅ Verify CLI"
if: success()
run: |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,19 +74,16 @@ public void apply(GeneratorContext generatorContext) {
generatorContext.addDependency(Dependency.builder()
.groupId("org.webjars.npm")
.artifactId("bootstrap")
.version("5.3.3")
.developmentOnly());

generatorContext.addDependency(Dependency.builder()
.groupId("org.webjars.npm")
.artifactId("bootstrap-icons")
.version("1.11.3")
.developmentOnly());

generatorContext.addDependency(Dependency.builder()
.groupId("org.webjars.npm")
.artifactId("jquery")
.version("3.7.1")
.developmentOnly());

final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
Expand Down
8 changes: 4 additions & 4 deletions grails-forge-core/src/main/resources/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
<dependency>
<groupId>org.grails.plugins</groupId>
<artifactId>hibernate5</artifactId>
<version>9.0.0-M2</version>
<version>9.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.grails.plugins</groupId>
<artifactId>cache</artifactId>
<version>8.0.0-M2</version>
<version>8.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.grails.plugins</groupId>
Expand All @@ -35,7 +35,7 @@
<dependency>
<groupId>org.grails.plugins</groupId>
<artifactId>database-migration</artifactId>
<version>6.0.0-M1</version>
<version>6.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.grails.plugins</groupId>
Expand All @@ -60,7 +60,7 @@
<dependency>
<groupId>org.grails.plugins</groupId>
<artifactId>views-gradle</artifactId>
<version>4.0.0-M1</version>
<version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.grails.plugins</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class HibernateGormSpec extends ApplicationContextSpec implements CommandOutputF
.renderBuildSrc()

then:
template.contains('implementation "org.grails.plugins:hibernate5:9.0.0-M2"')
template.contains('implementation "org.grails.plugins:hibernate5:9.0.0-SNAPSHOT"')
}

void "test buildSrc is present for buildscript dependencies"() {
Expand All @@ -51,7 +51,7 @@ class HibernateGormSpec extends ApplicationContextSpec implements CommandOutputF

expect:
buildGradle != null
buildGradle.contains("classpath \"org.grails.plugins:hibernate5:9.0.0-M2\"")
buildGradle.contains("classpath \"org.grails.plugins:hibernate5:9.0.0-SNAPSHOT\"")

}

Expand Down

0 comments on commit 009ccf4

Please sign in to comment.