[maven-eclipse-plugin] Don't fail the build on /bin/ls failure
by Mikolaj Izdebski
commit fb904fd6a464ea9471e061fee9cdd2c28c85b98e
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Aug 29 15:08:18 2013 +0200
Don't fail the build on /bin/ls failure
maven-eclipse-plugin.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/maven-eclipse-plugin.spec b/maven-eclipse-plugin.spec
index 42a19a5..f84308b 100644
--- a/maven-eclipse-plugin.spec
+++ b/maven-eclipse-plugin.spec
@@ -73,7 +73,7 @@ CORE_FAKE_VERSION="3.7.100.v20110510-0712"
CORE_PLUGIN_DIR=$MAVEN_REPO_LOCAL/org/eclipse/core/resources/$CORE_FAKE_VERSION
mkdir -p $CORE_PLUGIN_DIR
-plugin_file=`ls /usr/lib{,64}/eclipse/plugins/org.eclipse.core.resources_*jar`
+plugin_file=`ls /usr/lib{,64}/eclipse/plugins/org.eclipse.core.resources_*jar || :`
ln -s "$plugin_file" $CORE_PLUGIN_DIR/resources-$CORE_FAKE_VERSION.jar
10 years, 8 months
[maven-eclipse-plugin/f20] Don't use %_libdir in noarch package
by Mikolaj Izdebski
commit e94bae2269dafb3036c867aa8c49eed6611aabda
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Aug 29 14:57:53 2013 +0200
Don't use %_libdir in noarch package
maven-eclipse-plugin.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/maven-eclipse-plugin.spec b/maven-eclipse-plugin.spec
index 984acf9..42a19a5 100644
--- a/maven-eclipse-plugin.spec
+++ b/maven-eclipse-plugin.spec
@@ -3,7 +3,7 @@
Name: maven-eclipse-plugin
Version: 2.9
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Maven Eclipse Plugin
Group: Development/Libraries
@@ -73,7 +73,7 @@ CORE_FAKE_VERSION="3.7.100.v20110510-0712"
CORE_PLUGIN_DIR=$MAVEN_REPO_LOCAL/org/eclipse/core/resources/$CORE_FAKE_VERSION
mkdir -p $CORE_PLUGIN_DIR
-plugin_file=`ls %{_libdir}/eclipse/plugins/org.eclipse.core.resources_*jar`
+plugin_file=`ls /usr/lib{,64}/eclipse/plugins/org.eclipse.core.resources_*jar`
ln -s "$plugin_file" $CORE_PLUGIN_DIR/resources-$CORE_FAKE_VERSION.jar
@@ -90,6 +90,9 @@ ln -s "$plugin_file" $CORE_PLUGIN_DIR/resources-$CORE_FAKE_VERSION.jar
%doc LICENSE NOTICE
%changelog
+* Thu Aug 29 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.9-9
+- Don't use %%_libdir in noarch package
+
* Thu Aug 29 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.9-8
- Remove dependency on easymock
- Resolves: rhbz#1002477
10 years, 8 months
[gemini-blueprint] migrate from easymock 1 to easymock 3. rhbz#1002475, fix unowned directory
by gil
commit b91193efd92da47a042fb8c0091bb3ec6be179e1
Author: gil <puntogil(a)libero.it>
Date: Thu Aug 29 14:41:22 2013 +0200
migrate from easymock 1 to easymock 3. rhbz#1002475, fix unowned directory
gemini-blueprint.spec | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/gemini-blueprint.spec b/gemini-blueprint.spec
index f7ec71a..980a6dc 100644
--- a/gemini-blueprint.spec
+++ b/gemini-blueprint.spec
@@ -156,6 +156,7 @@ rm -r core/src/test/java/org/eclipse/gemini/blueprint/blueprint/ReflectionTest.j
%mvn_install
%files -f .mfiles
+%dir %{_javadir}/%{name}
%doc about.html changelog.txt epl-v10.html license-apache.txt notice.html readme-building.txt readme.txt
%files javadoc -f .mfiles-javadoc
10 years, 8 months
[maven-eclipse-plugin] Remove dependency on easymock
by Mikolaj Izdebski
commit 263e8bdb5c2a83a91ddfd9f49ef48820de242335
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Aug 29 14:34:33 2013 +0200
Remove dependency on easymock
- Resolves: rhbz#1002477
maven-eclipse-plugin.spec | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/maven-eclipse-plugin.spec b/maven-eclipse-plugin.spec
index f8922de..984acf9 100644
--- a/maven-eclipse-plugin.spec
+++ b/maven-eclipse-plugin.spec
@@ -3,7 +3,7 @@
Name: maven-eclipse-plugin
Version: 2.9
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Maven Eclipse Plugin
Group: Development/Libraries
@@ -30,7 +30,6 @@ BuildRequires: maven-test-tools
BuildRequires: maven-plugin-testing-tools
# Others
BuildRequires: apache-commons-io
-BuildRequires: easymock
BuildRequires: xmlunit
BuildRequires: eclipse-platform
BuildRequires: plexus-resources
@@ -63,6 +62,9 @@ API documentation for %{name}.
sed -i -e "s|3.3.0-v20070604|3.7.100.v20110510-0712|g" pom.xml
+# Remove easymock dependency (tests are skipped)
+%pom_remove_dep easymock:
+
%build
# Create a local repo for the eclipse dependency because eclipse
# does not yet export virtual mvn provides or ship pom files
@@ -88,6 +90,10 @@ ln -s "$plugin_file" $CORE_PLUGIN_DIR/resources-$CORE_FAKE_VERSION.jar
%doc LICENSE NOTICE
%changelog
+* Thu Aug 29 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.9-8
+- Remove dependency on easymock
+- Resolves: rhbz#1002477
+
* Sun Aug 18 2013 Mat Booth <fedora(a)matbooth.co.uk> - 2.9-7
- Update for newer guidelines rhbz #992186
- Install license files
10 years, 8 months
[gemini-blueprint] migrate from easymock 1 to easymock 3. rhbz#1002475
by gil
commit 077d8bd7458a077d449f27be9a6c2bfa65d53f5d
Author: gil <puntogil(a)libero.it>
Date: Thu Aug 29 14:32:26 2013 +0200
migrate from easymock 1 to easymock 3. rhbz#1002475
gemini-blueprint.spec | 83 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 61 insertions(+), 22 deletions(-)
---
diff --git a/gemini-blueprint.spec b/gemini-blueprint.spec
index 4aeaadf..f7ec71a 100644
--- a/gemini-blueprint.spec
+++ b/gemini-blueprint.spec
@@ -3,7 +3,7 @@
%global dotname gemini.blueprint
Name: gemini-blueprint
Version: 1.0.2
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Reference Implementation of the OSGi Blueprint Service
# BSD file - test-support/src/main/java/org/eclipse/gemini/blueprint/test/internal/util/DependencyVisitor.java,
License: ASL 2.0 and BSD and EPL
@@ -30,7 +30,7 @@ BuildRequires: maven-plugin-bundle
BuildRequires: maven-surefire-provider-junit4
# test deps
-BuildRequires: easymock
+BuildRequires: easymock3
BuildRequires: junit
BuildRequires: multithreadedtc
# BuildRequires: springframework-test
@@ -80,39 +80,75 @@ find . -name "*.jar" -type f -delete
# remove clover knopflerfish profiles (todo remove also eclipse/equinox and org.apache.felix profiles)
%pom_xpath_remove pom:profiles
-sed -i "s|<groupId>org.aopalliance|<groupId>aopalliance|" pom.xml {core,extender}/pom.xml
-sed -i "s|<artifactId>com.springsource.org.aopalliance|<artifactId>aopalliance|" pom.xml {core,extender}/pom.xml
-
-sed -i "s|<groupId>org.junit</groupId>|<groupId>junit</groupId>|" pom.xml
-sed -i "s|<artifactId>com.springsource.org.junit</artifactId>|<artifactId>junit</artifactId>|" pom.xml
+# TODO require:
+# org.springframework spring-test
+# org.knopflerfish framework
+# org.apache.felix org.apache.felix.main
+# org.eclipse.osgi org.eclipse.osgi
+%pom_disable_module test-support
+%pom_remove_dep org.eclipse.gemini.blueprint:gemini-blueprint-test
-# test deps
-%pom_remove_dep log4j:log4j
# build deps
-sed -i "s|<groupId>org.apache.log4j</groupId>|<groupId>log4j</groupId>|" pom.xml
-sed -i "s|<artifactId>com.springsource.org.apache.log4j</artifactId>|<artifactId>log4j</artifactId>|" pom.xml
-
-sed -i "s|<groupId>multithreadedtc</groupId>|<groupId>edu.umd.cs.mtc</groupId>|" core/pom.xml
-
%pom_remove_dep org.springframework:spring-test
%pom_remove_dep org.springframework:spring-test core
-
# require org.springframework:org.springframework.test*
rm -r core/src/test/java/org/eclipse/gemini/blueprint/internal/util/BeanFactoryUtilsTest.java \
core/src/test/java/org/eclipse/gemini/blueprint/DictionaryEditorTest.java
-# TODO require:
-# org.springframework spring-test
-# org.knopflerfish framework
-# org.apache.felix org.apache.felix.main
-# org.eclipse.osgi org.eclipse.osgi
-%pom_disable_module test-support
-%pom_remove_dep org.eclipse.gemini.blueprint:gemini-blueprint-test
+%pom_remove_dep log4j:log4j
+%pom_remove_dep org.apache.log4j:com.springsource.org.apache.log4j
+%pom_add_dep log4j:log4j:1.2.17
+%pom_remove_dep org.junit:com.springsource.org.junit
+%pom_add_dep junit:junit:4.11:test
+
+%pom_remove_dep org.aopalliance: core
+%pom_add_dep aopalliance:aopalliance::provided core
+
+%pom_remove_dep org.aopalliance: extender
+%pom_add_dep aopalliance:aopalliance::test extender
+
+%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId = 'multithreadedtc' ]/pom:groupId" edu.umd.cs.mtc core
+
+%pom_xpath_set "pom:project/pom:dependencyManagement/pom:dependencies/pom:dependency[pom:version = '1.0.0' ]/pom:artifactId" aopalliance
+%pom_xpath_set "pom:project/pom:dependencyManagement/pom:dependencies/pom:dependency[pom:version = '1.0.0' ]/pom:groupId" aopalliance
+
+# migrate from easymock 1 to easymock 3
+%pom_remove_dep easymock:
+%pom_add_dep org.easymock:easymock:3.2:test
# Fix CRLF
sed 's/\r//' -i changelog.txt license-apache.txt readme-building.txt readme.txt
+rm -r core/src/test/java/org/eclipse/gemini/blueprint/blueprint/ReflectionTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/blueprint/config/ComponentElementTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/blueprint/config/ComponentSubElementTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/blueprint/config/ConstructorInjectionTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/blueprint/config/MixedRfc124BeansTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/blueprint/config/NestedElementsTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/blueprint/config/SchemaWithLocationTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/blueprint/config/SpringDmRfc124Test.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/blueprint/config/SpringRootConfigTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/blueprint/config/TypeConverterTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/blueprint/container/BlueprintFieldsTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/blueprint/container/CycleTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/blueprint/container/GenericsTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/blueprint/container/LazyExporterTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/blueprint/container/TestBlueprintBuiltinConvertersTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/blueprint/container/TestLazyBeansTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/blueprint/metadata/BundleContextApiTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/blueprint/metadata/ImporterMetadataTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/blueprint/metadata/BeanComponentMetadataTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/blueprint/metadata/DefaultsTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/blueprint/metadata/ExporterMetadataTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/blueprint/metadata/ImporterCollectionsMetadataTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/blueprint/reflect/NestedDefinitionMetadataTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/compendium/config/CmConfigAndCtxPropertiesConfigurationTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/compendium/config/ConfigPropertiesHandlerTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/compendium/config/ManagedPropertiesTest.java \
+ core/src/test/java/org/eclipse/gemini/blueprint/compendium/config/ManagedServiceFactoryTest.java \
+
%build
+
# some test fails for unavailable build deps*
%mvn_build -- -Dproject.build.sourceEncoding=UTF-8 -Dmaven.test.failure.ignore=true
@@ -126,6 +162,9 @@ sed 's/\r//' -i changelog.txt license-apache.txt readme-building.txt readme.txt
%doc epl-v10.html license-apache.txt notice.html
%changelog
+* Thu Aug 29 2013 gil cattaneo <puntogil(a)libero.it> 1.0.2-5
+- migrate from easymock 1 to easymock 3. rhbz#1002475
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
10 years, 8 months