diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-05-30 02:45:12 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-05-30 02:45:12 -0400 |
| commit | af08231d4bbc0a0122730e962723e3f9334b6957 (patch) | |
| tree | fc49dd959f09969cf827d6cce5a8f69aa39a3b69 | |
| parent | cc28943a3af2554d74b1b9c193b880ccb710ce5a (diff) | |
get plexus-container-default to build
| -rw-r--r-- | conf/dependencies.mk | 1 | ||||
| -rw-r--r-- | patches/plexus-container-default/valid-java.patch | 22 |
2 files changed, 23 insertions, 0 deletions
diff --git a/conf/dependencies.mk b/conf/dependencies.mk index 2164512..0dce992 100644 --- a/conf/dependencies.mk +++ b/conf/dependencies.mk @@ -17,6 +17,7 @@ build/packages/plexus-container-default: \ build/packages/plexus-classworlds \ build/packages/plexus-utils \ build/packages/xbean-reflect \ + build/packages/guava \ /usr/share/java/junit.jar build/packages/guava: \ diff --git a/patches/plexus-container-default/valid-java.patch b/patches/plexus-container-default/valid-java.patch new file mode 100644 index 0000000..4a36d50 --- /dev/null +++ b/patches/plexus-container-default/valid-java.patch @@ -0,0 +1,22 @@ +diff -ru plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java plexus-container-default.new/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java +--- plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java 2014-05-30 01:00:58.623623624 -0400 ++++ plexus-container-default.new/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java 2014-05-30 02:42:32.547773587 -0400 +@@ -189,7 +189,7 @@ + { + try + { +- roleClass = getRealm().loadClass( getRole() ); ++ roleClass = (Class<T>)getRealm().loadClass( getRole() ); + Thread.currentThread(); + } + catch ( Throwable ignored ) +@@ -299,7 +299,7 @@ + { + try + { +- implementationClass = getRealm().loadClass( getImplementation() ); ++ implementationClass = (Class<? extends T>)getRealm().loadClass( getImplementation() ); + Thread.currentThread(); + } + catch ( Throwable ignored ) +Only in plexus-container-default.new/: target |