Skip to content

Commit ee41bc3

Browse files
author
Stephen Colebourne
committed
Remove direct dependency on commons-build
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/codec/trunk@385924 13f79535-47bb-0310-9956-ffa450edef68
1 parent af0d671 commit ee41bc3

5 files changed

Lines changed: 44 additions & 91 deletions

File tree

‎maven.xml‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,6 @@ limitations under the License.
1515
-->
1616
<project default="java:jar">
1717

18-
<!-- ================================================================== -->
19-
<!-- START : C O M M O N S - B U I L D -->
20-
<!-- ================================================================== -->
21-
<!-- Required: Look and Feel for documentation within distributions -->
22-
<!-- ================================================================== -->
23-
<postGoal name="xdoc:copy-resources">
24-
<copy todir="${basedir}/target/docs/style/" failonerror="false">
25-
<fileset dir="${basedir}/../commons-build/xdocs/style">
26-
<include name='**/*'/>
27-
<exclude name='**/CVS/**'/>
28-
</fileset>
29-
</copy>
30-
</postGoal>
31-
<!-- ================================================================== -->
32-
<!-- END: C O M M O N S - B U I L D -->
33-
<!-- ================================================================== -->
34-
3518
<preGoal name="dist:build-bin">
3619

3720
<copy todir="${maven.build.dir}/${maven.final.name}/bin/${maven.final.name}">

‎project.properties‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ maven.test.failure = false
3131
maven.junit.fork=true
3232
maven.linkcheck.enable=false
3333

34-
maven.xdoc.jsl=../commons-build/commons-site.jsl
3534
maven.xdoc.date=left
3635
maven.xdoc.version=${pom.currentVersion}
3736
maven.xdoc.developmentProcessUrl=http://jakarta.apache.org/commons/charter.html
@@ -50,7 +49,7 @@ maven.jar.manifest.attribute.X-Compile-Source-JDK=${maven.compile.source}
5049
maven.jar.manifest.attribute.X-Compile-Target-JDK=${maven.compile.target}
5150

5251
maven.jdiff.old.tag = CODEC_1_2
53-
#maven.jdiff.new.tag = HEAD
52+
#maven.jdiff.new.tag = CURRENT
5453
#maven.jdiff.new.tag = CODEC_1_3_RC1
5554
maven.jdiff.new.tag = CODEC_1_3
5655

‎project.xml‎

