Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
* upstream/master: (71 commits)
  Upgrade plugin to Grails 6.2
  Add insecure protocol publish using gradle properties.
  Upgrade plugin to Grails 5.3.6
  Update README.md and add github package publish.
  Remove depreciated GrailsDomainClass and use PersistentEntity
  Upgrade hibernate-filter plugin to grails 4.1.4
  Groovify isRoot method
  Use the deprecated way of checking if a class is a root domain class or not for now, to make the plugin compatible with grails 3.3.9 applications and multiple data sources configured. Error was obtained at startup: org.grails.datastore.mapping.model.MappingContext.getPersistentEntity(java.lang.String)] cannot be accessed before GORM has initialized, which was triggered by domainCLass.isRoot()
  Update version in README
  Commit version update
  Remove extra line
  Add sample for non persistent domain class
  Fix missing import
  #8 - Fix for mappedWith none being included
  #6 Update README version to 0.5.3 and add bintray gradle plugin
  #6 Update version to 0.5.3
  #6 Only enable filters when session exists
  Fixing tests and jointable functionality
  Fixing issue with NPE
  Add Join Table Support
  ...

# Conflicts:
#	.gitignore
#	.travis.yml
#	HibernateFilterGrailsPlugin.groovy
#	README.md
#	application.properties
#	grails-app/conf/BuildConfig.groovy
#	grails-app/conf/DataSource.groovy
#	grails-app/conf/org/grails/plugin/hibernate/filter/HibernateFilterFilters.groovy
#	grails-app/domain/test/domain/Bar.groovy
#	hibernate-filter-example/grails-app/assets/images/skin/database_add.png
#	hibernate-filter-example/grails-app/assets/images/skin/database_delete.png
#	hibernate-filter-example/grails-app/assets/images/skin/database_edit.png
#	hibernate-filter-example/grails-app/assets/images/skin/database_save.png
#	hibernate-filter-example/grails-app/assets/images/skin/database_table.png
#	hibernate-filter-example/grails-app/assets/images/skin/exclamation.png
#	hibernate-filter-example/grails-app/assets/images/skin/house.png
#	hibernate-filter-example/grails-app/assets/images/skin/information.png
#	hibernate-filter-example/grails-app/assets/images/skin/shadow.jpg
#	hibernate-filter-example/grails-app/assets/images/skin/sorted_asc.gif
#	hibernate-filter-example/grails-app/assets/images/skin/sorted_desc.gif
#	hibernate-filter-example/grails-app/assets/images/spinner.gif
#	hibernate-filter-example/grails-app/conf/spring/resources.groovy
#	hibernate-filter-example/grails-app/i18n/messages.properties
#	hibernate-filter-example/grails-app/i18n/messages_de.properties
#	hibernate-filter-example/grails-app/i18n/messages_es.properties
#	hibernate-filter-example/grails-app/i18n/messages_fr.properties
#	hibernate-filter-example/grails-app/i18n/messages_it.properties
#	hibernate-filter-example/grails-app/i18n/messages_nl.properties
#	hibernate-filter-example/grails-app/i18n/messages_pt_BR.properties
#	hibernate-filter-example/grails-app/i18n/messages_pt_PT.properties
#	hibernate-filter-example/grails-app/i18n/messages_ru.properties
#	hibernate-filter-example/grails-app/i18n/messages_th.properties
#	hibernate-filter-example/grails-app/i18n/messages_zh_CN.properties
#	src/groovy/org/grails/plugin/hibernate/filter/HibernateFilterBuilder.groovy
#	src/groovy/org/grails/plugin/hibernate/filter/HibernateFilterDomainConfiguration.groovy
  • Loading branch information
sbglasius committed Aug 29, 2024
2 parents bfe47b0 + e89096b commit ec50021
Show file tree
Hide file tree
Showing 142 changed files with 45,059 additions and 324 deletions.
20 changes: 10 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/.settings
/target/
*.iws
*.log
*.zip
plugin.xml
.DS_Store
/web-app/

#IntelliJ IDEA files
.idea/
build/
*.iml

