Skip to content
This repository was archived by the owner on Apr 7, 2022. It is now read-only.

Commit 406697a

Browse files
committed
Updated HtmlUnit version (1.11->1.13).
Updated Selenium version (0.9.2-SNAPSHOT -> 0.9.2). Updated Clover plugin (need a new license).
1 parent 53fb3b0 commit 406697a

6 files changed

Lines changed: 54 additions & 208 deletions

File tree

jwebunit-selenium-plugin/pom.xml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,6 @@
99
<artifactId>jwebunit-selenium-plugin</artifactId>
1010
<name>Selenium Plugin</name>
1111
<description>Selenium plugin for JWebUnit.</description>
12-
<repositories>
13-
<repository>
14-
<releases />
15-
<snapshots />
16-
<id>selenium</id>
17-
<name>Selenium repository</name>
18-
<url>http://maven.openqa.org/</url>
19-
</repository>
20-
</repositories>
2112
<build>
2213
<plugins>
2314
<plugin>
@@ -46,7 +37,6 @@
4637
<dependency>
4738
<groupId>org.openqa.selenium.client-drivers</groupId>
4839
<artifactId>selenium-java-client-driver</artifactId>
49-
<version>0.9.2-SNAPSHOT</version>
5040
<exclusions>
5141
<exclusion>
5242
<groupId>org.openqa.selenium.server</groupId>

jwebunit-webtestcase-generator/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
</goals>
2525
<configuration>
2626
<packageName>net.sourceforge.jwebunit.javacc</packageName>
27+
<outputDirectory>target/generated-sources/javacc</outputDirectory>
2728
</configuration>
2829
</execution>
2930
</executions>

pom.xml

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,23 @@
149149
<name>Mojo Codehaus Repository</name>
150150
<url>http://repository.codehaus.org/</url>
151151
</repository>
152+
<repository>
153+
<id>selenium</id>
154+
<name>Selenium repository</name>
155+
<url>http://maven.openqa.org/</url>
156+
</repository>
152157
</repositories>
158+
<pluginRepositories>
159+
<pluginRepository>
160+
<id>atlassian-m2-repository</id>
161+
<name>Atlassian Maven 2.x Repository</name>
162+
<url>http://repository.atlassian.com/maven2</url>
163+
</pluginRepository>
164+
</pluginRepositories>
153165
<build>
154166
<plugins>
155167
<plugin>
168+
<groupId>com.atlassian.maven.plugins</groupId>
156169
<artifactId>maven-clover-plugin</artifactId>
157170
<configuration>
158171
<flushPolicy>threaded</flushPolicy>
@@ -198,6 +211,14 @@
198211
</descriptors>
199212
</configuration>
200213
</plugin>
214+
<plugin>
215+
<groupId>org.apache.maven.plugins</groupId>
216+
<artifactId>maven-release-plugin</artifactId>
217+
<configuration>
218+
<autoVersionSubmodules>true</autoVersionSubmodules>
219+
<preparationGoals>clean install</preparationGoals>
220+
</configuration>
221+
</plugin>
201222
</plugins>
202223
<pluginManagement>
203224
<plugins>
@@ -213,7 +234,7 @@
213234
<inherited>true</inherited>
214235
<groupId>org.codehaus.mojo</groupId>
215236
<artifactId>javacc-maven-plugin</artifactId>
216-
<version>2.2-SNAPSHOT</version>
237+
<version>2.2</version>
217238
</plugin>
218239
<plugin>
219240
<inherited>true</inherited>
@@ -248,7 +269,7 @@
248269
<dependency>
249270
<groupId>org.mortbay.jetty</groupId>
250271
<artifactId>jetty</artifactId>
251-
<version>6.1.3</version>
272+
<version>6.1.6</version>
252273
</dependency>
253274
<dependency>
254275
<groupId>commons-fileupload</groupId>
@@ -263,7 +284,12 @@
263284
<dependency>
264285
<groupId>htmlunit</groupId>
265286
<artifactId>htmlunit</artifactId>
266-
<version>1.11</version>
287+
<version>1.13</version>
288+
</dependency>
289+
<dependency>
290+
<groupId>org.openqa.selenium.client-drivers</groupId>
291+
<artifactId>selenium-java-client-driver</artifactId>
292+
<version>0.9.2</version>
267293
</dependency>
268294
<dependency>
269295
<groupId>regexp</groupId>
@@ -316,7 +342,7 @@
316342
<artifactId>taglist-maven-plugin</artifactId>
317343
</plugin>
318344
<plugin>
319-
<groupId>org.apache.maven.plugins</groupId>
345+
<groupId>com.atlassian.maven.plugins</groupId>
320346
<artifactId>maven-clover-plugin</artifactId>
321347
<configuration>
322348
<generateHistorical>true</generateHistorical>
@@ -425,7 +451,7 @@
425451
<site>
426452
<id>jwebunit-website</id>
427453
<name>JWebUnit WebSite - Sourceforge</name>
428-
<url>file://d:/temp/site-jwebunit</url>
454+
<url>scp://shell.sourceforge.net/home/groups/j/jw/jwebunit/htdocs</url>
429455
</site>
430456
<repository>
431457
<id>jwebunit-m2-repo</id>

