diff --git a/eclipse-m2e-core-fix-manifests.patch b/eclipse-m2e-core-fix-manifests.patch index eb29f16..7963444 100644 --- a/eclipse-m2e-core-fix-manifests.patch +++ b/eclipse-m2e-core-fix-manifests.patch @@ -15,9 +15,9 @@ +++ org.eclipse.m2e.core/META-INF/MANIFEST.MF @@ -14,9 +14,10 @@ Require-Bundle: org.eclipse.osgi;bundle-version="3.10.0", org.eclipse.m2e.workspace.cli;bundle-version="0.1.0", - org.eclipse.core.runtime;bundle-version="3.7.0", + org.eclipse.core.runtime;bundle-version="3.12.0", org.eclipse.core.resources;bundle-version="3.9.0", -- com.google.guava;bundle-version="[14.0.1,16.0.0)" +- com.google.guava;bundle-version="[21.0,22.0)" + org.apache.maven.archetype.catalog, + org.apache.maven.archetype.descriptor, + com.google.guava @@ -32,7 +32,7 @@ org.eclipse.ui.ide, org.eclipse.core.filesystem, org.eclipse.ui.forms, -- com.google.guava;bundle-version="[14.0.1,16.0.0)" +- com.google.guava;bundle-version="[21.0,22.0)" + com.google.guava Export-Package: org.eclipse.m2e.editor.xml;x-internal:=true, org.eclipse.m2e.editor.xml.internal;x-internal:=true, @@ -43,7 +43,7 @@ org.eclipse.core.resources, org.eclipse.debug.core, org.eclipse.m2e.workspace.cli;bundle-version="0.1.0", -- com.google.guava;bundle-version="[14.0.1,16.0.0) +- com.google.guava;bundle-version="[21.0,22.0)" + com.google.guava Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/eclipse-m2e-core-lucene-5.patch b/eclipse-m2e-core-lucene-5.patch index 4e5e240..fe690c1 100644 --- a/eclipse-m2e-core-lucene-5.patch +++ b/eclipse-m2e-core-lucene-5.patch @@ -1,10 +1,11 @@ --- m2e-maven-runtime/org.eclipse.m2e.maven.indexer/src/main/java/org/apache/maven/index/DefaultIndexerEngine.java +++ m2e-maven-runtime/org.eclipse.m2e.maven.indexer/src/main/java/org/apache/maven/index/DefaultIndexerEngine.java -@@ -25,7 +25,8 @@ import java.util.Set; +@@ -25,7 +25,9 @@ import java.util.Set; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import org.apache.lucene.document.Fieldable; ++import org.apache.lucene.document.StringField; +import org.apache.lucene.index.IndexableField; +import org.apache.lucene.index.IndexableFieldType; import org.apache.lucene.index.IndexWriter; @@ -23,7 +24,19 @@ { result.put( f.name(), f.stringValue() ); } - +@@ -172,9 +172,9 @@ + String uinfo = ac.getArtifactInfo().getUinfo(); + // add artifact deletion marker + Document doc = new Document(); +- doc.add( new Field( ArtifactInfo.DELETED, uinfo, Field.Store.YES, Field.Index.NO ) ); +- doc.add( new Field( ArtifactInfo.LAST_MODIFIED, // +- Long.toString( System.currentTimeMillis() ), Field.Store.YES, Field.Index.NO ) ); ++ doc.add( new StringField( ArtifactInfo.DELETED, uinfo, Field.Store.YES ) ); ++ doc.add( new StringField( ArtifactInfo.LAST_MODIFIED, // ++ Long.toString( System.currentTimeMillis() ), Field.Store.YES ) ); + IndexWriter w = context.getIndexWriter(); + w.addDocument( doc ); + w.deleteDocuments( new Term( ArtifactInfo.UINFO, uinfo ) ); --- org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/util/ProposalUtil.java +++ org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/util/ProposalUtil.java @@ -31,7 +31,7 @@ import org.eclipse.swt.widgets.Control; @@ -35,9 +48,144 @@ import org.apache.maven.project.MavenProject; ---- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/NexusIndexManager.java.sav 2015-07-08 11:24:01.721784835 +0300 -+++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/NexusIndexManager.java 2015-07-08 11:27:07.617008266 +0300 -@@ -842,7 +842,7 @@ public class NexusIndexManager implement +--- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/NexusIndex.java.orig 2017-06-28 00:02:40.142038423 +0100 ++++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/NexusIndex.java 2017-06-28 00:08:18.822265593 +0100 +@@ -105,7 +105,7 @@ + public Collection find(Collection groupId, + Collection artifactId, Collection version, + Collection packaging) throws CoreException { +- BooleanQuery query = new BooleanQuery(); ++ BooleanQuery.Builder query = new BooleanQuery.Builder(); + + addQueryFromSearchExpressionCollection(query, MAVEN.PACKAGING, packaging); + +@@ -115,18 +115,18 @@ + + addQueryFromSearchExpressionCollection(query, MAVEN.VERSION, version); + +- return indexManager.search(repository, query).values(); ++ return indexManager.search(repository, query.build()).values(); + } + +- private void addQueryFromSearchExpressionCollection(final BooleanQuery query, final Field field, ++ private void addQueryFromSearchExpressionCollection(final BooleanQuery.Builder query, final Field field, + final Collection sec) { + if(sec != null && !sec.isEmpty()) { + if(sec.size() > 1) { +- BooleanQuery q = new BooleanQuery(); ++ BooleanQuery.Builder q = new BooleanQuery.Builder(); + for(SearchExpression se : sec) { + q.add(indexManager.constructQuery(field, se), Occur.SHOULD); + } +- query.add(q, Occur.MUST); ++ query.add(q.build(), Occur.MUST); + } else { + query.add(indexManager.constructQuery(field, sec.iterator().next()), Occur.MUST); + } +--- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/NexusIndexManager.java.orig 2017-06-28 00:40:07.535993939 +0100 ++++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/NexusIndexManager.java 2017-06-28 00:46:54.056462138 +0100 +@@ -52,9 +52,7 @@ + import org.apache.lucene.search.BooleanClause; + import org.apache.lucene.search.BooleanClause.Occur; + import org.apache.lucene.search.BooleanQuery; +-import org.apache.lucene.search.FilteredQuery; + import org.apache.lucene.search.Query; +-import org.apache.lucene.search.QueryWrapperFilter; + import org.apache.lucene.store.Directory; + import org.apache.lucene.store.FSDirectory; + +@@ -228,7 +226,7 @@ + public IndexedArtifactFile getIndexedArtifactFile(IRepository repository, ArtifactKey gav) throws CoreException { + + try { +- BooleanQuery query = new BooleanQuery(); ++ BooleanQuery.Builder query = new BooleanQuery.Builder(); + query.add(constructQuery(MAVEN.GROUP_ID, gav.getGroupId(), SearchType.EXACT), BooleanClause.Occur.MUST); + query.add(constructQuery(MAVEN.ARTIFACT_ID, gav.getArtifactId(), SearchType.EXACT), BooleanClause.Occur.MUST); + query.add(constructQuery(MAVEN.VERSION, gav.getVersion(), SearchType.EXACT), BooleanClause.Occur.MUST); +@@ -238,7 +236,7 @@ + } + + synchronized(getIndexLock(repository)) { +- Collection artifactInfo = getIndexer().identify(query, ++ Collection artifactInfo = getIndexer().identify(query.build(), + Collections.singleton(getIndexingContext(repository))); + if(artifactInfo != null && !artifactInfo.isEmpty()) { + return getIndexedArtifactFile((ArtifactInfo) artifactInfo.toArray()[0]); +@@ -342,7 +340,7 @@ + return search(null, term, type, classifier); + } + +- private void addClassifiersToQuery(BooleanQuery bq, int classifier) { ++ private void addClassifiersToQuery(BooleanQuery.Builder bq, int classifier) { + boolean includeJavaDocs = (classifier & IIndex.SEARCH_JAVADOCS) > 0; + Query tq = null; + if(!includeJavaDocs) { +@@ -373,46 +371,55 @@ + // query = new TermQuery(new Term(ArtifactInfo.GROUP_ID, term)); + // query = new PrefixQuery(new Term(ArtifactInfo.GROUP_ID, term)); + } else if(IIndex.SEARCH_ARTIFACT.equals(type)) { +- BooleanQuery bq = new BooleanQuery(); ++ BooleanQuery.Builder bq = new BooleanQuery.Builder(); + bq.add(constructQuery(MAVEN.GROUP_ID, term), Occur.SHOULD); //$NON-NLS-1$ + bq.add(constructQuery(MAVEN.ARTIFACT_ID, term), Occur.SHOULD); //$NON-NLS-1$ + bq.add( + constructQuery(MAVEN.SHA1, term.getStringValue(), term.getStringValue().length() == 40 ? SearchType.EXACT + : SearchType.SCORED), Occur.SHOULD); + addClassifiersToQuery(bq, classifier); +- query = bq; ++ query = bq.build(); + + } else if(IIndex.SEARCH_PARENTS.equals(type)) { + if(term == null) { + query = constructQuery(MAVEN.PACKAGING, "pom", SearchType.EXACT); //$NON-NLS-1$ + } else { +- BooleanQuery bq = new BooleanQuery(); ++ BooleanQuery.Builder bq = new BooleanQuery.Builder(); + bq.add(constructQuery(MAVEN.GROUP_ID, term), Occur.SHOULD); //$NON-NLS-1$ + bq.add(constructQuery(MAVEN.ARTIFACT_ID, term), Occur.SHOULD); //$NON-NLS-1$ + bq.add( + constructQuery(MAVEN.SHA1, term.getStringValue(), term.getStringValue().length() == 40 ? SearchType.EXACT + : SearchType.SCORED), Occur.SHOULD); + Query tq = constructQuery(MAVEN.PACKAGING, "pom", SearchType.EXACT); //$NON-NLS-1$ +- query = new FilteredQuery(tq, new QueryWrapperFilter(bq)); ++ BooleanQuery.Builder builder = new BooleanQuery.Builder(); ++ builder.add(bq.build(), Occur.MUST); ++ builder.add(tq, Occur.FILTER); ++ query = builder.build(); + } + + } else if(IIndex.SEARCH_PLUGIN.equals(type)) { + if(term == null) { + query = constructQuery(MAVEN.PACKAGING, "maven-plugin", SearchType.EXACT); //$NON-NLS-1$ + } else { +- BooleanQuery bq = new BooleanQuery(); ++ BooleanQuery.Builder bq = new BooleanQuery.Builder(); + bq.add(constructQuery(MAVEN.GROUP_ID, term), Occur.SHOULD); //$NON-NLS-1$ + bq.add(constructQuery(MAVEN.ARTIFACT_ID, term), Occur.SHOULD); //$NON-NLS-1$ + Query tq = constructQuery(MAVEN.PACKAGING, "maven-plugin", SearchType.EXACT); //$NON-NLS-1$ +- query = new FilteredQuery(tq, new QueryWrapperFilter(bq)); ++ BooleanQuery.Builder builder = new BooleanQuery.Builder(); ++ builder.add(bq.build(), Occur.MUST); ++ builder.add(tq, Occur.FILTER); ++ query = builder.build(); + } + + } else if(IIndex.SEARCH_ARCHETYPE.equals(type)) { +- BooleanQuery bq = new BooleanQuery(); ++ BooleanQuery.Builder bq = new BooleanQuery.Builder(); + bq.add(constructQuery(MAVEN.GROUP_ID, term), Occur.SHOULD); //$NON-NLS-1$ + bq.add(constructQuery(MAVEN.ARTIFACT_ID, term), Occur.SHOULD); //$NON-NLS-1$ + Query tq = constructQuery(MAVEN.PACKAGING, "maven-archetype", SearchType.EXACT); //$NON-NLS-1$ +- query = new FilteredQuery(tq, new QueryWrapperFilter(bq)); ++ BooleanQuery.Builder builder = new BooleanQuery.Builder(); ++ builder.add(bq.build(), Occur.MUST); ++ builder.add(tq, Occur.FILTER); ++ query = builder.build(); + + } else if(IIndex.SEARCH_PACKAGING.equals(type)) { + query = constructQuery(MAVEN.PACKAGING, term); +@@ -837,7 +844,7 @@ } protected Directory getIndexDirectory(IRepository repository) throws IOException { @@ -46,7 +194,7 @@ } public IndexedArtifactGroup resolveGroup(IndexedArtifactGroup group) { -@@ -1131,7 +1131,7 @@ public class NexusIndexManager implement +@@ -1126,7 +1133,7 @@ String details = getIndexDetails(repository); String id = repository.getUid() + "-cache"; //$NON-NLS-1$ File luceneCache = new File(request.getLocalIndexCacheDir(), details); diff --git a/eclipse-m2e-core.spec b/eclipse-m2e-core.spec index b985f09..939eaf0 100644 --- a/eclipse-m2e-core.spec +++ b/eclipse-m2e-core.spec @@ -1,8 +1,8 @@ -%global release_dir m2e-core-3aeac6a44a58749cefd18994c9ea09f5416dfb9c +%global release_dir m2e-core-451808222c3dad3a0ab5a530b75e94e006041f71 Name: eclipse-m2e-core -Version: 1.7.1 -Release: 0.4.git3aeac6a%{?dist} +Version: 1.8.0 +Release: 1%{?dist} Summary: Maven integration for Eclipse # Most of components are under EPL, but some of them are licensed under @@ -312,6 +312,10 @@ xmvn-subst -s $(find %{buildroot}%{_datadir}/eclipse/droplets/m2e-core -name jar %changelog +* Tue Jun 27 2017 Mat Booth - 1.8.0-1 +- Update to final Oxygen release +- Update lucene patch + * Wed May 31 2017 Mikolaj Izdebski - 1.7.1-0.4.git3aeac6a - Add missing build-requires on maven-install-plugin diff --git a/sources b/sources index 0ef85cc..f30554c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (m2e-core-3aeac6a44a58749cefd18994c9ea09f5416dfb9c.tar.xz) = 2b15cbbd63756fc2130666f436541a2ca3d6bf35a3c1051362386d3d695eb6040f0702255b13357b7e9ec9ea42113f908dfd5d1720ac92468250edf4bab2af8b +SHA512 (m2e-core-451808222c3dad3a0ab5a530b75e94e006041f71.tar.xz) = d2c1085e6340a975b4a71c4e3ada1a464d2c2204f662642779372f78772c418c76a6e2c1627a5f70a1f23a1bc763e27b8d31a07ec3960f4a5b2ff61e64a886d3