Move core.net fragmeents out of the host.
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>
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
similarity index 100%
rename from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/.classpath
rename to 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
similarity index 100%
rename from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/.project
rename to 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
similarity index 100%
rename from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/.settings/org.eclipse.core.runtime.prefs
rename to 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
similarity index 100%
rename from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/.settings/org.eclipse.jdt.core.prefs
rename to 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
similarity index 100%
rename from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/BUILD_INFO.txt
rename to 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
similarity index 92%
rename from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.core.net.linux.x86_64/META-INF/MANIFEST.MF
index 0889a8e..bce4a7b 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-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
similarity index 100%
rename from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/about.html
rename to 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
similarity index 100%
rename from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/build.properties
rename to 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
similarity index 100%
rename from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/fragment.properties
rename to 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
similarity index 100%
rename from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/libgnomeproxy-1.0.0.so
rename to 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
similarity index 96%
rename from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/pom.xml
rename to bundles/org.eclipse.core.net.linux.x86_64/pom.xml
index ef23954..f149071 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
similarity index 100%
rename from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/src/org/eclipse/core/net/ProxyProvider.java
rename to 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
similarity index 100%
rename from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/.classpath
rename to 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
similarity index 100%
rename from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/.project
rename to 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
similarity index 100%
rename from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/.settings/org.eclipse.core.runtime.prefs
rename to 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
similarity index 100%
rename from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/.settings/org.eclipse.jdt.core.prefs
rename to 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
similarity index 100%
rename from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/BUILD_INFO.txt
rename to 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
similarity index 92%
rename from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.core.net.win32.x86_64/META-INF/MANIFEST.MF
index 379fa01..05b0357 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-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
similarity index 100%
rename from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/about.html
rename to 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
similarity index 100%
rename from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/build.properties
rename to 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
similarity index 100%
rename from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/fragment.properties
rename to 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
similarity index 100%
rename from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/jWinHttp-1.0.0.dll
rename to 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
similarity index 94%
rename from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/pom.xml
rename to bundles/org.eclipse.core.net.win32.x86_64/pom.xml
index ba451fc..a8161db 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
similarity index 100%
rename from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/src/org/eclipse/core/net/ProxyProvider.java
rename to 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 7690ac2..0000000
--- 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 58989dc..66fcedc 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>
