Skip to content

Commit 35cbae7

Browse files
committed
[CODEC-129] Use standard Maven directory layout.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/codec/trunk@1173287 13f79535-47bb-0310-9956-ffa450edef68
1 parent 3b33188 commit 35cbae7

218 files changed

Lines changed: 19 additions & 21 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

pom.xml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ limitations under the License.
201201
<maven.compile.source>1.5</maven.compile.source>
202202
<maven.compile.target>1.5</maven.compile.target>
203203
<commons.componentid>codec</commons.componentid>
204-
<commons.release.version>2.0</commons.release.version>
204+
<commons.release.version>1.6</commons.release.version>
205205
<!-- The RC version used in the staging repository URL. -->
206206
<commons.rc.version>RC1</commons.rc.version>
207207
<commons.jira.id>CODEC</commons.jira.id>
@@ -213,13 +213,11 @@ limitations under the License.
213213
<commons.javadoc.java.link>http://download.oracle.com/javase/1.5.0/docs/api/</commons.javadoc.java.link>
214214
</properties>
215215
<build>
216-
<sourceDirectory>src/java</sourceDirectory>
217216
<resources>
218217
<resource>
219-
<directory>src/resources</directory>
218+
<directory>src/main/resources</directory>
220219
</resource>
221220
</resources>
222-
<testSourceDirectory>src/test</testSourceDirectory>
223221
<plugins>
224222
<plugin>
225223
<groupId>org.apache.maven.plugins</groupId>
@@ -248,10 +246,10 @@ limitations under the License.
248246
<plugin>
249247
<artifactId>maven-assembly-plugin</artifactId>
250248
<configuration>
251-
<descriptors>
252-
<descriptor>src/assembly/bin.xml</descriptor>
253-
<descriptor>src/assembly/src.xml</descriptor>
254-
</descriptors>
249+
<!-- <descriptors> -->
250+
<!-- <descriptor>src/assembly/bin.xml</descriptor> -->
251+
<!-- <descriptor>src/assembly/src.xml</descriptor> -->
252+
<!-- </descriptors> -->
255253
<tarLongFileMode>gnu</tarLongFileMode>
256254
</configuration>
257255
</plugin>
@@ -262,7 +260,7 @@ limitations under the License.
262260
<plugin>
263261
<groupId>org.apache.maven.plugins</groupId>
264262
<artifactId>maven-changes-plugin</artifactId>
265-
<version>2.4</version>
263+
<version>2.6</version>
266264
<configuration>
267265
<xmlPath>${basedir}/src/changes/changes.xml</xmlPath>
268266
<issueLinkTemplate>%URL%/%ISSUE%</issueLinkTemplate>

src/java/org/apache/commons/codec/BinaryDecoder.java renamed to src/main/java/org/apache/commons/codec/BinaryDecoder.java

File renamed without changes.

src/java/org/apache/commons/codec/BinaryEncoder.java renamed to src/main/java/org/apache/commons/codec/BinaryEncoder.java

File renamed without changes.

src/java/org/apache/commons/codec/CharEncoding.java renamed to src/main/java/org/apache/commons/codec/CharEncoding.java

File renamed without changes.
File renamed without changes.

src/java/org/apache/commons/codec/DecoderException.java renamed to src/main/java/org/apache/commons/codec/DecoderException.java

File renamed without changes.
File renamed without changes.

src/java/org/apache/commons/codec/EncoderException.java renamed to src/main/java/org/apache/commons/codec/EncoderException.java

File renamed without changes.

0 commit comments

Comments
 (0)