Merge pull request querydsl#1949 from querydsl/querydsl-3.7.4

Querydsl 3.7.4
thackel · Jun 30, 2016 · 6988c7b · 6988c7b
2 parents 5b7c6e3 + 9583ece
commit 6988c7b
Show file tree

Hide file tree

Showing 26 changed files with 77 additions and 31 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.mysema.querydsl</groupId>
   <artifactId>querydsl-root</artifactId>
-  <version>3.7.4.BUILD-SNAPSHOT</version>
+  <version>3.7.4</version>
   <name>Querydsl</name>
   <description>parent project for Querydsl modules</description>
   <url>${project.homepage}</url>
@@ -463,7 +463,14 @@
         <module>querydsl-scala</module>
       </modules>
     </profile>
-
+
+    <profile>
+      <id>docs</id>
+      <modules>
+        <module>querydsl-docs</module>
+      </modules>
+    </profile>
+
     <profile>
       <id>hibernate-search</id>
       <modules>

diff --git a/querydsl-apt/pom.xml b/querydsl-apt/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.7.4.BUILD-SNAPSHOT</version>
+    <version>3.7.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/querydsl-codegen/pom.xml b/querydsl-codegen/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.7.4.BUILD-SNAPSHOT</version>
+    <version>3.7.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/querydsl-collections/pom.xml b/querydsl-collections/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.7.4.BUILD-SNAPSHOT</version>
+    <version>3.7.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/querydsl-core/pom.xml b/querydsl-core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.7.4.BUILD-SNAPSHOT</version>
+    <version>3.7.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/querydsl-docs/pom.xml b/querydsl-docs/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.7.3</version>
+    <version>3.7.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/querydsl-docs/src/main/docbook/en-US/Querydsl_Reference.xml b/querydsl-docs/src/main/docbook/en-US/Querydsl_Reference.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-        <!ENTITY versionNumber "3.7.3">
+        <!ENTITY versionNumber "3.7.4">
         <!ENTITY copyrightYear "2007-2016">
         <!ENTITY copyrightHolder "Original authors">
 ]>

diff --git a/querydsl-docs/src/main/docbook/ko-KR/Querydsl_Reference.xml b/querydsl-docs/src/main/docbook/ko-KR/Querydsl_Reference.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-        <!ENTITY versionNumber "3.7.3">
+        <!ENTITY versionNumber "3.7.4">
         <!ENTITY copyrightYear "2007-2016">
         <!ENTITY copyrightHolder "Original authors">
 ]>

diff --git a/querydsl-examples/pom.xml b/querydsl-examples/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.mysema.querydsl</groupId>
         <artifactId>querydsl-root</artifactId>
-        <version>3.7.4.BUILD-SNAPSHOT</version>
+        <version>3.7.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/querydsl-examples/querydsl-example-jpa-guice/pom.xml b/querydsl-examples/querydsl-example-jpa-guice/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-examples</artifactId>
-    <version>3.7.4.BUILD-SNAPSHOT</version>
+    <version>3.7.4</version>
     <relativePath>../</relativePath>
   </parent>
 

diff --git a/querydsl-examples/querydsl-example-sql-guice/pom.xml b/querydsl-examples/querydsl-example-sql-guice/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-examples</artifactId>
-    <version>3.7.4.BUILD-SNAPSHOT</version>
+    <version>3.7.4</version>
     <relativePath>../</relativePath>
   </parent>
 

diff --git a/querydsl-examples/querydsl-example-sql-spring/pom.xml b/querydsl-examples/querydsl-example-sql-spring/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-examples</artifactId>
-    <version>3.7.4.BUILD-SNAPSHOT</version>
+    <version>3.7.4</version>
     <relativePath>../</relativePath>
   </parent>
 

