← Back to branch summary

~ubuntu-branches/ubuntu/saucy/commons-configuration/saucy

« back to all changes in this revision

Viewing changes to pom.xml

  • Committer: Package Import Robot
  • Author(s): Emmanuel Bourg
  • Date: 2013-07-01 16:29:44 UTC
  • mfrom: (1.1.4)
  • Revision ID: package-import@ubuntu.com-20130701162944-98waq5gogha5gpn1
Tags: 1.9-1
* New upstream release
* debian/control:
  - Updated Standards-Version to 3.9.4 (no changes)
  - Use canonical URLs for the Vcs-* fields
  - Added new build dependencies (libjavacc-maven-plugin-java, junit4)
  - Upgraded the dependency on the Servlet API (2.5 -> 3.0)
  - Removed the dependency on the Activation Framework (glassfish-activation)
  - Replaced the dependency on glassfish-mail with libgnumail-java
  - Removed the unused dependencies:
    liblog4j1.2-java-doc, libmaven-assembly-plugin-java
  - Replaced the dependency on libcommons-jexl-java by libcommons-jexl2-java
* debian/watch: Changed to point the official Apache distribution server
* Removed the obsolete file debian/ant.properties
* Installed the upstream changelog in the binary packages
* Added the report plugins to maven.ignoreRules
* Added the classpath attribute to the jar manifest

Show diffs side-by-side

added added

removed removed

Lines of Context:
pom.xml
16
16
   limitations under the License.
17
17
-->
18
18
<!-- ===================================================================== -->
19
 
<!-- $Id: pom.xml 1165087 2011-09-04 19:09:18Z oheger $ -->
 
19
<!-- $Id: pom.xml 1369344 2012-08-04 15:19:50Z oheger $ -->
20
20
<!-- ===================================================================== -->
21
21
<project
22
22
    xmlns="http://maven.apache.org/POM/4.0.0"
25
25
  <parent>
26
26
    <groupId>org.apache.commons</groupId>
27
27
    <artifactId>commons-parent</artifactId>
28
 
    <version>21</version>
 
28
    <version>25</version>
29
29
  </parent>
30
30
  <modelVersion>4.0.0</modelVersion>
31
31
  <groupId>commons-configuration</groupId>
32
32
  <artifactId>commons-configuration</artifactId>
33
 
  <version>1.7</version>
 
33
  <version>1.9</version>
34
34
  <name>Commons Configuration</name>
35
35
 
36
36
  <inceptionYear>2001</inceptionYear>
47
47
  </issueManagement>
48
48
 
49
49
  <scm>
50
 
    <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/configuration/trunk</connection>
51
 
    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/configuration/trunk</developerConnection>
52
 
    <url>http://svn.apache.org/viewvc/commons/proper/configuration/trunk</url>
 
50
    <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/configuration/tags/CONFIGURATION_1_9</connection>
 
51
    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/configuration/tags/CONFIGURATION_1_9</developerConnection>
 
52
    <url>http://svn.apache.org/viewvc/commons/proper/configuration/tags/CONFIGURATION_1_9</url>
53
53
  </scm>
54
54
 
 
55
  <distributionManagement>
 
56
    <site>
 
57
      <id>apache.website</id>
 
58
      <url>${commons.deployment.protocol}://people.apache.org/www/commons.apache.org/${commons.componentid}</url>
 
59
    </site>
 
60
  </distributionManagement>
 
61
 
55
62
    <developers>
56
63
        <developer>
57
64
          <name>Daniel Rall</name>
205
212
      <groupId>commons-collections</groupId>
206
213
      <artifactId>commons-collections</artifactId>
207
214
      <version>3.2.1</version>
 
215
      <optional>true</optional>
208
216
    </dependency>
209
217
 
210
218
    <dependency>
233
241
     <groupId>commons-digester</groupId>
234
242
      <artifactId>commons-digester</artifactId>
235
243
      <version>1.8.1</version>
 
244
      <optional>true</optional>
236
245
    </dependency>
237
246
 
238
247
    <dependency>
239
248
      <groupId>commons-beanutils</groupId>
240
249
      <artifactId>commons-beanutils</artifactId>
241
250
      <version>1.8.3</version>
 
251
      <optional>true</optional>
242
252
    </dependency>
243
253
 
244
254
    <dependency>
245
255
      <groupId>commons-codec</groupId>
246
256
      <artifactId>commons-codec</artifactId>
247
 
      <version>1.5</version>
 
257
      <version>1.6</version>
248
258
      <optional>true</optional>
249
259
    </dependency>
250
260
 
251
261
    <dependency>
252
 
      <groupId>commons-jexl</groupId>
 
262
      <groupId>org.apache.commons</groupId>
253
263
      <artifactId>commons-jexl</artifactId>
254
 
      <version>1.1</version>
 
