diff --git a/.gitignore b/.gitignore index bf49b86..e56cc8a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,17 +2,6 @@ .idea .project .settings -filerepo_client/dist/ -filerepo_client/nbproject/private/ -filerepo_client/node/ -filerepo_client/node_modules/ -filerepo_client/test_out/ -filerepo_client/temp/ -filerepo_client/app/compiled-less -filerepo_webapp/.externalToolBuilders/ -npm-debug.log -phantomjs -tags *.DS_Store */bin/ **/.classpath @@ -22,3 +11,4 @@ tags **/.tern-project **/*.iml **/git.properties +.metadata/ diff --git a/pom.xml b/pom.xml index f261c78..a52e1b0 100644 --- a/pom.xml +++ b/pom.xml @@ -23,6 +23,7 @@ 2.9.9 1.8 1.8 + https://nexus.locusworks.net @@ -31,6 +32,9 @@ org.apache.maven.plugins maven-surefire-plugin 2.20.1 + + always + org.apache.maven.plugins @@ -130,28 +134,42 @@ - - - nexus-proxy-public - http://devops.locusworks.net:8081/repository/maven-public/ - - - - - nexus-proxy-public - http://devops.locusworks.net:8081/repository/maven-public/ - - - nexus-snapshot - http://devops.locusworks.net:8081/repository/locusworks-snapshot/ + ${nexus.repo}/repository/locusworks-snapshot/ nexus-release - http://devops.locusworks.net:8081/repository/locusworks-release/ + ${nexus.repo}/repository/locusworks-release/ + + + locusworks-public + locusworks-public + ${nexus.repo}/repository/locusworks-public/ + + true + + + true + + + + + + + locusworks-public + ${nexus.repo}/repository/locusworks-public/ + + true + + + true + + + + \ No newline at end of file