diff --git a/querydsl-hibernate-search/pom.xml b/querydsl-hibernate-search/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.7.4.BUILD-SNAPSHOT</version>
+    <version>3.7.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/querydsl-jdo/pom.xml b/querydsl-jdo/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.7.4.BUILD-SNAPSHOT</version>
+    <version>3.7.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/querydsl-jpa-codegen/pom.xml b/querydsl-jpa-codegen/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.7.4.BUILD-SNAPSHOT</version>
+    <version>3.7.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/querydsl-jpa/pom.xml b/querydsl-jpa/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.7.4.BUILD-SNAPSHOT</version>
+    <version>3.7.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/querydsl-lucene3/pom.xml b/querydsl-lucene3/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.7.4.BUILD-SNAPSHOT</version>
+    <version>3.7.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/querydsl-lucene4/pom.xml b/querydsl-lucene4/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.7.4.BUILD-SNAPSHOT</version>
+    <version>3.7.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/querydsl-maven-plugin/pom.xml b/querydsl-maven-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.mysema.querydsl</groupId>
         <artifactId>querydsl-root</artifactId>
-        <version>3.7.4.BUILD-SNAPSHOT</version>
+        <version>3.7.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/querydsl-mongodb/pom.xml b/querydsl-mongodb/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.7.4.BUILD-SNAPSHOT</version>
+    <version>3.7.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/querydsl-scala/pom.xml b/querydsl-scala/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.7.4.BUILD-SNAPSHOT</version>
+    <version>3.7.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/querydsl-spatial/pom.xml b/querydsl-spatial/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.7.4.BUILD-SNAPSHOT</version>
+    <version>3.7.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/querydsl-sql-codegen/pom.xml b/querydsl-sql-codegen/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.7.4.BUILD-SNAPSHOT</version>
+    <version>3.7.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/querydsl-sql-spring/pom.xml b/querydsl-sql-spring/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.7.4.BUILD-SNAPSHOT</version>
+    <version>3.7.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/querydsl-sql/pom.xml b/querydsl-sql/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.7.4.BUILD-SNAPSHOT</version>
+    <version>3.7.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/release.sh b/release.sh
@@ -1,6 +1,45 @@
 #!/bin/sh
-git checkout QUERYDSL_3
-git pull origin QUERYDSL_3
-mvn versions:set -DgenerateBackupPoms=false
-mvn clean deploy -DskipTests -Dgpg.skip=false
-./dist.sh
+VERSION=$2
+TAG=QUERYDSL_`sed 's/\./_/g' <<< $VERSION`
+
+pre() {
+  git checkout QUERYDSL_3
+  git pull origin QUERYDSL_3
+  mvn -Pall,docs versions:set -DgenerateBackupPoms=false -DnewVersion=$VERSION
+  sed -i '' "s/3\..\../$VERSION/" querydsl-docs/src/main/docbook/en-US/Querydsl_Reference.xml
+  sed -i '' "s/3\..\../$VERSION/" querydsl-docs/src/main/docbook/ko-KR/Querydsl_Reference.xml
+  git checkout -b querydsl-$VERSION
+  git add .
+  git commit -m "Querydsl $VERSION"
+  git push origin querydsl-$VERSION
+  # TODO create PR
+}
+
+doit() {
+  git checkout QUERYDSL_3
+  git pull --ff-only origin QUERYDSL_3
+  mvn clean deploy -DskipTests -Dgpg.skip=false
+  ./dist.sh
+  ssh [email protected] "mkdir /var/www/html/static/querydsl/$VERSION"
+  scp -r target/dist/* [email protected]:/var/www/html/static/querydsl/$VERSION/
+  git tag $TAG
+  git push --tags
+  echo -e "Don't forget \x1b[33mquerydsl-contrib\x1b[m."
+}
+
+post() {
+  echo "post release stuff"
+  # TODO update querydsl.com
+  # TODO close github milestone
+  # TODO bump version
+}
+
+if [ “$1” == “pre” ]; then
+  pre
+elif [ “$1” == “doit” ]; then
+  doit
+elif [ “$1” == “post” ]; then
+  post
+else
+  echo "./release (pre|doit|post) VERSION"
+fi