Lines changed: 40 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ limitations under the License.
2929
collection of phonetic encoding utilities.
3030
</description>
3131
<logo>/images/logo.png</logo>
32-
<url>http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url>
33-
<package>org.apache.commons.${pom.artifactId.substring(8)}</package>
32+
<url>http://jakarta.apache.org/commons/codec/</url>
33+
<package>org.apache.commons.codec</package>
3434
<organization>
3535
<name>The Apache Software Foundation</name>
3636
<url>http://jakarta.apache.org</url>
@@ -45,12 +45,12 @@ limitations under the License.
4545
</licenses>
4646
<gumpRepositoryId>jakarta</gumpRepositoryId>
4747
<issueTrackingUrl>http://issues.apache.org/bugzilla/</issueTrackingUrl>
48-
<siteAddress>jakarta.apache.org</siteAddress>
49-
<siteDirectory>/www/jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</siteDirectory>
50-
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons/${pom.artifactId.substring(8)}/</distributionDirectory>
48+
<siteAddress>people.apache.org</siteAddress>
49+
<siteDirectory>/www/jakarta.apache.org/commons/codec/</siteDirectory>
50+
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons/codec/</distributionDirectory>
5151
<repository>
52-
<connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk</connection>
53-
<url>http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk</url>
52+
<connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/codec/trunk</connection>
53+
<url>http://svn.apache.org/repos/asf/jakarta/commons/proper/codec/trunk</url>
5454
</repository>
5555
<mailingLists>
5656
<mailingList>
@@ -184,25 +184,30 @@ limitations under the License.
184184
</contributor>
185185
</contributors>
186186
<dependencies>
187-
<dependency>
188-
<groupId>junit</groupId>
189-
<artifactId>junit</artifactId>
190-
<version>3.8.1</version>
191-
<url>http://www.junit.org</url>
192-
<properties>
193-
<scope>test</scope>
194-
</properties>
195-
</dependency>
196-
<dependency>
197-
<groupId>maven-plugins</groupId>
198-
<artifactId>maven-cobertura-plugin</artifactId>
199-
<version>1.1.1</version>
200-
<url>http://maven-plugins.sourceforge.net/maven-cobertura-plugin/</url>
201-
<type>plugin</type>
202-
<properties>
203-
<comment>Site generation</comment>
204-
</properties>
205-
</dependency>
187+
<dependency>
188+
<groupId>junit</groupId>
189+
<artifactId>junit</artifactId>
190+
<version>3.8.1</version>
191+
<properties>
192+
<scope>test</scope>
193+
<comment>
194+
Required only for testing.
195+
</comment>
196+
</properties>
197+
</dependency>
198+
<dependency>
199+
<groupId>maven-plugins</groupId>
200+
<artifactId>maven-cobertura-plugin</artifactId>
201+
<version>1.1.1</version>
202+
<url>http://maven-plugins.sourceforge.net/maven-cobertura-plugin/</url>
203+
<type>plugin</type>
204+
<properties>
205+
<scope>test</scope>
206+
<comment>
207+
Required only for generating test coverage reports.
208+
</comment>
209+
</properties>
210+
</dependency>
206211
</dependencies>
207212
<issueTrackingUrl>http://issues.apache.org/bugzilla/buglist.cgi?bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;email1=&amp;emailtype1=substring&amp;emailassigned_to1=1&amp;email2=&amp;emailtype2=substring&amp;emailreporter2=1&amp;bugidtype=include&amp;bug_id=&amp;changedin=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;product=Commons&amp;component=Codec&amp;short_desc=&amp;short_desc_type=allwordssubstr&amp;long_desc=&amp;long_desc_type=allwordssubstr&amp;bug_file_loc=&amp;bug_file_loc_type=allwordssubstr&amp;keywords=&amp;keywords_type=anywords&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=&amp;cmdtype=doit&amp;newqueryname=&amp;order=Reuse+same+sort+as+last+time</issueTrackingUrl>
208213
<build>
@@ -231,23 +236,14 @@ limitations under the License.
231236
</unitTest>
232237
</build>
233238
<reports>
234-
<report>maven-changes-plugin</report>
235-
<report>maven-changelog-plugin</report>
236-
<report>maven-checkstyle-plugin</report>
237-
<!-- <report>maven-clover-plugin</report> -->
238-
<report>maven-cobertura-plugin</report>
239-
<report>maven-developer-activity-plugin</report>
240-
<report>maven-file-activity-plugin</report>
241-
<!-- <report>maven-findbugs-plugin</report> -->
242-
<report>maven-javadoc-plugin</report>
243-
<report>maven-jdepend-plugin</report>
244-
<report>maven-jdiff-plugin</report>
245-
<report>maven-junit-report-plugin</report>
246-
<report>maven-jxr-plugin</report>
247-
<report>maven-license-plugin</report>
248-
<!-- <report>maven-linkcheck-plugin</report> -->
249-
<!-- <report>maven-jellydoc-plugin</report> -->
250-
<!-- <report>maven-statcvs-plugin</report> -->
251-
<!-- <report>maven-tasklist-plugin</report> -->
239+
<report>maven-changes-plugin</report>
240+
<report>maven-checkstyle-plugin</report>
241+
<report>maven-javadoc-plugin</report>
242+
<report>maven-jdepend-plugin</report>
243+
<report>maven-junit-report-plugin</report>
244+
<report>maven-jxr-plugin</report>
245+
<report>maven-license-plugin</report>
246+
<report>maven-cobertura-plugin</report>
247+
<report>maven-jdiff-plugin</report>
252248
</reports>
253249
</project>

‎xdocs/navigation.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1414
See the License for the specific language governing permissions and
1515
limitations under the License.
1616
-->
17-
<!DOCTYPE org.apache.commons.menus SYSTEM '../../commons-build/menus/menus.dtd'>
17+
<!DOCTYPE org.apache.commons.menus SYSTEM 'http://jakarta.apache.org/commons/build/maven-build.dtd'>
1818
<project name="Codec">
1919

2020
<title>Codec</title>
@@ -33,7 +33,7 @@ limitations under the License.
3333
<item name="Release Notes" href="/changes-report.html"/>
3434
</menu>
3535

36-
&common-menus;
36+
&commons;
3737

3838
</body>
3939
</project>

‎xdocs/style/project.css‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1 @@
1-
/*
2-
* Copyright 2004-2005 The Apache Software Foundation.
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
15-
*/
16-
17-
#banner, #banner td {
18-
background: #fff;
19-
color: #000;
20-
}
21-
22-
#banner td {
23-
height: 100%;
24-
vertical-align: middle;
25-
}
26-
1+
@import url("http://jakarta.apache.org/style/jakarta-maven.css");

0 commit comments

Comments
 (0)