Skip to content

Commit 59494b7

Browse files
slandelleslandelle
slandelle
authored and
slandelle
committed
Clean up pom
1 parent 68ef9de commit 59494b7

File tree

1 file changed

+50
-93
lines changed

1 file changed

+50
-93
lines changed

‎pom.xml

Lines changed: 50 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
54
<parent>
65
<groupId>org.sonatype.oss</groupId>
76
<artifactId>oss-parent</artifactId>
@@ -281,75 +280,28 @@
281280
</execution>
282281
</executions>
283282
</plugin>
284-
<!--
285-
<plugin>
286-
<groupId>org.apache.maven.plugins</groupId>
287-
<artifactId>maven-shade-plugin</artifactId>
288-
<version>1.2.1</version>
289-
<executions>
290-
<execution>
291-
<phase>package</phase>
292-
<goals>
293-
<goal>shade</goal>
294-
</goals>
295-
<configuration>
296-
<shadedArtifactAttached>true</shadedArtifactAttached>
297-
<shadedClassifierName>shaded</shadedClassifierName>
298-
<artifactSet>
299-
<excludes>
300-
<exclude>commons-codec:commons-codec</exclude>
301-
<exclude>commons-lang:commons-lang</exclude>
302-
<exclude>commons-logging:commons-logging</exclude>
303-
<exclude>junit:junit</exclude>
304-
<exclude>log4j:log4j</exclude>
305-
</excludes>
306-
</artifactSet>
307-
<transformers>
308-
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
309-
<transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" />
310-
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer" />
311-
</transformers>
312-
</configuration>
313-
</execution>
314-
</executions>
315-
</plugin>
316-
-->
317-
<!--
318-
<plugin>
319-
<groupId>org.codehaus.mojo</groupId>
320-
<artifactId>clirr-maven-plugin</artifactId>
321-
<version>2.3</version>
322-
<configuration>
323-
<excludes>
324-
<exclude>**/NettyAsyncHttpProvider$*</exclude>
325-
<exclude>**/AsyncHandler$STATE</exclude>
326-
<exclude>**/ProxyServer$Protocol</exclude>
327-
<exclude>**/Realm$AuthScheme</exclude>
328-
<exclude>**/SimpleAsyncHttpClient$ErrorDocumentBehaviour</exclude>
329-
<exclude>**/SpnegoEngine</exclude>
330-
<exclude>**/Request</exclude>
331-
<exclude>**/Request$EntityWriter</exclude>
332-
<exclude>**/RequestBuilderBase</exclude>
333-
<exclude>**/Response</exclude>
334-
<exclude>**/Response$*</exclude>
335-
<exclude>**/FilterContext</exclude>
336-
<exclude>**/FilterContext$*</exclude>
337-
<exclude>**/NettyResponseFuture</exclude>
338-
<exclude>**/**ResponseBodyPart</exclude>
339-
<exclude>**/**WebSocket</exclude>
340-
</excludes>
341-
</configuration>
342-
<executions>
343-
<execution>
344-
<id>check-api-compat</id>
345-
<phase>verify</phase>
346-
<goals>
347-
<goal>check-no-fork</goal>
348-
</goals>
349-
</execution>
350-
</executions>
351-
</plugin>
352-
-->
283+
<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId>
284+
<version>1.2.1</version> <executions> <execution> <phase>package</phase>
285+
<goals> <goal>shade</goal> </goals> <configuration> <shadedArtifactAttached>true</shadedArtifactAttached>
286+
<shadedClassifierName>shaded</shadedClassifierName> <artifactSet> <excludes>
287+
<exclude>commons-codec:commons-codec</exclude> <exclude>commons-lang:commons-lang</exclude>
288+
<exclude>commons-logging:commons-logging</exclude> <exclude>junit:junit</exclude>
289+
<exclude>log4j:log4j</exclude> </excludes> </artifactSet> <transformers>
290+
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"
291+
/> <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer"
292+
/> <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"
293+
/> </transformers> </configuration> </execution> </executions> </plugin> -->
294+
<!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>clirr-maven-plugin</artifactId>
295+
<version>2.3</version> <configuration> <excludes> <exclude>**/NettyAsyncHttpProvider$*</exclude>
296+
<exclude>**/AsyncHandler$STATE</exclude> <exclude>**/ProxyServer$Protocol</exclude>
297+
<exclude>**/Realm$AuthScheme</exclude> <exclude>**/SimpleAsyncHttpClient$ErrorDocumentBehaviour</exclude>
298+
<exclude>**/SpnegoEngine</exclude> <exclude>**/Request</exclude> <exclude>**/Request$EntityWriter</exclude>
299+
<exclude>**/RequestBuilderBase</exclude> <exclude>**/Response</exclude> <exclude>**/Response$*</exclude>
300+
<exclude>**/FilterContext</exclude> <exclude>**/FilterContext$*</exclude>
301+
<exclude>**/NettyResponseFuture</exclude> <exclude>**/**ResponseBodyPart</exclude>
302+
<exclude>**/**WebSocket</exclude> </excludes> </configuration> <executions>
303+
<execution> <id>check-api-compat</id> <phase>verify</phase> <goals> <goal>check-no-fork</goal>
304+
</goals> </execution> </executions> </plugin> -->
353305
</plugins>
354306
</build>
355307
<reporting>
@@ -376,8 +328,10 @@
376328
<version>1.0.3</version>
377329
</docletArtifact>
378330
<additionalparam>
379-
-hdf project.name "${project.name} ${project.version}"
380-
-d ${project.reporting.outputDirectory}/apidocs
331+
-hdf project.name "${project.name}
332+
${project.version}"
333+
-d
334+
${project.reporting.outputDirectory}/apidocs
381335
</additionalparam>
382336
</configuration>
383337
<reportSets>
@@ -460,8 +414,7 @@
460414
<profile>
461415
<id>test-output</id>
462416
<properties>
463-
<surefire.redirectTestOutputToFile>false
464-
</surefire.redirectTestOutputToFile>
417+
<surefire.redirectTestOutputToFile>false</surefire.redirectTestOutputToFile>
465418
</properties>
466419
</profile>
467420
</profiles>
@@ -499,92 +452,96 @@
499452
<dependency>
500453
<groupId>ch.qos.logback</groupId>
501454
<artifactId>logback-classic</artifactId>
502-
<version>1.0.13</version>
455+
<version>${logback.version}</version>
503456
<scope>test</scope>
504457
</dependency>
505458
<dependency>
506459
<groupId>log4j</groupId>
507460
<artifactId>log4j</artifactId>
508-
<version>1.2.13</version>
461+
<version>${log4j.version}</version>
509462
<scope>test</scope>
510463
</dependency>
511464
<dependency>
512465
<groupId>org.testng</groupId>
513466
<artifactId>testng</artifactId>
514-
<version>5.8</version>
467+
<version>${testng.version}</version>
515468
<scope>test</scope>
516-
<classifier>jdk15</classifier>
517469
</dependency>
518470
<dependency>
519471
<groupId>org.eclipse.jetty</groupId>
520472
<artifactId>jetty-server</artifactId>
521-
<version>8.1.1.v20120215</version>
473+
<version>${jetty.version}</version>
522474
<scope>test</scope>
523475
</dependency>
524476
<dependency>
525477
<groupId>org.eclipse.jetty</groupId>
526478
<artifactId>jetty-servlet</artifactId>
527-
<version>8.1.1.v20120215</version>
479+
<version>${jetty.version}</version>
528480
<scope>test</scope>
529481
</dependency>
530482
<dependency>
531483
<groupId>org.eclipse.jetty</groupId>
532484
<artifactId>jetty-websocket</artifactId>
533-
<version>8.1.1.v20120215</version>
485+
<version>${jetty.version}</version>
534486
<scope>test</scope>
535487
</dependency>
536488
<dependency>
537489
<groupId>org.eclipse.jetty</groupId>
538490
<artifactId>jetty-servlets</artifactId>
539-
<version>8.1.1.v20120215</version>
491+
<version>${jetty.version}</version>
540492
<scope>test</scope>
541493
</dependency>
542494
<dependency>
543495
<groupId>org.eclipse.jetty</groupId>
544496
<artifactId>jetty-security</artifactId>
545-
<version>8.1.1.v20120215</version>
497+
<version>${jetty.version}</version>
546498
<scope>test</scope>
547499
</dependency>
548500
<dependency>
549501
<groupId>org.apache.tomcat</groupId>
550502
<artifactId>coyote</artifactId>
551-
<version>6.0.29</version>
503+
<version>${tomcat.version}</version>
552504
<scope>test</scope>
553505
</dependency>
554506
<dependency>
555507
<groupId>org.apache.tomcat</groupId>
556508
<artifactId>catalina</artifactId>
557-
<version>6.0.29</version>
509+
<version>${tomcat.version}</version>
558510
<scope>test</scope>
559511
<exclusions>
560512
<exclusion>
561-
<artifactId>servlet-api</artifactId>
562513
<groupId>org.apache.tomcat</groupId>
514+
<artifactId>servlet-api</artifactId>
563515
</exclusion>
564516
</exclusions>
565517
</dependency>
566518
<dependency>
567519
<groupId>commons-io</groupId>
568520
<artifactId>commons-io</artifactId>
569-
<version>2.0.1</version>
521+
<version>${commons-io.version}</version>
570522
<scope>test</scope>
571523
</dependency>
572524
<dependency>
573525
<groupId>commons-fileupload</groupId>
574526
<artifactId>commons-fileupload</artifactId>
575-
<version>1.2.2</version>
527+
<version>${commons-fileupload.version}</version>
576528
<scope>test</scope>
577529
</dependency>
578530
</dependencies>
579531
<properties>
580-
<distMgmtSnapshotsUrl>
581-
http://oss.sonatype.org/content/repositories/snapshots
582-
</distMgmtSnapshotsUrl>
532+
<distMgmtSnapshotsUrl>http://oss.sonatype.org/content/repositories/snapshots</distMgmtSnapshotsUrl>
583533
<surefire.redirectTestOutputToFile>true
584534
</surefire.redirectTestOutputToFile>
585535
<source.property>1.6</source.property>
586536
<target.property>1.6</target.property>
587537
<surefire.version>2.16</surefire.version>
538+
<logback.version>1.0.13</logback.version>
539+
<log4j.version>1.2.17</log4j.version>
540+
<testng.version>6.8.5</testng.version>
541+
<jetty.version>8.1.1.v20120215</jetty.version>
542+
<tomcat.version>6.0.29</tomcat.version>
543+
<commons-io.version>2.4</commons-io.version>
544+
<commons-fileupload.version>1.3</commons-fileupload.version>
588545
</properties>
589546
</project>
590547

0 commit comments

Comments
 (0)