[javapackages] Upload documentation images only if there is a change
by Stanislav Ochotnicky
commit 0311004456f36e026a35a447383627ec6d42659f
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Wed Mar 6 16:29:56 2013 +0100
Upload documentation images only if there is a change
.gitignore | 1 +
doc/Makefile | 9 +++++++--
2 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dcbffbb..1bfd76f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
*.tar.*
*.html
+.images_uploaded
diff --git a/doc/Makefile b/doc/Makefile
index 407793f..7f3af5d 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -3,8 +3,13 @@ all: index.html
index.html: index.txt
asciidoc -b html5 -a icons -a toc2 -a theme=flask index.txt
-upload: index.html
- scp -r index.html images/ fedorapeople.org:public_html/java-packaging-howto/
+.images_uploaded: images/* images/icons/*
+ scp -r images/ fedorapeople.org:public_html/java-packaging-howto/
+ touch .images_uploaded
+
+
+upload: index.html .images_uploaded
+ scp -r index.html fedorapeople.org:public_html/java-packaging-howto/
clean:
rm *html
11 years, 3 months
[objectweb-asm] Make jetty orbit depmap point to asm-all jar
by Mikolaj Izdebski
commit 92e102ddfdfc810110182397411628cea8470bd7
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Mar 6 17:17:34 2013 +0100
Make jetty orbit depmap point to asm-all jar
- Resolves: rhbz#917625
objectweb-asm.spec | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/objectweb-asm.spec b/objectweb-asm.spec
index 2645a66..9b694b3 100644
--- a/objectweb-asm.spec
+++ b/objectweb-asm.spec
@@ -30,7 +30,7 @@
Name: objectweb-asm
Version: 3.3.1
-Release: 6%{?dist}
+Release: 7%{?dist}
Epoch: 0
Summary: A code manipulation tool to implement adaptable systems
License: BSD
@@ -92,13 +92,13 @@ install -m 644 output/dist/lib/all/asm-all-%{version}.pom $RPM_BUILD_ROOT%{_mave
for pom in output/dist/lib/*.pom; do
install -m 644 ${pom} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.objectweb-asm-`basename ${pom/-%{version}/}`
done
-%add_maven_depmap JPP.objectweb-asm-asm.pom %{name}/asm.jar -a "org.eclipse.jetty.orbit:org.objectweb.asm"
+%add_maven_depmap JPP.objectweb-asm-asm.pom %{name}/asm.jar
%add_maven_depmap JPP.objectweb-asm-asm-analysis.pom %{name}/asm-analysis.jar
%add_maven_depmap JPP.objectweb-asm-asm-commons.pom %{name}/asm-commons.jar
%add_maven_depmap JPP.objectweb-asm-asm-tree.pom %{name}/asm-tree.jar
%add_maven_depmap JPP.objectweb-asm-asm-util.pom %{name}/asm-util.jar
%add_maven_depmap JPP.objectweb-asm-asm-xml.pom %{name}/asm-xml.jar
-%add_maven_depmap JPP.objectweb-asm-asm-all.pom %{name}/asm-all.jar
+%add_maven_depmap JPP.objectweb-asm-asm-all.pom %{name}/asm-all.jar -a "org.eclipse.jetty.orbit:org.objectweb.asm"
%add_maven_depmap JPP.objectweb-asm-asm-parent.pom
# javadoc
@@ -116,6 +116,10 @@ cp -pr output/dist/doc/javadoc/user/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%{_javadocdir}/%{name}
%changelog
+* Wed Mar 6 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:3.3.1-7
+- Make jetty orbit depmap point to asm-all jar
+- Resolves: rhbz#917625
+
* Mon Mar 4 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:3.3.1-6
- Add depmap for org.eclipse.jetty.orbit
- Resolves: rhbz#917625
11 years, 3 months
[javapackages-tools] Update to upstream version 0.13.0
by Mikolaj Izdebski
commit 3030f95aea7aeba9112f535808106334a041b15a
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Mar 6 16:57:12 2013 +0100
Update to upstream version 0.13.0
.gitignore | 1 +
javapackages-tools.spec | 14 +++++++++-----
sources | 2 +-
3 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 19ec41f..72b6c9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@
/javapackages-0.12.5.tar.xz
/javapackages-0.12.6.tar.xz
/javapackages-2f13366e47a0a687160fe3c555e5588af49a7566.tar.bz2
+/javapackages-0.13.0.tar.xz
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 5a1a201..dd3bc95 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -1,11 +1,11 @@
Name: javapackages-tools
Version: 0.13.0
-Release: 0.1.git2f13366%{?dist}
+Release: 1%{?dist}
Summary: Macros and scripts for Java packaging support
License: BSD
URL: https://fedorahosted.org/javapackages/
-Source0: http://git.fedorahosted.org/cgit/javapackages.git/snapshot/javapackages-2...
+Source0: https://fedorahosted.org/released/javapackages/javapackages-%{version}.ta...
BuildArch: noarch
BuildRequires: jpackage-utils
@@ -51,7 +51,7 @@ This package provides macros and scripts to support packaging Maven artifacts.
%prep
-%setup -q -n javapackages-2f13366e47a0a687160fe3c555e5588af49a7566
+%setup -q -n javapackages-%{version}
%build
@@ -81,7 +81,8 @@ install -p -m 644 scripts/pom_editor.sh $RPM_BUILD_ROOT%{_javadir}-utils
install -p -m 644 scripts/xmvn_config_editor.sh $RPM_BUILD_ROOT%{_javadir}-utils
install -p -m 755 scripts/mvn-* $RPM_BUILD_ROOT%{_bindir}
-install -p -m 644 configs/system-configuration.xml $RPM_BUILD_ROOT%{_datadir}/xmvn/configuration.xml
+install -p -m 644 configs/configuration*.xml $RPM_BUILD_ROOT%{_datadir}/xmvn
+ln -sf %{_datadir}/xmvn/configuration-19.xml $RPM_BUILD_ROOT%{_datadir}/xmvn/configuration.xml
# On Fedora 18 we don't want to install mvn-local and mvn-rpmbuild
# scripts as they are already provided by maven package.
@@ -107,10 +108,13 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/mvn-{local,rpmbuild}
%{_sysconfdir}/rpm/macros.xmvn
%{_sysconfdir}/maven/*.xml
%{_bindir}/mvn-*
-%{_datadir}/xmvn/configuration.xml
+%{_datadir}/xmvn/configuration*.xml
%changelog
+* Wed Mar 6 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.13.0-1
+- Update to upstream version 0.13.0
+
* Wed Mar 6 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.13.0-0.1.git2f13366
- Upate to upstream pre-release snapshot 2f13366
diff --git a/sources b/sources
index 34750cc..0e9b0e4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a92249d43739db120cf2a202fb6f8242 javapackages-2f13366e47a0a687160fe3c555e5588af49a7566.tar.bz2
+2a97fc9da9ff287940ae4e25808fdf30 javapackages-0.13.0.tar.xz
11 years, 3 months
[javapackages: 14/14] Merge branch 'xmvn-0.4.x'
by Mikolaj Izdebski
commit 7aca758a08cb5e88d56f45ef55df582ba7f5c278
Merge: 61015ad 906d046
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Mar 6 16:48:55 2013 +0100
Merge branch 'xmvn-0.4.x'
Conflicts:
scripts/mvn-local
configs/configuration-19-rpmbuild-raw.xml | 23 ++++++++
configs/configuration-19-rpmbuild.xml | 24 ++++++++
configs/configuration-19.xml | 53 ++++++++++++++++++
macros.xmvn | 2 +-
scripts/mvn-alias | 24 +++++++--
scripts/mvn-build | 27 ++++-----
scripts/mvn-file | 19 +++++--
scripts/mvn-local | 14 ++++--
scripts/mvn-package | 13 ++++-
scripts/mvn-rpmbuild | 34 ++++++++----
scripts/xmvn_config_editor.sh | 82 +++++++++++++++++++++++++++++
11 files changed, 272 insertions(+), 43 deletions(-)
---
diff --cc scripts/mvn-build
index 3e1e462,e51eee2..fd48dff
--- a/scripts/mvn-build
+++ b/scripts/mvn-build
@@@ -89,13 -87,9 +89,11 @@@ pre_goals
post_goals=
if [ -n "$RPM_PACKAGE_NAME" ]; then
- export XMVN_INSTALL_NAME="$RPM_PACKAGE_NAME"
- else
- export XMVN_INSTALL_NAME=$(basename "$PWD")
+ _write_xmvn_config "%mvn_build macro (default)" "installerSettings" "packageName" "$RPM_PACKAGE_NAME"
fi
+export XMVN_RESOLV_POM_REPOS="/usr/share/maven2/poms/,/usr/share/maven-effective-poms/,/usr/share/maven-poms/"
+
while [ $# -gt 0 ]; do
case "$1" in
--)
@@@ -103,12 -97,9 +101,13 @@@
break
;;
-d|--xmvn-debug)
- export XMVN_DEBUG=1
+ _write_xmvn_config "%mvn_build macro (--xmvn-debug option)" "resolverSettings" "debug" "true"
+ _write_xmvn_config "%mvn_build macro (--xmvn-debug option)" "installerSettings" "debug" "true"
;;
+ # XXX
+ -E|--disable-effective-poms)
+ export XMVN_RESOLV_POM_REPOS="/usr/share/maven2/poms/,/usr/share/maven-poms/"
+ ;;
-f|--force|--skip-tests)
base_goal=package
skip_tests=-Dmaven.test.skip=true
diff --cc scripts/mvn-local
index 75088e0,c278c30..4acd0bd
--- a/scripts/mvn-local
+++ b/scripts/mvn-local
@@@ -35,14 -35,7 +35,20 @@@ export TYCHO_MVN_LOCAL=tru
unset TYCHO_MVN_RPMBUILD
export TYCHO_MVN_RPMBUILD
- # XXX Allow -Dmaven.local.effective.pom=false to be used to disable
++# Allow -Dmaven.local.effective.pom=false to be used to disable
+# resolution from effective POM repository.
- XMVN_RESOLV_POM_REPOS="/usr/share/maven2/poms/,/usr/share/maven-effective-poms/,/usr/share/maven-poms/"
++XMVN_COMPAT=19-rpmbuild
+for arg in "$@"; do
+ if egrep -q '^-Dmaven\.local\.effective\.pom=false' <<<"$arg"; then
- XMVN_RESOLV_POM_REPOS="/usr/share/maven2/poms/,/usr/share/maven-poms/"
++ XMVN_COMPAT=19-rpmbuild-raw
+ fi
+done
- export XMVN_RESOLV_POM_REPOS
++export XMVN_COMPAT
++
+ # Maven needs to have M2_HOME exported. See: rhbz#912333
+ export M2_HOME=/usr/share/maven
+
++# Extra arguments passed to JVM
++export ADDITIONAL_OPTIONS="${ADDITIONAL_OPTIONS} ${MAVEN_OPTS}"
+
exec xmvn "${@}"
diff --cc scripts/mvn-rpmbuild
index 9337e08,26dcb55..c44d3f9
--- a/scripts/mvn-rpmbuild
+++ b/scripts/mvn-rpmbuild
@@@ -41,24 -36,29 +36,39 @@@ unset TYCHO_MVN_LOCA
export TYCHO_MVN_LOCAL
# Support local depmaps
- XMVN_RESOLV_DEPMAPS=,
+ depmap=/some/nonexistent/path
for arg in "$@"; do
if egrep -q '^-Dmaven\.local\.depmap\.file=' <<<"$arg"; then
- XMVN_RESOLV_DEPMAPS="$XMVN_RESOLV_DEPMAPS,"$(sed 's/[^=]*=//' <<<"$arg")
+ depmap="$XMVN_RESOLV_DEPMAPS,"$(sed 's/[^=]*=//' <<<"$arg")
fi
done
- export XMVN_RESOLV_DEPMAPS
- # XXX Allow -Dmaven.local.effective.pom=false to be used to disable
+ mkdir -p .xmvn/config.d
+ cat >>.xmvn/config.d/mvn-rpmbuild-config.xml <<EOF
+ <configuration>
+ <resolverSettings>
+ <!-- XMvn default repo location is .xm2, but for backwards-compatibility
+ we use .m2 if called as mvn-rpmbuild. -->
+ <localRepositories>
+ <repository>.m2</repository>
+ <localRepositories>
+ <metadataRepositories>
+ <repository>$depmap</repository>
+ </metadataRepositories>
+ </resolverSettings>
+ </configuration>
+ EOF
+
++# Allow -Dmaven.local.effective.pom=false to be used to disable
+# resolution from effective POM repository.
- XMVN_RESOLV_POM_REPOS="/usr/share/maven2/poms/,/usr/share/maven-effective-poms/,/usr/share/maven-poms/"
++XMVN_COMPAT=19-rpmbuild
+for arg in "$@"; do
+ if egrep -q '^-Dmaven\.local\.effective\.pom=false' <<<"$arg"; then
- XMVN_RESOLV_POM_REPOS="/usr/share/maven2/poms/,/usr/share/maven-poms/"
++ XMVN_COMPAT=19-rpmbuild-raw
+ fi
+done
- export XMVN_RESOLV_POM_REPOS
++export XMVN_COMPAT
+
# Install maven metadata for plugins in groups org.apache.maven.plugins
# and org.codehaus.mojo. This is to allow plugins in these groups to be
# used without giving groupId prefix.
11 years, 3 months
[javapackages] (14 commits) ...Merge branch 'xmvn-0.4.x'
by Mikolaj Izdebski
Summary of changes:
35b800c... Import initial system-configuration.xml (*)
d6bc714... Start implementing xmvn_config_editor.sh (*)
d6ef20e... Update mvn-* scripts to be compatible with XMvn 0.4.0 (*)
2f92574... Update mvn-rpmbuild to support XMvn 0.4.0 (*)
1070218... Update configuration to newer format (*)
ac0da51... Use absolute path to xmvn_config_editor.sh (*)
0cb70a4... In configuration use <artifactGlob> instead of <artifact> (*)
b132f6d... Add <installRoot> to system-configuration.xml (*)
2f13366... Update xmvn root location in %mvn_install (*)
4bc16cd... Rename system-configuration.xml to configuration-19.xml (*)
1c21149... Add effective POM directory to default configuration (*)
621df21... Add configuration-19-rpmbuild.xml (*)
906d046... Add configuration-19-rpmbuild-raw.xml (*)
7aca758... Merge branch 'xmvn-0.4.x'
(*) This commit already existed in another branch; no separate mail sent
11 years, 3 months
[javapackages/xmvn-0.4.x] Add configuration-19-rpmbuild-raw.xml
by Mikolaj Izdebski
commit 906d046e1af5e5832aa52a589f73ddd17d67c50b
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Mar 6 16:40:17 2013 +0100
Add configuration-19-rpmbuild-raw.xml
configs/configuration-19-rpmbuild-raw.xml | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
---
diff --git a/configs/configuration-19-rpmbuild-raw.xml b/configs/configuration-19-rpmbuild-raw.xml
new file mode 100644
index 0000000..d8082c6
--- /dev/null
+++ b/configs/configuration-19-rpmbuild-raw.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="US-ASCII"?>
+<configuration>
+ <resolverSettings>
+ <localRepositories>
+ <repository>.m2</repository>
+ </localRepositories>
+ <jarRepositories>
+ <repository>/usr/share/java</repository>
+ <repository>/usr/lib/java</repository>
+ </jarRepositories>
+ <pomRepositories>
+ <repository>/usr/share/maven-poms</repository>
+ <repository>/usr/share/maven/poms</repository>
+ <repository>/usr/share/maven2/poms</repository>
+ </pomRepositories>
+ <metadataRepositories>
+ <repository>/usr/share/maven-fragments</repository>
+ </metadataRepositories>
+ <prefixes>
+ <prefix>/</prefix>
+ </prefixes>
+ </resolverSettings>
+</configuration>
11 years, 3 months
[javapackages/xmvn-0.4.x] Add configuration-19-rpmbuild.xml
by Mikolaj Izdebski
commit 621df21d0cf4e08999ac23732bd0e22cf8a5f4a7
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Mar 6 16:39:42 2013 +0100
Add configuration-19-rpmbuild.xml
configs/configuration-19-rpmbuild.xml | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
---
diff --git a/configs/configuration-19-rpmbuild.xml b/configs/configuration-19-rpmbuild.xml
new file mode 100644
index 0000000..5aafe7e
--- /dev/null
+++ b/configs/configuration-19-rpmbuild.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="US-ASCII"?>
+<configuration>
+ <resolverSettings>
+ <localRepositories>
+ <repository>.m2</repository>
+ </localRepositories>
+ <jarRepositories>
+ <repository>/usr/share/java</repository>
+ <repository>/usr/lib/java</repository>
+ </jarRepositories>
+ <pomRepositories>
+ <repository>/usr/share/maven-effective-poms</repository>
+ <repository>/usr/share/maven-poms</repository>
+ <repository>/usr/share/maven/poms</repository>
+ <repository>/usr/share/maven2/poms</repository>
+ </pomRepositories>
+ <metadataRepositories>
+ <repository>/usr/share/maven-fragments</repository>
+ </metadataRepositories>
+ <prefixes>
+ <prefix>/</prefix>
+ </prefixes>
+ </resolverSettings>
+</configuration>
11 years, 3 months