diff options
| author | Robert Gemmell <robbie@apache.org> | 2013-09-30 22:10:04 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2013-09-30 22:10:04 +0000 |
| commit | 499269cd18d32d685b9ec5c9acacbbcf1b47d4f6 (patch) | |
| tree | 57860c4b15838f8391d59dc061048107371f13a4 /qpid/java/management | |
| parent | 1a231b61a54be40f49a3ab91d1bbfdff7b427090 (diff) | |
| download | qpid-python-499269cd18d32d685b9ec5c9acacbbcf1b47d4f6.tar.gz | |
QPID-5048: add pluginManagement section to the qpid parent, to override apache parent versions as desired and set any additional config.
Sets the compiler source+target values in parent and removes unecessary duplicate compiler plugin config from child modules.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1527797 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/management')
| -rw-r--r-- | qpid/java/management/common/pom.xml | 28 | ||||
| -rw-r--r-- | qpid/java/management/example/pom.xml | 15 |
2 files changed, 1 insertions, 42 deletions
diff --git a/qpid/java/management/common/pom.xml b/qpid/java/management/common/pom.xml index ee8fcabb83..2489dd0680 100644 --- a/qpid/java/management/common/pom.xml +++ b/qpid/java/management/common/pom.xml @@ -28,37 +28,9 @@ <artifactId>qpid-management-common</artifactId> <dependencies> -<!-- - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.6.4</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.16</version> - <scope>test</scope> - </dependency> --> </dependencies> <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <!--version specified via parent poms --> - <configuration> - <source>${java.source}</source> - <target>${java.target}</target> - <optimize>true</optimize> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> - </plugin> - </plugins> </build> </project> diff --git a/qpid/java/management/example/pom.xml b/qpid/java/management/example/pom.xml index 351d19aef5..c5fd6566d8 100644 --- a/qpid/java/management/example/pom.xml +++ b/qpid/java/management/example/pom.xml @@ -40,21 +40,8 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <!--version specified via parent poms --> - <configuration> - <source>${java.source}</source> - <target>${java.target}</target> - <optimize>true</optimize> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> - <!--version specified via parent poms --> + <!--version specified in parent pluginManagement --> <configuration> <skip>true</skip> </configuration> |