Skip to content

Commit 49b3443

Browse files
author
davidfestal
committed
eclipse-archived#6169 (NoClassDefFoundError for remote repository) - clean OSGI deps:
- use the OSGI bundle symbolic names when available - don't change OSGI manifest data when already there (especially respect existing import-package directives) - add a qualifier at the end of the OSGI bundle version in order to identify such a bundle bundle as being part of the Ceylon dependencies. - add direct dependencies from `maven-resolver-aether` to `aether.api`and `aether.spi`.
1 parent 8bd81a0 commit 49b3443

File tree

26 files changed

+277
-205
lines changed

26 files changed

+277
-205
lines changed

‎cmr-aether/.classpath

+8-8
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
<classpathentry kind="lib" path="/ceylon-runtime/dist/repo/org/apache/maven/maven-settings-builder/3.3.9/org.apache.maven.maven-settings-builder-3.3.9.jar"/>
1313
<classpathentry kind="lib" path="/ceylon-runtime/dist/repo/org/codehaus/plexus/plexus-interpolation/1.22/org.codehaus.plexus.plexus-interpolation-1.22.jar"/>
1414
<classpathentry kind="lib" path="/ceylon-runtime/dist/repo/org/codehaus/plexus/plexus-utils/3.0.22/org.codehaus.plexus.plexus-utils-3.0.22.jar"/>
15-
<classpathentry kind="lib" path="/ceylon-runtime/dist/repo/org/eclipse/aether/aether-api/1.1.0/org.eclipse.aether.aether-api-1.1.0.jar"/>
16-
<classpathentry kind="lib" path="/ceylon-runtime/dist/repo/org/eclipse/aether/aether-connector-basic/1.1.0/org.eclipse.aether.aether-connector-basic-1.1.0.jar"/>
17-
<classpathentry kind="lib" path="/ceylon-runtime/dist/repo/org/eclipse/aether/aether-impl/1.1.0/org.eclipse.aether.aether-impl-1.1.0.jar"/>
18-
<classpathentry kind="lib" path="/ceylon-runtime/dist/repo/org/eclipse/aether/aether-spi/1.1.0/org.eclipse.aether.aether-spi-1.1.0.jar"/>
19-
<classpathentry kind="lib" path="/ceylon-runtime/dist/repo/org/eclipse/aether/aether-transport-file/1.1.0/org.eclipse.aether.aether-transport-file-1.1.0.jar"/>
20-
<classpathentry kind="lib" path="/ceylon-runtime/dist/repo/org/eclipse/aether/aether-transport-http/1.1.0/org.eclipse.aether.aether-transport-http-1.1.0.jar"/>
21-
<classpathentry kind="lib" path="/ceylon-runtime/dist/repo/org/eclipse/aether/aether-util/1.1.0/org.eclipse.aether.aether-util-1.1.0.jar"/>
15+
<classpathentry kind="lib" path="/ceylon-runtime/dist/repo/org/eclipse/aether/api/1.1.0/org.eclipse.aether.api-1.1.0.jar"/>
16+
<classpathentry kind="lib" path="/ceylon-runtime/dist/repo/org/eclipse/aether/connector/basic/1.1.0/org.eclipse.aether.connector.basic-1.1.0.jar"/>
17+
<classpathentry kind="lib" path="/ceylon-runtime/dist/repo/org/eclipse/aether/impl/1.1.0/org.eclipse.aether.impl-1.1.0.jar"/>
18+
<classpathentry kind="lib" path="/ceylon-runtime/dist/repo/org/eclipse/aether/spi/1.1.0/org.eclipse.aether.spi-1.1.0.jar"/>
19+
<classpathentry kind="lib" path="/ceylon-runtime/dist/repo/org/eclipse/aether/transport/file/1.1.0/org.eclipse.aether.transport.file-1.1.0.jar"/>
20+
<classpathentry kind="lib" path="/ceylon-runtime/dist/repo/org/eclipse/aether/transport/http/1.1.0/org.eclipse.aether.transport.http-1.1.0.jar"/>
21+
<classpathentry kind="lib" path="/ceylon-runtime/dist/repo/org/eclipse/aether/util/1.1.0/org.eclipse.aether.util-1.1.0.jar"/>
2222
<classpathentry kind="lib" path="/ceylon-runtime/dist/repo/org/apache/commons/lang3/3.4/org.apache.commons.lang3-3.4.jar"/>
23-
<classpathentry kind="lib" path="/ceylon-runtime/dist/repo/com/google/guava/guava/18.0/com.google.guava.guava-18.0.jar"/>
23+
<classpathentry kind="lib" path="/ceylon-runtime/dist/repo/com/google/guava/18.0/com.google.guava-18.0.jar"/>
2424
<classpathentry kind="output" path="build/classes"/>
2525
</classpath>

