forked from eclipse-tycho/tycho
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adapt to removed support for loading pack.gz packaged artifacts in P2
Eclipse P2 got its support for loading pack.gz packed artifacts from repositories finally removed in eclipse-equinox/p2#310. In order to fix the tests, remove packed duplicates from and replace only packed ecf artifact with unpacked eclipse.core.runtime artifact in test repository at '\resources\repositories\packgz'
- Loading branch information
1 parent
666e788
commit a99c076
Showing
20 changed files
with
94 additions
and
174 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 0 additions & 29 deletions
29
tycho-core/src/test/java/org/eclipse/tycho/test/util/P2Repositories.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
tycho-core/src/test/resources/repositories/e342_3/artifacts.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
<?xml version='1.0' encoding='UTF-8'?> | ||
<?artifactRepository version='1.1.0'?> | ||
<repository name='e342_3' type='org.eclipse.equinox.p2.artifact.repository.simpleRepository' version='1'> | ||
<properties size='2'> | ||
<property name='p2.compressed' value='false'/> | ||
<property name='p2.timestamp' value='1338060413228'/> | ||
</properties> | ||
<mappings size='3'> | ||
<rule filter='(& (classifier=osgi.bundle))' output='${repoUrl}/plugins/${id}_${version}.jar'/> | ||
<rule filter='(& (classifier=binary))' output='${repoUrl}/binary/${id}_${version}'/> | ||
<rule filter='(& (classifier=org.eclipse.update.feature))' output='${repoUrl}/features/${id}_${version}.jar'/> | ||
</mappings> | ||
<artifacts size='2'> | ||
<artifact classifier='osgi.bundle' id='org.eclipse.core.runtime' version='3.4.0.v20080512'> | ||
<properties size='3'> | ||
<property name='artifact.size' value='69026'/> | ||
<property name='download.size' value='69026'/> | ||
<property name='download.md5' value='c1c7af4eaca62fcc24f82c2c02ac77dd'/> | ||
</properties> | ||
</artifact> | ||
<artifact classifier='osgi.bundle' id='org.eclipse.osgi' version='3.4.3.R34x_v20081215-1030'> | ||
<properties size='4'> | ||
<property name='artifact.size' value='11034'/> | ||
<property name='download.size' value='11034'/> | ||
<property name='download.md5' value='58057045158895009b845b9a93f3eb6e'/> | ||
<property name='download.contentType' value='application/zip'/> | ||
</properties> | ||
</artifact> | ||
</artifacts> | ||
</repository> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+67.4 KB
...c/test/resources/repositories/e342_3/plugins/org.eclipse.core.runtime_3.4.0.v20080512.jar
Binary file not shown.
File renamed without changes.
32 changes: 7 additions & 25 deletions
32
...repositories/packgz_corrupt/artifacts.xml → ...s/repositories/e342_corrupt/artifacts.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,49 +1,31 @@ | ||
<?xml version='1.0' encoding='UTF-8'?> | ||
<?artifactRepository version='1.1.0'?> | ||
<repository name='packgz' type='org.eclipse.equinox.p2.artifact.repository.simpleRepository' version='1'> | ||
<properties size='3'> | ||
<property name='publishPackFilesAsSiblings' value='true'/> | ||
<repository name='e342_corrupt' type='org.eclipse.equinox.p2.artifact.repository.simpleRepository' version='1'> | ||
<properties size='2'> | ||
<property name='p2.compressed' value='false'/> | ||
<property name='p2.timestamp' value='1338060413228'/> | ||
</properties> | ||
<mappings size='5'> | ||
<rule filter='(& (classifier=osgi.bundle) (format=packed))' output='${repoUrl}/plugins/${id}_${version}.jar.pack.gz'/> | ||
<mappings size='3'> | ||
<rule filter='(& (classifier=osgi.bundle))' output='${repoUrl}/plugins/${id}_${version}.jar'/> | ||
<rule filter='(& (classifier=binary))' output='${repoUrl}/binary/${id}_${version}'/> | ||
<rule filter='(& (classifier=org.eclipse.update.feature) (format=packed))' output='${repoUrl}/features/${id}_${version}.jar.pack.gz'/> | ||
<rule filter='(& (classifier=org.eclipse.update.feature))' output='${repoUrl}/features/${id}_${version}.jar'/> | ||
</mappings> | ||
<artifacts size='3'> | ||
<!-- broken entry because artifact is "corrupt" (actually the artifact is a different pack200-compressed archive, containing a wrong_content.txt file) --> | ||
<artifacts size='2'> | ||
<!-- broken entry because artifact is missing --> | ||
<artifact classifier='osgi.bundle' id='org.eclipse.ecf' version='3.1.300.v20120319-0616'> | ||
<processing size='1'> | ||
<step id='org.eclipse.equinox.p2.processing.Pack200Unpacker' required='true'/> | ||
</processing> | ||
<properties size='3'> | ||
<property name='artifact.size' value='971'/> | ||
<property name='download.size' value='703'/> | ||
<property name='download.md5' value='00000000000000000000000000000000'/><!-- non-matching md5 --> | ||
<property name='format' value='packed'/> | ||
</properties> | ||
</artifact> | ||
<!-- broken entry because artifact is "corrupt" (actually the artifact is a different pack200-compressed archive, containing a wrong_content.txt file) --> | ||
<artifact classifier='osgi.bundle' id='org.eclipse.osgi' version='3.4.3.R34x_v20081215-1030'> | ||
<properties size='4'> | ||
<property name='artifact.size' value='11034'/> | ||
<property name='download.size' value='11034'/> | ||
<property name='download.md5' value='58057045158895009b845b9a93f3eb6e'/> | ||
<property name='download.md5' value='00000000000000000000000000000000'/><!-- non-matching md5 --> | ||
<property name='download.contentType' value='application/zip'/> | ||
</properties> | ||
</artifact> | ||
<!-- broken entry because artifact is missing --> | ||
<artifact classifier='osgi.bundle' id='org.eclipse.osgi' version='3.4.3.R34x_v20081215-1030'> | ||
<processing size='1'> | ||
<step id='org.eclipse.equinox.p2.processing.Pack200Unpacker' required='true'/> | ||
</processing> | ||
<properties size='3'> | ||
<property name='artifact.size' value='10855'/> | ||
<property name='download.size' value='1723'/> | ||
<property name='format' value='packed'/> | ||
</properties> | ||
</artifact> | ||
</artifacts> | ||
</repository> |
File renamed without changes.
10 changes: 10 additions & 0 deletions
10
...pse.core.runtime/3.4.0.v20080512/org.eclipse.core.runtime-3.4.0.v20080512-p2artifacts.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
<?xml version='1.0' encoding='UTF-8'?> | ||
<?artifactRepository version='1.1.0'?> | ||
<artifacts size='1'> | ||
<artifact classifier='osgi.bundle' id='org.eclipse.core.runtime' version='3.4.0.v20080512'> | ||
<properties size='2'> | ||
<property name='artifact.size' value='69026'/> | ||
<property name='download.size' value='69026'/> | ||
</properties> | ||
</artifact> | ||
</artifacts> |
Binary file added
BIN
+67.4 KB
...dle/org.eclipse.core.runtime/3.4.0.v20080512/org.eclipse.core.runtime_3.4.0.v20080512.jar
Binary file not shown.
14 changes: 0 additions & 14 deletions
14
...eclipse.ecf/3.1.300.v20120319-0616/org.eclipse.ecf-3.1.300.v20120319-0616-p2artifacts.xml
This file was deleted.
Oops, something went wrong.
Binary file removed
BIN
-703 Bytes
...pse.ecf/3.1.300.v20120319-0616/org.eclipse.ecf-3.1.300.v20120319-0616-pack200.jar.pack.gz
Binary file not shown.
Oops, something went wrong.