diff --git a/docs/release/1.0.0.txt b/docs/release/1.0.0.txt deleted file mode 100644 index b579443..0000000 --- a/docs/release/1.0.0.txt +++ /dev/null @@ -1 +0,0 @@ -First Release \ No newline at end of file diff --git a/dynamic-orm-examples/example-test-qmodels/src/main/java/orm/query/examples/qmodels/QRolePermission.java b/dynamic-orm-examples/example-test-qmodels/src/main/java/orm/query/examples/qmodels/QRolePermission.java index c1fc37b..e1ab9d7 100644 --- a/dynamic-orm-examples/example-test-qmodels/src/main/java/orm/query/examples/qmodels/QRolePermission.java +++ b/dynamic-orm-examples/example-test-qmodels/src/main/java/orm/query/examples/qmodels/QRolePermission.java @@ -32,10 +32,10 @@ public class QRolePermission extends com.querydsl.sql.RelationalPathBase rolePermissionPkey = createPrimaryKey(id); - public final com.querydsl.sql.ForeignKey rolePermission1Fkey = createForeignKey(permissionId, "ID"); - public final com.querydsl.sql.ForeignKey rolePermission2Fkey = createForeignKey(roleId, "ID"); + public final com.querydsl.sql.ForeignKey rolePermission1Fkey = createForeignKey(permissionId, "ID"); + public QRolePermission(String variable) { super(QRolePermission.class, forVariable(variable), "PUBLIC", "ROLE_PERMISSION"); addMetadata(); diff --git a/dynamic-orm-examples/example-test-qmodels/src/main/java/orm/query/examples/qmodels/QUserrole.java b/dynamic-orm-examples/example-test-qmodels/src/main/java/orm/query/examples/qmodels/QUserrole.java index c89e8a4..b0f7d41 100644 --- a/dynamic-orm-examples/example-test-qmodels/src/main/java/orm/query/examples/qmodels/QUserrole.java +++ b/dynamic-orm-examples/example-test-qmodels/src/main/java/orm/query/examples/qmodels/QUserrole.java @@ -32,10 +32,10 @@ public class QUserrole extends com.querydsl.sql.RelationalPathBase { public final com.querydsl.sql.PrimaryKey userrolePkey = createPrimaryKey(id); - public final com.querydsl.sql.ForeignKey userroleUserIdFkey = createForeignKey(userId, "ID"); - public final com.querydsl.sql.ForeignKey userroleRoleIdFkey = createForeignKey(roleId, "ID"); + public final com.querydsl.sql.ForeignKey userroleUserIdFkey = createForeignKey(userId, "ID"); + public QUserrole(String variable) { super(QUserrole.class, forVariable(variable), "PUBLIC", "USERROLE"); addMetadata(); diff --git a/release.sh b/release.sh index 1cf646d..a9421d6 100755 --- a/release.sh +++ b/release.sh @@ -53,8 +53,6 @@ tagName=`cat $PROPERTY_FILE | grep "scm.tag" | grep -i -v -E "scm.tagNameFormat" tagVersion=`cat $PROPERTY_FILE | grep "project.rel.com.github.vzakharchenko..dynamic-orm" | cut -d'=' -f2` tagDevVersion=`cat $PROPERTY_FILE | grep "project.dev.com.github.vzakharchenko..dynamic-orm" | cut -d'=' -f2` -releaseNotes=`cat ./docs/release/${tagVersion}.txt`; - if [[ "x${tagVersion}" == "x" ]]; then echo "tagVersion is empty" exit 1; @@ -73,13 +71,7 @@ mvn clean install -Dkeycloak-plugin=$tagVersion -Dproduction=true # create release git pull -hub release create -m "Dynamic Orm ${tagName} - -releaseNotes: -
-$releaseNotes
-
-" $tagName +hub release create -m "Dynamic Orm ${tagName}" $tagName # update version of keycloak-radius mvn versions:set -DnewVersion=$tagDevVersion