Skip to content

Commit

Permalink
GH-4474: Publish classes attachment from war modules
Browse files Browse the repository at this point in the history
  • Loading branch information
@erikgb
erikgb committed Mar 20, 2023
1 parent 4433e05 commit 2c2ced1
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 227 deletions.
62 changes: 11 additions & 51 deletions compliance/repository/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,59 +14,12 @@
<testserver.webapp.dir>${project.build.directory}/rdf4j-server</testserver.webapp.dir>
</properties>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rdf4j-repository-http</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rdf4j-repository-sparql</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rdf4j-repository-sail</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rdf4j-repository-manager</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rdf4j-sail-memory</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rdf4j-sail-inferencer</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rdf4j-http-protocol</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rdf4j-repository-testsuite</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rdf4j-rio-turtle</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rdf4j-rio-nquads</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
Expand All @@ -78,9 +31,18 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<groupId>${project.groupId}</groupId>
<artifactId>rdf4j-http-server</artifactId>
<version>${project.version}</version>
<classifier>classes</classifier>
<scope>test</scope>
<exclusions>
<!-- FIXME: This exclusion is required because Spring dependency management is done in rdf4j-tools module -->
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-jcl</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Expand All @@ -99,8 +61,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<warName>rdf4j-server</warName>
<archiveClasses>true</archiveClasses>
<webappDirectory>${testserver.webapp.dir}</webappDirectory>
</configuration>
</plugin>
Expand Down
1 change: 1 addition & 0 deletions compliance/repository/src/test/java/org/eclipse/rdf4j/repository/http/HTTPMemServer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ public HTTPMemServer() throws IOException {
WebAppContext webapp = new WebAppContext();
webapp.setContextPath(RDF4J_CONTEXT);
webapp.setWar(webappDir);
webapp.getServerClasspathPattern().add("org.slf4j.", "ch.qos.logback.");
jetty.setHandler(webapp);

manager = RemoteRepositoryManager.getInstance(SERVER_URL);
Expand Down
186 changes: 12 additions & 174 deletions compliance/sparql/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,82 +16,17 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rdf4j-model</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rdf4j-sparql-testsuite</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rdf4j-rio-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rdf4j-rio-turtle</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rdf4j-rio-rdfxml</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rdf4j-query</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rdf4j-queryresultio-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rdf4j-queryresultio-sparqlxml</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rdf4j-queryparser-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rdf4j-queryparser-sparql</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rdf4j-repository-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rdf4j-repository-dataset</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rdf4j-repository-contextaware</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rdf4j-repository-sail</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rdf4j-sail-api</artifactId>
<artifactId>rdf4j-http-server</artifactId>
<version>${project.version}</version>
<classifier>classes</classifier>
<scope>test</scope>
<exclusions>
<!-- FIXME: This exclusion is required because Spring dependency management is done in rdf4j-tools module -->
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-jcl</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Expand All @@ -101,101 +36,9 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rdf4j-sail-memory</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rdf4j-sail-nativerdf</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rdf4j-sail-lmdb</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.lwjgl</groupId>
<artifactId>lwjgl-lmdb</artifactId>
<classifier>natives-linux</classifier>
<version>${lwjgl.version}</version>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.lwjgl</groupId>
<artifactId>lwjgl-lmdb</artifactId>
<classifier>natives-macos-arm64</classifier>
<version>${lwjgl.version}</version>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.lwjgl</groupId>
<artifactId>lwjgl-lmdb</artifactId>
<classifier>natives-macos</classifier>
<version>${lwjgl.version}</version>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.lwjgl</groupId>
<artifactId>lwjgl-lmdb</artifactId>
<classifier>natives-windows</classifier>
<version>${lwjgl.version}</version>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.lwjgl</groupId>
<artifactId>lwjgl</artifactId>
<classifier>natives-linux</classifier>
<version>${lwjgl.version}</version>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.lwjgl</groupId>
<artifactId>lwjgl</artifactId>
<classifier>natives-macos</classifier>
<version>${lwjgl.version}</version>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.lwjgl</groupId>
<artifactId>lwjgl</artifactId>
<classifier>natives-macos-arm64</classifier>
<version>${lwjgl.version}</version>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.lwjgl</groupId>
<artifactId>lwjgl</artifactId>
<classifier>natives-windows</classifier>
<version>${lwjgl.version}</version>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rdf4j-tools-federation</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rdf4j-http-protocol</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rdf4j-repository-manager</artifactId>
<artifactId>rdf4j-sparql-testsuite</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
Expand All @@ -207,11 +50,6 @@
<artifactId>jetty-webapp</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down
1 change: 1 addition & 0 deletions ...ance/sparql/src/test/java/org/eclipse/rdf4j/query/parser/sparql/SPARQLEmbeddedServer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ public SPARQLEmbeddedServer(List<String> repositoryIds) throws IOException {
jetty = new Server(PORT);

WebAppContext webapp = new WebAppContext();
webapp.getServerClasspathPattern().add("org.slf4j.", "ch.qos.logback.");
webapp.setContextPath(SERVER_CONTEXT);
// warPath configured in pom.xml maven-war-plugin configuration
webapp.setWar(webappDir);
Expand Down
1 change: 1 addition & 0 deletions tools/federation/src/test/java/org/eclipse/rdf4j/federated/server/EmbeddedServer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ public EmbeddedServer(String host, int port, String contextPath, String warPath)
jetty.addConnector(conn);

WebAppContext webapp = new WebAppContext();
webapp.getServerClasspathPattern().add("org.slf4j.", "ch.qos.logback.");
webapp.setContextPath(contextPath);
webapp.setTempDirectory(new File("temp/webapp/"));
webapp.setWar(warPath);
Expand Down
1 change: 1 addition & 0 deletions tools/server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
<configuration>
<warName>rdf4j-server</warName>
<archiveClasses>true</archiveClasses>
<attachClasses>true</attachClasses>
<webappDirectory>${testserver.webapp.dir}</webappDirectory>
</configuration>
</plugin>
Expand Down
3 changes: 1 addition & 2 deletions tools/server/src/test/java/org/eclipse/rdf4j/http/server/TestServer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,7 @@ public TestServer() throws IOException {
jetty.addConnector(conn);

WebAppContext webapp = new WebAppContext();
webapp.addSystemClass("org.slf4j.");
webapp.addSystemClass("ch.qos.logback.");
webapp.getServerClasspathPattern().add("org.slf4j.", "ch.qos.logback.");
webapp.setContextPath(RDF4J_CONTEXT);
// warPath configured in pom.xml maven-war-plugin configuration
webapp.setWar("./target/rdf4j-server");
Expand Down
1 change: 1 addition & 0 deletions tools/workbench/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
<configuration>
<warName>rdf4j-workbench</warName>
<archiveClasses>true</archiveClasses>
<attachClasses>true</attachClasses>
</configuration>
</plugin>
<plugin>
Expand Down

0 comments on commit 2c2ced1

Please sign in to comment.