264
      <version>2.1.1</version>
255
265
      <optional>true</optional>
256
266
    </dependency>
257
267
 
293
303
      <scope>provided</scope>
294
304
    </dependency>
295
305
 
296
 
    <dependency>
297
 
      <groupId>org.apache.ant</groupId>
298
 
      <artifactId>ant</artifactId>
299
 
      <version>1.8.2</version>
300
 
      <optional>true</optional>
301
 
    </dependency>
302
 
 
303
306
     <dependency>
304
307
       <groupId>xerces</groupId>
305
308
       <artifactId>xercesImpl</artifactId>
347
350
    <dependency>
348
351
      <groupId>junit</groupId>
349
352
      <artifactId>junit</artifactId>
350
 
      <version>3.8.1</version>
 
353
      <version>4.10</version>
351
354
      <scope>test</scope>
352
355
    </dependency>
353
356
 
383
386
    </dependency>
384
387
 
385
388
    <dependency>
 
389
      <groupId>org.easymock</groupId>
 
390
      <artifactId>easymock</artifactId>
 
391
      <version>3.1</version>
 
392
      <scope>test</scope>
 
393
    </dependency>
 
394
 
 
395
    <dependency>
386
396
      <groupId>javax.mail</groupId>
387
397
      <artifactId>mail</artifactId>
388
398
      <version>1.4</version>
420
430
 
421
431
  <properties>
422
432
    <commons.componentid>configuration</commons.componentid>
423
 
    <commons.release.version>1.7</commons.release.version>
424
 
    <commons.binary.suffix></commons.binary.suffix>
 
433
    <commons.release.version>1.9</commons.release.version>
 
434
    <commons.rc.version>RC1</commons.rc.version>
425
435
    <commons.jira.id>CONFIGURATION</commons.jira.id>
426
436
    <commons.jira.pid>12310467</commons.jira.pid>
427
 
    <maven.compile.source>1.4</maven.compile.source>
428
 
    <maven.compile.target>1.4</maven.compile.target>
 
437
    <maven.compile.source>1.5</maven.compile.source>
 
438
    <maven.compile.target>1.5</maven.compile.target>
 
439
 
 
440
    <!-- Explicitly declare optional dependencies for the OSGi manifest. -->
 
441
    <commons.osgi.import>
 
442
      org.apache.commons.beanutils.*;resolution:=optional,
 
443
      org.apache.commons.digester.*;resolution:=optional,
 
444
      org.apache.commons.collections.*;resolution:=optional,
 
445
      org.apache.commons.codec.*;resolution:=optional,
 
446
      org.apache.commons.jxpath.*;resolution:=optional,
 
447
      org.apache.xml.resolver.*;resolution:=optional,
 
448
      javax.servlet.*;resolution:=optional,
 
449
      org.apache.commons.jexl2.*;resolution:=optional,
 
450
      org.apache.commons.vfs2.*;resolution:=optional,
 
451
      *
 
452
    </commons.osgi.import>
429
453
  </properties>
430
454
 
431
455
  <build>
432
 
    <sourceDirectory>src/java</sourceDirectory>
433
 
    <testSourceDirectory>src/test</testSourceDirectory>
434
 
    <resources>
435
 
      <resource>
436
 
        <directory>.</directory>
437
 
        <targetPath>META-INF</targetPath>
 
456
      <testResources>
 
457
        <testResource>
 
458
          <directory>src/test/resources</directory>
 
459
        </testResource>
 
460
        <testResource>
 
461
          <directory>src/main/resources</directory>
 
462
          <includes>
 
463
            <include>*.dtd</include>
 
464
          </includes>
 
465
        </testResource>
 
466
        <!-- hack to ensure the N&L appear in jars -->
 
467
        <testResource>
 
468
          <directory>${basedir}</directory>
 
469
          <targetPath>META-INF</targetPath>
438
470
          <includes>
439
471
            <include>NOTICE.txt</include>
440
472
            <include>LICENSE.txt</include>
441
473
          </includes>
442
 
        </resource>
443
 
        <resource>
444
 
          <directory>conf</directory>
445
 
          <includes>
446
 
            <include>digesterRules.xml</include>
447
 
            <include>properties.dtd</include>
448
 
            <include>PropertyList-1.0.dtd</include>
449
 
          </includes>
450
 
        </resource>
451
 
      </resources>
452
 
      <testResources>
453
 
        <testResource>
454
 
          <directory>conf</directory>
455
 
          <includes>
456
 
            <include>*.xml</include>
457
 
            <include>testdb.script</include>
458
 
            <include>*.properties</include>
459
 
            <include>*.dtd</include>
460
 
            <include>*.xsd</include>
461
 
          </includes>
462
 
        </testResource>
463
 
        <testResource>
464
 
          <directory>conf</directory>
465
 
          <targetPath>org/apache/commons/configuration</targetPath>
