[tycho] fedoraproject-p2: Bump BREE to JavaSE-1.8
by Mikolaj Izdebski
commit 3472fb8204ce8db1af005970379c69da1de28c92
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Feb 4 16:34:21 2015 +0100
fedoraproject-p2: Bump BREE to JavaSE-1.8
- fedoraproject-p2: Fix installing of virtual bundles provided by p2.inf
sources | 2 +-
tycho.spec | 10 +++++++---
2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index 93e77d6..3adb551 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-b42b7d6e92a7971615a21e8c63624fe3 fedoraproject-p2-b1a848.tar.xz
+0c7c5bc738676674028f23bd25824966 fedoraproject-p2-d701d8.tar.xz
d7ee912e8da240c8d87892ed876960ae org.eclipse.tycho-tycho-0.22.0.tar.bz2
c600a5115f29962c974b75b4b25e74f1 eclipse-bootstrap.tar.xz
diff --git a/tycho.spec b/tycho.spec
index 04fc902..5855898 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -17,7 +17,7 @@
# %%global snap -SNAPSHOT
%global snap %{nil}
-%global fp_p2_sha b1a848
+%global fp_p2_sha d701d8
%global fp_p2_version 0.0.1
%global fp_p2_snap -SNAPSHOT
@@ -25,7 +25,7 @@
Name: %{?scl_prefix}tycho
Version: 0.22.0
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
@@ -64,7 +64,7 @@ Patch6: %{pkg_name}-running-env-only.patch
BuildArch: noarch
-BuildRequires: java-devel
+BuildRequires: java-devel >= 1:1.8
BuildRequires: maven-local >= 4.2.0
BuildRequires: maven-clean-plugin
BuildRequires: maven-dependency-plugin
@@ -427,6 +427,10 @@ ln -s %{_javadir}/tycho/org.fedoraproject.p2.jar %{buildroot}%{_datadir}/xmvn/li
%{_javadocdir}/tycho
%changelog
+* Wed Feb 4 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.22.0-10
+- fedoraproject-p2: Bump BREE to JavaSE-1.8
+- fedoraproject-p2: Fix installing of virtual bundles provided by p2.inf
+
* Wed Jan 28 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.22.0-9
- fedoraproject-p2: Allow installation of bundles not built with tycho
9 years, 2 months
[aether-ant-tasks] Update to upstream version 1.0.1
by Mikolaj Izdebski
commit 39fddbe176e2714ff466b8f43cc82468c91128d8
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Feb 4 13:37:35 2015 +0100
Update to upstream version 1.0.1
.gitignore | 1 +
0001-Add-support-for-XMvn-workspace-reader.patch | 6 +++---
...3.2.3.patch => 0002-Update-to-Maven-3.2.3.patch | 12 ++++++------
aether-ant-tasks.spec | 11 +++++++----
sources | 2 +-
5 files changed, 18 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1d0a15c..b3b2dca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/aether-ant-tasks-0.9.0.M4.tar.bz2
/aether-ant-tasks-0.9.0.v20140226.tar.bz2
/aether-ant-tasks-1.0.0.v20140518.tar.bz2
+/aether-ant-tasks-1.0.1.v20141111.tar.bz2
diff --git a/0001-Add-support-for-XMvn-workspace-reader.patch b/0001-Add-support-for-XMvn-workspace-reader.patch
index 86e6389..bc71a10 100644
--- a/0001-Add-support-for-XMvn-workspace-reader.patch
+++ b/0001-Add-support-for-XMvn-workspace-reader.patch
@@ -1,7 +1,7 @@
-From 59f7850fd2cde1c5af1aaa6f2a8a50585e490ff8 Mon Sep 17 00:00:00 2001
+From 5b975bc4bb0d61c686fb3f0fbdbf4a8f6d23e26c Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed, 11 Sep 2013 18:31:04 +0200
-Subject: [PATCH] Add support for XMvn workspace reader
+Subject: [PATCH 1/2] Add support for XMvn workspace reader
---
.../org/eclipse/aether/internal/ant/AntRepoSys.java | 21 +++++++++++++++++++++
@@ -61,5 +61,5 @@ index 76cc927..ee1d444 100644
}
--
-1.9.0
+2.1.0
diff --git a/0001-Update-to-Maven-3.2.3.patch b/0002-Update-to-Maven-3.2.3.patch
similarity index 91%
rename from 0001-Update-to-Maven-3.2.3.patch
rename to 0002-Update-to-Maven-3.2.3.patch
index 28ef4e9..fb2d49c 100644
--- a/0001-Update-to-Maven-3.2.3.patch
+++ b/0002-Update-to-Maven-3.2.3.patch
@@ -1,7 +1,7 @@
-From a31528c40665cefc216a2cf8a37f1b00a29a55f8 Mon Sep 17 00:00:00 2001
+From 240b4be7a73fb83f14065cca917615a06a3b4fb0 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Fri, 7 Nov 2014 14:48:21 +0100
-Subject: [PATCH] Update to Maven 3.2.3
+Subject: [PATCH 2/2] Update to Maven 3.2.3
---
pom.xml | 2 +-
@@ -9,16 +9,16 @@ Subject: [PATCH] Update to Maven 3.2.3
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
-index 7f0eb73..03ef826 100644
+index 7d22ca6..18ce0d3 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -114,7 +114,7 @@
+@@ -117,7 +117,7 @@
<surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile>
<sonatypeOssDistMgmtSnapshotsId>sonatype-nexus-snapshots</sonatypeOssDistMgmtSnapshotsId>
<sonatypeOssDistMgmtSnapshotsUrl>https://oss.sonatype.org/content/repositories/snapshots/</sonatypeOssDistMgmtSnapshotsUrl>
- <mavenVersion>3.1.0</mavenVersion>
+ <mavenVersion>3.2.3</mavenVersion>
- <aetherVersion>1.0.0.v20140518</aetherVersion>
+ <aetherVersion>1.0.1.v20141111</aetherVersion>
</properties>
diff --git a/src/main/java/org/eclipse/aether/internal/ant/AntModelResolver.java b/src/main/java/org/eclipse/aether/internal/ant/AntModelResolver.java
@@ -60,5 +60,5 @@ index dc7ef72..e0d40c5 100644
+
}
--
-1.9.3
+2.1.0
diff --git a/aether-ant-tasks.spec b/aether-ant-tasks.spec
index 63b3971..a26eb4e 100644
--- a/aether-ant-tasks.spec
+++ b/aether-ant-tasks.spec
@@ -1,9 +1,9 @@
-%global vertag v20140518
+%global vertag v20141111
Name: aether-ant-tasks
Epoch: 1
-Version: 1.0.0
-Release: 3%{?dist}
+Version: 1.0.1
+Release: 1%{?dist}
Summary: Ant tasks using Aether to resolve, install and deploy artifacts
Group: Development/Libraries
BuildArch: noarch
@@ -14,7 +14,7 @@ Source0: http://git.eclipse.org/c/aether/aether-ant.git/snapshot/%{name}-
Source5: ant-classpath
Patch0001: 0001-Add-support-for-XMvn-workspace-reader.patch
-Patch0002: 0001-Update-to-Maven-3.2.3.patch
+Patch0002: 0002-Update-to-Maven-3.2.3.patch
BuildRequires: maven-local
BuildRequires: mvn(junit:junit)
@@ -80,6 +80,9 @@ install -p -m 644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/ant.d/%{name}
%doc epl-v10.html notice.html
%changelog
+* Wed Feb 4 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1:1.0.1-1
+- Update to upstream version 1.0.1
+
* Fri Nov 7 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1:1.0.0-3
- Update to Maven 3.2.3
diff --git a/sources b/sources
index 1246244..13c3363 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8d257385d092f579585ab423f27a25a0 aether-ant-tasks-1.0.0.v20140518.tar.bz2
+37c2b83c5dd2ed2d23853a2e1e2cba5a aether-ant-tasks-1.0.1.v20141111.tar.bz2
9 years, 2 months
[aether] Update to upstream version 1.0.2
by Mikolaj Izdebski
commit 99be90a0eb119c49797ec4e955d2c34ba53a88f5
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Feb 4 13:34:37 2015 +0100
Update to upstream version 1.0.2
.gitignore | 1 +
aether.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b193711..1f2be75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
/aether-0.9.1.v20140329.tar.bz2
/aether-1.0.0.v20140518.tar.bz2
/aether-1.0.1.v20141111.tar.bz2
+/aether-1.0.2.v20150114.tar.bz2
diff --git a/aether.spec b/aether.spec
index 3e73b12..b6f0eae 100644
--- a/aether.spec
+++ b/aether.spec
@@ -1,8 +1,8 @@
-%global vertag v20141111
+%global vertag v20150114
Name: aether
Epoch: 1
-Version: 1.0.1
+Version: 1.0.2
Release: 1%{?dist}
Summary: Library to resolve, install and deploy artifacts the Maven way
License: EPL
@@ -182,6 +182,9 @@ rm -rf aether-transport-http/src/test
%doc epl-v10.html notice.html
%changelog
+* Wed Feb 4 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1:1.0.2-1
+- Update to upstream version 1.0.2
+
* Wed Feb 4 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1:1.0.1-1
- Update to upstream version 1.0.1
diff --git a/sources b/sources
index b0f865d..5c2fa8f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-512224326be56bac3caf9780224311b8 aether-1.0.1.v20141111.tar.bz2
+cc5ef065625e9bd5dd94acde8221e103 aether-1.0.2.v20150114.tar.bz2
9 years, 2 months
[aether] Update to upstream version 1.0.1
by Mikolaj Izdebski
commit 4902fcc8bcaba9926a1368302d596c9c3c38b45d
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Feb 4 07:23:04 2015 +0100
Update to upstream version 1.0.1
.gitignore | 1 +
...433953-Remove-support-for-Plexus-IoC-fram.patch | 29 +++++++++++---------
aether.spec | 9 ++++--
sources | 2 +-
4 files changed, 24 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 38b6eef..b193711 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
/aether-0.9.0.v20140226.tar.bz2
/aether-0.9.1.v20140329.tar.bz2
/aether-1.0.0.v20140518.tar.bz2
+/aether-1.0.1.v20141111.tar.bz2
diff --git a/0001-Revert-Bug-433953-Remove-support-for-Plexus-IoC-fram.patch b/0001-Revert-Bug-433953-Remove-support-for-Plexus-IoC-fram.patch
index 8630982..85986c7 100644
--- a/0001-Revert-Bug-433953-Remove-support-for-Plexus-IoC-fram.patch
+++ b/0001-Revert-Bug-433953-Remove-support-for-Plexus-IoC-fram.patch
@@ -1,6 +1,6 @@
-From 7c7d1f459729d60cc4fa96ad723fbfcefaffc9ef Mon Sep 17 00:00:00 2001
+From b74b2f6299605ec0dfca4aabb21fb3fe13844d47 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk(a)redhat.com>
-Date: Wed, 21 May 2014 10:08:34 +0200
+Date: Wed, 4 Feb 2015 07:26:24 +0100
Subject: [PATCH] Revert "Bug 433953 - Remove support for Plexus IoC framework"
This reverts commit c5edb824e8ae5336cf10fc8cbe745a01ca760d6d.
@@ -51,7 +51,7 @@ This reverts commit c5edb824e8ae5336cf10fc8cbe745a01ca760d6d.
create mode 100644 aether-transport-http/src/test/java/org/eclipse/aether/transport/http/PlexusSupportTest.java
diff --git a/aether-connector-basic/pom.xml b/aether-connector-basic/pom.xml
-index ee208a8..08429a3 100644
+index 747f9dc..5363540 100644
--- a/aether-connector-basic/pom.xml
+++ b/aether-connector-basic/pom.xml
@@ -51,6 +51,17 @@
@@ -231,7 +231,7 @@ index 0000000..e57e508
+
+}
diff --git a/aether-impl/pom.xml b/aether-impl/pom.xml
-index 9627aff..a39794f 100644
+index cad3afd..832ed85 100644
--- a/aether-impl/pom.xml
+++ b/aether-impl/pom.xml
@@ -51,6 +51,18 @@
@@ -843,7 +843,7 @@ index 561ba8c..7bce2be 100644
throws RepositoryOfflineException
{
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManager.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManager.java
-index ccb618a..fa2cf89 100644
+index 8a54d62..7b13b3f 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManager.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManager.java
@@ -1,5 +1,5 @@
@@ -853,16 +853,16 @@ index ccb618a..fa2cf89 100644
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
-@@ -17,6 +17,8 @@ import java.util.ListIterator;
+@@ -18,6 +18,8 @@ import java.util.ListIterator;
import javax.inject.Inject;
import javax.inject.Named;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
+ import org.eclipse.aether.RepositoryCache;
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.impl.RemoteRepositoryManager;
- import org.eclipse.aether.impl.UpdatePolicyAnalyzer;
-@@ -38,14 +40,18 @@ import org.eclipse.aether.util.StringUtils;
+@@ -40,6 +42,7 @@ import org.eclipse.aether.util.StringUtils;
/**
*/
@Named
@@ -870,6 +870,9 @@ index ccb618a..fa2cf89 100644
public class DefaultRemoteRepositoryManager
implements RemoteRepositoryManager, Service
{
+@@ -77,10 +80,13 @@ public class DefaultRemoteRepositoryManager
+
+ }
+ @Requirement( role = LoggerFactory.class )
private Logger logger = NullLoggerFactory.LOGGER;
@@ -881,7 +884,7 @@ index ccb618a..fa2cf89 100644
private ChecksumPolicyProvider checksumPolicyProvider;
public DefaultRemoteRepositoryManager()
-@@ -75,6 +81,12 @@ public class DefaultRemoteRepositoryManager
+@@ -110,6 +116,12 @@ public class DefaultRemoteRepositoryManager
return this;
}
@@ -1616,7 +1619,7 @@ index 0000000..26324ef
+
+}
diff --git a/aether-transport-classpath/pom.xml b/aether-transport-classpath/pom.xml
-index b980591..8d7dc0e 100644
+index 41d0506..c7775cb 100644
--- a/aether-transport-classpath/pom.xml
+++ b/aether-transport-classpath/pom.xml
@@ -51,6 +51,17 @@
@@ -1746,7 +1749,7 @@ index 0000000..c984df6
+
+}
diff --git a/aether-transport-file/pom.xml b/aether-transport-file/pom.xml
-index 35bf5b1..0d4a252 100644
+index 40a2190..2a30814 100644
--- a/aether-transport-file/pom.xml
+++ b/aether-transport-file/pom.xml
@@ -51,6 +51,17 @@
@@ -1872,7 +1875,7 @@ index 0000000..f579995
+
+}
diff --git a/aether-transport-http/pom.xml b/aether-transport-http/pom.xml
-index feb9adb..c911c0e 100644
+index e86dcc7..e7432ea 100644
--- a/aether-transport-http/pom.xml
+++ b/aether-transport-http/pom.xml
@@ -68,6 +68,17 @@
@@ -2043,5 +2046,5 @@ index 5d91358..be57919 100644
* Sets the wagon provider to use to acquire and release wagon instances.
*
--
-1.9.0
+2.1.0
diff --git a/aether.spec b/aether.spec
index 6799256..3e73b12 100644
--- a/aether.spec
+++ b/aether.spec
@@ -1,9 +1,9 @@
-%global vertag v20140518
+%global vertag v20141111
Name: aether
Epoch: 1
-Version: 1.0.0
-Release: 3%{?dist}
+Version: 1.0.1
+Release: 1%{?dist}
Summary: Library to resolve, install and deploy artifacts the Maven way
License: EPL
URL: http://eclipse.org/aether
@@ -182,6 +182,9 @@ rm -rf aether-transport-http/src/test
%doc epl-v10.html notice.html
%changelog
+* Wed Feb 4 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1:1.0.1-1
+- Update to upstream version 1.0.1
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:1.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index 8570003..b0f865d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-abc98e42c2df50436728e721bd56cdbe aether-1.0.0.v20140518.tar.bz2
+512224326be56bac3caf9780224311b8 aether-1.0.1.v20141111.tar.bz2
9 years, 2 months
[sisu] Update to upstream milestone 0.3.0.M1
by Mikolaj Izdebski
commit 80e53710f524d248402cab752682f5cc23be665d
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Feb 4 07:00:16 2015 +0100
Update to upstream milestone 0.3.0.M1
.gitignore | 2 +
sisu-ignored-tests.patch | 151 ++++++++++++++++++++++++++++++++++++++++++++++
sisu.spec | 23 +++++---
sources | 4 +-
4 files changed, 170 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index eaa901a..bd7e4bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,5 @@
/org.eclipse.sisu.plexus-0.2.0.tar.bz2
/org.eclipse.sisu.inject-0.2.1.tar.bz2
/org.eclipse.sisu.plexus-0.2.1.tar.bz2
+/org.eclipse.sisu.inject-0.3.0.M1.tar.bz2
+/org.eclipse.sisu.plexus-0.3.0.M1.tar.bz2
diff --git a/sisu-ignored-tests.patch b/sisu-ignored-tests.patch
index 1115049..484fa7d 100644
--- a/sisu-ignored-tests.patch
+++ b/sisu-ignored-tests.patch
@@ -52,3 +52,154 @@
public void testMarkedWithAttributesSearch()
{
final LocatedBeans<Marked, Bean> beans =
+--- sisu-plexus/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusXmlScannerTest.java~ 2014-08-24 01:48:47.000000000 +0200
++++ sisu-plexus/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusXmlScannerTest.java 2015-02-04 07:06:49.696531924 +0100
+@@ -159,83 +159,6 @@
+ new PlexusXmlScanner( null, plexusXml, null ).scan( space, true );
+ }
+
+- @SuppressWarnings( "deprecation" )
+- public void testComponents()
+- {
+- final ClassSpace space = new URLClassSpace( PlexusXmlScannerTest.class.getClassLoader() );
+-
+- final Map<String, PlexusBeanMetadata> metadata = new HashMap<String, PlexusBeanMetadata>();
+- final PlexusXmlScanner scanner = new PlexusXmlScanner( null, null, metadata );
+-
+- final Map<Component, DeferredClass<?>> componentMap = scanner.scan( space, true );
+-
+- assertEquals( 6, componentMap.size() );
+-
+- final Component component1 =
+- new ComponentImpl( DefaultBean.class, Hints.DEFAULT_HINT, Strategies.PER_LOOKUP, "" );
+- assertEquals( DefaultBean.class, componentMap.get( component1 ).load() );
+-
+- final Component component2 = new ComponentImpl( Bean.class, "debug", Strategies.SINGLETON, "For debugging" );
+- assertEquals( DebugBean.class, componentMap.get( component2 ).load() );
+-
+- final Component component3 = new ComponentImpl( Bean.class, Hints.DEFAULT_HINT, Strategies.SINGLETON, "" );
+- assertEquals( AnotherBean.class, componentMap.get( component3 ).load() );
+-
+- final Component component4 = new ComponentImpl( Bean.class, "clone", Strategies.SINGLETON, "" );
+- assertEquals( DefaultBean.class, componentMap.get( component4 ).load().getSuperclass() );
+- final Class<?> proxy = CustomTestClassLoader.proxy( componentMap.get( component4 ).load() );
+-
+- try
+- {
+- assertNotNull( proxy.getMethod( "TestMe" ) );
+- }
+- catch ( final NoSuchMethodException e )
+- {
+- fail( "Proxied class is missing 'TestMe' method" );
+- }
+-
+- final PlexusBeanMetadata metadata1 = metadata.get( DefaultBean.class.getName() );
+-
+- assertFalse( metadata1.isEmpty() );
+-
+- assertEquals( new ConfigurationImpl( "someFieldName", "<some-field-name><item>PRIMARY</item></some-field-name>" ),
+- metadata1.getConfiguration( new NamedProperty( "someFieldName" ) ) );
+-
+- assertEquals( new ConfigurationImpl( "simple", "value" ),
+- metadata1.getConfiguration( new NamedProperty( "simple" ) ) );
+-
+- assertEquals( new ConfigurationImpl( "value", "<value with=\"attribute\"></value>" ),
+- metadata1.getConfiguration( new NamedProperty( "value" ) ) );
+-
+- assertEquals( new ConfigurationImpl( "emptyValue1", "<empty-value1 with=\"attribute\" />" ),
+- metadata1.getConfiguration( new NamedProperty( "emptyValue1" ) ) );
+-
+- assertEquals( new ConfigurationImpl( "emptyValue2", "" ),
+- metadata1.getConfiguration( new NamedProperty( "emptyValue2" ) ) );
+-
+- assertFalse( metadata1.isEmpty() );
+-
+- assertEquals( new RequirementImpl( Bean.class, true, "debug" ),
+- metadata1.getRequirement( new NamedProperty( "bean", TypeLiteral.get( Bean.class ) ) ) );
+-
+- assertFalse( metadata1.isEmpty() );
+-
+- metadata1.getConfiguration( new NamedProperty( "foo" ) );
+-
+- assertEquals( new RequirementImpl( Bean.class, false, Hints.DEFAULT_HINT, "debug" ),
+- metadata1.getRequirement( new NamedProperty( "beanMap" ) ) );
+-
+- assertFalse( metadata1.isEmpty() );
+-
+- assertEquals( new RequirementImpl( Bean.class, false ),
+- metadata1.getRequirement( new NamedProperty( "beanField" ) ) );
+-
+- assertTrue( metadata1.isEmpty() );
+-
+- assertNotNull( metadata.get( AnotherBean.class.getName() ) );
+- assertNull( metadata.get( DebugBean.class.getName() ) );
+- }
+-
+ static class FixedClassSpace
+ implements ClassSpace
+ {
+@@ -392,64 +315,4 @@
+ }
+ }
+
+- static final class CustomTestClassLoader
+- extends ClassLoader
+- {
+- private static final String PROXY_MARKER = "$proxy";
+-
+- CustomTestClassLoader( final ClassLoader parent )
+- {
+- super( parent );
+- }
+-
+- static Class<?> proxy( final Class<?> clazz )
+- {
+- try
+- {
+- return new CustomTestClassLoader( clazz.getClassLoader() ).loadClass( clazz.getName() + PROXY_MARKER );
+- }
+- catch ( final ClassNotFoundException e )
+- {
+- throw new TypeNotPresentException( clazz.getName(), e );
+- }
+- }
+-
+- @Override
+- protected synchronized Class<?> loadClass( final String name, final boolean resolve )
+- throws ClassNotFoundException
+- {
+- return super.loadClass( name, resolve );
+- }
+-
+- @Override
+- protected Class<?> findClass( final String name )
+- throws ClassNotFoundException
+- {
+- final String proxyName = name.replace( '.', '/' );
+- final String superName = proxyName.substring( 0, proxyName.length() - PROXY_MARKER.length() );
+-
+- final ClassWriter cw = new ClassWriter( ClassWriter.COMPUTE_MAXS );
+- cw.visit( Opcodes.V1_5, Modifier.PUBLIC | Modifier.FINAL, proxyName, null, superName, null );
+- MethodVisitor mv = cw.visitMethod( Modifier.PUBLIC, "<init>", "()V", null, null );
+-
+- mv.visitCode();
+- mv.visitVarInsn( Opcodes.ALOAD, 0 );
+- mv.visitMethodInsn( Opcodes.INVOKESPECIAL, superName, "<init>", "()V", false );
+- mv.visitInsn( Opcodes.RETURN );
+- mv.visitMaxs( 0, 0 );
+- mv.visitEnd();
+-
+- mv = cw.visitMethod( Modifier.PUBLIC, "TestMe", "()V", null, null );
+-
+- mv.visitCode();
+- mv.visitInsn( Opcodes.RETURN );
+- mv.visitMaxs( 0, 0 );
+- mv.visitEnd();
+- cw.visitEnd();
+-
+- final byte[] buf = cw.toByteArray();
+-
+- return defineClass( name, buf, 0, buf.length );
+- }
+- }
+ }
diff --git a/sisu.spec b/sisu.spec
index ff4d5e0..d3b440e 100644
--- a/sisu.spec
+++ b/sisu.spec
@@ -1,7 +1,11 @@
+# Release type, either "milestone" or "release"
+%global reltype milestone
+%global reltag .M1
+
Name: sisu
Epoch: 1
-Version: 0.2.1
-Release: 10%{?dist}
+Version: 0.3.0
+Release: 0.1%{?reltag}%{?dist}
Summary: Eclipse dependency injection framework
# bundled asm is under BSD
# See also: https://fedorahosted.org/fpc/ticket/346
@@ -10,8 +14,8 @@ URL: http://eclipse.org/sisu
# TODO: unbundle asm
-Source0: http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.inject.git/snapshot/...
-Source1: http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.plexus.git/snapshot/...
+Source0: http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.inject.git/snapshot/...
+Source1: http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.plexus.git/snapshot/...
Patch0: %{name}-OSGi-import-guava.patch
Patch1: %{name}-java8.patch
@@ -115,8 +119,8 @@ This package contains %{summary}.
%prep
%setup -q -c -T
-tar xf %{SOURCE0} && mv releases/* sisu-inject && rmdir releases
-tar xf %{SOURCE1} && mv releases/* sisu-plexus && rmdir releases
+tar xf %{SOURCE0} && mv %{reltype}s/* sisu-inject && rmdir %{reltype}s
+tar xf %{SOURCE1} && mv %{reltype}s/* sisu-plexus && rmdir %{reltype}s
%patch0
%patch1
@@ -184,9 +188,9 @@ EOF
%install
%mvn_artifact sisu-inject/pom.xml
-%mvn_artifact sisu-inject/org.eclipse.sisu.inject/pom.xml sisu-inject/org.eclipse.sisu.inject/target/org.eclipse.sisu.inject-%{version}.jar
+%mvn_artifact sisu-inject/org.eclipse.sisu.inject/pom.xml sisu-inject/org.eclipse.sisu.inject/target/org.eclipse.sisu.inject-%{version}%{?reltag}.jar
%mvn_artifact sisu-plexus/pom.xml
-%mvn_artifact sisu-plexus/org.eclipse.sisu.plexus/pom.xml sisu-plexus/org.eclipse.sisu.plexus/target/org.eclipse.sisu.plexus-%{version}.jar
+%mvn_artifact sisu-plexus/org.eclipse.sisu.plexus/pom.xml sisu-plexus/org.eclipse.sisu.plexus/target/org.eclipse.sisu.plexus-%{version}%{?reltag}.jar
%mvn_install
@@ -201,6 +205,9 @@ EOF
%changelog
+* Wed Feb 4 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1:0.3.0-0.1.M1
+- Update to upstream milestone 0.3.0.M1
+
* Tue Sep 30 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1:0.2.1-10
- Port to plexus-utils 3.0.18
diff --git a/sources b/sources
index a256204..8794505 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-cec0b709e3718e3d220b00cc67b4292c org.eclipse.sisu.inject-0.2.1.tar.bz2
-d7b14e659f55ddb3f74384d39e5096ce org.eclipse.sisu.plexus-0.2.1.tar.bz2
+7c8e0b75878b71e5b77e2a8e1b35ffa8 org.eclipse.sisu.inject-0.3.0.M1.tar.bz2
+4afe3fb24ff0d93066b670e288c365b3 org.eclipse.sisu.plexus-0.3.0.M1.tar.bz2
9 years, 2 months