Skip to content

Commit a890c21

Browse files
kris-sigurkris-sigur
committed
Merge pull request #204 from ukwa/issue-176
2 parents bc53d4f + a20a5ef commit a890c21

File tree

9 files changed

+1232
-1217
lines changed

9 files changed

+1232
-1217
lines changed

‎src/site/xdoc/release_notes.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
<li>Failing test: testPadDateStr(org.archive.wayback.util.TimestampTest) <a href="https://github.com/iipc/openwayback/issues/231">#231</a></li>
3535
<li>Replace current (IA) favicon with one matching OpenWayback logo. <a href="https://github.com/iipc/openwayback/issues/247">#247</a></li>
3636
<li>Fixed ARCRecordingProxy times out. <a href="https://github.com/iipc/openwayback/issues/116">#116</a></li>
37+
<li>Moved 'SWFReplayRenderer' to external file; imported to maintain functionality. <a href="https://github.com/iipc/openwayback/issues/176">#176</a></li>
3738
</ul>
3839
</subsection>
3940
</section>

‎wayback-core/pom.xml‎

Lines changed: 136 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -1,136 +1,136 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2-
3-
<modelVersion>4.0.0</modelVersion>
4-
5-
<parent>
6-
<artifactId>openwayback</artifactId>
7-
<groupId>org.netpreserve.openwayback</groupId>
8-
<version>2.2.0-SNAPSHOT</version>
9-
</parent>
10-
11-
<artifactId>openwayback-core</artifactId>
12-
<name>OpenWayback Core Java Classes</name>
13-
<packaging>jar</packaging>
14-
15-
<build>
16-
<plugins>
17-
<plugin>
18-
<groupId>org.apache.maven.plugins</groupId>
19-
<artifactId>maven-jar-plugin</artifactId>
20-
<version>2.2</version>
21-
<executions>
22-
<execution>
23-
<goals>
24-
<goal>test-jar</goal>
25-
</goals>
26-
</execution>
27-
</executions>
28-
</plugin>
29-
</plugins>
30-
</build>
31-
32-
<dependencies>
33-
<dependency>
34-
<groupId>${project.groupId}</groupId>
35-
<artifactId>openwayback-cdx-server</artifactId>
36-
</dependency>
37-
<dependency>
38-
<groupId>junit</groupId>
39-
<artifactId>junit</artifactId>
40-
<scope>test</scope>
41-
</dependency>
42-
<dependency>
43-
<groupId>javax.servlet</groupId>
44-
<artifactId>servlet-api</artifactId>
45-
<scope>provided</scope>
46-
</dependency>
47-
<dependency>
48-
<groupId>org.netpreserve.commons</groupId>
49-
<artifactId>webarchive-commons</artifactId>
50-
</dependency>
51-
<!-- JWAT Dependencies -->
52-
<dependency>
53-
<groupId>org.jwat</groupId>
54-
<artifactId>jwat-arc</artifactId>
55-
<version>1.0.1</version>
56-
</dependency>
57-
<dependency>
58-
<groupId>org.jwat</groupId>
59-
<artifactId>jwat-warc</artifactId>
60-
<version>1.0.1</version>
61-
</dependency>
62-
<!-- End JWAT Dependencies -->
63-
<dependency>
64-
<groupId>org.netpreserve.openwayback</groupId>
65-
<artifactId>openwayback-access-control-core</artifactId>
66-
<exclusions>
67-
<exclusion>
68-
<groupId>commons-pool</groupId>
69-
<artifactId>commons-pool</artifactId>
70-
</exclusion>
71-
<exclusion>
72-
<groupId>org.netpreserve.heritrix</groupId>
73-
<artifactId>commons</artifactId>
74-
</exclusion>
75-
<!-- access-control and its dependency has "compile"
76-
dependency on junit, which screw up downstream
77-
projects. Exclude it until it's fixed. -->
78-
<exclusion>
79-
<artifactId>junit</artifactId>
80-
<groupId>junit</groupId>
81-
</exclusion>
82-
</exclusions>
83-
</dependency>
84-
<dependency>
85-
<groupId>com.googlecode.juniversalchardet</groupId>
86-
<artifactId>juniversalchardet</artifactId>
87-
</dependency>
88-
<dependency>
89-
<groupId>org.springframework</groupId>
90-
<artifactId>spring-core</artifactId>
91-
</dependency>
92-
<dependency>
93-
<groupId>org.springframework</groupId>
94-
<artifactId>spring-beans</artifactId>
95-
</dependency>
96-
<dependency>
97-
<groupId>org.springframework</groupId>
98-
<artifactId>spring-web</artifactId>
99-
</dependency>
100-
<dependency>
101-
<groupId>org.beanshell</groupId>
102-
<artifactId>bsh</artifactId>
103-
</dependency>
104-
<dependency>
105-
<groupId>org.htmlparser</groupId>
106-
<artifactId>htmlparser</artifactId>
107-
</dependency>
108-
<dependency>
109-
<groupId>com.flagstone</groupId>
110-
<artifactId>transform</artifactId>
111-
</dependency>
112-
<dependency>
113-
<groupId>redis.clients</groupId>
114-
<artifactId>jedis</artifactId>
115-
<version>2.0.0</version>
116-
</dependency>
117-
<dependency>
118-
<groupId>com.sleepycat</groupId>
119-
<artifactId>je</artifactId>
120-
<version>4.1.6</version>
121-
</dependency>
122-
<dependency>
123-
<groupId>org.easymock</groupId>
124-
<artifactId>easymock</artifactId>
125-
<version>2.5.1</version>
126-
<scope>test</scope>
127-
</dependency>
128-
<dependency>
129-
<groupId>org.apache.httpcomponents</groupId>
130-
<artifactId>httpclient</artifactId>
131-
<version>4.3.5</version>
132-
<type>jar</type>
133-
</dependency>
134-
</dependencies>
135-
136-
</project>
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2+
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<parent>
6+
<artifactId>openwayback</artifactId>
7+
<groupId>org.netpreserve.openwayback</groupId>
8+
<version>2.2.0-SNAPSHOT</version>
9+
</parent>
10+
11+
<artifactId>openwayback-core</artifactId>
12+
<name>OpenWayback Core Java Classes</name>
13+
<packaging>jar</packaging>
14+
15+
<build>
16+
<plugins>
17+
<plugin>
18+
<groupId>org.apache.maven.plugins</groupId>
19+
<artifactId>maven-jar-plugin</artifactId>
20+
<version>2.2</version>
21+
<executions>
22+
<execution>
23+
<goals>
24+
<goal>test-jar</goal>
25+
</goals>
26+
</execution>
27+
</executions>
28+
</plugin>
29+
</plugins>
30+
</build>
31+
32+
<dependencies>
33+
<dependency>
34+
<groupId>${project.groupId}</groupId>
35+
<artifactId>openwayback-cdx-server</artifactId>
36+
</dependency>
37+
<dependency>
38+
<groupId>junit</groupId>
39+
<artifactId>junit</artifactId>
40+
<scope>test</scope>
41+
</dependency>
42+
<dependency>
43+
<groupId>javax.servlet</groupId>
44+
<artifactId>servlet-api</artifactId>
45+
<scope>provided</scope>
46+
</dependency>
47+
<dependency>
48+
<groupId>org.netpreserve.commons</groupId>
49+
<artifactId>webarchive-commons</artifactId>
50+
</dependency>
51+
<!-- JWAT Dependencies -->
52+
<dependency>
53+
<groupId>org.jwat</groupId>
54+
<artifactId>jwat-arc</artifactId>
55+
<version>1.0.1</version>
56+
</dependency>
57+
<dependency>
58+
<groupId>org.jwat</groupId>
59+
<artifactId>jwat-warc</artifactId>
60+
<version>1.0.1</version>
61+
</dependency>
62+
<!-- End JWAT Dependencies -->
63+
<dependency>
64+
<groupId>org.netpreserve.openwayback</groupId>
65+
<artifactId>openwayback-access-control-core</artifactId>
66+
<exclusions>
67+
<exclusion>
68+
<groupId>commons-pool</groupId>
69+
<artifactId>commons-pool</artifactId>
70+
</exclusion>
71+
<exclusion>
72+
<groupId>org.netpreserve.heritrix</groupId>
73+
<artifactId>commons</artifactId>
74+
</exclusion>
75+
<!-- access-control and its dependency has "compile"
76+
dependency on junit, which screw up downstream
77+
projects. Exclude it until it's fixed. -->
78+
<exclusion>
79+
<artifactId>junit</artifactId>
80+
<groupId>junit</groupId>
81+
</exclusion>
82+
</exclusions>
83+
</dependency>
84+
<dependency>
85+
<groupId>com.googlecode.juniversalchardet</groupId>
86+
<artifactId>juniversalchardet</artifactId>
87+
</dependency>
88+
<dependency>
89+
<groupId>org.springframework</groupId>
90+
<artifactId>spring-core</artifactId>
91+
</dependency>
92+
<dependency>
93+
<groupId>org.springframework</groupId>
94+
<artifactId>spring-beans</artifactId>
95+
</dependency>
96+
<dependency>
97+
<groupId>org.springframework</groupId>
98+
<artifactId>spring-web</artifactId>
99+
</dependency>
100+
<dependency>
101+
<groupId>org.beanshell</groupId>
102+
<artifactId>bsh</artifactId>
103+
</dependency>
104+
<dependency>
105+
<groupId>org.htmlparser</groupId>
106+
<artifactId>htmlparser</artifactId>
107+
</dependency>
108+
<dependency>
109+
<groupId>com.flagstone</groupId>
110+
<artifactId>transform</artifactId>
111+
</dependency>
112+
<dependency>
113+
<groupId>redis.clients</groupId>
114+
<artifactId>jedis</artifactId>
115+
<version>2.0.0</version>
116+
</dependency>
117+
<dependency>
118+
<groupId>com.sleepycat</groupId>
119+
<artifactId>je</artifactId>
120+
<version>4.1.6</version>
121+
</dependency>
122+
<dependency>
123+
<groupId>org.easymock</groupId>
124+
<artifactId>easymock</artifactId>
125+
<version>2.5.1</version>
126+
<scope>test</scope>
127+
</dependency>
128+
<dependency>
129+
<groupId>org.apache.httpcomponents</groupId>
130+
<artifactId>httpclient</artifactId>
131+
<version>4.3.5</version>
132+
<type>jar</type>
133+
</dependency>
134+
</dependencies>
135+
136+
</project>

0 commit comments

Comments
 (0)