# Eclipse files
target/
.settings
.classpath
.project
.slcache/

#Gradle
.gradle/
5 changes: 1 addition & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
language: groovy

jdk:
- oraclejdk7

script: ./grailsw clean && yes | ./grailsw refresh-dependencies && ./grailsw test-app
- oraclejdk8
10 changes: 10 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
## Change Log

### 0.2.0
##### 2016-07-20
- Upgraded Grails version to 3.1.9
- Upgraded Gradle wrapper version to 2.14.1
- Java version changed to 1.8
- Removed dependency from `compile org.grails:grails-datastore-gorm-hibernate4:4.0.7.RELEASE`;
added `provided "org.grails.plugins:hibernate4"`
- Fixed wrong command in README.md file
47 changes: 0 additions & 47 deletions HibernateFilterGrailsPlugin.groovy

This file was deleted.

69 changes: 65 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,68 @@
[![Build Status](https://travis-ci.org/gpc/grails-hibernate-filter.svg?branch=master)](https://travis-ci.org/gpc/grails-hibernate-filter)
grails-hibernate-filter
=======================

This repository contains the source code for the Grails 1.X and 2.X versions of the Hibernate Filter plugin. Documentation is [available here](https://grails.org/plugin/hibernate-filter).
# Description
This is a fork of the original [Grails Hibernate Filter Plugin](http://grails.org/plugin/hibernate-filter)
created from fork [alexkramer/grails-hibernate-filter](https://github.com/alexkramer/grails-hibernate-filter)
to make it work with Grails 4.0.0 > *, Hibernate 5, and GORM 7.

Please check the [plugin descriptor](https://github.com/gpc/grails-hibernate-filter/blob/master/HibernateFilterGrailsPlugin.groovy#L5) to determine the latest version, because the latest version displayed on the plugin's documentation page is unreliable.
This repo contains two projects:

1. hibernate-filter-plugin - with plugin code
1. hibernate-filter-example - with example application using plugin

Information about the Grails 3.X version of this plugin is [available here](https://bintray.com/piotrchowaniec/grails-plugins/grails-hibernate-filter).
# Usage

## Build Plugin File

Clone the repository and execute in main directory command:

./gradlew hibernate-filter-plugin:jar

You can publish it to your maven local repository using:

./gradlew hibernate-filter-plugin:publishToMavenLocal

## Running example application

To run example application use command:

./gradlew hibernate-filter-example:bootRun

## Installation

Add dependency in build.gradle:

for Grails < 3.x

repositories {
maven { url "https://dl.bintray.com/goodstartgenetics/grails3-plugins/" }
}

dependencies {
compile "org.grails.plugins:hibernate-filter-plugin:0.5.5"
}

for Grails 4.x

repositories {
maven { url "https://maven.pkg.github.com/vsachinv/grails-hibernate-filter" }
}
dependencies {
compile "org.grails.plugins:hibernate-filter-plugin:4.0-M2"
}

for Grails 5.x

repositories {
maven { url "https://maven.pkg.github.com/vsachinv/grails-hibernate-filter" }
}
dependencies {
compile "org.grails.plugins:hibernate-filter-plugin:5.0-M1"
}

# Usage

Please refer to this project's [wiki](https://github.com/alexkramer/grails-hibernate-filter/wiki) for usage.
3 changes: 0 additions & 3 deletions application.properties

This file was deleted.

13 changes: 13 additions & 0 deletions buildSrc/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
repositories {
mavenLocal()
mavenCentral()
maven { url "https://plugins.gradle.org/m2/" }
maven { url "https://repo.grails.org/grails/core" }
}

dependencies {
implementation("org.grails:grails-gradle-plugin:6.1.2")
implementation("org.grails.plugins:hibernate5:8.1.0")
implementation("com.bertramlabs.plugins:asset-pipeline-gradle:4.3.0")
implementation("com.gorylenko.gradle-git-properties:gradle-git-properties:2.4.2")
}
Binary file added gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 5 additions & 0 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit ec50021

Please sign in to comment.