Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2018-10-30 12:16:06 -0400
committerAlexander Kurtakov2018-10-30 12:45:16 -0400
commitbfeba8f3c940d1df631f0a688da55952d0437ac5 (patch)
treed26c303093587d7ed602776480c8aed6af4f6070
parentae43ae1a68fd23451f8d3a05b361c67d48faf43a (diff)
downloadeclipse.platform.team-I20181102-2120.tar.gz
eclipse.platform.team-I20181102-2120.tar.xz
eclipse.platform.team-I20181102-2120.zip
Having them in there confuses jgit timestamp provider making it complain if there is a change in fragment to also ask for version bump of the host. Change-Id: Ie644415a0a8ddb9522fbcb539cd3b4bdc74b90d1 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
-rw-r--r--bundles/org.eclipse.core.net.linux.x86_64/.classpath (renamed from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/.classpath)0
-rw-r--r--bundles/org.eclipse.core.net.linux.x86_64/.project (renamed from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/.project)0
-rw-r--r--bundles/org.eclipse.core.net.linux.x86_64/.settings/org.eclipse.core.runtime.prefs (renamed from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/.settings/org.eclipse.core.runtime.prefs)0
-rw-r--r--bundles/org.eclipse.core.net.linux.x86_64/.settings/org.eclipse.jdt.core.prefs (renamed from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--bundles/org.eclipse.core.net.linux.x86_64/BUILD_INFO.txt (renamed from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/BUILD_INFO.txt)0
-rw-r--r--bundles/org.eclipse.core.net.linux.x86_64/META-INF/MANIFEST.MF (renamed from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/META-INF/MANIFEST.MF)2
-rw-r--r--bundles/org.eclipse.core.net.linux.x86_64/about.html (renamed from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/about.html)0
-rw-r--r--bundles/org.eclipse.core.net.linux.x86_64/build.properties (renamed from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/build.properties)0
-rw-r--r--bundles/org.eclipse.core.net.linux.x86_64/fragment.properties (renamed from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/fragment.properties)0
-rw-r--r--bundles/org.eclipse.core.net.linux.x86_64/libgnomeproxy-1.0.0.so (renamed from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/libgnomeproxy-1.0.0.so)bin259848 -> 259848 bytes
-rw-r--r--bundles/org.eclipse.core.net.linux.x86_64/pom.xml (renamed from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/pom.xml)4
-rw-r--r--bundles/org.eclipse.core.net.linux.x86_64/src/org/eclipse/core/net/ProxyProvider.java (renamed from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/src/org/eclipse/core/net/ProxyProvider.java)0
-rw-r--r--bundles/org.eclipse.core.net.win32.x86_64/.classpath (renamed from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/.classpath)0
-rw-r--r--bundles/org.eclipse.core.net.win32.x86_64/.project (renamed from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/.project)0
-rw-r--r--bundles/org.eclipse.core.net.win32.x86_64/.settings/org.eclipse.core.runtime.prefs (renamed from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/.settings/org.eclipse.core.runtime.prefs)0
-rw-r--r--bundles/org.eclipse.core.net.win32.x86_64/.settings/org.eclipse.jdt.core.prefs (renamed from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--bundles/org.eclipse.core.net.win32.x86_64/BUILD_INFO.txt (renamed from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/BUILD_INFO.txt)0
-rw-r--r--bundles/org.eclipse.core.net.win32.x86_64/META-INF/MANIFEST.MF (renamed from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/META-INF/MANIFEST.MF)2
-rw-r--r--bundles/org.eclipse.core.net.win32.x86_64/about.html (renamed from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/about.html)0
-rw-r--r--bundles/org.eclipse.core.net.win32.x86_64/build.properties (renamed from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/build.properties)0
-rw-r--r--bundles/org.eclipse.core.net.win32.x86_64/fragment.properties (renamed from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/fragment.properties)0
-rw-r--r--bundles/org.eclipse.core.net.win32.x86_64/jWinHttp-1.0.0.dll (renamed from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/jWinHttp-1.0.0.dll)bin44032 -> 44032 bytes
-rw-r--r--bundles/org.eclipse.core.net.win32.x86_64/pom.xml (renamed from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/pom.xml)4
-rw-r--r--bundles/org.eclipse.core.net.win32.x86_64/src/org/eclipse/core/net/ProxyProvider.java (renamed from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/src/org/eclipse/core/net/ProxyProvider.java)0
-rw-r--r--bundles/org.eclipse.core.net/fragments/.gitignore9
-rw-r--r--pom.xml6
26 files changed, 9 insertions, 18 deletions
diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/.classpath b/bundles/org.eclipse.core.net.linux.x86_64/.classpath
index 01836c484..01836c484 100644
--- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/.classpath
+++ b/bundles/org.eclipse.core.net.linux.x86_64/.classpath
diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/.project b/bundles/org.eclipse.core.net.linux.x86_64/.project
index a22a02fce..a22a02fce 100644
--- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/.project
+++ b/bundles/org.eclipse.core.net.linux.x86_64/.project
diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.core.net.linux.x86_64/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2..5a0ad22d2 100644
--- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/.settings/org.eclipse.core.runtime.prefs
+++ b/bundles/org.eclipse.core.net.linux.x86_64/.settings/org.eclipse.core.runtime.prefs
diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.core.net.linux.x86_64/.settings/org.eclipse.jdt.core.prefs
index a698e5967..a698e5967 100644
--- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.core.net.linux.x86_64/.settings/org.eclipse.jdt.core.prefs
diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/BUILD_INFO.txt b/bundles/org.eclipse.core.net.linux.x86_64/BUILD_INFO.txt
index a312cc736..a312cc736 100644
--- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/BUILD_INFO.txt
+++ b/bundles/org.eclipse.core.net.linux.x86_64/BUILD_INFO.txt
diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/META-INF/MANIFEST.MF b/bundles/org.eclipse.core.net.linux.x86_64/META-INF/MANIFEST.MF
index 0889a8ea9..bce4a7b96 100644
--- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.core.net.linux.x86_64/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %fragmentName
Bundle-Vendor: %providerName
Bundle-Localization: fragment
Bundle-SymbolicName: org.eclipse.core.net.linux.x86_64;singleton:=true
-Bundle-Version: 1.2.200.qualifier
+Bundle-Version: 1.2.300.qualifier
Fragment-Host: org.eclipse.core.net;bundle-version="1.1.0"
Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64))
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/about.html b/bundles/org.eclipse.core.net.linux.x86_64/about.html
index 164f781a8..164f781a8 100644
--- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/about.html
+++ b/bundles/org.eclipse.core.net.linux.x86_64/about.html
diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/build.properties b/bundles/org.eclipse.core.net.linux.x86_64/build.properties
index 03ab15c87..03ab15c87 100644
--- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/build.properties
+++ b/bundles/org.eclipse.core.net.linux.x86_64/build.properties
diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/fragment.properties b/bundles/org.eclipse.core.net.linux.x86_64/fragment.properties
index 225a330c1..225a330c1 100644
--- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/fragment.properties
+++ b/bundles/org.eclipse.core.net.linux.x86_64/fragment.properties
diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/libgnomeproxy-1.0.0.so b/bundles/org.eclipse.core.net.linux.x86_64/libgnomeproxy-1.0.0.so
index ab71687a2..ab71687a2 100644
--- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/libgnomeproxy-1.0.0.so
+++ b/bundles/org.eclipse.core.net.linux.x86_64/libgnomeproxy-1.0.0.so
Binary files differ
diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/pom.xml b/bundles/org.eclipse.core.net.linux.x86_64/pom.xml
index ef239547c..f1490713e 100644
--- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/pom.xml
+++ b/bundles/org.eclipse.core.net.linux.x86_64/pom.xml
@@ -15,11 +15,11 @@
<artifactId>eclipse.platform.team</artifactId>
<groupId>eclipse.platform.team</groupId>
<version>4.10.0-SNAPSHOT</version>
- <relativePath>../../../../</relativePath>
+ <relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.core</groupId>
<artifactId>org.eclipse.core.net.linux.x86_64</artifactId>
- <version>1.2.200-SNAPSHOT</version>
+ <version>1.2.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/src/org/eclipse/core/net/ProxyProvider.java b/bundles/org.eclipse.core.net.linux.x86_64/src/org/eclipse/core/net/ProxyProvider.java
index f2f9a4bcc..f2f9a4bcc 100644
--- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/src/org/eclipse/core/net/ProxyProvider.java
+++ b/bundles/org.eclipse.core.net.linux.x86_64/src/org/eclipse/core/net/ProxyProvider.java
diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/.classpath b/bundles/org.eclipse.core.net.win32.x86_64/.classpath
index eca7bdba8..eca7bdba8 100644
--- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/.classpath
+++ b/bundles/org.eclipse.core.net.win32.x86_64/.classpath
diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/.project b/bundles/org.eclipse.core.net.win32.x86_64/.project
index 4f4816faf..4f4816faf 100644
--- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/.project
+++ b/bundles/org.eclipse.core.net.win32.x86_64/.project
diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.core.net.win32.x86_64/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2..5a0ad22d2 100644
--- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/.settings/org.eclipse.core.runtime.prefs
+++ b/bundles/org.eclipse.core.net.win32.x86_64/.settings/org.eclipse.core.runtime.prefs
diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.core.net.win32.x86_64/.settings/org.eclipse.jdt.core.prefs
index a698e5967..a698e5967 100644
--- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.core.net.win32.x86_64/.settings/org.eclipse.jdt.core.prefs
diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/BUILD_INFO.txt b/bundles/org.eclipse.core.net.win32.x86_64/BUILD_INFO.txt
index 41aa77dc1..41aa77dc1 100644
--- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/BUILD_INFO.txt
+++ b/bundles/org.eclipse.core.net.win32.x86_64/BUILD_INFO.txt
diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/META-INF/MANIFEST.MF b/bundles/org.eclipse.core.net.win32.x86_64/META-INF/MANIFEST.MF
index 379fa015b..05b035770 100644
--- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.core.net.win32.x86_64/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %fragmentName
Bundle-Vendor: %providerName
Bundle-Localization: fragment
Bundle-SymbolicName: org.eclipse.core.net.win32.x86_64;singleton:=true
-Bundle-Version: 1.1.200.qualifier
+Bundle-Version: 1.1.300.qualifier
Fragment-Host: org.eclipse.core.net;bundle-version="1.1.0"
Eclipse-PlatformFilter: (& (osgi.os=win32) (osgi.arch=x86_64))
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/about.html b/bundles/org.eclipse.core.net.win32.x86_64/about.html
index 164f781a8..164f781a8 100644
--- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/about.html
+++ b/bundles/org.eclipse.core.net.win32.x86_64/about.html
diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/build.properties b/bundles/org.eclipse.core.net.win32.x86_64/build.properties
index 55c2b946b..55c2b946b 100644
--- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/build.properties
+++ b/bundles/org.eclipse.core.net.win32.x86_64/build.properties
diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/fragment.properties b/bundles/org.eclipse.core.net.win32.x86_64/fragment.properties
index ff4e4defc..ff4e4defc 100644
--- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/fragment.properties
+++ b/bundles/org.eclipse.core.net.win32.x86_64/fragment.properties
diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/jWinHttp-1.0.0.dll b/bundles/org.eclipse.core.net.win32.x86_64/jWinHttp-1.0.0.dll
index 00771efc1..00771efc1 100644
--- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/jWinHttp-1.0.0.dll
+++ b/bundles/org.eclipse.core.net.win32.x86_64/jWinHttp-1.0.0.dll
Binary files differ
diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/pom.xml b/bundles/org.eclipse.core.net.win32.x86_64/pom.xml
index ba451fc15..a8161dbcf 100644
--- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/pom.xml
+++ b/bundles/org.eclipse.core.net.win32.x86_64/pom.xml
@@ -15,11 +15,11 @@
<artifactId>eclipse.platform.team</artifactId>
<groupId>eclipse.platform.team</groupId>
<version>4.10.0-SNAPSHOT</version>
- <relativePath>../../../../</relativePath>
+ <relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.core</groupId>
<artifactId>org.eclipse.core.net.win32.x86_64</artifactId>
- <version>1.1.200-SNAPSHOT</version>
+ <version>1.1.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/src/org/eclipse/core/net/ProxyProvider.java b/bundles/org.eclipse.core.net.win32.x86_64/src/org/eclipse/core/net/ProxyProvider.java
index e32aae27d..e32aae27d 100644
--- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/src/org/eclipse/core/net/ProxyProvider.java
+++ b/bundles/org.eclipse.core.net.win32.x86_64/src/org/eclipse/core/net/ProxyProvider.java
diff --git a/bundles/org.eclipse.core.net/fragments/.gitignore b/bundles/org.eclipse.core.net/fragments/.gitignore
deleted file mode 100644
index 7690ac256..000000000
--- a/bundles/org.eclipse.core.net/fragments/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-/.project
-/*/*/bin/
-*~
-*.rej
-*.bak
-javacore.*
-heapdump.*
-core.*
-Snap.*
diff --git a/pom.xml b/pom.xml
index 58989dc24..66fcedc42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,9 +73,9 @@
<module>features/org.eclipse.cvs-feature</module>
- <!-- creatively located fragments -->
- <module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64</module>
- <module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64</module>
+ <!-- fragments -->
+ <module>bundles/org.eclipse.core.net.linux.x86_64</module>
+ <module>bundles/org.eclipse.core.net.win32.x86_64</module>
<module>tests</module>
</modules>

Back to the top