diff --git a/README.md b/README.md index a2b6586..f3e42e7 100644 --- a/README.md +++ b/README.md @@ -65,6 +65,13 @@ Release Notes ------------- +### 4.5 - 1 Oct 2016 +- Attach files by dropping into textarea +- Issues / Pull requests switcher in dashboard +- HikariCP could be configured in `GITBUCKET_HOME/database.conf` +- Improve Cookie security +- Improve mobile view + ### 4.4 - 28 Aug 2016 - Import a SQL dump file to the database - `go get` support in private repositories diff --git a/build.sbt b/build.sbt index e49451b..760aab1 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ val Organization = "io.github.gitbucket" val Name = "gitbucket" -val GitBucketVersion = "4.4.0" +val GitBucketVersion = "4.5.0" val ScalatraVersion = "2.4.1" val JettyVersion = "9.3.9.v20160517" diff --git a/doc/release.md b/doc/release.md index 504778c..682dc88 100644 --- a/doc/release.md +++ b/doc/release.md @@ -46,9 +46,10 @@ ### Deploy assembly jar file -For plug-in development, we have to publish the assembly jar file to the public Maven repository by `release/deploy-assembly-jar.sh`. +For plug-in development, we have to publish the GitBucket jar file to the Maven central repository as well. At first, hit following command to publish artifacts to the sonatype OSS repository: ```bash -$ cd release/ -$ ./deploy-assembly-jar.sh +$ sbt publish-signed ``` + +Then operate release sequence at https://oss.sonatype.org/. diff --git a/release/deploy-assembly-jar.sh b/release/deploy-assembly-jar.sh deleted file mode 100755 index 43778d7..0000000 --- a/release/deploy-assembly-jar.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -. ./env.sh - -cd ../ -./sbt.sh clean assembly - -cd release - -if [[ "$GITBUCKET_VERSION" =~ -SNAPSHOT$ ]]; then - MVN_DEPLOY_PATH=mvn-snapshot -else - MVN_DEPLOY_PATH=mvn -fi - -echo $MVN_DEPLOY_PATH - -mvn deploy:deploy-file \ - -DgroupId=gitbucket\ - -DartifactId=gitbucket-assembly\ - -Dversion=$GITBUCKET_VERSION\ - -Dpackaging=jar\ - -Dfile=../target/scala-2.11/gitbucket-assembly-$GITBUCKET_VERSION.jar\ - -DrepositoryId=sourceforge.jp\ - -Durl=scp://shell.sourceforge.jp/home/groups/a/am/amateras/htdocs/$MVN_DEPLOY_PATH/ diff --git a/release/env.sh b/release/env.sh deleted file mode 100644 index 5892171..0000000 --- a/release/env.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -export GITBUCKET_VERSION=`cat ../build.sbt | grep 'val GitBucketVersion' | cut -d \" -f 2` -echo "GITBUCKET_VERSION: $GITBUCKET_VERSION" diff --git a/release/pom.xml b/release/pom.xml deleted file mode 100644 index 0d84d21..0000000 --- a/release/pom.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - 4.0.0 - jp.sf.amateras - gitbucket-assembly - 0.0.1 - - - - org.apache.maven.wagon - wagon-ssh - 2.10 - - - - \ No newline at end of file diff --git a/src/main/scala/gitbucket/core/GitBucketCoreModule.scala b/src/main/scala/gitbucket/core/GitBucketCoreModule.scala index d1685ba..a404be3 100644 --- a/src/main/scala/gitbucket/core/GitBucketCoreModule.scala +++ b/src/main/scala/gitbucket/core/GitBucketCoreModule.scala @@ -14,5 +14,6 @@ ), new Version("4.2.1"), new Version("4.3.0"), - new Version("4.4.0") + new Version("4.4.0"), + new Version("4.5.0") )