Skip to content

Commit a4a3254

Browse files
authored
Merge pull request #629 from internetarchive/restlet-2.5
Bump restlet from 2.4.0 to 2.5.0-rc1 and remove restlet repository
2 parents d11d38a + 7c04c0b commit a4a3254

File tree

2 files changed

+10
-16
lines changed

2 files changed

+10
-16
lines changed

engine/pom.xml

+9-15
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,6 @@
1111
<packaging>jar</packaging>
1212
<name>Heritrix 3: 'engine' subproject</name>
1313

14-
<repositories>
15-
<repository>
16-
<id>maven-restlet</id>
17-
<url>https://maven.restlet.talend.com</url>
18-
</repository>
19-
</repositories>
20-
2114
<dependencies>
2215
<dependency>
2316
<groupId>org.archive.heritrix</groupId>
@@ -44,14 +37,14 @@
4437
<scope>test</scope>
4538
</dependency>
4639
<dependency>
47-
<groupId>org.restlet.jse</groupId>
40+
<groupId>org.restlet</groupId>
4841
<artifactId>org.restlet</artifactId>
49-
<version>2.4.0</version>
42+
<version>${restlet.version}</version>
5043
</dependency>
5144
<dependency>
52-
<groupId>org.restlet.jse</groupId>
45+
<groupId>org.restlet</groupId>
5346
<artifactId>org.restlet.ext.jetty</artifactId>
54-
<version>2.4.0</version>
47+
<version>${restlet.version}</version>
5548
<exclusions>
5649
<exclusion>
5750
<groupId>org.eclipse.jetty</groupId>
@@ -60,15 +53,15 @@
6053
</exclusions>
6154
</dependency>
6255
<dependency>
63-
<groupId>org.restlet.jse</groupId>
56+
<groupId>org.restlet</groupId>
6457
<artifactId>org.restlet.ext.xml</artifactId>
65-
<version>2.4.0</version>
58+
<version>${restlet.version}</version>
6659
</dependency>
6760
<dependency>
6861
<!-- for HTTP Digest auth -->
69-
<groupId>org.restlet.jse</groupId>
62+
<groupId>org.restlet</groupId>
7063
<artifactId>org.restlet.ext.crypto</artifactId>
71-
<version>2.4.0</version>
64+
<version>${restlet.version}</version>
7265
</dependency>
7366
<!-- jaxb is no longer included in jdk11+ -->
7467
<dependency>
@@ -116,5 +109,6 @@
116109
</build>
117110
<properties>
118111
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
112+
<restlet.version>2.5.0-rc1</restlet.version>
119113
</properties>
120114
</project>

engine/src/main/java/org/archive/crawler/restlet/EngineApplication.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public Engine getEngine() {
137137
protected class EngineStatusService extends StatusService {
138138

139139
@Override
140-
public Representation getRepresentation(Status status, Request request, Response response) {
140+
public Representation toRepresentation(Status status, Request request, Response response) {
141141
StringWriter st = new StringWriter();
142142
PrintWriter pw = new PrintWriter(st);
143143
if(status.getCode()==404){

0 commit comments

Comments
 (0)