Skip to content

Commit

Permalink
Make s3-wagon-private available by default [IMMUTANT-252]
Browse files Browse the repository at this point in the history
I've tested this manually, and it appears to work. I haven't created a
test for it since it requires s3 credentials.
  • Loading branch information
tobias committed Apr 4, 2013
1 parent 1ec6a85 commit 6f3b067
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 0 deletions.
6 changes: 6 additions & 0 deletions modules/bootstrap/pom.xml
Expand Up @@ -53,6 +53,12 @@
<scope>compile</scope>
</dependency>

<dependency>
<groupId>s3-wagon-private</groupId>
<artifactId>s3-wagon-private</artifactId>
<scope>compile</scope>
</dependency>

</dependencies>

<build>
Expand Down
Expand Up @@ -98,6 +98,11 @@ to gracefully handle missing dependencies."
[project]
(when project
(project/load-certificates project)
;; trigger loading of s3-wagon-private, but don't load any other
;; plugins, since load-plugins tries to add them to the current
;; classloader, which will be the shared bootstrap classloader,
;; not the application's CL, and we don't want that to happen.
(project/load-plugins project :no-plugins)
(try
(->> (update-in project [:dependencies]
(fn [deps] (remove #(and
Expand Down
4 changes: 4 additions & 0 deletions modules/bootstrap/src/module/resources/module.xml
Expand Up @@ -52,6 +52,10 @@
<resource-root path="wagon-provider-api.jar"/>
<resource-root path="wagon-http.jar"/>
<resource-root path="wagon-http-shared4.jar"/>
<resource-root path="s3-wagon-private.jar"/>
<resource-root path="org.springframework.build.aws.maven.jar"/>
<resource-root path="jets3t.jar"/>
<resource-root path="commons-httpclient.jar"/>
</resources>

<dependencies>
Expand Down
8 changes: 8 additions & 0 deletions pom.xml
Expand Up @@ -346,6 +346,13 @@
<artifactId>clj-http</artifactId>
<version>${version.clj-http}</version>
</dependency>

<dependency>
<groupId>s3-wagon-private</groupId>
<artifactId>s3-wagon-private</artifactId>
<version>${version.s3-wagon-private}</version>
</dependency>

</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -383,6 +390,7 @@
<version.codox>0.6.3</version.codox>
<version.fntest>0.3.10</version.fntest>
<version.clj-http>0.5.8</version.clj-http>
<version.s3-wagon-private>1.1.2</version.s3-wagon-private>

<warn-on-reflection>false</warn-on-reflection>
</properties>
Expand Down

0 comments on commit 6f3b067

Please sign in to comment.