diff options
| -rw-r--r-- | conf/dependencies.mk | 6 | ||||
| -rw-r--r-- | conf/sources.mk | 2 | ||||
| -rw-r--r-- | rules/generic/Makefile | 6 | ||||
| -rw-r--r-- | rules/xbean/no-log4j.patch (renamed from rules/xbean-reflect/no-log4j.patch) | 12 | ||||
| -rw-r--r-- | rules/xbean/subdir-deps.mk | 13 |
5 files changed, 27 insertions, 12 deletions
diff --git a/conf/dependencies.mk b/conf/dependencies.mk index 17d5eaa..273ed69 100644 --- a/conf/dependencies.mk +++ b/conf/dependencies.mk @@ -14,7 +14,7 @@ modello-cli = \ build/packages/plexus-classworlds \ build/packages/plexus-container-default \ build/packages/plexus-utils \ - build/packages/xbean-reflect + build/packages/xbean build/packages/modello-plugins: \ build/packages/modello-core \ @@ -40,7 +40,7 @@ build/packages/maven-plugin-tools-api-bootstrap: \ build/packages/plexus-container-default \ build/packages/plexus-utils -build/packages/xbean-reflect: \ +build/packages/xbean: \ /usr/share/java/asm-all-2.jar \ /usr/share/java/commons-logging/commons-logging.jar @@ -55,7 +55,7 @@ build/packages/plexus-container-default: \ build/packages/guava \ build/packages/plexus-classworlds \ build/packages/plexus-utils \ - build/packages/xbean-reflect \ + build/packages/xbean \ /usr/share/java/junit.jar build/packages/guava: \ diff --git a/conf/sources.mk b/conf/sources.mk index 201f7f5..5c79fe7 100644 --- a/conf/sources.mk +++ b/conf/sources.mk @@ -11,7 +11,7 @@ maven-plugin-api-bootstrap = tar|$(_apache_mirror)/maven/maven maven-plugin-annotations-bootstrap = svn|$(_apache_svn)|maven/plugin-tools/tags/maven-plugin-tools-3.3/maven-plugin-annotations maven-plugin-tools-api-bootstrap = svn|$(_apache_svn)|maven/plugin-tools/tags/maven-plugin-tools-3.3/maven-plugin-tools-api -xbean-reflect = svn|$(_apache_svn)|geronimo/xbean/tags/xbean-3.4/xbean-reflect # Yes, I know xbean 3.4 is old +xbean = svn|$(_apache_svn)|geronimo/xbean/tags/xbean-3.4 # Yes, I know xbean 3.4 is old plexus-build-api = git|git://github.com/sonatype/sisu-build-api.git|plexus-build-api-0.0.7 plexus-cipher = git|git://github.com/sonatype/plexus-cipher.git|plexus-cipher-1.7 diff --git a/rules/generic/Makefile b/rules/generic/Makefile index dc0840b..e059ce7 100644 --- a/rules/generic/Makefile +++ b/rules/generic/Makefile @@ -42,7 +42,7 @@ target/$(artifact)-$(version).pom: pom.xml target/$(artifact)-$(version).jar: %.jar: % $(JAR) -cf $@ -C $< . -target/$(artifact)-$(version): \ +target/$(artifact)-$(version): %: \ target/META-INF/maven/$(group)/$(artifact)/pom.properties \ target/META-INF/maven/$(group)/$(artifact)/pom.xml \ $(call dep_dir,target/classes) \ @@ -54,11 +54,13 @@ target/$(artifact)-$(version): \ target/META-INF/maven/$(group)/$(artifact)/pom.xml: pom.xml install -Dm644 $< $@ +# That is almost the default date format for locale=C, but the DOM is +# 0-padded instead of space-padded. target/META-INF/maven/$(group)/$(artifact)/pom.properties: pom.xml $(MKDIRS) $(@D) printf '%s\n' \ '#Generated by Make' \ - "#$$(LC_ALL=C date)" \ + "#$$(LC_ALL=C date '+%a %b %d %H:%M:%S %Z %Y')" \ 'version=$(version)' \ 'groupId=$(group)' \ 'artifactId=$(artifact)' \ diff --git a/rules/xbean-reflect/no-log4j.patch b/rules/xbean/no-log4j.patch index 7b9285c..3c1ed3f 100644 --- a/rules/xbean-reflect/no-log4j.patch +++ b/rules/xbean/no-log4j.patch @@ -1,7 +1,7 @@ -Index: xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/Log4jConverter.java +Index: xbean/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/Log4jConverter.java =================================================================== ---- xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/Log4jConverter.java (revision 1598206) -+++ xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/Log4jConverter.java (working copy) +--- xbean/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/Log4jConverter.java (revision 1598206) ++++ xbean/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/Log4jConverter.java (working copy) @@ -1,32 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more @@ -35,10 +35,10 @@ Index: xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/Log4jConverte - return Logger.getLogger(text); - } -} -Index: xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java +Index: xbean/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java =================================================================== ---- xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java (revision 1598206) -+++ xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java (working copy) +--- xbean/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java (revision 1598206) ++++ xbean/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java (working copy) @@ -120,11 +120,6 @@ registerConverter(new WeakHashMapEditor()); diff --git a/rules/xbean/subdir-deps.mk b/rules/xbean/subdir-deps.mk new file mode 100644 index 0000000..ac61290 --- /dev/null +++ b/rules/xbean/subdir-deps.mk @@ -0,0 +1,13 @@ +# FIXME: other dependencies +subdirs := $(filter-out xbean-spring xbean-telnet xbean-classloader maven-xbean-plugin,$(subdirs)) + +target/$(artifact)-$(version): \ + target/META-INF/LICENSE \ + target/META-INF/NOTICE + +target/META-INF/NOTICE: $(firstword $(wildcard NOTICE.txt ../NOTICE.txt)) + $(MKDIRS) $(@D) + grep -v '^//' < $< > $@ + +target/META-INF/LICENSE: $(firstword $(wildcard LICENSE.txt ../LICENSE.txt)) + $(INSTALL) -Dm644 $< $@ |