[eclipse-jbosstools] Update to 4.1.1.Final
Gerard Ryan
galileo at fedoraproject.org
Thu Dec 19 23:38:08 UTC 2013
commit fb4472da6a1d653f2442da17fda5d283cb993f0c
Author: Gerard Ryan <gerard at ryan.lt>
Date: Thu Dec 19 23:38:01 2013 +0000
Update to 4.1.1.Final
create-tarball.sh | 12 ++++++------
eclipse-jbosstools.spec | 38 ++++++++++++++++++++++++--------------
sources | 2 +-
3 files changed, 31 insertions(+), 21 deletions(-)
---
diff --git a/create-tarball.sh b/create-tarball.sh
index ad862c1..6cfa965 100644
--- a/create-tarball.sh
+++ b/create-tarball.sh
@@ -1,6 +1,6 @@
#!/usr/bin/bash
-version="4.1.1.CR1"
+version="4.1.1.Final"
name="eclipse-jbosstools"
MODULES="jbosstools-base \
@@ -15,15 +15,15 @@ MODULES="jbosstools-base \
# Where possible, commit SHAs based on stable Git tag
declare -A commits
-commits[jbosstools-base]="293528aa1dd4b0be2b40e3d1017428271383c514"
+commits[jbosstools-base]="bdb07a034e3a37158a77275ddb323262223ec719"
commits[jbosstools-build]="f04ad1b579e7980a86e3199851ab763225af3cdd"
commits[jbosstools-build-sites]="700d68f030e280204766543e64c00601f9969a49"
commits[jbosstools-freemarker]="8d132659a1105d1ce6eb1392252e87189bb45018"
-commits[jbosstools-javaee]="200fdab7404dac985387f7fa57726f0d92c02e02"
-commits[jbosstools-jst]="f1182cd47a961ec52a080df607da96deed2b33a7"
-commits[jbosstools-openshift]="b81ca452d89ef9ee391c9595bb6bc6ef9c664ad9"
+commits[jbosstools-javaee]="b48ce93f9c39ef79d26b0822217adfb14ab7fb68"
+commits[jbosstools-jst]="7c87540ecb5cbab45c009b17428a695fdbf0cd9f"
+commits[jbosstools-openshift]="59411f033efd5f9fae48b36b48edf3228c567f44"
commits[jbosstools-server]="3443a6af700d4cbe46025c863e81aa433a94c420"
-commits[jbosstools-webservices]="b0a9c3d4c716b32c080fccab9a37593576e4e245"
+commits[jbosstools-webservices]="fec0aa96b8cf97233103c66aeba17f10bdf8948f"
mkdir ${name}-${version}/
diff --git a/eclipse-jbosstools.spec b/eclipse-jbosstools.spec
index fefb075..59de557 100644
--- a/eclipse-jbosstools.spec
+++ b/eclipse-jbosstools.spec
@@ -1,10 +1,10 @@
%global eclipse_dropins %{_datadir}/eclipse/dropins
%global build_base jbosstools-build-sites/aggregate/local-site/.m2/org/jboss/tools/
-%global rls_tag CR1
+%global rls_tag Final
Name: eclipse-jbosstools
Version: 4.1.1
-Release: 0.1%{?dist}
+Release: 1%{?dist}
Summary: Eclipse plugins that support JBoss and related technology
# For mult. license info, see https://community.jboss.org/thread/158037
@@ -542,15 +542,20 @@ for pom in ${disable_site_module}; do %pom_disable_module site jbosstools-${pom}
# Set tycho version to 0.18.0-SNAPSHOT in jbosstools-build/parent/pom.xml
sed -i -e 's|<tychoVersion>0.17.0</tychoVersion>|<tychoVersion>0.18.0</tychoVersion>|g' jbosstools-build/parent/pom.xml
-# Hack parent version for non-updated bundles
-%pom_set_parent org.jboss.tools:parent:%{version}.%{rls_tag}-SNAPSHOT jbosstools-base/pom.xml
-%pom_set_parent org.jboss.tools:parent:%{version}.%{rls_tag}-SNAPSHOT jbosstools-server/pom.xml
-%pom_set_parent org.jboss.tools:parent:%{version}.%{rls_tag}-SNAPSHOT jbosstools-javaee/pom.xml
-%pom_set_parent org.jboss.tools:parent:%{version}.%{rls_tag}-SNAPSHOT jbosstools-javaee/jsf/pom.xml
-%pom_set_parent org.jboss.tools:parent:%{version}.%{rls_tag}-SNAPSHOT jbosstools-javaee/cdi/pom.xml
-%pom_set_parent org.jboss.tools:parent:%{version}.%{rls_tag}-SNAPSHOT jbosstools-jst/pom.xml
-%pom_set_parent org.jboss.tools:parent:%{version}.%{rls_tag}-SNAPSHOT jbosstools-freemarker/pom.xml
-%pom_set_parent org.jboss.tools:parent:%{version}.%{rls_tag}-SNAPSHOT jbosstools-webservices/pom.xml
+# Version hasn't been updated to 4.1.1.Final :-/
+%pom_xpath_replace pom:project/pom:version "<version>%{version}.%{rls_tag}</version>" jbosstools-build/parent
+%pom_xpath_replace pom:project/pom:version "<version>%{version}.%{rls_tag}</version>" jbosstools-build-sites/aggregate/pom.xml
+%pom_set_parent org.jboss.tools:parent:%{version}.%{rls_tag} jbosstools-base/pom.xml
+%pom_set_parent org.jboss.tools:parent:%{version}.%{rls_tag} jbosstools-build-sites/aggregate/pom.xml
+%pom_set_parent org.jboss.tools:parent:%{version}.%{rls_tag} jbosstools-build-sites/aggregate/local-site/pom.xml
+%pom_set_parent org.jboss.tools:parent:%{version}.%{rls_tag} jbosstools-server/pom.xml
+%pom_set_parent org.jboss.tools:parent:%{version}.%{rls_tag} jbosstools-javaee/pom.xml
+%pom_set_parent org.jboss.tools:parent:%{version}.%{rls_tag} jbosstools-javaee/jsf/pom.xml
+%pom_set_parent org.jboss.tools:parent:%{version}.%{rls_tag} jbosstools-javaee/cdi/pom.xml
+%pom_set_parent org.jboss.tools:parent:%{version}.%{rls_tag} jbosstools-jst/pom.xml
+%pom_set_parent org.jboss.tools:parent:%{version}.%{rls_tag} jbosstools-freemarker/pom.xml
+%pom_set_parent org.jboss.tools:parent:%{version}.%{rls_tag} jbosstools-webservices/pom.xml
+%pom_set_parent org.jboss.tools:parent:%{version}.%{rls_tag} jbosstools-openshift/pom.xml
%build
# Build everything from within jbosstools-build-sites
@@ -569,13 +574,18 @@ install -d -m 755 %{buildroot}%{_mavenpomdir}
pushd %{build_base}
# POM-only artifacts
-for pom in parent base javaee.all server.all; do
+for pom in base javaee.all server.all; do
pushd ${pom}/*-SNAPSHOT/
install -pm 644 ${pom}-*.pom \
%{buildroot}%{_mavenpomdir}/JPP-%{name}-${pom}.pom
%add_maven_depmap JPP-%{name}-${pom}.pom -f ${pom}
popd
done
+pushd parent/%{version}.%{rls_tag}/
+ install -pm 644 parent-*.pom \
+ %{buildroot}%{_mavenpomdir}/JPP-%{name}-parent.pom
+ %add_maven_depmap JPP-%{name}-parent.pom -f parent
+popd
# Normal feature/plugin projects
for tool in common usage archives jmx as jst cdi ws freemarker runtime stacks foundation openshift; do
@@ -923,8 +933,8 @@ popd;
%{_mavendepmapfragdir}/%{name}-openshift
%changelog
-* Sat Nov 16 2013 Gerard Ryan <galileo at fedoraproject.org> - 4.1.1-0.1
-- Update to 4.1.1.CR1
+* Fri Dec 13 2013 Gerard Ryan <galileo at fedoraproject.org> - 4.1.1-1
+- Update to 4.1.1.Final
* Wed Oct 02 2013 Gerard Ryan <galileo at fedoraproject.org> - 4.1.0-7
- RHBZ-1014459: Unbundle jars from plugin bundles
diff --git a/sources b/sources
index ff9d069..a953ac5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5052a618f7bacf60b503047672660f37 eclipse-jbosstools-4.1.0.Final.tar.xz
+cb93fbf9512b0612546d7dfc0578b241 eclipse-jbosstools-4.1.1.Final.tar.xz
More information about the scm-commits
mailing list