466
 
          <includes>
467
 
            <include>test.properties</include>
468
 
            <include>include.properties</include>
469
 
          </includes>
470
 
        </testResource>
471
 
        <testResource>
472
 
          <directory>conf/config</directory>
473
 
          <targetPath>config</targetPath>
474
 
          <includes>
475
 
            <include>**/*.properties</include>
476
 
          </includes>
477
474
        </testResource>
478
475
      </testResources>
479
476
      <plugins>
497
494
          <artifactId>maven-assembly-plugin</artifactId>
498
495
          <configuration>
499
496
            <descriptors>
500
 
              <descriptor>src/assembly/bin.xml</descriptor>
501
 
              <descriptor>src/assembly/src.xml</descriptor>
 
497
              <descriptor>src/main/assembly/bin.xml</descriptor>
 
498
              <descriptor>src/main/assembly/src.xml</descriptor>
502
499
            </descriptors>
503
500
            <tarLongFileMode>gnu</tarLongFileMode>
504
501
          </configuration>
516
513
            </execution>
517
514
          </executions>
518
515
        </plugin>
 
516
        <plugin>
 
517
          <groupId>org.codehaus.mojo</groupId>
 
518
          <artifactId>javacc-maven-plugin</artifactId>
 
519
          <version>2.6</version>
 
520
          <executions>
 
521
            <execution>
 
522
              <id>javacc</id>
 
523
              <goals>
 
524
                <goal>javacc</goal>
 
525
              </goals>
 
526
            </execution>
 
527
          </executions>
 
528
        </plugin>
519
529
        <!-- Uncomment to instrument with Clover
520
530
        <plugin>
521
531
          <groupId>com.atlassian.maven.plugins</groupId>
538
548
    </build>
539
549
  <profiles>
540
550
    <profile>
541
 
      <!-- A profile for building with JDK 1.4. This profile excludes some
542
 
           classes with dependencies to libraries requiring Java 1.5+.
543
 
      -->
544
 
      <id>java-1.4</id>
545
 
      <activation>
546
 
        <activeByDefault>false</activeByDefault>
547
 
      </activation>
548
 
      <build>
549
 
        <plugins>
550
 
          <plugin>
551
 
            <groupId>org.apache.maven.plugins</groupId>
552
 
            <artifactId>maven-compiler-plugin</artifactId>
553
 
            <configuration>
554
 
              <excludes>
555
 
                <exclude>**/VFSFileSystem.java</exclude>
556
 
                <exclude>**/VFSFileChangedReloadingStrategy.java</exclude>
557
 
              </excludes>
558
 
              <testExcludes>
559
 
                <exclude>**/TestVFSFileChangedReloadingStrategy.java</exclude>
560
 
                <exclude>**/TestVFSConfigurationBuilder.java</exclude>
561
 
                <exclude>**/TestWebdavConfigurationBuilder.java</exclude>
562
 
              </testExcludes>
563
 
            </configuration>
564
 
          </plugin>
565
 
          <plugin>
566
 
            <groupId>org.apache.maven.plugins</groupId>
567
 
            <artifactId>maven-surefire-plugin</artifactId>
568
 
            <configuration>
569
 
              <excludes>
570
 
                <exclude>**/TestVFSFileChangedReloadingStrategy*.*</exclude>
571
 
                <exclude>**/TestVFSConfigurationBuilder*.*</exclude>
572
 
                <exclude>**/TestWebdavConfigurationBuilder*.*</exclude>
573
 
              </excludes>
574
 
            </configuration>
575
 
          </plugin>
576
 
        </plugins>
577
 
      </build>
578
 
    </profile>
579
 
 
580
 
    <profile>
581
551
      <id>webdav</id>
582
552
      <activation>
583
553
        <activeByDefault>false</activeByDefault>
648
618
        </configuration>
649
619
      </plugin>
650
620
      <plugin>
651
 
        <groupId>org.codehaus.mojo</groupId>
652
 
        <artifactId>clirr-maven-plugin</artifactId>
653
 
        <version>2.3</version>
654
 
        <configuration>
655
 
          <comparisonVersion>1.6</comparisonVersion>
656
 
          <minSeverity>info</minSeverity>
657
 
        </configuration>
658
 
      </plugin>
659
 
      <plugin>
660
 
        <groupId>org.codehaus.mojo</groupId>
661
 
        <artifactId>rat-maven-plugin</artifactId>
 
621
        <groupId>org.apache.rat</groupId>
 
622
        <artifactId>apache-rat-plugin</artifactId>
662
623
        <configuration>
663
624
          <excludes>
664
 
            <exclude>conf/**/*</exclude>
665
625
            <exclude>src/java/org/apache/commons/configuration/plist/*.java</exclude>
666
626
            <exclude>velocity.log</exclude>
667
627
          </excludes>