Skip to content

Commit 799255c

Browse files
berezovskyiberezovskyi
committed
Use javax.servlet-api dependency
Signed-off-by: Andrew Berezovskyi <andriib@kth.se>
1 parent 0481456 commit 799255c

2 files changed

Lines changed: 71 additions & 67 deletions

File tree

‎core/oslc4j-utils/pom.xml‎

Lines changed: 71 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,79 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
4-
<parent>
5-
<groupId>org.eclipse.lyo.oslc4j.core</groupId>
6-
<artifactId>oslc4j-core-build</artifactId>
7-
<version>5.0.0-SNAPSHOT</version>
8-
<relativePath>../oslc4j-core-build/pom.xml</relativePath>
9-
</parent>
10-
<name>Lyo :: Core :: Utilities</name>
11-
<artifactId>oslc4j-utils</artifactId>
12-
<description>Additional utilities such as the OSLC4J Marshaller and Unmarshaller</description>
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<parent>
5+
<groupId>org.eclipse.lyo.oslc4j.core</groupId>
6+
<artifactId>oslc4j-core-build</artifactId>
7+
<version>5.0.0-SNAPSHOT</version>
8+
<relativePath>../oslc4j-core-build/pom.xml</relativePath>
9+
</parent>
10+
<name>Lyo :: Core :: Utilities</name>
11+
<artifactId>oslc4j-utils</artifactId>
12+
<description>Additional utilities such as the OSLC4J Marshaller and Unmarshaller</description>
1313

14-
<properties>
15-
</properties>
14+
<properties>
15+
</properties>
1616

17-
<dependencies>
18-
<dependency>
19-
<groupId>org.eclipse.lyo.oslc4j.core</groupId>
20-
<artifactId>oslc4j-json4j-provider</artifactId>
21-
</dependency>
22-
<dependency>
23-
<groupId>org.eclipse.lyo.oslc4j.core</groupId>
24-
<artifactId>oslc4j-jena-provider</artifactId>
25-
</dependency>
17+
<dependencies>
18+
<dependency>
19+
<groupId>org.eclipse.lyo.oslc4j.core</groupId>
20+
<artifactId>oslc4j-json4j-provider</artifactId>
21+
</dependency>
22+
<dependency>
23+
<groupId>org.eclipse.lyo.oslc4j.core</groupId>
24+
<artifactId>oslc4j-jena-provider</artifactId>
25+
</dependency>
26+
<dependency>
27+
<groupId>javax.servlet</groupId>
28+
<artifactId>javax.servlet-api</artifactId>
29+
<scope>provided</scope>
30+
</dependency>
2631

27-
<dependency>
28-
<groupId>jakarta.ws.rs</groupId>
29-
<artifactId>jakarta.ws.rs-api</artifactId>
30-
<scope>provided</scope>
31-
</dependency>
32+
<dependency>
33+
<groupId>jakarta.ws.rs</groupId>
34+
<artifactId>jakarta.ws.rs-api</artifactId>
35+
<scope>provided</scope>
36+
</dependency>
3237

3338

34-
<!-- TEST -->
35-
<dependency>
36-
<groupId>junit</groupId>
37-
<artifactId>junit</artifactId>
38-
<scope>test</scope>
39-
</dependency>
40-
<dependency>
41-
<groupId>org.glassfish.jersey.containers</groupId>
42-
<artifactId>jersey-container-servlet</artifactId>
43-
<scope>test</scope>
44-
</dependency>
45-
<dependency>
46-
<groupId>org.glassfish.jersey.core</groupId>
47-
<artifactId>jersey-server</artifactId>
48-
<scope>test</scope>
49-
</dependency>
50-
<dependency>
51-
<groupId>org.glassfish.jersey.core</groupId>
52-
<artifactId>jersey-common</artifactId>
53-
<scope>test</scope>
54-
</dependency>
55-
<!-- <dependency>
56-
<groupId>org.glassfish.jersey.inject</groupId>
57-
<artifactId>jersey-hk2</artifactId>
58-
<scope>test</scope>
59-
</dependency>-->
60-
</dependencies>
39+
<!-- TEST -->
40+
<dependency>
41+
<groupId>junit</groupId>
42+
<artifactId>junit</artifactId>
43+
<scope>test</scope>
44+
</dependency>
45+
<dependency>
46+
<groupId>org.glassfish.jersey.containers</groupId>
47+
<artifactId>jersey-container-servlet</artifactId>
48+
<scope>test</scope>
49+
</dependency>
50+
<dependency>
51+
<groupId>org.glassfish.jersey.core</groupId>
52+
<artifactId>jersey-server</artifactId>
53+
<scope>test</scope>
54+
</dependency>
55+
<dependency>
56+
<groupId>org.glassfish.jersey.core</groupId>
57+
<artifactId>jersey-common</artifactId>
58+
<scope>test</scope>
59+
</dependency>
60+
<!-- <dependency>
61+
<groupId>org.glassfish.jersey.inject</groupId>
62+
<artifactId>jersey-hk2</artifactId>
63+
<scope>test</scope>
64+
</dependency>-->
65+
</dependencies>
6166

62-
<build>
63-
<plugins>
64-
<plugin>
65-
<groupId>org.apache.maven.plugins</groupId>
66-
<artifactId>maven-source-plugin</artifactId>
67-
</plugin>
68-
<plugin>
69-
<groupId>org.apache.maven.plugins</groupId>
70-
<artifactId>maven-javadoc-plugin</artifactId>
71-
</plugin>
72-
</plugins>
73-
</build>
67+
<build>
68+
<plugins>
69+
<plugin>
70+
<groupId>org.apache.maven.plugins</groupId>
71+
<artifactId>maven-source-plugin</artifactId>
72+
</plugin>
73+
<plugin>
74+
<groupId>org.apache.maven.plugins</groupId>
75+
<artifactId>maven-javadoc-plugin</artifactId>
76+
</plugin>
77+
</plugins>
78+
</build>
7479
</project>

‎core/oslc4j-utils/src/main/java/org/eclipse/lyo/core/utils/marshallers/LyoConfigUtil.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import org.slf4j.LoggerFactory;
55

66
import javax.servlet.ServletContext;
7-
import javax.ws.rs.core.UriBuilder;
87
import java.net.InetAddress;
98
import java.net.UnknownHostException;
109
import java.util.Locale;

0 commit comments

Comments
 (0)