Skip to content

Commit 896f2bc

Browse files
committed
Revert back the plugin
1 parent 0704ee7 commit 896f2bc

File tree

2 files changed

+49
-0
lines changed

2 files changed

+49
-0
lines changed

gradle.properties

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,20 @@ enableCentralSonatypeSnapshotsRep = true
3434
# Enable the maven local repository (for local development when needed) when present (value ignored)
3535
#enableMavenLocalRepo = true
3636

37+
# The default Hibernate ORM version (override using `-PhibernateOrmVersion=the.version.you.want`)
38+
hibernateOrmVersion = 7.0.+
39+
40+
# Override default Hibernate ORM Gradle plugin version
41+
#hibernateOrmGradlePluginVersion = 7.0.2.Final
42+
43+
# If set to true, skip Hibernate ORM version parsing (default is true, if set to null)
44+
# this is required when using intervals or weird versions or the build will fail
45+
#skipOrmVersionParsing = true
46+
47+
# Override default Vert.x Sql client version
48+
#vertxSqlClientVersion = 5.0.0-SNAPSHOT
49+
50+
# Override default Vert.x Web client and server versions. For integration tests, both default to vertxSqlClientVersion
51+
#vertxWebVersion = 5.0.0
52+
#vertxWebtClientVersion = 5.0.0
53+

local-build-plugins/src/main/java/org/hibernate/reactive/env/VersionsPlugin.java

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ public class VersionsPlugin implements Plugin<Project> {
2323
public static final String RELEASE_VERSION = "releaseVersion";
2424
public static final String DEVELOPMENT_VERSION = "developmentVersion";
2525

26+
public static final String ORM_VERSION = "hibernateOrmVersion";
27+
public static final String ORM_PLUGIN_VERSION = "hibernateOrmGradlePluginVersion";
2628
public static final String SKIP_ORM_VERSION_PARSING = "skipOrmVersionParsing";
2729

2830
public static final String RELATIVE_FILE = "gradle/version.properties";
@@ -55,6 +57,14 @@ public void apply(Project project) {
5557
project.getLogger().lifecycle( "Development version: n/a" );
5658
}
5759

60+
final String ormVersionString = determineOrmVersion( project );
61+
final Object ormVersion = resolveOrmVersion( ormVersionString, project );
62+
project.getLogger().lifecycle( "ORM version: {}", ormVersion );
63+
project.getExtensions().add( ORM_VERSION, ormVersion );
64+
65+
final Object ormPluginVersion = determineOrmPluginVersion( ormVersion, project );
66+
project.getLogger().lifecycle( "ORM Gradle plugin version: {}", ormPluginVersion );
67+
project.getExtensions().add( ORM_PLUGIN_VERSION, ormPluginVersion );
5868
}
5969

6070
private ProjectVersion determineReleaseVersion(Project project) {
@@ -112,4 +122,26 @@ private static void withInputStream(File file, Consumer<InputStream> action) {
112122
throw new RuntimeException( "Error reading file stream = " + file.getAbsolutePath(), e );
113123
}
114124
}
125+
126+
private String determineOrmVersion(Project project) {
127+
if ( project.hasProperty( ORM_VERSION ) ) {
128+
return (String) project.property( ORM_VERSION );
129+
}
130+
throw new IllegalStateException( "Hibernate ORM version not specified on project" );
131+
}
132+
133+
private Object resolveOrmVersion(String stringForm, Project project) {
134+
if ( project.hasProperty( SKIP_ORM_VERSION_PARSING )
135+
&& Boolean.parseBoolean( (String) project.property( SKIP_ORM_VERSION_PARSING ) ) ) {
136+
return stringForm;
137+
}
138+
return new ProjectVersion( stringForm );
139+
}
140+
141+
private Object determineOrmPluginVersion(Object ormVersion, Project project) {
142+
if ( project.hasProperty( ORM_PLUGIN_VERSION ) ) {
143+
return project.property( ORM_PLUGIN_VERSION );
144+
}
145+
return ormVersion;
146+
}
115147
}

0 commit comments

Comments
 (0)