]> source.dussan.org Git - gitblit.git/log
gitblit.git
9 years agoCreate filestore directory on startup
James Moger [Thu, 19 Nov 2015 22:55:38 +0000 (17:55 -0500)]
Create filestore directory on startup

9 years agoDocumentation
James Moger [Wed, 18 Nov 2015 15:06:12 +0000 (10:06 -0500)]
Documentation

9 years agoCatch some potential NPEs
James Moger [Wed, 18 Nov 2015 14:19:23 +0000 (09:19 -0500)]
Catch some potential NPEs

9 years agoRequire admin permissions to view the filestore page
James Moger [Wed, 18 Nov 2015 14:15:50 +0000 (09:15 -0500)]
Require admin permissions to view the filestore page

9 years agoUpdate to JGit 4.1.1
James Moger [Wed, 18 Nov 2015 14:06:12 +0000 (09:06 -0500)]
Update to JGit 4.1.1

9 years agoDocumentation
James Moger [Wed, 18 Nov 2015 14:05:48 +0000 (09:05 -0500)]
Documentation

9 years agoDo not display fork button if target repo already exists (fixes #944)
James Moger [Tue, 10 Nov 2015 13:58:35 +0000 (08:58 -0500)]
Do not display fork button if target repo already exists (fixes #944)

9 years agoDeclare top and bottom page links on reflog page (fixes #761)
James Moger [Tue, 10 Nov 2015 13:22:18 +0000 (08:22 -0500)]
Declare top and bottom page links on reflog page (fixes #761)

9 years agoMerge pull request #947 from paulsputer/LogUpdateForAllAuthentication
James Moger [Mon, 26 Oct 2015 19:09:25 +0000 (15:09 -0400)]
Merge pull request #947 from paulsputer/LogUpdateForAllAuthentication

Log update for Fail2Ban usage

9 years agoLog update for Fail2Ban usage 947/head
Paul Martin [Sun, 25 Oct 2015 16:12:32 +0000 (16:12 +0000)]
Log update for Fail2Ban usage

+ Adds standard logging for all authentication providers
+ Updates help page to use default GitBlit SSH port

9 years agoMerge pull request #921 from paulsputer/git-lfs-support
James Moger [Sat, 10 Oct 2015 12:13:12 +0000 (08:13 -0400)]
Merge pull request #921 from paulsputer/git-lfs-support

Initial Git-LFS support

9 years agoGit-LFS support 921/head
Paul Martin [Sat, 10 Oct 2015 11:46:51 +0000 (12:46 +0100)]
Git-LFS support

+ Metadata maintained in append-only JSON file providing complete audit
history.
+ Filestore menu item
+ Lists filestore items
+ Current size and availability
+ Link to GitBlit Filestore help page (top right)
+ Hooks into existing repository permissions
+ Uses default repository path for out-of-box operation with Git-LFS
client
+ accessRestrictionFilter now has access to http method and auth header
+ Testing for servlet and manager

9 years agoMerge pull request #940 from RainerW/ticket-932-timedpwd
James Moger [Fri, 9 Oct 2015 11:58:35 +0000 (07:58 -0400)]
Merge pull request #940 from RainerW/ticket-932-timedpwd

#932 do not trim passwords anywhere in the ui

9 years ago#932 do not trim passwords anywhere in the ui 940/head
RainerW [Thu, 8 Oct 2015 10:32:35 +0000 (12:32 +0200)]
#932 do not trim passwords anywhere in the ui

9 years agoMerge branch 'topic/pr-934' into develop
James Moger [Mon, 5 Oct 2015 12:12:43 +0000 (08:12 -0400)]
Merge branch 'topic/pr-934' into develop

9 years agoAddress review comments
James Moger [Mon, 5 Oct 2015 12:09:53 +0000 (08:09 -0400)]
Address review comments

9 years agoMerge branch 'topic/pr-935' into develop
James Moger [Mon, 5 Oct 2015 12:04:34 +0000 (08:04 -0400)]
Merge branch 'topic/pr-935' into develop

9 years agoEnsure a repository is only searched once
James Moger [Mon, 5 Oct 2015 12:04:10 +0000 (08:04 -0400)]
Ensure a repository is only searched once

9 years agoTweak search page translation resource
James Moger [Mon, 5 Oct 2015 12:03:37 +0000 (08:03 -0400)]
Tweak search page translation resource

9 years agoRevert manual specification of ssh user auth factories
James Moger [Mon, 5 Oct 2015 11:57:12 +0000 (07:57 -0400)]
Revert manual specification of ssh user auth factories

9 years agoAdd "all repositories" parameter 935/head
Vitaliy Filippov [Tue, 29 Sep 2015 10:58:21 +0000 (13:58 +0300)]
Add "all repositories" parameter

9 years agoAllow to strip domain from kerberos usernames 933/head 934/head
Vitaliy Filippov [Mon, 1 Jun 2015 20:36:49 +0000 (23:36 +0300)]
Allow to strip domain from kerberos usernames

9 years agoMerge pull request #929 from willyann/develop
James Moger [Wed, 30 Sep 2015 16:00:35 +0000 (12:00 -0400)]
Merge pull request #929 from willyann/develop

send email subject utf-8 encoded

9 years agosend email subject utf-8 encoded 929/head
william [Wed, 30 Sep 2015 14:50:38 +0000 (22:50 +0800)]
send email subject utf-8 encoded

9 years agoUpdate to JGit 4.1.0
James Moger [Wed, 30 Sep 2015 11:39:45 +0000 (07:39 -0400)]
Update to JGit 4.1.0

9 years agoMerge pull request #927 from willyann/develop
James Moger [Wed, 30 Sep 2015 11:19:30 +0000 (07:19 -0400)]
Merge pull request #927 from willyann/develop

redefine some traditional chinese translation after user's feedback

9 years agoredefine some traditional chinese translation after user's feedback since from 2015... 927/head
william [Wed, 30 Sep 2015 05:58:48 +0000 (13:58 +0800)]
redefine some traditional chinese translation after user's feedback since from 2015/08/05

9 years agoFixes #922: RSS feed link ignores forward-slash character
James Moger [Mon, 28 Sep 2015 14:25:59 +0000 (10:25 -0400)]
Fixes #922: RSS feed link ignores forward-slash character

9 years agoMerge pull request #908 from mrjoel/mrjoel-authrequestnotsession
James Moger [Fri, 18 Sep 2015 18:30:07 +0000 (14:30 -0400)]
Merge pull request #908 from mrjoel/mrjoel-authrequestnotsession

prevent session fixation for external authentication

9 years agoUpdate to Guice 4.0 final with -gb2 ServletFilter fix
James Moger [Fri, 18 Sep 2015 18:07:38 +0000 (14:07 -0400)]
Update to Guice 4.0 final with -gb2 ServletFilter fix

9 years agoSimplify RefModel dates
James Moger [Fri, 18 Sep 2015 18:02:52 +0000 (14:02 -0400)]
Simplify RefModel dates

9 years agoUse author date to be consistent with other tools (fixes #919)
James Moger [Fri, 18 Sep 2015 15:23:42 +0000 (11:23 -0400)]
Use author date to be consistent with other tools (fixes #919)

9 years agoDocumentation (fixes #917)
James Moger [Fri, 18 Sep 2015 13:19:49 +0000 (09:19 -0400)]
Documentation (fixes #917)

9 years agoUpdate dependency changes in release log
James Moger [Fri, 18 Sep 2015 12:55:49 +0000 (08:55 -0400)]
Update dependency changes in release log

9 years agoUpdate to Lucene 4.10.4
James Moger [Fri, 18 Sep 2015 12:55:08 +0000 (08:55 -0400)]
Update to Lucene 4.10.4

9 years agoUpdate to Jetty 9.2.13
James Moger [Fri, 18 Sep 2015 12:46:23 +0000 (08:46 -0400)]
Update to Jetty 9.2.13

9 years agoUpdate to JGit 4.0.2
James Moger [Fri, 18 Sep 2015 12:38:00 +0000 (08:38 -0400)]
Update to JGit 4.0.2

9 years agoUpdate to SSHD 1.0.0
James Moger [Fri, 18 Sep 2015 12:30:29 +0000 (08:30 -0400)]
Update to SSHD 1.0.0

9 years agoUpdate to BouncyCastle 1.52
James Moger [Fri, 18 Sep 2015 12:30:00 +0000 (08:30 -0400)]
Update to BouncyCastle 1.52

9 years agoUpdate to Groovy 2.4.4
James Moger [Fri, 18 Sep 2015 12:28:42 +0000 (08:28 -0400)]
Update to Groovy 2.4.4

9 years agoUpdate to Wicket 1.4.22
James Moger [Fri, 18 Sep 2015 12:27:32 +0000 (08:27 -0400)]
Update to Wicket 1.4.22

9 years agoUpdate to SLF4J 1.7.12
James Moger [Fri, 18 Sep 2015 12:21:38 +0000 (08:21 -0400)]
Update to SLF4J 1.7.12

9 years agoUpdate to Pegdown 1.5.0
James Moger [Fri, 18 Sep 2015 12:19:36 +0000 (08:19 -0400)]
Update to Pegdown 1.5.0

9 years agoRevert "Merge pull request #915 from lucamilanesio/lucene-5.2.1"
James Moger [Fri, 18 Sep 2015 11:54:46 +0000 (07:54 -0400)]
Revert "Merge pull request #915 from lucamilanesio/lucene-5.2.1"

This reverts commit 55c385e96e6594ec1ac3b5cd41ccd2df6048b696, reversing
changes made to 61bb29d492ca9c34471ec0a119d1445ccde086e9.

9 years agoMerge pull request #915 from lucamilanesio/lucene-5.2.1
James Moger [Tue, 15 Sep 2015 11:42:11 +0000 (07:42 -0400)]
Merge pull request #915 from lucamilanesio/lucene-5.2.1

Bump to Lucene 5.2.1

9 years agoBump to Lucene 5.2.1 915/head
Luca Milanesio [Wed, 9 Sep 2015 16:00:05 +0000 (17:00 +0100)]
Bump to Lucene 5.2.1

9 years agoUpdate IDE files and gitignore
James Moger [Tue, 1 Sep 2015 12:49:54 +0000 (08:49 -0400)]
Update IDE files and gitignore

9 years agoFix #909: Add missing SLFJ dependencies in Manager build
James Moger [Tue, 1 Sep 2015 12:49:02 +0000 (08:49 -0400)]
Fix #909: Add missing SLFJ dependencies in Manager build

9 years agoRemoved GoogleCode reference from README
James Moger [Wed, 12 Aug 2015 13:08:19 +0000 (09:08 -0400)]
Removed GoogleCode reference from README

9 years agoMerge pull request #296 from Enrico204/develop
James Moger [Mon, 10 Aug 2015 19:39:19 +0000 (15:39 -0400)]
Merge pull request #296 from Enrico204/develop

Added better logging for fail2ban

9 years agoAdded better logging for fail2ban 296/head
Enrico204 [Mon, 10 Aug 2015 19:13:49 +0000 (21:13 +0200)]
Added better logging for fail2ban

9 years agoAdd traditional Chinese language choice
James Moger [Fri, 7 Aug 2015 15:12:08 +0000 (11:12 -0400)]
Add traditional Chinese language choice

9 years agoMerge pull request #294 from willyann/develop
James Moger [Fri, 7 Aug 2015 15:11:10 +0000 (11:11 -0400)]
Merge pull request #294 from willyann/develop

Add traditional Chinese translation

9 years agominor translation 294/head
william [Wed, 5 Aug 2015 09:39:58 +0000 (17:39 +0800)]
minor translation

9 years agotrandition chinese translation 293/head
william [Wed, 5 Aug 2015 07:56:39 +0000 (15:56 +0800)]
trandition chinese translation
it's for zh_TW(Taiwan)

9 years agoMerge pull request #283 from mrjoel/mrjoel-fixuserfeedlink 292/head
James Moger [Thu, 30 Jul 2015 13:34:56 +0000 (09:34 -0400)]
Merge pull request #283 from mrjoel/mrjoel-fixuserfeedlink

fix feed link from user's repository page

9 years agoMerge pull request #291 from plamentotev/patch-1
James Moger [Thu, 30 Jul 2015 13:28:12 +0000 (09:28 -0400)]
Merge pull request #291 from plamentotev/patch-1

Fix tags not properly indexed in Lucene

9 years agoprevent session fixation for external authentication 908/head
Joel Johnson [Fri, 26 Jun 2015 22:10:54 +0000 (16:10 -0600)]
prevent session fixation for external authentication

  + use request instead of session to flag authentication status
    and user, for external authentication types

9 years agofix feed link from user's repository page 283/head
Joel Johnson [Tue, 30 Jun 2015 16:32:33 +0000 (10:32 -0600)]
fix feed link from user's repository page

9 years agoFix tags not properly indexed in Lucene 291/head
Plamen Totev [Sun, 12 Jul 2015 15:08:14 +0000 (18:08 +0300)]
Fix tags not properly indexed in Lucene

All tags that reference to particular object are stored in a list within a map.
There is a if statement that inits empty list when there are not references
to the current object yet, but the boolean expression checks for the wrong value.

9 years agoMerge pull request #287 from mrjoel/mrjoel-sortprojectlist
James Moger [Wed, 8 Jul 2015 11:40:20 +0000 (07:40 -0400)]
Merge pull request #287 from mrjoel/mrjoel-sortprojectlist

sort projects displayed on projects page

9 years agoMerge pull request #284 from mrjoel/mrjoel-useshortrefs
James Moger [Sat, 4 Jul 2015 20:21:05 +0000 (16:21 -0400)]
Merge pull request #284 from mrjoel/mrjoel-useshortrefs

prefer shortened refs for cleaner/shorter URLs

9 years agoMerge pull request #281 from mrjoel/mrjoel-ticketswithexternalurl
James Moger [Sat, 4 Jul 2015 20:19:36 +0000 (16:19 -0400)]
Merge pull request #281 from mrjoel/mrjoel-ticketswithexternalurl

allow internal privilege evaluation external URLs

9 years agoMerge pull request #286 from mrjoel/mrjoel-projectlistcss
James Moger [Sat, 4 Jul 2015 20:08:34 +0000 (16:08 -0400)]
Merge pull request #286 from mrjoel/mrjoel-projectlistcss

provide spacing on the projects page listing

9 years agoMerge pull request #289 from mrjoel/mrjoel-typos
James Moger [Sat, 4 Jul 2015 20:06:47 +0000 (16:06 -0400)]
Merge pull request #289 from mrjoel/mrjoel-typos

fix comment typo

9 years agoprovide spacing on the projects page listing 286/head
Joel Johnson [Thu, 2 Jul 2015 22:15:14 +0000 (16:15 -0600)]
provide spacing on the projects page listing

The projects page was showing the project listing directly under the navbar
with no spacing. This adds spacing to have the elements offset.

The table is showing using the common "repositories" class, however it can't
be changed directly since several other table displays use the same class, and
have adequate top margin spacing. We create a new class for the one-off use
on the projects page.

9 years agosort projects displayed on projects page 287/head
Joel Johnson [Thu, 2 Jul 2015 21:35:19 +0000 (15:35 -0600)]
sort projects displayed on projects page

9 years agofix comment typo 289/head
Joel Johnson [Wed, 1 Jul 2015 19:29:23 +0000 (13:29 -0600)]
fix comment typo

9 years agoallow advertising gitblit privileges for external URLs 281/head
Joel Johnson [Mon, 29 Jun 2015 23:13:19 +0000 (17:13 -0600)]
allow advertising gitblit privileges for external URLs

commit c20191fc0931a19bec0df1ab2b56f287e5d8b7c7 enabled support
for hiding internal URLs, but didn't consider that it broke the
evaluation of permissions (used for tickets, etc.), and caused
a NPE on repoUrl.permission when trying to view the TicketPage.

With all internal mechanisms disabled, it would result in the
first URL being external with unknown permissions. This adds an
option to use internal permissions even for external URLs.

Note that this does not grant any additional permissions, but
does offer the option to have gitblit advertise the full set of
what is allowed, even if the external URL imposes additional
restrictions.

9 years agoprefer shortened refs for cleaner/shorter URLs 284/head
Joel Johnson [Wed, 1 Jul 2015 07:15:02 +0000 (01:15 -0600)]
prefer shortened refs for cleaner/shorter URLs

9 years agoMerge pull request #282 from mrjoel/mrjoel-fixhttpurlperms
James Moger [Tue, 30 Jun 2015 12:53:06 +0000 (08:53 -0400)]
Merge pull request #282 from mrjoel/mrjoel-fixhttpurlperms

fix permission capping for HTTP/HTTPS

9 years agoMerge pull request #278 from mrjoel/mrjoel-addversiontojarfilename
James Moger [Tue, 30 Jun 2015 12:49:31 +0000 (08:49 -0400)]
Merge pull request #278 from mrjoel/mrjoel-addversiontojarfilename

Add version number to WAR jar filename

9 years agoMerge pull request #277 from mrjoel/mrjoel-serverNPEfix
James Moger [Tue, 30 Jun 2015 12:48:35 +0000 (08:48 -0400)]
Merge pull request #277 from mrjoel/mrjoel-serverNPEfix

NPE server fix

9 years agoMerge pull request #276 from mrjoel/mrjoel-typofixes
James Moger [Tue, 30 Jun 2015 12:47:32 +0000 (08:47 -0400)]
Merge pull request #276 from mrjoel/mrjoel-typofixes

typo fixes

9 years agoMerge pull request #275 from mrjoel/mrjoel-cookiesession3.0
James Moger [Tue, 30 Jun 2015 12:46:22 +0000 (08:46 -0400)]
Merge pull request #275 from mrjoel/mrjoel-cookiesession3.0

use JEE 3.0 to allow cookie session tracking

9 years agofix permission capping for HTTP/HTTPS 282/head
Joel Johnson [Tue, 30 Jun 2015 07:00:52 +0000 (01:00 -0600)]
fix permission capping for HTTP/HTTPS

Previously used request scheme, but request scheme is unrelated to
the URL being generated. Instead, base the permission capping on the
scheme of the URL itself.

9 years agouse JEE 3.0 to allow cookie session tracking 275/head
Joel Johnson [Fri, 26 Jun 2015 21:46:34 +0000 (15:46 -0600)]
use JEE 3.0 to allow cookie session tracking

9 years agoif failed to bind to port, don't use socket 277/head
Joel Johnson [Fri, 26 Jun 2015 21:47:44 +0000 (15:47 -0600)]
if failed to bind to port, don't use socket

9 years agoadd version number to built jar files 278/head
Joel Johnson [Fri, 19 Jun 2015 21:05:21 +0000 (15:05 -0600)]
add version number to built jar files

9 years agotypo: instantiate log message 276/head
Joel Johnson [Mon, 22 Jun 2015 22:00:08 +0000 (16:00 -0600)]
typo: instantiate log message

9 years agotypo: site ticket documentation
Joel Johnson [Mon, 22 Jun 2015 21:59:56 +0000 (15:59 -0600)]
typo: site ticket documentation

9 years agoUpdate to JGit 4.0.1
James Moger [Sun, 28 Jun 2015 13:34:21 +0000 (09:34 -0400)]
Update to JGit 4.0.1

9 years agoMerged #259 "Allow custom host & port specification for advertised SSH urls"
James Moger [Mon, 15 Jun 2015 16:58:10 +0000 (10:58 -0600)]
Merged #259 "Allow custom host & port specification for advertised SSH urls"

9 years agoRenamed ssh.Display(Host|Port) to ssh.Advertised(Host|Port) 59/259/2
James Moger [Mon, 15 Jun 2015 16:56:23 +0000 (12:56 -0400)]
Renamed ssh.Display(Host|Port) to ssh.Advertised(Host|Port)

9 years agoAdded git.sshDisplay{Port|Host} to hide port forward.
Morten Bøgeskov [Thu, 4 Jun 2015 06:24:34 +0000 (08:24 +0200)]
Added git.sshDisplay{Port|Host} to hide port forward.

Running gitblit in a container it's easy to expose the ssh on the default port.
Using git.sshDisplayPort/git.sshDisplayHost you can expose the forwarded address
as the official location.

9 years agoMerged #258 "Create an avatar provider that defaults to Gravatar"
James Moger [Mon, 15 Jun 2015 16:27:14 +0000 (10:27 -0600)]
Merged #258 "Create an avatar provider that defaults to Gravatar"

9 years agoRevised AvatarGenerator to be injectable 58/258/2
James Moger [Mon, 15 Jun 2015 16:25:14 +0000 (12:25 -0400)]
Revised AvatarGenerator to be injectable

9 years agoFirst draft for a customized avatar image
Fabrice Bacchella [Wed, 3 Jun 2015 15:10:16 +0000 (17:10 +0200)]
First draft for a customized avatar image

9 years agoMerge pull request #263 from jeyoung/netbeans_support
James Moger [Mon, 15 Jun 2015 14:55:17 +0000 (10:55 -0400)]
Merge pull request #263 from jeyoung/netbeans_support

Reworked NetBeans project to be based on the pom.xml rather than the …

9 years agoMerged #257 "Bump to JGit 4.0.0"
James Moger [Mon, 15 Jun 2015 14:31:07 +0000 (08:31 -0600)]
Merged #257 "Bump to JGit 4.0.0"

9 years agoMerged #256 "allow configuring of internal URLs offered"
James Moger [Mon, 15 Jun 2015 12:18:21 +0000 (06:18 -0600)]
Merged #256 "allow configuring of internal URLs offered"

9 years agoallow configuring of internal URLs offered 274/head 56/256/1
Joel Johnson [Fri, 12 Jun 2015 23:46:31 +0000 (17:46 -0600)]
allow configuring of internal URLs offered

9 years agoBump to JGit 4.0.0 272/head 57/257/1
Luca Milanesio [Fri, 12 Jun 2015 16:59:37 +0000 (17:59 +0100)]
Bump to JGit 4.0.0

JGit 4.0.0 fixes a memory leak but introduces a non-compatible change
for closing the RevWalk: before it was release() but now is close()

9 years agoMerged #57 "My Tickets needs a repository filter" 271/head
James Moger [Wed, 27 May 2015 12:12:49 +0000 (06:12 -0600)]
Merged #57 "My Tickets needs a repository filter"

9 years agoMerged #255 "Invalid kerberos patches, works now and with a test."
James Moger [Wed, 27 May 2015 11:50:02 +0000 (05:50 -0600)]
Merged #255 "Invalid kerberos patches, works now and with a test."

9 years agoInvalid kerberos patches, works now and with a test. 265/head 55/255/2
Fabrice Bacchella [Mon, 25 May 2015 21:02:13 +0000 (23:02 +0200)]
Invalid kerberos patches, works now and with a test.

9 years agoMerged #254 "Two slight improvement for custom UserService"
James Moger [Tue, 26 May 2015 12:37:10 +0000 (06:37 -0600)]
Merged #254 "Two slight improvement for custom UserService"

9 years agoTwo slight improvement for custom UserService: 264/head 54/254/1
Fabrice Bacchella [Tue, 26 May 2015 08:48:40 +0000 (10:48 +0200)]
Two slight improvement for custom UserService:
- try userRealm as a file only if class is not found, other exeptions are real error
- log userService only after setup, for better logging, as it can use gitblit.properties for custom .toString

9 years agoMerge pull request #262 from fbacchella/keepsession
James Moger [Sun, 24 May 2015 14:16:45 +0000 (10:16 -0400)]
Merge pull request #262 from fbacchella/keepsession

Do not replace session when authentication type is CONTAINER

9 years agoReworked NetBeans project to be based on the pom.xml rather than the build.xml. 263/head
Eddy Young [Sun, 24 May 2015 08:50:07 +0000 (09:50 +0100)]
Reworked NetBeans project to be based on the pom.xml rather than the build.xml.

Maven pom.xml is the new default for organising NetBeans projects, but the structure of the gitblit source folder is unusual because of the placement of the bugtraq source in the tree and Maven does not support this by default. This change introduces Maven Build Helper plugin to integrate the additional source locations. This is preferable to using nbproject\project.xml because 1) there is no need to generate the classpath for that file from build.moxie and 2) the POM generated by build.moxie can be re-used almost as-is, with the following additional configuration.

Additional Maven Build Helper (add under build/plugins):

            <plugin>
                <groupId>org.codehaus.mojo</groupId>
                <artifactId>build-helper-maven-plugin</artifactId>
                <executions>
                    <execution>
                        <id>add-source-bugtraq</id>
                        <phase>generate-sources</phase>
                        <goals>
                            <goal>add-source</goal>
                        </goals>
                        <configuration>
                            <sources>
                                <source>src/main/bugtraq</source>
                            </sources>
                        </configuration>
                    </execution>
                    <execution>
                        <id>add-test-source-bugtraq</id>
                        <phase>generate-test-sources</phase>
                        <goals>
                            <goal>add-test-source</goal>
                        </goals>
                        <configuration>
                            <sources>
                                <source>src/test/bugtraq</source>
                            </sources>
                        </configuration>
                    </execution>
                    <execution>
                        <id>add-resources</id>
                        <phase>generate-resources</phase>
                        <goals>
                            <goal>add-resource</goal>
                        </goals>
                        <configuration>
                            <resources>
                                <resource>
                                    <directory>src/main/resources</directory>
                                    <targetPath>resources</targetPath>
                                    <excludes>
                                        <exclude>**/junk/**</exclude>
                                    </excludes>
                                </resource>
                            </resources>
                        </configuration>
                    </execution>
                    <execution>
                        <id>add-test-resources</id>
                        <phase>generate-test-resources</phase>
                        <goals>
                            <goal>add-test-resource</goal>
                        </goals>
                        <configuration>
                            <resources>
                                <resource>
                                    <directory>src/test/resources</directory>
                                    <targetPath>resources</targetPath>
                                    <excludes>
                                        <exclude>**/junk/**</exclude>
                                    </excludes>
                                </resource>
                            </resources>
                        </configuration>
                    </execution>
                </executions>

            </plugin>

Source configuration (add at the end of pom.xml):

    <properties>
        <maven.compiler.source>1.7</maven.compiler.source>
        <maven.compiler.target>1.7</maven.compiler.target>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    </properties>