[liquibase] Update to Liquibase 3.1.1
Alex Wood
awood at fedoraproject.org
Wed May 28 20:49:43 UTC 2014
commit 2c17b3e22fa10f6a1032dfa3ca63b235b500bf95
Author: Alex Wood <awood at redhat.com>
Date: Wed May 28 16:44:14 2014 -0400
Update to Liquibase 3.1.1
.gitignore | 1 +
build.xml | 56 ----------------------------
liquibase.spec | 112 ++++++++++++++++++++++++++++++++++++--------------------
sources | 2 +-
4 files changed, 74 insertions(+), 97 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5ec2a03..1d88eec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/liquibase-2.0.5.tar.gz
/liquibase-3.0.7.tar.gz
/liquibase-3.1.0.tar.gz
+/liquibase-3.1.1.tar.gz
diff --git a/liquibase.spec b/liquibase.spec
index 6988484..6c3fe4c 100644
--- a/liquibase.spec
+++ b/liquibase.spec
@@ -1,28 +1,41 @@
+# Provide an option to build the Maven plugin. As far as I can tell, RPM versions
+# of Maven plugins are only really useful as BuildRequires for other RPMs and it's
+# unlikely that an RPM would need to run Liquibase during its build process.
+%bcond_with maven_plugin
+
Name: liquibase
Summary: Database Refactoring Tool
-Version: 3.1.0
-Release: 2%{?dist}
+Version: 3.1.1
+Release: 1%{?dist}
License: ASL 2.0
Group: Applications/Databases
# Liquibase does not distribute source releases. To generate:
# git clone https://github.com/liquibase/liquibase.git
# cd liquibase/
-# git archive --format=tar.gz --prefix=liquibase-3.1.0/ liquibase-parent-3.1.0 liquibase-core/ changelog.txt LICENSE.txt pom.xml > liquibase-3.1.0.tar.gz
+# git archive --format=tar.gz --prefix=liquibase-3.1.1/ liquibase-parent-3.1.1 > liquibase-3.1.1.tar.gz
Source0: %{name}-%{version}.tar.gz
-Source1: build.xml
BuildRequires: java-devel >= 0:1.6.0
-BuildRequires: jpackage-utils
-%if 0%{?rhel} && 0%{?rhel} <= 6
-BuildRequires: servlet25
-%else
-BuildRequires: servlet3
-%endif
-BuildRequires: ant >= 0:1.7.0
+BuildRequires: javapackages-tools
+BuildRequires: maven-local
+BuildRequires: servlet
+BuildRequires: snakeyaml >= 0:1.13
+BuildRequires: mvn(org.springframework:spring-context)
+BuildRequires: mvn(org.springframework:spring-beans)
+BuildRequires: mvn(org.springframework:spring-core)
+BuildRequires: mvn(org.jboss.weld.se:weld-se)
+BuildRequires: mvn(javax.enterprise:cdi-api)
Requires: java-headless >= 0:1.6.0
-Requires: jpackage-utils
+Requires: javapackages-tools
+Requires: servlet
+Requires: snakeyaml >= 0:1.13
+Requires: mvn(org.springframework:spring-context)
+Requires: mvn(org.springframework:spring-beans)
+Requires: mvn(org.springframework:spring-core)
+Requires: mvn(org.jboss.weld.se:weld-se)
+Requires: mvn(javax.enterprise:cdi-api)
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildArch: noarch
@@ -41,56 +54,75 @@ Summary: API documentation for %{name}
%description javadoc
This package contains %{summary}.
+%if %{with maven_plugin}
+%package maven-plugin
+Group: Development/Tools
+Summary: Maven plugin for %{name}
+BuildRequires: mvn(org.apache.maven:maven-project)
+BuildRequires: mvn(org.apache.maven:maven-core)
+Requires: %{name} = %{version}-%{release}
+Requires: maven
+
+%description maven-plugin
+%{summary}.
+%endif
+
%prep
%setup -q
-cp -p %SOURCE1 %{name}-core/
-# Remove the Spring wrapper; this is not available as a build dependency:
-rm %{name}-core/src/main/java/liquibase/integration/spring/SpringLiquibase.java
-rm %{name}-core/src/main/java/liquibase/integration/spring/MultiTenantSpringLiquibase.java
+%pom_disable_module liquibase-osgi
+%pom_disable_module liquibase-integration-tests
+%pom_disable_module liquibase-debian
+
+%if %{without maven_plugin}
+%pom_disable_module liquibase-maven-plugin
+%endif
+
+%pom_remove_dep org.springframework:spring %{name}-core
+%pom_add_dep org.springframework:spring-core %{name}-core
+%pom_add_dep org.springframework:spring-beans %{name}-core
+%pom_add_dep org.springframework:spring-context %{name}-core
-# Liquibase requires snakeyaml which is not available in EPEL.
-rm %{name}-core/src/main/java/liquibase/parser/core/yaml/YamlChangeLogParser.java
-rm %{name}-core/src/main/java/liquibase/parser/core/json/JsonChangeLogParser.java
-rm %{name}-core/src/main/java/liquibase/serializer/core/yaml/YamlChangeLogSerializer.java
-rm %{name}-core/src/main/java/liquibase/serializer/core/json/JsonChangeLogSerializer.java
+# Symlink liquibase/liquibase-core.jar to liquibase.jar
+%mvn_file :%{name}-core %{name}/%{name}-core %{name}
-%{__mkdir} -p %{name}-core/lib
-build-jar-repository -s -p %{name}-core/lib ant servlet
+# Remove all test dependencies. We aren't running tests with this build.
+%pom_xpath_remove "//pom:dependency[pom:scope='test']" %{name}-core
+
+%if %{with maven_plugin}
+# Build maven plugin
+%mvn_package ":liquibase-maven-plugin" %{name}-maven-plugin
+%pom_add_dep org.apache.maven:maven-core %{name}-maven-plugin
+%endif
%build
-ant -f %{name}-core/build.xml clean package javadoc
+%mvn_build -f
%install
-rm -rf %{buildroot}
-%{__mkdir} -p %{buildroot}%{_bindir}
-%{__install} -d -m 755 %{buildroot}%{_javadir}/%{name}
-%{__install} -m 0644 -D -p %{name}-core/dist/lib/%{name}.jar %{buildroot}%{_javadir}/%{name}/%{name}-core.jar
-pushd %{buildroot}%{_javadir}
-ln -sf %{name}/%{name}-core.jar %{name}.jar
-popd
+%mvn_install
%jpackage_script liquibase.integration.commandline.Main "" "" %{name} %{name} true
-# javadoc
-%{__install} -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -rp %{name}-core/dist/javadoc %{buildroot}%{_javadocdir}/%{name}
-
%clean
rm -rf %{buildroot}
-%files
+%files -f .mfiles
%defattr(-,root,root)
%doc changelog.txt LICENSE.txt
%dir %{_javadir}/%{name}
-%{_javadir}/%{name}/%{name}-core.jar
-%{_javadir}/%{name}.jar
%{_bindir}/%{name}
-%files javadoc
+%if %{with maven_plugin}
+%files maven-plugin -f .mfiles-%{name}-maven-plugin
+%endif
+
+%files javadoc -f .mfiles-javadoc
%doc LICENSE.txt
-%{_javadocdir}/%{name}
%changelog
+* Tue May 27 2014 Alex Wood <awood at redhat.com> 3.1.1-1
+- Update to 3.1.1
+- Switch to Maven based build
+
* Fri Mar 28 2014 Michael Simacek <msimacek at redhat.com> - 3.1.0-2
- Use Requires: java-headless rebuild (#1067528)
diff --git a/sources b/sources
index b0a0f32..05d7918 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-36eea79cab55a6fa7cd601f91291b454 liquibase-3.1.0.tar.gz
+513b1405b6aec8b8327dbd4b41f4ec91 liquibase-3.1.1.tar.gz
More information about the scm-commits
mailing list