Adjust builds for appropriate dependencies

diff --git a/build.moxie b/build.moxie
index 8ca5275563a60243b41c9f3ffd22267ed70c5b5c..735e18579361e10ec4a68549ccf8cfe3584e88af 100644 (file)
--- a/build.moxie
+++ b/build.moxie
@@ -130,16 +130,14 @@ properties: {
 #
 
 dependencies:
-# Dagger dependency injection library (annotation processor)
-- compile 'com.google.inject:guice:${guice.version}' :war
+- compile 'com.google.inject:guice:${guice.version}' :war :fedclient
 - compile 'com.google.inject.extensions:guice-servlet:${guice-servlet.version}' :war
-- compile 'com.google.guava:guava:16.0.1' :war
-# Standard dependencies
+- compile 'com.google.guava:guava:16.0.1' :war :fedclient
 - compile 'com.intellij:annotations:12.0' :war
-- compile 'log4j:log4j:1.2.17' :war :fedclient :authority
-- compile 'org.slf4j:slf4j-api:1.7.7' :war :fedclient :authority
-- compile 'org.slf4j:slf4j-log4j12:1.7.7' :war :fedclient :authority
-- compile 'com.sun.mail:javax.mail:1.5.1' :war :authority
+- compile 'log4j:log4j:1.2.17' :war :fedclient
+- compile 'org.slf4j:slf4j-api:1.7.7' :war :fedclient
+- compile 'org.slf4j:slf4j-log4j12:1.7.7' :war :fedclient
+- compile 'com.sun.mail:javax.mail:1.5.1' :war
 - compile 'javax.servlet:javax.servlet-api:3.1.0' :fedclient
 - compile 'org.eclipse.jetty.aggregate:jetty-all:${jetty.version}' @jar
 - compile 'org.apache.wicket:wicket:${wicket.version}' :war !org.mockito
@@ -157,11 +155,11 @@ dependencies:
 - compile 'org.fusesource.wikitext:tracwiki-core:${wikitext.version}' :war
 - compile 'org.fusesource.wikitext:mediawiki-core:${wikitext.version}' :war
 - compile 'org.fusesource.wikitext:confluence-core:${wikitext.version}' :war
-- compile 'org.eclipse.jgit:org.eclipse.jgit:${jgit.version}' :war :fedclient :manager :authority !junit
-- compile 'org.eclipse.jgit:org.eclipse.jgit.http.server:${jgit.version}' :war :manager :authority !junit
-- compile 'org.bouncycastle:bcprov-jdk15on:${bouncycastle.version}' :war :authority
-- compile 'org.bouncycastle:bcmail-jdk15on:${bouncycastle.version}' :war :authority
-- compile 'org.bouncycastle:bcpkix-jdk15on:${bouncycastle.version}' :war :authority
+- compile 'org.eclipse.jgit:org.eclipse.jgit:${jgit.version}' :war :fedclient :manager !junit
+- compile 'org.eclipse.jgit:org.eclipse.jgit.http.server:${jgit.version}' :war :manager !junit
+- compile 'org.bouncycastle:bcprov-jdk15on:${bouncycastle.version}' :war
+- compile 'org.bouncycastle:bcmail-jdk15on:${bouncycastle.version}' :war
+- compile 'org.bouncycastle:bcpkix-jdk15on:${bouncycastle.version}' :war
 - compile 'org.apache.sshd:sshd-core:${sshd.version}' :war !org.easymock
 - compile 'org.apache.mina:mina-core:${mina.version}' :war !org.easymock
 - compile 'rome:rome:0.9' :war :manager :api
@@ -176,7 +174,7 @@ dependencies:
 - compile 'org.freemarker:freemarker:2.3.20' :war
 - compile 'com.github.dblock.waffle:waffle-jna:1.5' :war
 - compile 'org.kohsuke:libpam4j:1.7' :war
-- compile 'args4j:args4j:2.0.26' :war :fedclient :authority
+- compile 'args4j:args4j:2.0.26' :war :fedclient
 - compile 'commons-codec:commons-codec:1.7' :war
 - compile 'redis.clients:jedis:2.3.1' :war
 - compile 'ro.fortsoft.pf4j:pf4j:0.8.0' :war

diff --git a/build.xml b/build.xml
index c88bd8fda46129bd018e2cae653d3b2dfa075bb8..9a94cda8bf6ecf7e46f617b023da6b0d828ec4f2 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -295,7 +295,7 @@
                         classes, exclude any classes in classpath jars -->\r
                <mx:genjar tag="" includeresources="false" excludeClasspathJars="true"\r
                        destfile="${project.targetDirectory}/fedclient.jar"\r
-                       excludes="**/.class,**/*.java, **/Thumbs.db, **/*.mkd, com/gitblit/wicket/**">\r
+                       excludes="**/.class, **/*.java, **/Thumbs.db, **/*.mkd, **/*.md, **/*.css, com/gitblit/wicket/**">\r
                        <mainclass name="com.gitblit.FederationClient" />\r
                        <class name="com.gitblit.Keys" />\r
                        <launcher paths="ext" />\r
@@ -335,7 +335,8 @@
                <!-- generate jar by traversing the class hierarchy of the specified\r
                         classes, exclude any classes in classpath jars -->\r
                <mx:genjar tag="" includeResources="false" excludeClasspathJars="true"\r
-                       destfile="${project.targetDirectory}/manager.jar">\r
+                       destfile="${project.targetDirectory}/manager.jar"\r
+                       excludes="**/.class, **/*.java, **/Thumbs.db, **/*.mkd, **/*.md, **/*.css, com/gitblit/wicket/**">\r
                        <resource file="${project.src.dir}/com/gitblit/client/splash.png" />\r
                        <resource file="${project.resources.dir}/gitblt-favicon.png" />\r
                        <resource file="${project.resources.dir}/gitweb-favicon.png" />\r
@@ -411,9 +412,10 @@
 \r
                <!-- Build API Library jar -->\r
                <mx:genjar tag="" includeResources="false" excludeClasspathJars="true"\r
-                       destfile="${project.targetDirectory}/gbapi-${project.version}.jar">\r
+                       destfile="${project.targetDirectory}/gbapi-${project.version}.jar"\r
+                       excludes="**/.class, **/*.java, **/Thumbs.db, **/*.mkd, **/*.md, **/*.css, com/gitblit/wicket/**">\r
+                       <mainclass name="com.gitblit.client.GitblitClient" />\r
                        <class name="com.gitblit.Keys" />\r
-                       <class name="com.gitblit.client.GitblitClient" />\r
                        <class name="com.gitblit.models.FederationModel" />\r
                        <class name="com.gitblit.models.FederationProposal" />\r
                        <class name="com.gitblit.models.FederationSet" />                       \r