src/changes/changes.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,17 @@
77
</author>
88
</properties>
99
<body>
10-
<release version="1.5" date="UNKNOW">
10+
<release version="1.5" date="UNKNOW">
11+
<action type="update" dev="Julien Henry">
12+
Update to HtmlUnit 1.13.
13+
</action>
1114
<action type="add" dev="Julien Henry">
1215
Add basic Selenium support.
1316
</action>
1417
<action type="update" dev="Julien Henry">
1518
Rename IJWebUnitDialog in ITestingEngine.
1619
</action>
17-
</release>
20+
</release>
1821
<release version="1.4.1" date="may 5, 2007">
1922
<action type="fix" dev="Julien Henry" issue="1706395" due-to="meilon">
2023
getPageSource() now returns source of the current frame or window.

src/site/xdoc/building-maven.xml

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -23,27 +23,27 @@
2323
First you need to download the latest Maven 2, which
2424
currently is
2525
<a href="http://maven.apache.org">
26-
<tt>Maven-2.0.6</tt>
26+
<tt>Maven-2.0.8</tt>
2727
</a>
2828
, make sure you download the binary archive
29-
(maven-2.0.6-bin.zip).
29+
(e.g. apache-maven-2.0.8-bin.tar.bz2).
3030
</p>
3131
<p>
3232
Installing Maven should be easy: unzip the file to
3333
any directory you like, let's say:
34-
<source>C:\maven-2.0.6</source>
34+
<source>/opt/apache-maven-2.0.8</source>
3535
</p>
3636
<p>
3737
Next you need to do 2 things:
3838
<ul>
3939
<li>
4040
add an environment variable MAVEN_HOME which
4141
points to the install directory of Maven,
42-
i.e. C:\maven-2.0.6
42+
i.e. /opt/apache-maven-2.0.8
4343
</li>
4444
<li>
4545
add
46-
<tt>%MAVEN_HOME%\bin</tt>
46+
<tt>$MAVEN_HOME/bin</tt>
4747
to your path (using the variable you can
4848
switch more easily when a new version
4949
arrives)
@@ -73,34 +73,25 @@
7373
<subsection
7474
name="Installing not released or snapshot plugins">
7575
<p>
76-
JWebUnit needs some bleeding edge Maven plugins to
77-
build properly.
76+
JWebUnit needs some tweak to
77+
build properly under Microsoft Windows.
7878
</p>
7979
<ul>
8080
<li>
81-
javacc-maven-plugin 2.2-SNAPSHOT because of this
81+
javacc-maven-plugin 2.3-SNAPSHOT because of this
8282
<a
83-
href="http://jira.codehaus.org/browse/MJAVACC-20">
83+
href="http://jira.codehaus.org/browse/MJAVACC-29">
8484
issue
8585
</a>
8686
</li>
87-
<li>
88-
[cosmetic] maven-javadoc-plugin 2.3-SNAPSHOT.
89-
</li>
9087
</ul>
9188
<p>
92-
I'm affraid as long these patchs are not applied and
93-
plugins are not released, JWebUnit builds are not
94-
reproductible. You can vote for these issues or spam
89+
Windows users will have to checkout sources of javacc-maven-plugin then
90+
apply patch proposed in MJAVACC-29 then build the plugin (should be 2.3-SNAPSHOT)
91+
then alter JWebUnit pom.xml to use your local version.
92+
You can vote for these issues or spam
9593
the Maven mailing list to help. ;)
9694
</p>
97-
<p>
98-
Installation of javacc-maven-plugin-2.2-SNAPSHOT
99-
<br />
100-
You have to add Codehaus Snapshot Repository to your
101-
settings.xml, but it could mess your repository by
102-
downloading and using not intended SNAPSHOTS.
103-
</p>
10495
</subsection>
10596
<subsection name="Building JWebUnit">
10697
<p>

src/test/clover/clover.license