‎compiler-java/src/com/redhat/ceylon/launcher/CeylonClassLoader.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,14 @@ public static List<File> getClassPath() throws URISyntaxException, FileNotFoundE
118118
archives.add(getRepoJar(ceylonRepo, "org.jboss.modules", Versions.DEPENDENCY_JBOSS_MODULES_VERSION));
119119
archives.add(getRepoJar(ceylonRepo, "org.jboss.logmanager", Versions.DEPENDENCY_LOGMANAGER_VERSION));
120120
// Maven support for CMR
121-
archives.add(getRepoJar(ceylonRepo, "org.eclipse.aether.aether-api", "1.1.0")); // optional
122-
archives.add(getRepoJar(ceylonRepo, "org.eclipse.aether.aether-spi", "1.1.0")); // optional
123-
archives.add(getRepoJar(ceylonRepo, "org.eclipse.aether.aether-util", "1.1.0")); // optional
124-
archives.add(getRepoJar(ceylonRepo, "org.eclipse.aether.aether-impl", "1.1.0")); // optional
125-
archives.add(getRepoJar(ceylonRepo, "org.eclipse.aether.aether-connector-basic", "1.1.0")); // optional
126-
archives.add(getRepoJar(ceylonRepo, "org.eclipse.aether.aether-transport-file", "1.1.0")); // optional
127-
archives.add(getRepoJar(ceylonRepo, "org.eclipse.aether.aether-transport-http", "1.1.0")); // optional
128-
archives.add(getRepoJar(ceylonRepo, "com.google.guava.guava", "18.0")); // optional
121+
archives.add(getRepoJar(ceylonRepo, "org.eclipse.aether.api", "1.1.0")); // optional
122+
archives.add(getRepoJar(ceylonRepo, "org.eclipse.aether.spi", "1.1.0")); // optional
123+
archives.add(getRepoJar(ceylonRepo, "org.eclipse.aether.util", "1.1.0")); // optional
124+
archives.add(getRepoJar(ceylonRepo, "org.eclipse.aether.impl", "1.1.0")); // optional
125+
archives.add(getRepoJar(ceylonRepo, "org.eclipse.aether.connector.basic", "1.1.0")); // optional
126+
archives.add(getRepoJar(ceylonRepo, "org.eclipse.aether.transport.file", "1.1.0")); // optional
127+
archives.add(getRepoJar(ceylonRepo, "org.eclipse.aether.transport.http", "1.1.0")); // optional
128+
archives.add(getRepoJar(ceylonRepo, "com.google.guava", "18.0")); // optional
129129
archives.add(getRepoJar(ceylonRepo, "org.apache.commons.lang3", "3.4")); // optional
130130
archives.add(getRepoJar(ceylonRepo, "org.apache.maven.maven-artifact", "3.3.9")); // optional
131131
archives.add(getRepoJar(ceylonRepo, "org.apache.maven.maven-model", "3.3.9")); // optional

‎dist/build.properties

+2
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ jboss-modules.url=
66
jboss-modules.dir=org/jboss/modules
77
jboss-modules.repo=${jboss-modules.dir}/${jboss-modules.version}/${jboss-modules.module}
88
jboss-modules.lib=${basedir}/../runtime/lib/${jboss-modules.jar}
9+
10+
external-bundle-qualifier=CEYLON-DEPENDENCIES-v0

0 commit comments

Comments
 (0)