Skip to content

Commit 009ccf4

Browse files
authored
Merge pull request #486 from grails/remove-webjar-versions
Back to snapshot versions & remove webjar versions which now come from grails-bom
2 parents ac13723 + 8e8585b commit 009ccf4

File tree

4 files changed

+7
-10
lines changed

4 files changed

+7
-10
lines changed

.github/workflows/gradle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
env:
3232
DEVELOCITY_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
3333
DEVELOCITY_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
34-
run: ./gradlew build
34+
run: ./gradlew build --refresh-dependencies
3535
- name: "✅ Verify CLI"
3636
if: success()
3737
run: |

grails-forge-core/src/main/java/org/grails/forge/feature/assetPipeline/AssetPipeline.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,19 +74,16 @@ public void apply(GeneratorContext generatorContext) {
7474
generatorContext.addDependency(Dependency.builder()
7575
.groupId("org.webjars.npm")
7676
.artifactId("bootstrap")
77-
.version("5.3.3")
7877
.developmentOnly());
7978

8079
generatorContext.addDependency(Dependency.builder()
8180
.groupId("org.webjars.npm")
8281
.artifactId("bootstrap-icons")
83-
.version("1.11.3")
8482
.developmentOnly());
8583

8684
generatorContext.addDependency(Dependency.builder()
8785
.groupId("org.webjars.npm")
8886
.artifactId("jquery")
89-
.version("3.7.1")
9087
.developmentOnly());
9188

9289
final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();

grails-forge-core/src/main/resources/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
<dependency>
2121
<groupId>org.grails.plugins</groupId>
2222
<artifactId>hibernate5</artifactId>
23-
<version>9.0.0-M2</version>
23+
<version>9.0.0-SNAPSHOT</version>
2424
</dependency>
2525
<dependency>
2626
<groupId>org.grails.plugins</groupId>
2727
<artifactId>cache</artifactId>
28-
<version>8.0.0-M2</version>
28+
<version>8.0.0-SNAPSHOT</version>
2929
</dependency>
3030
<dependency>
3131
<groupId>org.grails.plugins</groupId>
@@ -35,7 +35,7 @@
3535
<dependency>
3636
<groupId>org.grails.plugins</groupId>
3737
<artifactId>database-migration</artifactId>
38-
<version>6.0.0-M1</version>
38+
<version>6.0.0-SNAPSHOT</version>
3939
</dependency>
4040
<dependency>
4141
<groupId>org.grails.plugins</groupId>
@@ -60,7 +60,7 @@
6060
<dependency>
6161
<groupId>org.grails.plugins</groupId>
6262
<artifactId>views-gradle</artifactId>
63-
<version>4.0.0-M1</version>
63+
<version>4.0.0-SNAPSHOT</version>
6464
</dependency>
6565
<dependency>
6666
<groupId>org.grails.plugins</groupId>

grails-forge-core/src/test/groovy/org/grails/forge/feature/database/HibernateGormSpec.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class HibernateGormSpec extends ApplicationContextSpec implements CommandOutputF
4141
.renderBuildSrc()
4242

4343
then:
44-
template.contains('implementation "org.grails.plugins:hibernate5:9.0.0-M2"')
44+
template.contains('implementation "org.grails.plugins:hibernate5:9.0.0-SNAPSHOT"')
4545
}
4646

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

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

5656
}
5757

0 commit comments

Comments
 (0)