diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-07-20 23:00:11 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-07-20 23:00:11 -0400 |
| commit | 0f558004575ac0666c59c59c49fc8d15ace184d3 (patch) | |
| tree | 2f56be5135648b41b5dedbc0b39e4436bb096328 | |
| parent | 531de540e9a4df428b6640fd4c57e544fc48dbd6 (diff) | |
Build Apache commons-{io,logging} from source
| -rw-r--r-- | conf/dependencies.mk | 10 | ||||
| -rw-r--r-- | conf/sources.mk | 3 | ||||
| -rw-r--r-- | rules/commons-logging-bootstrap/delete.list | 4 |
3 files changed, 12 insertions, 5 deletions
diff --git a/conf/dependencies.mk b/conf/dependencies.mk index 5d90e80..8e84807 100644 --- a/conf/dependencies.mk +++ b/conf/dependencies.mk @@ -37,8 +37,8 @@ build/packages/httpcomponents-core: \ build/packages/commons-cli build/packages/httpcomponents-client-bootstrap: \ build/packages/commons-codec \ - build/packages/httpcomponents-core \ - /usr/share/java/commons-logging/commons-logging.jar + build/packages/commons-logging-bootstrap \ + build/packages/httpcomponents-core build/packages/maven: \ $(dep-modello-cli) \ @@ -81,9 +81,9 @@ build/packages/maven-plugin-tools-api-bootstrap: \ build/packages/xbean-bootstrap: \ build/packages/asm3 \ - build/packages/slf4j-api \ + build/packages/commons-logging-bootstrap \ build/packages/osgi42-core \ - /usr/share/java/commons-logging/commons-logging.jar + build/packages/slf4j-api # Modello @@ -160,6 +160,7 @@ build/packages/ognl: \ build/packages/qdox: \ build/packages/jflex build/packages/wagon: \ + build/packages/commons-io \ build/packages/commons-lang2 \ build/packages/commons-net \ build/packages/httpcomponents-core \ @@ -167,7 +168,6 @@ build/packages/wagon: \ build/packages/jsoup \ build/packages/plexus-interactivity \ build/packages/plexus-utils \ - /usr/share/java/commons-io/commons-io.jar \ /usr/share/java/junit.jar build/packages/hawtjni-bootstrap: \ build/packages/commons-cli \ diff --git a/conf/sources.mk b/conf/sources.mk index f342452..2a1658a 100644 --- a/conf/sources.mk +++ b/conf/sources.mk @@ -6,8 +6,11 @@ _tarbombs = # Apache tarballs commons-cli = tar|$(_apache_mirror)/commons/cli/source/commons-cli-1.2-src.tar.gz +commons-io = tar|$(_apache_mirror)/commons/io/source/commons-io-2.4-src.tar.gz commons-codec = tar|$(_apache_mirror)/commons/codec/source/commons-codec-1.9-src.tar.gz commons-lang2 = tar|$(_apache_mirror)/commons/lang/source/commons-lang-2.6-src.tar.gz +commons-logging = tar|$(_apache_mirror)/commons/logging/source/commons-logging-1.2-src.tar.gz +commons-logging-bootstrap = $(commons-logging) commons-net = tar|$(_apache_mirror)/commons/net/source/commons-net-3.3-src.tar.gz httpcomponents-client-bootstrap = tar|$(_apache_mirror)/httpcomponents/httpclient/source/httpcomponents-client-4.3.4-src.tar.gz diff --git a/rules/commons-logging-bootstrap/delete.list b/rules/commons-logging-bootstrap/delete.list new file mode 100644 index 0000000..614a89f --- /dev/null +++ b/rules/commons-logging-bootstrap/delete.list @@ -0,0 +1,4 @@ +src/main/java/org/apache/commons/logging/impl/AvalonLogger.java +src/main/java/org/apache/commons/logging/impl/Log4JLogger.java +src/main/java/org/apache/commons/logging/impl/LogKitLogger.java +src/main/java/org/apache/commons/logging/impl/ServletContextCleaner.java |