Lines changed: 4 additions & 169 deletions
Original file line numberDiff line numberDiff line change
@@ -1,169 +1,4 @@
1-
Product: Clover
2-
License: Open Source License, 0.x, 1.x
3-
Issued: Wed Nov 29 2006 13:34:19 CST
4-
Expiry: Never
5-
Maintenance Expiry: Never
6-
Key: 7f17a20b5b090da53672ec2be
7-
Name: Julien HENRY
8-
Org: JWebUnit
9-
Certificate: AAAB5G+Ow8B7/zEbxOMqqKwwrdpP+a1COmJGHco7sCNLjHkHnajPF+dQW
10-
Ct12PMy0uml0s9xuus5wKngJ9OFk5DFeh01dzQF66bhXH1HsO1TZPnKl85Q9hY8Obs0fxY
11-
3jhJRbYV9eewtg+KPUM0ZP/Wbb5ulMfvsUoa5QDMxb37PP7IjS6Y7TILtnFKsWjcAJcnyM
12-
vXutYDmQ//FBc2l+nTm/c3MqmkbfjIYHeunuA0eSLzgRW+qwN+DcvMXPhmxZH8XbsNQNGu
13-
IfyH8f4LopUzPByro1FTLtDe+n1mWvUY6flN6yTSocEHgaWOy4Y1zp0EmRGrT8WuvjLrGz
14-
ynu1SXGxvgxxO3N1ao3GyJnKX/uvfsEGVi8oF9ut5uMkQiocjgTsDBzHD7aUCIg628h6jK
15-
f6eRL0xg0uqxIn60z5stPhq4pLnxPKtgoqTUk7iBakfSLQPRcIBFgt/F74uO+08k689Qj1
16-
qnqaYe+lJL3OFdoJ3VFsu2SAhhFre9Vfrf/1cZQ7B1oCqo3fxBu21Yvbds0a+8oganmWtQ
17-
GL+aIQ4Stf73QT9OmTCR0A37CPLMiQ+c9QIrqz0erRycQJf7xfffjoo6mePPENc2/63rG+
18-
sDKpmkGNC8uOMDe8AgEX7H6W2a328vWVJWf8V5bJpfCibEcg03N9nZKK57k3YxLO5/Mnwp
19-
fyO21rQLIhiCnzpr8tOi+qiAukXnv1GxsjlpvVVCtP3WaGovhmv64w9x4j/hJVv76xleAU
20-
4mOYBHr7NHH1qV50TVnKEzU9iwT0wgcW6TanHdhxtW+G4l4Vdi3+UFXv+ldCoqGhQ==
21-
License Agreement: CLOVER VERSION 1 (ONE) SOFTWARE LICENSE AGREEMENT
22-
23-
1. Licenses and Software
24-
25-
Cenqua Pty Ltd, an Australian Proprietary Limited Company ("CENQUA")
26-
hereby grants to the purchaser (the "LICENSEE") a limited, revocable,
27-
worldwide, non-exclusive, nontransferable, non-sublicensable license
28-
to use the Clover version 1 (one) software (the "Software"),
29-
including any minor upgrades thereof during the Term (hereinafter
30-
defined) up to, but not including the next major version of the
31-
Software. The licensee shall not, or knowingly allow others to,
32-
reverse engineer, decompile, disassemble, modify, adapt, create
33-
derivative works from or otherwise attempt to derive source code from
34-
the Software provided. And, in accordance with the terms and
35-
conditions of this Software License Agreement (the "Agreement"), the
36-
Software shall be used solely by the licensed users in accordance
37-
with the following edition specific conditions:
38-
39-
a) Server Edition
40-
41-
A Server Edition license entitles the Licensee to execute one
42-
instance of Clover Server Edition on one (1) machine for the purposes
43-
of instrumententing source code and generating reports. There are no
44-
limitations on the use of the instrumented source code or generated
45-
reports produced by Server Edition.
46-
47-
b) Workstation Edition
48-
49-
A Workstation Edition license entitles the licensee to use Clover
50-
Workstation Edition on one (1) machine by one (1) individual end
51-
user. Workstation Edition does not permit the generation of reports
52-
for distribution.
53-
54-
c) Team Edition
55-
56-
A Team Edition license entitles the licensee to use Clover Team
57-
edition on any number of machines solely by the licensed number of
58-
users. Reports generated by Clover Team Edition are strictly for use
59-
only by the licensed number of individual end users.
60-
61-
2. License Fee
62-
63-
In exchange for the License(s), the Licensee shall pay to CENQUA a
64-
one-time, up front, non-refundable license fee. At the sole
65-
discretion of CENQUA this fee will be waived for non-commercial
66-
projects. Notwithstanding the Licensee's payment of the License Fee,
67-
CENQUA reserves the right to terminate the License if CENQUA
68-
discovers that the Licensee and/or the Licensee's use of the Software
69-
is in breach of this Agreement.
70-
71-
3. Proprietary Rights
72-
73-
CENQUA will retain all right, title and interest in and to the
74-
Software, all copies thereof, and CENQUA website(s), software, and
75-
other intellectual property, including, but not limited to, ownership
76-
of all copyrights, look and feel, trademark rights, design rights,
77-
trade secret rights and any and all other intellectual property and
78-
other proprietary rights therein. The Licensee will not directly or
79-
indirectly obtain or attempt to obtain at any time, any right, title
80-
or interest by registration or otherwise in or to the trademarks,
81-
82-
service marks, copyrights, trade names, symbols, logos or
83-
designations or other intellectual property rights owned or used by
84-
CENQUA. All technical manuals or other information provided by CENQUA
85-
to the Licensee shall be the sole property of CENQUA.
86-
87-
4. Term and Termination
88-
89-
Subject to the other provisions hereof, this Agreement shall commence
90-
upon the Licensee's opting into this Agreement and continue until the
91-
Licensee discontinues use of the Software or the Agreement terminates
92-
automatically upon the Licensee's breach of any term or condition of
93-
this Agreement (the "Term"). Upon any such termination, the Licensee
94-
will delete the Software immediately.
95-
96-
5. Copying & Transfer
97-
98-
The Licensee may copy the Software for back-up purposes only. The
99-
100-
Licensee may not assign or otherwise transfer the Software to any
101-
third party.
102-
103-
6. Specific Disclaimer of Warranty and Limitation of Liability
104-
105-
THE SOFTWARE IS PROVIDED WITHOUT WARRANTY OF ANY KIND. CENQUA
106-
DISCLAIMS ALL WARRANTIES, EXPRESSED OR IMPLIED, INCLUDING BUT NOT
107-
LIMITED TO THE WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
108-
PARTICULAR PURPOSE. CENQUA WILL NOT BE LIABLE FOR ANY DAMAGES
109-
ASSOCIATED WITH THE SOFTWARE, INCLUDING, WITHOUT LIMITATION,
110-
ORDINARY, INCIDENTAL, INDIRECT, OR CONSEQUENTIAL DAMAGES OF ANY KIND,
111-
INCLUDING BUT NOT LIMITED TO DAMAGES RELATING TO LOST DATA OR LOST
112-
PROFITS, EVEN IF CENQUA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
113-
DAMAGES.
114-
115-
7. Warranties and Representations
116-
117-
Licensee Indemnification. CENQUA agrees to indemnify, defend and hold
118-
the Licensee harmless from and against any and all liabilities,
119-
damages, losses, claims, costs, and expenses (including reasonable
120-
legal fees) arising out of or resulting from the Software or the use
121-
thereof infringing upon, misappropriating or violating any patents,
122-
copyrights, trademarks, or trade secret rights or other proprietary
123-
rights of persons, firms or entities who are not parties to this
124-
Agreement.
125-
126-
CENQUA Indemnification. The Licensee warrants and represents that the
127-
Licensee's actions with regard to the Software will be in compliance
128-
with all applicable laws; and the Licensee agrees to indemnify,
129-
defend, and hold CENQUA harmless from and against any and all
130-
liabilities, damages, losses, claims, costs, and expenses (including
131-
reasonable legal fees) arising out of or resulting from the
132-
Licensee's failure to observe the use restrictions set forth herein.
133-
134-
8. Publicity
135-
136-
The Licensee grants permission for CENQUA to use Licensee's name
137-
solely in customer lists. CENQUA shall not, without prior consent in
138-
writing, use the Licensee's name, or that of its affiliates, in any
139-
form with the specific exception of customer lists. CENQUA agrees to
140-
remove Licensee's name from any and all materials within 7 days if
141-
notified by the Licensee in writing.
142-
143-
9. Governing Law
144-
145-
This Agreement shall be governed by the laws of New South Wales,
146-
Australia.
147-
148-
10.Independent Contractors
149-
150-
The parties are independent contractors with respect to each other,
151-
and nothing in this Agreement shall be construed as creating an
152-
employer-employee relationship, a partnership, agency relationship or
153-
a joint venture between the parties.
154-
155-
11. Assignment
156-
157-
This Agreement is not assignable or transferable by the Licensee.
158-
CENQUA in its sole discretion may transfer a license to a third party
159-
at the written request of the Licensee.
160-
161-
12. Entire Agreement
162-
163-
This Agreement constitutes the entire agreement between the parties
164-
concerning the Licensee's use of the Software. This Agreement
165-
supersedes any prior verbal understanding between the parties and any
166-
Licensee purchase order or other ordering document, regardless of
167-
whether such document is received by CENQUA before or after execution
168-
of this Agreement. This Agreement may be amended only in writing by
169-
CENQUA.
1+
MQpNMhENqlxGcrLMOGJoHGbfpQQbIHXwBKdQHgnoJIPpWcu
2+
mj2KsjCI4jjE6OmAX86ksjtB2L06E2bAAQ14fyLOfeyGHGY
3+
PNrOUxOQNMPMMQPqpnRwxnNrmMqpqmOQrrsWXWSvTvxWtSN
4+
nmpmUUnnvsroqusqrnuUUnnvsroqusqrnuUUANbYLkfqUUn

0 commit comments

Comments
 (0)