[openjpa] update to 2.2.1
by gil
commit afaf7e8b4aab7b68ae865363738b5db6bab5e99b
Author: gil <puntogil(a)libero.it>
Date: Thu Nov 8 10:23:41 2012 +0100
update to 2.2.1
.gitignore | 1 +
openjpa.spec | 159 +++++++++++++++++++++++++++++++++++++++-------------------
sources | 2 +-
3 files changed, 110 insertions(+), 52 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 93270ea..94b5349 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/apache-openjpa-2.2.0-source.zip
+/apache-openjpa-2.2.1-source.zip
diff --git a/openjpa.spec b/openjpa.spec
index 061054b..28f2f97 100644
--- a/openjpa.spec
+++ b/openjpa.spec
@@ -1,8 +1,9 @@
# set to 0 provides a minimal test suite
%global with_tests 0
+
Name: openjpa
-Version: 2.2.0
-Release: 2%{?dist}
+Version: 2.2.1
+Release: 1%{?dist}
Summary: Java Persistence 2.0 API
Group: Development/Libraries
# # For a breakdown of the licensing, see NOTICE file
@@ -10,33 +11,11 @@ License: ASL 2.0 and CDDL
Url: http://openjpa.apache.org/
Source0: ftp://ftp.gbnet.net/pub/apache/dist/%{name}/%{version}/apache-%{name}-%{v...
# force tomcat 7.x apis
-Source1: %{name}-%{version}-depmap
-
-# remove org.codehaus.mojo ianal-maven-plugin 1.0-alpha-1
-Patch0: %{name}-%{version}-remove-ianal-plugin.patch
-# remove unavailable deps
-Patch1: %{name}-%{version}-parent-pom.patch
-Patch2: %{name}-%{version}-remove-checkstyle-plugin.patch
-# remove com.ibm.websphere websphere_uow_api 0.0.1
-# change org.osgi org.osgi.core 4.2.0 in org.apache.felix 1.4.0
-Patch3: %{name}-%{version}-kernel-pom.patch
-# remove unavailable test deps org.jmock jmock jmock-junit3 2.5.1
-Patch4: %{name}-%{version}-jdbc-pom.patch
-# change
-# org.osgi org.osgi.core 4.2.0 in org.apache.felix 1.4.0
-# org.apache.geronimo.specs geronimo-jpa_2.0_spec 1.1 with org.hibernate.javax.persistence hibernate-jpa-2.0-api 1.0.1.Final
-Patch5: %{name}-%{version}-persistence-pom.patch
+Source1: %{name}-2.2.0-depmap
# fix test failure
-Patch6: %{name}-%{version}-persistence-jdbc-DynamicEnhancementSuite.patch
-# replace
-# org.apache.bval org.apache.bval.bundle with bval-core and bval-jsr303
-# org.apache.geronimo.specs geronimo-jpa_2.0_spec with org.hibernate.javax.persistence hibernate-jpa-2.0-api
-Patch7: %{name}-%{version}-maven-plugin-pom.patch
-Patch8: %{name}-%{version}-slice-pom.patch
-Patch9: %{name}-%{version}-jest-pom.patch
-Patch10: %{name}-%{version}-tools-it-poms.patch
+Patch0: %{name}-2.2.0-persistence-jdbc-DynamicEnhancementSuite.patch
# remove testing profiles for unavailable drivers: db2jcc informix-driver jcc-driver jdbc-driver jdbc-oracle jtds sqljdbc
-Patch11: %{name}-%{version}-remove-test-profiles.patch
+Patch1: %{name}-2.2.0-remove-test-profiles.patch
BuildRequires: java-devel
BuildRequires: jpackage-utils
@@ -66,6 +45,7 @@ BuildRequires: apache-commons-dbcp
BuildRequires: apache-commons-lang
BuildRequires: apache-commons-logging
BuildRequires: apache-commons-pool
+BuildRequires: bval
BuildRequires: felix-osgi-core
BuildRequires: geronimo-jms
BuildRequires: geronimo-jta
@@ -73,8 +53,11 @@ BuildRequires: geronimo-validation
BuildRequires: glassfish-jaxb
BuildRequires: glassfish-jaxb-api
BuildRequires: hibernate-jpa-2.0-api
+BuildRequires: hsqldb
BuildRequires: log4j
+BuildRequires: maven
BuildRequires: objectweb-asm
+BuildRequires: plexus-utils
BuildRequires: postgresql-jdbc
BuildRequires: serp
BuildRequires: slf4j
@@ -83,10 +66,11 @@ BuildRequires: tomcat-servlet-3.0-api
# test deps
BuildRequires: apache-commons-jci-rhino
BuildRequires: derby
-BuildRequires: hsqldb
BuildRequires: httpunit
+BuildRequires: jmock
#BuildRequires: jtds
BuildRequires: junit
+BuildRequires: maven-plugin-testing-harness
BuildRequires: mysql-connector-java
BuildRequires: regexp
BuildRequires: simple-jndi
@@ -104,6 +88,7 @@ Requires: geronimo-validation
Requires: glassfish-jaxb
Requires: glassfish-jaxb-api
Requires: hibernate-jpa-2.0-api
+Requires: hsqldb
Requires: log4j
Requires: objectweb-asm
Requires: postgresql-jdbc
@@ -127,8 +112,6 @@ which simplifies storing objects in databases.
%package tools
Group: Development/Libraries
Summary: OpenJPA tools - Maven Plugin
-BuildRequires: bval
-BuildRequires: plexus-utils
Requires: maven
Requires: bval
Requires: geronimo-validation
@@ -155,35 +138,105 @@ This package contains javadoc for %{name}.
find . -name "*.class" -delete
find . -name "*.jar" -delete
-%patch0 -p0
-%patch1 -p0
-%patch2 -p0
-%patch3 -p0
-%patch4 -p0
-%patch5 -p0
-%patch6 -p0
-%patch7 -p0
-%patch8 -p0
-%patch9 -p0
-%patch10 -p0
-%patch11 -p1
-
-sed -i "s|<module>openjpa</module>|<!--module>openjpa</module-->|" pom.xml
-sed -i "s|<module>openjpa-all</module>|<!--module>openjpa-all</module-->|" pom.xml
-sed -i "s|<module>openjpa-examples</module>|<!--module>openjpa-examples</module-->|" pom.xml
-sed -i "s|<module>openjpa-integration</module>|<!--module>openjpa-integration</module-->|" pom.xml
-sed -i "s|<module>openjpa-project</module>|<!--module>openjpa-project</module-->|" pom.xml
-sed -i "s|<module>openbooks</module>|<!--module>openbooks</module-->|" openjpa-examples/pom.xml
+%pom_remove_plugin com.agilejava.docbkx:docbkx-maven-plugin
+%pom_remove_plugin org.apache.maven.plugins:maven-checkstyle-plugin
+%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin
+%pom_remove_plugin org.codehaus.mojo:ianal-maven-plugin
+%pom_remove_plugin org.codehaus.mojo:taglist-maven-plugin
+
+%pom_remove_dep net.sourceforge.findbugs:annotations
+%pom_remove_dep org.apache.geronimo.specs:geronimo-jpa_2.0_spec
+%pom_xpath_inject "pom:project/pom:dependencyManagement/pom:dependencies" "
+ <dependency>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <version>1.0.1.Final</version>
+ </dependency>"
+%pom_remove_dep org.apache.bval:org.apache.bval.bundle
+%pom_xpath_inject "pom:project/pom:dependencyManagement/pom:dependencies" "
+ <dependency>
+ <groupId>org.apache.bval</groupId>
+ <artifactId>bval-core</artifactId>
+ <version>0.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.bval</groupId>
+ <artifactId>bval-jsr303</artifactId>
+ <version>0.5</version>
+ </dependency>"
+
+%pom_remove_dep com.ibm.websphere:websphere_uow_api openjpa-kernel
# require non free com.ibm.websphere websphere_uow_api 0.0.1
rm openjpa-kernel/src/main/java/org/apache/openjpa/ee/WASRegistryManagedRuntime.java
rm openjpa-kernel/src/main/java/org/apache/openjpa/ee/AutomaticManagedRuntime.java
-# require unavailable jmock
-rm -r openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/*
+for p in kernel persistence; do
+%pom_remove_dep org.osgi:org.osgi.core openjpa-${p}
+%pom_xpath_inject "pom:project/pom:dependencies" "
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>1.4.0</version>
+ <scope>provided</scope>
+ </dependency>" openjpa-${p}
+done
+
+for p in openjpa-jest \
+ openjpa-persistence \
+ openjpa-tools/openjpa-maven-plugin \
+ openjpa-tools/openjpa-maven-plugin/src/it/default_settings \
+ openjpa-tools/openjpa-maven-plugin/src/it/dependingArtifact \
+ openjpa-tools/openjpa-maven-plugin/src/it/nonDefaultPersistenceXml \
+ openjpa-tools/openjpa-maven-plugin/src/it/testDependencies \
+ ; do
+%pom_remove_dep org.apache.geronimo.specs:geronimo-jpa_2.0_spec ${p}
+%pom_xpath_inject "pom:project/pom:dependencies" "
+ <dependency>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <version>1.0.1.Final</version>
+ </dependency>" ${p}
+done
+
+%pom_remove_dep org.apache.geronimo.specs:geronimo-jpa_2.0_spec openjpa-slice
+%pom_xpath_inject "pom:project/pom:dependencies" "
+ <dependency>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <version>1.0.1.Final</version>
+ <scope>test</scope>
+ </dependency>" openjpa-slice
+
+%pom_remove_dep org.apache.bval:org.apache.bval.bundle openjpa-tools/openjpa-maven-plugin
+%pom_xpath_inject "pom:project/pom:dependencies" "
+ <dependency>
+ <groupId>org.apache.bval</groupId>
+ <artifactId>bval-core</artifactId>
+ <version>0.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.bval</groupId>
+ <artifactId>bval-jsr303</artifactId>
+ <version>0.5</version>
+ </dependency>" openjpa-tools/openjpa-maven-plugin
+
+%patch0 -p0
+%patch1 -p1
+# in f17 buildnumber dont work
+#om_remove_plugin org.codehaus.mojo:buildnumber-maven-plugin
+
+
+%pom_disable_module openjpa
+%pom_disable_module openjpa-all
+%pom_disable_module openjpa-examples
+%pom_disable_module openjpa-integration
+%pom_disable_module openjpa-project
+%pom_disable_module openbooks openjpa-examples
%build
# test random fails
+
mvn-rpmbuild -e \
%if %{with_tests}
-Ptest-derby \
@@ -260,12 +313,16 @@ install -p -m 644 %{name}-ant %{buildroot}%{_sysconfdir}/ant.d/%{name}
%{_mavenpomdir}/JPP.%{name}-tools.pom
%{_mavenpomdir}/JPP.%{name}-maven-plugin.pom
%{_mavendepmapfragdir}/%{name}-tools
+%doc LICENSE NOTICE
%files javadoc
%{_javadocdir}/%{name}
%doc LICENSE NOTICE
%changelog
+* Thu Nov 08 2012 gil cattaneo <puntogil(a)libero.it> 2.2.1-1
+- update to 2.2.1
+
* Mon Jul 16 2012 gil cattaneo <puntogil(a)libero.it> 2.2.0-2
- Fixed license tag
- Own directory
diff --git a/sources b/sources
index 7ced949..1d3f722 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c311bb883a3cce76eba83c0ae9289f88 apache-openjpa-2.2.0-source.zip
+642be4e6629a137aff8cc921208b17a6 apache-openjpa-2.2.1-source.zip
11 years, 5 months
[tycho] Add capability to build without depending on Tycho or Eclipse.
by Roland Grunberg
commit 627ff82552ca5d03ec3e5ffd50a61cb7287b6227
Author: Roland Grunberg <rgrunber(a)redhat.com>
Date: Mon Nov 5 09:46:08 2012 -0500
Add capability to build without depending on Tycho or Eclipse.
When %%bootstrap flag is set, Tycho will build without a BR on Eclipse or
Tycho. This can be used to build when these packages are not yet on the
buildroot. This requires a zipped reactor cache containing the
dependencies that would have been provided by Tycho, and Eclipse.
make_bootstrap_repo.sh | 4 +--
tycho-fix-build.patch | 20 +--------------
tycho-remove-units.patch | 15 ++++++++++++
tycho.spec | 58 ++++++++++++++++++++++++++++++++++++---------
4 files changed, 64 insertions(+), 33 deletions(-)
---
diff --git a/make_bootstrap_repo.sh b/make_bootstrap_repo.sh
index 4a7cf5c..9f5a284 100755
--- a/make_bootstrap_repo.sh
+++ b/make_bootstrap_repo.sh
@@ -1,8 +1,6 @@
#!/bin/bash
rm -rf $(pwd)/.m2
-export TYCHO_TARGET_PLATFORM=/usr/lib/eclipse
-
-mvn-local -Dmaven.repo.local=$(pwd)/.m2 -Dmaven.local.debug=true -X -Dmaven.test.skip -Dsite.generation=true clean install 1>log1.txt 2>log2.txt || exit
+mvn-local -Dmaven.repo.local=$(pwd)/.m2 -Dmaven.local.debug=true -X -Dmaven.test.skip clean verify 1>log1.txt 2>log2.txt || exit
tar caf maven-repo.tar.xz .m2
diff --git a/tycho-fix-build.patch b/tycho-fix-build.patch
index 03a99ea..0e3111f 100644
--- a/tycho-fix-build.patch
+++ b/tycho-fix-build.patch
@@ -1,4 +1,4 @@
-From 1f2c5e307b8d8d2a46ee5eb32359e33d9db3c225 Mon Sep 17 00:00:00 2001
+From 06f5c9b4caf08c1aa2a3febb67a9db1e2f7c3781 Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber(a)redhat.com>
Date: Tue, 12 Jun 2012 09:56:38 -0400
Subject: [PATCH 1/4] Fix the Tycho build to work on Fedora.
@@ -20,13 +20,12 @@ Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814
tycho-artifactcomparator/pom.xml | 4 ++--
.../eclipse/tycho/p2/target/ee/CustomEEResolutionHandler.java | 2 +-
.../tycho-bundles-external/tycho-bundles-external.product | 1 -
- tycho-bundles/tycho-bundles-target/tycho.target | 4 ----
.../tycho-standalone-p2-director/p2 Director.product | 1 -
tycho-compiler-jdt/pom.xml | 4 ----
.../tycho/core/maven/TychoMavenLifecycleParticipant.java | 4 +++-
.../org/eclipse/tycho/test/AbstractTychoIntegrationTest.java | 11 +++++------
.../org/eclipse/tycho/testing/EmptyLifecycleExecutor.java | 8 ++++++++
- 10 files changed, 19 insertions(+), 25 deletions(-)
+ 9 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/pom.xml b/pom.xml
index afe83e3..ed2d224 100644
@@ -89,21 +88,6 @@ index b12ff8c..9e53672 100644
<plugin id="org.eclipse.equinox.ds"/>
<plugin id="org.eclipse.equinox.frameworkadmin"/>
<plugin id="org.eclipse.equinox.frameworkadmin.equinox"/>
-diff --git a/tycho-bundles/tycho-bundles-target/tycho.target b/tycho-bundles/tycho-bundles-target/tycho.target
-index 3436ba6..da4da36 100644
---- a/tycho-bundles/tycho-bundles-target/tycho.target
-+++ b/tycho-bundles/tycho-bundles-target/tycho.target
-@@ -2,10 +2,6 @@
- <?pde version="3.8"?><target name="Target platform for Tycho's bundles" sequenceNumber="8">
- <locations>
- <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit">
--<unit id="org.eclipse.equinox.executable.feature.group" version="3.6.0.v20120913-142258-7P7OG2BFLWUl7Unz-8OO8IEVz-8"/>
--<unit id="org.eclipse.sdk.ide" version="4.3.0.I20121002-0800"/>
--<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.8.0.v20120913-170722-84FAgGhRFnbPjaFro9s2VXtitW"/>
--<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.8.0.v20120524-0542-9N8BHpPGMMn84SxoTtoj_mfujQDR"/>
- <repository location="http://download.eclipse.org/eclipse/updates/4.3-I-builds/I20121002-0800"/>
- </location>
- </locations>
diff --git a/tycho-bundles/tycho-standalone-p2-director/p2 Director.product b/tycho-bundles/tycho-standalone-p2-director/p2 Director.product
index dd80b5e..797b4ba 100644
--- a/tycho-bundles/tycho-standalone-p2-director/p2 Director.product
diff --git a/tycho-remove-units.patch b/tycho-remove-units.patch
new file mode 100644
index 0000000..179a3f5
--- /dev/null
+++ b/tycho-remove-units.patch
@@ -0,0 +1,15 @@
+diff --git a/tycho-bundles/tycho-bundles-target/tycho.target b/tycho-bundles/tycho-bundles-target/tycho.target
+index 3436ba6..da4da36 100644
+--- a/tycho-bundles/tycho-bundles-target/tycho.target
++++ b/tycho-bundles/tycho-bundles-target/tycho.target
+@@ -2,10 +2,6 @@
+ <?pde version="3.8"?><target name="Target platform for Tycho's bundles" sequenceNumber="8">
+ <locations>
+ <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit">
+-<unit id="org.eclipse.equinox.executable.feature.group" version="3.6.0.v20120913-142258-7P7OG2BFLWUl7Unz-8OO8IEVz-8"/>
+-<unit id="org.eclipse.sdk.ide" version="4.3.0.I20121002-0800"/>
+-<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.8.0.v20120913-170722-84FAgGhRFnbPjaFro9s2VXtitW"/>
+-<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.8.0.v20120524-0542-9N8BHpPGMMn84SxoTtoj_mfujQDR"/>
+ <repository location="http://download.eclipse.org/eclipse/updates/4.3-I-builds/I20121002-0800"/>
+ </location>
+ </locations>
diff --git a/tycho.spec b/tycho.spec
index 36ede66..4c071ab 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -1,3 +1,6 @@
+# Bootstrap build
+# Set this if Tycho and Eclipse are not in buildroot
+%global bootstrap 0
# When building version under development (non-release)
# %%global snap -SNAPSHOT
@@ -5,7 +8,7 @@
Name: tycho
Version: 0.16.0
-Release: 15%{?dist}
+Release: 16%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
@@ -21,6 +24,10 @@ Source1: EmptyMojo.java
# we need to make sure we are using maven 3 deps
Source2: depmap.xml
Source3: copy-platform-all
+# Bootstrap repo for building when Tycho and Eclipse not built.
+%if %{bootstrap}
+Source4: maven-repo.tar.xz
+%endif
Patch0: %{name}-fix-build.patch
# Upstream builds against maven-surefire 2.12.3
@@ -31,9 +38,10 @@ Patch3: %{name}-use-custom-resolver.patch
# a different version from the nonbootstrapped. Otherwise there will
# be cyclic dependencies.
Patch4: %{name}-bootstrap.patch
-# Maven local mode will look in reactore cache for exact version (path lookup)
+# Maven local mode will look in reactor cache for exact version (path lookup)
# Set the built intermediary version of Tycho to be found in the reactor cache
Patch5: %{name}-set-reactor-cache-version.patch
+Patch6: %{name}-remove-units.patch
BuildArch: noarch
@@ -55,9 +63,11 @@ BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-surefire-provider-junit4
BuildRequires: objectweb-asm4
BuildRequires: plexus-containers-component-metadata
-BuildRequires: eclipse-jdt
BuildRequires: decentxml
+%if ! %{bootstrap}
+BuildRequires: eclipse-jdt
BuildRequires: %{name}
+%endif
Requires: jpackage-utils
Requires: decentxml
@@ -67,7 +77,10 @@ Requires: maven-dependency-plugin
Requires: maven-shared-verifier
Requires: maven-surefire-provider-junit4
Requires: objectweb-asm4
-#Requires: eclipse-jdt
+Requires: ecj
+%if ! %{bootstrap}
+Requires: eclipse-equinox-osgi
+%endif
%description
@@ -123,6 +136,12 @@ popd
export MAVEN_OPTS="$MAVEN_OPTS -XX:MaxPermSize=256m"
+%if %{bootstrap}
+tar -xf %{SOURCE4}
+%else
+
+%patch6 -p1
+
# installed version of Tycho
sysVer=`grep -C 1 "<artifactId>tycho</artifactId>" %{_mavenpomdir}/JPP.tycho-main.pom | grep "version" | sed 's/.*>\(.*\)<.*/\1/'`
@@ -134,7 +153,7 @@ echo "System version is ${sysVer} and attempting to build ${buildVer}."
# If version installed on system is the same as the version being built
# an intermediary build must be done to prevent a cycle at build time.
if [ "${sysVer}" == "${buildVer}" ]; then
-echo "Performing bootstrap build"
+echo "Performing intermediary build"
%patch4 -p1
mvn-rpmbuild -Dmaven.local.depmap.file=%{SOURCE2} -DskipTychoVersionCheck -Dmaven.test.skip=true install javadoc:aggregate
@@ -143,6 +162,8 @@ mvn-rpmbuild -Dmaven.local.depmap.file=%{SOURCE2} -DskipTychoVersionCheck -Dmave
%patch5 -p1
fi
+%endif
+
%build
mvn-rpmbuild -Dmaven.local.depmap.file=%{SOURCE2} -DskipTychoVersionCheck -Dmaven.test.skip=true clean install javadoc:aggregate
@@ -199,15 +220,25 @@ cp -pr target/site/api*/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
install -pm 755 %{SOURCE3} $RPM_BUILD_ROOT%{_javadir}/%{name}/copy-platform-all
+%if %{bootstrap}
# org.eclipse.osgi
-install -pm 644 %{_mavenpomdir}/JPP.eclipse-osgi.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.tycho-osgi.pom
-install -m 644 %{_javadir}/eclipse/osgi.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/
-%add_maven_depmap JPP.%{name}-osgi.pom %{name}/osgi.jar -a "org.eclipse.tycho:org.eclipse.osgi"
+osgiJarPath=`find ".m2" -name "org.eclipse.osgi_*.jar"`
+osgiJar=`basename $osgiJarPath`
+osgiVer=`echo $osgiJar | sed 's/^.*_//' | sed 's/.jar//'`
+
+mvn-rpmbuild org.apache.maven.plugins:maven-install-plugin:install-file \
+-Dfile=$osgiJarPath \
+-Dpackaging=jar \
+-DgroupId=org.eclipse.tycho \
+-DartifactId=org.eclipse.osgi \
+-Dversion=$osgiVer
-# org.eclipse.jdt.core
-install -pm 644 %{_mavenpomdir}/JPP.eclipse-jdt.core.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.tycho-jdt.core.pom
-install -m 644 %{_javadir}/eclipse/jdt.core.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/
-%add_maven_depmap JPP.%{name}-jdt.core.pom %{name}/jdt.core.jar -a "org.eclipse.tycho:org.eclipse.jdt.core"
+osgiPomPath=`find ".m2/org/eclipse/tycho/org.eclipse.osgi" -name "org.eclipse.osgi-*.pom"`
+
+install -pm 644 $osgiPomPath $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.tycho-osgi.pom
+install -m 644 $osgiJarPath $RPM_BUILD_ROOT%{_javadir}/%{name}/osgi.jar
+%add_maven_depmap JPP.%{name}-osgi.pom %{name}/osgi.jar -a "org.eclipse.tycho:org.eclipse.osgi"
+%endif
%files
%{_mavenpomdir}/*
@@ -219,6 +250,9 @@ install -m 644 %{_javadir}/eclipse/jdt.core.jar $RPM_BUILD_ROOT%{_javadir}/%{nam
%{_javadocdir}/%{name}
%changelog
+* Mon Nov 5 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-16
+- Add capability to build without depending on Tycho or Eclipse.
+
* Sat Oct 20 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-15
- Package org.eclipse.osgi and org.eclipse.jdt.core.
11 years, 5 months
