rpms/eclipse
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
7fcdb7701c
eclipse/eclipse-no-source-for-dependencies.patch

530 lines
20 KiB
Diff
Raw Normal View History

Fixing dependencies
2012-07-26 15:21:47 +00:00
--- eclipse.platform.releng/features/org.eclipse.platform-feature/sourceTemplateFeature/build.properties.orig 2012-03-27 16:28:35.000000000 +0200
+++ eclipse.platform.releng/features/org.eclipse.platform-feature/sourceTemplateFeature/build.properties 2012-03-30 09:03:43.205386499 +0200
@@ -31,6 +31,4 @@
plugin@org.eclipse.ecf.provider.filetransfer.source;version=3.2.0.qualifier;unpack="false",\
plugin@org.eclipse.ecf.provider.filetransfer.ssl.source;version=1.0.0.qualifier;unpack="false",\
plugin@org.eclipse.ecf.provider.filetransfer.httpclient.source;version=4.0.200.qualifier;unpack="false",\
- plugin@org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source;version=1.0.0.qualifier;unpack="false",\
- plugin@org.apache.commons.codec.source;version=1.3.0.qualifier;unpack="false,\
- plugin@org.apache.commons.httpclient.source;version=3.1.0.qualifier;unpack="false"
\ No newline at end of file
+ plugin@org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source;version=1.0.0.qualifier;unpack="false"
\ No newline at end of file
--- eclipse.platform.releng/features/org.eclipse.sdk/build.properties.orig 2012-04-06 11:35:38.000000000 +0200
+++ eclipse.platform.releng/features/org.eclipse.sdk/build.properties 2012-04-06 13:02:22.997174313 +0200
@@ -11,33 +11,12 @@
bin.includes=eclipse_update_120.jpg,feature.xml,feature.properties
generate.feature@org.eclipse.platform.source=org.eclipse.platform,feature@org.eclipse.rcp.source,feature@org.eclipse.equinox.p2.user.ui.source;optional="true",plugin@org.eclipse.platform.doc.isv;unpack="false",\
- plugin@org.apache.ant.source;version=1.8.3.qualifier;unpack="false",\
- plugin@com.jcraft.jsch.source;version=0.1.46.qualifier;unpack="false",\
exclude@org.eclipse.platform.doc.user
generate.feature@org.eclipse.jdt.source=org.eclipse.jdt, plugin@org.eclipse.jdt.doc.isv;unpack="false",\
-plugin@org.junit.source;version=3.8.2.qualifier;unpack="false",\
-plugin@org.junit.source;version=4.10.0.qualifier;unpack="false",\
-plugin@org.hamcrest.core.source;version=1.1.0.qualifier;unpack="false",\
exclude@org.eclipse.jdt.doc.user
generate.feature@org.eclipse.pde.source=org.eclipse.pde,plugin@org.objectweb.asm.source;version=3.3.1.qualifier;unpack="false",\exclude@org.eclipse.pde.doc.user
generate.feature@org.eclipse.cvs.source=org.eclipse.cvs
-generate.feature@org.eclipse.help.source=org.eclipse.help,\
- plugin@javax.servlet.source;version=3.0.0.qualifier;unpack="false",\
- plugin@javax.servlet.jsp.source;version=2.2.0.qualifier;unpack="false",\
- plugin@org.apache.jasper.glassfish.source;version=2.2.2.qualifier;unpack="false",\
- plugin@com.sun.el.source;version=2.2.0.qualifier;unpack="false",\
- plugin@org.apache.commons.logging.source;version=1.0.4.qualifier;unpack="false",\
- plugin@org.apache.lucene.source;version=2.9.1.qualifier;unpack="false",\
- plugin@org.apache.lucene.analysis.source;version=2.9.1.qualifier;unpack="false",\
- plugin@org.apache.lucene.core.source;version=2.9.1.qualifier;unpack="false",\
- plugin@org.eclipse.jetty.continuation.source;version=8.1.3.qualifier;unpack="false",\
- plugin@org.eclipse.jetty.http.source;version=8.1.3.qualifier;unpack="false",\
- plugin@org.eclipse.jetty.io.source;version=8.1.3.qualifier;unpack="false",\
- plugin@org.eclipse.jetty.security.source;version=8.1.3.qualifier;unpack="false",\
- plugin@org.eclipse.jetty.server.source;version=8.1.3.qualifier;unpack="false",\
- plugin@org.eclipse.jetty.servlet.source;version=8.1.3.qualifier;unpack="false",\
- plugin@org.eclipse.jetty.util.source;version=8.1.3.qualifier;unpack="false",\
- plugin@javax.el.source;version=2.2.0.qualifier;unpack="false"
+generate.feature@org.eclipse.help.source=org.eclipse.help
generatedVersionLength=45
--- rt.equinox.p2/features/org.eclipse.equinox.p2.sdk/feature.xml.bak 2012-07-25 17:45:43.000000000 +0200
+++ rt.equinox.p2/features/org.eclipse.equinox.p2.sdk/feature.xml 2012-07-26 15:53:52.708568166 +0200
@@ -31,13 +31,6 @@
unpack="false"/>
<plugin
- id="org.apache.commons.codec.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.apache.commons.httpclient"
download-size="0"
install-size="0"
@@ -45,13 +38,6 @@
unpack="false"/>
<plugin
- id="org.apache.commons.httpclient.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.apache.commons.logging"
download-size="0"
install-size="0"
@@ -59,13 +45,6 @@
unpack="false"/>
<plugin
- id="org.apache.commons.logging.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.equinox.p2.artifact.repository"
download-size="0"
install-size="0"
@@ -458,13 +437,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.ecf.filetransfer.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.ecf.identity"
download-size="0"
install-size="0"
@@ -472,13 +444,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.ecf.identity.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.ecf.provider.filetransfer"
download-size="0"
install-size="0"
@@ -493,13 +458,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.ecf.provider.filetransfer.httpclient.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.ecf.provider.filetransfer.httpclient.ssl"
download-size="0"
install-size="0"
@@ -508,20 +466,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ecf.provider.filetransfer.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.ecf.provider.filetransfer.ssl"
download-size="0"
install-size="0"
@@ -530,20 +474,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.ecf.provider.filetransfer.ssl.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ecf.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.ecf.ssl"
download-size="0"
install-size="0"
@@ -552,13 +482,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.ecf.ssl.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.equinox.simpleconfigurator"
download-size="0"
install-size="0"
--- rt.equinox.p2/features/org.eclipse.equinox.p2.sdk/build.properties.bak 2012-07-25 17:45:43.000000000 +0200
+++ rt.equinox.p2/features/org.eclipse.equinox.p2.sdk/build.properties 2012-07-26 15:52:00.768876554 +0200
@@ -11,17 +11,6 @@
###############################################################################
bin.includes = feature.xml,feature.properties
-generate.plugin@org.apache.commons.codec.source=org.apache.commons.codec
-generate.plugin@org.apache.commons.httpclient.source=org.apache.commons.httpclient
-generate.plugin@org.apache.commons.logging.source=org.apache.commons.logging
-generate.plugin@org.eclipse.ecf.filetransfer.source=org.eclipse.ecf.filetransfer
-generate.plugin@org.eclipse.ecf.identity.source=org.eclipse.ecf.identity
-generate.plugin@org.eclipse.ecf.provider.filetransfer.httpclient.source=org.eclipse.ecf.provider.filetransfer.httpclient
-generate.plugin@org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source=org.eclipse.ecf.provider.filetransfer.httpclient.ssl
-generate.plugin@org.eclipse.ecf.provider.filetransfer.source=org.eclipse.ecf.provider.filetransfer
-generate.plugin@org.eclipse.ecf.provider.filetransfer.ssl.source=org.eclipse.ecf.provider.filetransfer.ssl
-generate.plugin@org.eclipse.ecf.source=org.eclipse.ecf
-generate.plugin@org.eclipse.ecf.ssl.source=org.eclipse.ecf.ssl
generate.plugin@org.eclipse.equinox.frameworkadmin.equinox.source=org.eclipse.equinox.frameworkadmin.equinox
generate.plugin@org.eclipse.equinox.frameworkadmin.source=org.eclipse.equinox.frameworkadmin
generate.plugin@org.eclipse.equinox.p2.artifact.repository.source=org.eclipse.equinox.p2.artifact.repository
--- rt.equinox.framework/features/org.eclipse.equinox.core.sdk/feature.xml.bak 2012-07-25 17:42:07.000000000 +0200
+++ rt.equinox.framework/features/org.eclipse.equinox.core.sdk/feature.xml 2012-07-26 16:18:17.122501404 +0200
@@ -356,13 +356,6 @@
unpack="false"/>
<plugin
- id="org.apache.felix.gogo.command.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.apache.felix.gogo.runtime"
download-size="0"
install-size="0"
@@ -370,13 +363,6 @@
unpack="false"/>
<plugin
- id="org.apache.felix.gogo.runtime.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.apache.felix.gogo.shell"
download-size="0"
install-size="0"
@@ -384,13 +370,6 @@
unpack="false"/>
<plugin
- id="org.apache.felix.gogo.shell.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.apache.mina.core"
download-size="0"
install-size="0"
@@ -398,24 +377,10 @@
unpack="false"/>
<plugin
- id="org.apache.mina.core.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.apache.sshd.core"
download-size="0"
install-size="0"
version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.sshd.core.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
unpack="false"/>
<plugin
Fix missing sources for dependencies.
2012-07-27 07:45:08 +00:00
--- rt.equinox.bundles/features/org.eclipse.equinox.serverside.sdk/feature.xml.orig 2012-07-25 17:41:27.000000000 +0200
+++ rt.equinox.bundles/features/org.eclipse.equinox.serverside.sdk/feature.xml 2012-07-26 17:48:14.260030722 +0200
Fixing dependencies
2012-07-26 15:21:47 +00:00
@@ -50,32 +50,11 @@
unpack="false"/>
<plugin
- id="javax.servlet.jsp.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="javax.servlet.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="javax.el"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
-
- <plugin
- id="javax.el.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
<plugin
id="org.eclipse.equinox.http.jetty"
Fix missing sources for dependencies.
2012-07-27 07:45:08 +00:00
@@ -152,40 +131,20 @@
Fixing dependencies
2012-07-26 15:21:47 +00:00
install-size="0"
version="0.0.0"
Fix missing sources for dependencies.
2012-07-27 07:45:08 +00:00
unpack="false"/>
Fixing dependencies
2012-07-26 15:21:47 +00:00
- <plugin
- id="org.apache.jasper.glassfish.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
Fix missing sources for dependencies.
2012-07-27 07:45:08 +00:00
- unpack="false"/>
Fixing dependencies
2012-07-26 15:21:47 +00:00
<plugin
Fix missing sources for dependencies.
2012-07-27 07:45:08 +00:00
id="org.eclipse.jetty.continuation"
Fixing dependencies
2012-07-26 15:21:47 +00:00
download-size="0"
install-size="0"
version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jetty.continuation.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
+ unpack="false"/>
<plugin
id="org.eclipse.jetty.http"
download-size="0"
install-size="0"
version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jetty.http.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
+ unpack="false"/>
<plugin
Fix missing sources for dependencies.
2012-07-27 07:45:08 +00:00
@@ -195,13 +154,6 @@
Fixing dependencies
2012-07-26 15:21:47 +00:00
version="0.0.0"
unpack="false"/>
- <plugin
- id="org.eclipse.jetty.io.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
<plugin
id="org.eclipse.jetty.security"
Fix missing sources for dependencies.
2012-07-27 07:45:08 +00:00
@@ -211,28 +163,12 @@
Fixing dependencies
2012-07-26 15:21:47 +00:00
unpack="false"/>
<plugin
- id="org.eclipse.jetty.security.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-
- <plugin
id="org.eclipse.jetty.server"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
- <plugin
- id="org.eclipse.jetty.server.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-
<plugin
id="org.eclipse.jetty.servlet"
download-size="0"
Fix missing sources for dependencies.
2012-07-27 07:45:08 +00:00
@@ -240,25 +176,11 @@
Fixing dependencies
2012-07-26 15:21:47 +00:00
version="0.0.0"
unpack="false"/>
- <plugin
- id="org.eclipse.jetty.servlet.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
<plugin
id="org.eclipse.jetty.util"
download-size="0"
install-size="0"
version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jetty.util.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
unpack="false"/>
<plugin
Fix missing sources for dependencies.
2012-07-27 07:45:08 +00:00
--- rt.equinox.bundles/features/org.eclipse.equinox.serverside.sdk/feature.xml.bak 2012-07-27 09:19:13.000000000 +0200
+++ rt.equinox.bundles/features/org.eclipse.equinox.serverside.sdk/feature.xml 2012-07-27 09:34:17.405316598 +0200
@@ -125,12 +125,6 @@
install-size="0"
version="0.0.0"
unpack="false"/>
- <plugin
- id="org.apache.jasper.glassfish"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
<plugin
id="org.eclipse.jetty.continuation"
A couple of problems more fixed
2012-07-30 16:00:09 +00:00
--- eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml.bak 2012-07-25 17:40:44.000000000 +0200
+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml 2012-07-30 16:28:44.017838079 +0200
@@ -67,6 +67,12 @@
Update to SR1 RC4.
2012-09-19 11:20:23 +00:00
<plugin id="org.w3c.css.sac" />
<plugin id="org.w3c.dom.smil" />
<plugin id="org.w3c.dom.svg" />
A couple of problems more fixed
2012-07-30 16:00:09 +00:00
+
Successful local build!
2012-08-10 12:23:47 +00:00
+ <plugin id="org.w3c.dom.svg" /><plugin id="org.apache.batik.css"/><plugin id="org.apache.batik.util"/>
+ <plugin id="org.apache.geronimo.specs.geronimo-annotation_1.1_spec" /><plugin id="org.apache.batik.util.gui"/>
+ <plugin id=" org.apache.felix.gogo.command" /><plugin id="javax.inject"/>
+ <plugin id="org.apache.felix.gogo.runtime" /><plugin id="org.w3c.css.sac"/>
- Moved launcher version change after secondary fragments creation. - Created some directories when creating secondary fragments.
2012-10-23 04:28:36 +00:00
+ <plugin id="org.apache.felix.gogo.shell" /><plugin id="org.eclipse.equinox.launcher.gtk.linux.ppc"/><plugin id="org.eclipse.equinox.launcher.gtk.linux.arm"/>
A couple of problems more fixed
2012-07-30 16:00:09 +00:00
</excludes>
</configuration>
</execution>
no source for some parts of org.eclipse.equinox.p2.core.feature
2012-07-31 06:01:31 +00:00
--- rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml.bak 2012-07-25 17:45:43.000000000 +0200
+++ rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml 2012-07-31 07:41:13.103636303 +0200
Local build started working again. Remote nearly.
2012-08-17 13:09:37 +00:00
@@ -42,6 +42,17 @@
no source for some parts of org.eclipse.equinox.p2.core.feature
2012-07-31 06:01:31 +00:00
<excludes>
<plugin id="org.sat4j.core" />
<plugin id="org.sat4j.pb" />
Local build started working again. Remote nearly.
2012-08-17 13:09:37 +00:00
+ <plugin id="org.apache.commons.codec" />
+ <plugin id="org.apache.commons.httpclient" />
+ <plugin id="org.apache.commons.logging" />
+ <plugin id="org.eclipse.ecf"/>
+ <plugin id="org.eclipse.ecf.filetransfer"/>
+ <plugin id="org.eclipse.ecf.identity"/>
+ <plugin id="org.eclipse.ecf.provider.filetransfer"/>
+ <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient"/>
+ <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient.ssl"/>
+ <plugin id="org.eclipse.ecf.provider.filetransfer.ssl"/>
+ <plugin id="org.eclipse.ecf.ssl"/>
no source for some parts of org.eclipse.equinox.p2.core.feature
2012-07-31 06:01:31 +00:00
</excludes>
</configuration>
</execution>
Fix source generation for help feature.
2012-07-31 06:20:19 +00:00
--- eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml.bak 2012-07-31 07:43:57.000000000 +0200
+++ eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml 2012-07-31 08:05:24.279277920 +0200
@@ -59,6 +59,17 @@
<goals>
<goal>source-feature</goal>
</goals>
+ <configuration>
+ <excludes>
Successful local build!
2012-08-10 12:23:47 +00:00
+ <plugin id="javax.servlet" /><plugin id="javax.el" /><plugin id="org.apache.el" /><plugin id="org.apache.commons.logging" />
+ <plugin id="javax.servlet.jsp" /><plugin id="org.apache.lucene.analysis" /><plugin id="org.apache.lucene.core" />
+ <plugin id="org.apache.tomcat" /><plugin id="org.eclipse.jetty.continuation" /><plugin id="org.eclipse.jetty.http" />
+ <plugin id="org.apache.juli" /><plugin id="org.eclipse.jetty.io" /><plugin id="org.eclipse.jetty.security" />
+ <plugin id="org.eclipse.jetty.util" /><plugin id="org.eclipse.jetty.server" />
Remove the reference to org.apache.jasper (replaced by glassfish)
2012-10-31 16:55:22 +00:00
+ <plugin id="org.glassfish.web.javax.servlet.jsp" /><plugin id="org.eclipse.jetty.servlet" />
use glassfish jsp.
2012-08-29 15:50:48 +00:00
+ <plugin id="org.apache.commons.el" /><plugin id="org.glassfish.web.javax.servlet.jsp" />
Fix source generation for help feature.
2012-07-31 06:20:19 +00:00
+ </excludes>
+ </configuration>
</execution>
</executions>
</plugin>
Successful local build!
2012-08-10 12:23:47 +00:00
--- eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml.bak 2012-08-10 09:56:55.000000000 +0200
+++ eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml 2012-08-10 10:09:14.758180621 +0200
Local build started working again. Remote nearly.
2012-08-17 13:09:37 +00:00
@@ -59,6 +59,8 @@
Successful local build!
2012-08-10 12:23:47 +00:00
<plugin id="org.eclipse.equinox.security.macosx"/>
<plugin id="org.eclipse.equinox.security.macosx"/>
+ <plugin id="com.jcraft.jsch"/>
Don't package non-existing fragments on s390, s390x. Add BR to GConf-2-devel
2012-11-13 17:37:05 +00:00
+ <plugin id="org.apache.ant"/><plugin id="org.eclipse.core.filesystem.linux.ppc"/><plugin id="org.eclipse.core.filesystem.linux.ppc64"/><plugin id="org.eclipse.core.filesystem.linux.arm"/><plugin id="org.eclipse.core.filesystem.linux.s390"/><plugin id="org.eclipse.core.filesystem.linux.s390x"/>
Successful local build!
2012-08-10 12:23:47 +00:00
</excludes>
</configuration>
</execution>
--- eclipse.jdt/org.eclipse.jdt-feature/pom.xml.bak 2012-08-10 10:11:03.000000000 +0200
+++ eclipse.jdt/org.eclipse.jdt-feature/pom.xml 2012-08-10 10:21:52.409764968 +0200
@@ -40,6 +40,8 @@
<excludes>
<plugin id="org.eclipse.jdt" />
<plugin id="org.junit4" />
+ <plugin id="org.junit" />
+ <plugin id="org.hamcrest.core" />
<plugin id="org.eclipse.jdt.doc.user" />
</excludes>
</configuration>
--- eclipse.pde/org.eclipse.pde-feature/pom.xml.bak 2012-08-10 10:23:32.000000000 +0200
+++ eclipse.pde/org.eclipse.pde-feature/pom.xml 2012-08-10 10:36:43.211016068 +0200
@@ -39,6 +39,7 @@
<configuration>
<excludes>
<plugin id="org.eclipse.pde"/>
+ <plugin id="org.objectweb.asm"/>
<plugin id="org.eclipse.pde.doc.user"/>
</excludes>
</configuration>
Reference in New Issue Copy Permalink