You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ks...@apache.org on 2017/02/21 21:36:59 UTC
[1/2] servicemix-maven-plugins git commit: Formatting in pom files
corrected
Repository: servicemix-maven-plugins
Updated Branches:
refs/heads/master 8978f142a -> ed7f6d18e
Formatting in pom files corrected
Project: http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/commit/7c62ffa3
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/tree/7c62ffa3
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/diff/7c62ffa3
Branch: refs/heads/master
Commit: 7c62ffa3f740f1d9123b36c1c5a6cf1d4da077c0
Parents: 8978f14
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Tue Feb 21 22:13:18 2017 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Tue Feb 21 22:13:18 2017 +0100
----------------------------------------------------------------------
depends-maven-plugin/pom.xml | 7 +-
maven-plugins-pom/pom.xml | 459 +++++++++++++++++++-------------------
pom.xml | 14 +-
3 files changed, 242 insertions(+), 238 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/blob/7c62ffa3/depends-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/depends-maven-plugin/pom.xml b/depends-maven-plugin/pom.xml
index 83c76fd..af40647 100644
--- a/depends-maven-plugin/pom.xml
+++ b/depends-maven-plugin/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed
with this work for additional information regarding copyright ownership. The ASF licenses this file to You under the Apache License,
@@ -29,8 +30,8 @@
<version>3.5</version>
<executions>
<execution>
- <id>default-descriptor</id>
- <phase>process-classes</phase>
+ <id>default-descriptor</id>
+ <phase>process-classes</phase>
</execution>
</executions>
</plugin>
http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/blob/7c62ffa3/maven-plugins-pom/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins-pom/pom.xml b/maven-plugins-pom/pom.xml
index afee4cb..28c3720 100644
--- a/maven-plugins-pom/pom.xml
+++ b/maven-plugins-pom/pom.xml
@@ -1,240 +1,241 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-pom</artifactId>
- <version>5</version>
- </parent>
-
- <groupId>org.apache.servicemix.tooling</groupId>
- <artifactId>maven-plugins-pom</artifactId>
- <version>6-SNAPSHOT</version>
-
- <packaging>pom</packaging>
- <name>Apache ServiceMix :: Plugins :: Plugins POM</name>
-
- <properties>
- <servicemix.legal.version>1.0</servicemix.legal.version>
- </properties>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>2.6</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
- </plugin>
- </plugins>
- </reporting>
-
- <build>
- <defaultGoal>install</defaultGoal>
-
- <pluginManagement>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>servicemix-pom</artifactId>
+ <version>5</version>
+ </parent>
+
+ <groupId>org.apache.servicemix.tooling</groupId>
+ <artifactId>maven-plugins-pom</artifactId>
+ <version>6-SNAPSHOT</version>
+
+ <packaging>pom</packaging>
+ <name>Apache ServiceMix :: Plugins :: Plugins POM</name>
+
+ <properties>
+ <servicemix.legal.version>1.0</servicemix.legal.version>
+ </properties>
+
+ <reporting>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.5.1</version>
- <configuration>
- <useReleaseProfile>false</useReleaseProfile>
- <preparationGoals>clean install</preparationGoals>
- <goals>deploy</goals>
- <arguments>-Prelease,deploy</arguments>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>2.6</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.7</version>
+ </plugin>
</plugins>
- </pluginManagement>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.0</version>
- <executions>
- <execution>
- <id>copy-legal</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
+ </reporting>
+
+ <build>
+ <defaultGoal>install</defaultGoal>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.5.1</version>
<configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.servicemix.legal</groupId>
- <artifactId>legal</artifactId>
- <version>${servicemix.legal.version}</version>
- <type>xml</type>
- <outputDirectory>target/legal/</outputDirectory>
- </artifactItem>
- </artifactItems>
- <stripVersion>true</stripVersion>
+ <useReleaseProfile>false</useReleaseProfile>
+ <preparationGoals>clean install</preparationGoals>
+ <goals>deploy</goals>
+ <arguments>-Prelease,deploy</arguments>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
<configuration>
- <resourceBundles>
- <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
- </resourceBundles>
- <supplementalModels>
- <supplementalModel>target/legal/legal.xml</supplementalModel>
- </supplementalModels>
- <properties>
- <addLicense>true</addLicense>
- <addArtifact>true</addArtifact>
- <projectName>Apache ServiceMix</projectName>
- </properties>
+ <source>1.5</source>
+ <target>1.5</target>
</configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>all</id>
- <activation>
- <!--
- <activeByDefault>true</activeByDefault>
- -->
- </activation>
- <modules>
- <module>checksum-maven-plugin</module>
- <module>depends-maven-plugin</module>
- <module>docs-maven-plugin</module>
- <module>jbi-maven-plugin</module>
- <module>res-maven-plugin</module>
- <module>xfire-maven-plugin</module>
- <module>servicemix-build</module>
- </modules>
- </profile>
-
- <profile>
- <id>release</id>
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.5.1</version>
- <configuration>
- <preparationGoals>clean,verify,install</preparationGoals>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
-
- <!-- We want a source jar -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.0.4</version>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <!-- We want the JavaDoc JAR published with the release -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
- <inherited>true</inherited>
- <configuration>
- <source>1.5</source>
- </configuration>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <!-- We want to sign the artifact, the POM, and all attached artifacts -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.0-alpha-4</version>
- <inherited>true</inherited>
- <executions>
- <execution>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <!-- We want to deploy the artifact to a staging location for perusal -->
- <plugin>
- <inherited>true</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>
- <updateReleaseInfo>true</updateReleaseInfo>
- </configuration>
- </plugin>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.0</version>
+ <executions>
+ <execution>
+ <id>copy-legal</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.servicemix.legal</groupId>
+ <artifactId>legal</artifactId>
+ <version>${servicemix.legal.version}</version>
+ <type>xml</type>
+ <outputDirectory>target/legal/</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ <stripVersion>true</stripVersion>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+ <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+ </resourceBundles>
+ <supplementalModels>
+ <supplementalModel>target/legal/legal.xml</supplementalModel>
+ </supplementalModels>
+ <properties>
+ <addLicense>true</addLicense>
+ <addArtifact>true</addArtifact>
+ <projectName>Apache ServiceMix</projectName>
+ </properties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
- </build>
- </profile>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>all</id>
+ <activation>
+ <!--
+ <activeByDefault>true</activeByDefault>
+ -->
+ </activation>
+ <modules>
+ <module>checksum-maven-plugin</module>
+ <module>depends-maven-plugin</module>
+ <module>docs-maven-plugin</module>
+ <module>jbi-maven-plugin</module>
+ <module>res-maven-plugin</module>
+ <module>xfire-maven-plugin</module>
+ <module>servicemix-build</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.5.1</version>
+ <configuration>
+ <preparationGoals>clean,verify,install</preparationGoals>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </configuration>
+ </plugin>
+
+ <!-- We want a source jar -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.0.4</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- We want the JavaDoc JAR published with the release -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.4</version>
+ <inherited>true</inherited>
+ <configuration>
+ <source>1.5</source>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- We want to sign the artifact, the POM, and all attached artifacts -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.0-alpha-4</version>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- We want to deploy the artifact to a staging location for perusal -->
+ <plugin>
+ <inherited>true</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>
+ <updateReleaseInfo>true</updateReleaseInfo>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+ </profile>
- </profiles>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/blob/7c62ffa3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 34ea9c3..610a7d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<!--
@@ -29,9 +30,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-pom</artifactId>
- <version>5</version>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>servicemix-pom</artifactId>
+ <version>5</version>
</parent>
<groupId>org.apache.servicemix.plugins</groupId>
@@ -42,14 +43,15 @@
<scm>
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-maven-bundles.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-maven-bundles.git</developerConnection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-maven-bundles.git
+ </developerConnection>
<url>https://git-wip-us.apache.org/repos/asf?p=servicemix-maven-bundles.git</url>
<tag>HEAD</tag>
</scm>
<modules>
<module>maven-plugins-pom</module>
-
+
<module>depends-maven-plugin</module>
</modules>
[2/2] servicemix-maven-plugins git commit: Maven configuration updated
Posted by ks...@apache.org.
Maven configuration updated
Project: http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/commit/ed7f6d18
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/tree/ed7f6d18
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/diff/ed7f6d18
Branch: refs/heads/master
Commit: ed7f6d18ecde7ab7366c3344879f3c4b2790219d
Parents: 7c62ffa
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Tue Feb 21 22:36:19 2017 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Tue Feb 21 22:36:19 2017 +0100
----------------------------------------------------------------------
depends-maven-plugin/pom.xml | 8 +++
maven-plugins-pom/pom.xml | 134 ++++++++++++++++++--------------------
pom.xml | 9 ---
3 files changed, 71 insertions(+), 80 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/blob/ed7f6d18/depends-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/depends-maven-plugin/pom.xml b/depends-maven-plugin/pom.xml
index af40647..be086d7 100644
--- a/depends-maven-plugin/pom.xml
+++ b/depends-maven-plugin/pom.xml
@@ -22,6 +22,14 @@
<version>1.4.0-SNAPSHOT</version>
<name>Apache ServiceMix :: Plugins :: Maven2 Depends Plugin</name>
+ <scm>
+ <connection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-maven-bundles.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-maven-bundles.git
+ </developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf?p=servicemix-maven-bundles.git</url>
+ <tag>HEAD</tag>
+ </scm>
+
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/blob/ed7f6d18/maven-plugins-pom/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins-pom/pom.xml b/maven-plugins-pom/pom.xml
index 28c3720..6283858 100644
--- a/maven-plugins-pom/pom.xml
+++ b/maven-plugins-pom/pom.xml
@@ -32,6 +32,14 @@
<packaging>pom</packaging>
<name>Apache ServiceMix :: Plugins :: Plugins POM</name>
+ <scm>
+ <connection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-maven-bundles.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-maven-bundles.git
+ </developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf?p=servicemix-maven-bundles.git</url>
+ <tag>HEAD</tag>
+ </scm>
+
<properties>
<servicemix.legal.version>1.0</servicemix.legal.version>
</properties>
@@ -41,17 +49,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>2.6</version>
+ <version>3.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.2</version>
+ <version>2.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
+ <version>2.9.1</version>
</plugin>
</plugins>
</reporting>
@@ -64,7 +72,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.5.1</version>
+ <version>2.5.3</version>
<configuration>
<useReleaseProfile>false</useReleaseProfile>
<preparationGoals>clean install</preparationGoals>
@@ -76,12 +84,50 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>3.6.1</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>3.0.1</version>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <includePom>true</includePom>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jarsigner-plugin</artifactId>
+ <version>1.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9.1</version>
+ <inherited>true</inherited>
+ <configuration>
+ <source>1.5</source>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>
@@ -89,7 +135,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.0</version>
+ <version>3.0.0</version>
<executions>
<execution>
<id>copy-legal</id>
@@ -111,10 +157,18 @@
</configuration>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.servicemix.legal</groupId>
+ <artifactId>legal</artifactId>
+ <version>${servicemix.legal.version}</version>
+ <type>xml</type>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0</version>
+ <version>1.5</version>
<executions>
<execution>
<goals>
@@ -141,76 +195,14 @@
<profiles>
<profile>
- <id>all</id>
- <activation>
- <!--
- <activeByDefault>true</activeByDefault>
- -->
- </activation>
- <modules>
- <module>checksum-maven-plugin</module>
- <module>depends-maven-plugin</module>
- <module>docs-maven-plugin</module>
- <module>jbi-maven-plugin</module>
- <module>res-maven-plugin</module>
- <module>xfire-maven-plugin</module>
- <module>servicemix-build</module>
- </modules>
- </profile>
-
- <profile>
<id>release</id>
<build>
<plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.5.1</version>
- <configuration>
- <preparationGoals>clean,verify,install</preparationGoals>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
-
- <!-- We want a source jar -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.0.4</version>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <!-- We want the JavaDoc JAR published with the release -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
- <inherited>true</inherited>
- <configuration>
- <source>1.5</source>
- </configuration>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
<!-- We want to sign the artifact, the POM, and all attached artifacts -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
- <version>1.0-alpha-4</version>
+ <version>1.6</version>
<inherited>true</inherited>
<executions>
<execution>
@@ -226,7 +218,7 @@
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.3</version>
+ <version>2.8.2</version>
<configuration>
<altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>
<updateReleaseInfo>true</updateReleaseInfo>
http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/blob/ed7f6d18/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 610a7d3..68e4d34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,17 +41,8 @@
<packaging>pom</packaging>
<name>Apache ServiceMix :: Plugins</name>
- <scm>
- <connection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-maven-bundles.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-maven-bundles.git
- </developerConnection>
- <url>https://git-wip-us.apache.org/repos/asf?p=servicemix-maven-bundles.git</url>
- <tag>HEAD</tag>
- </scm>
-
<modules>
<module>maven-plugins-pom</module>
-
<module>depends-maven-plugin</module>
</modules>