Skip to content

Commit

Permalink
update to forge-parent 21
Browse files Browse the repository at this point in the history
deployment will be handled by nexus-staging-maven-plugin from now on
  • Loading branch information
peterlynch committed Nov 26, 2012
1 parent d53aed9 commit 79cbb2f
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 39 deletions.
2 changes: 1 addition & 1 deletion header.txt
@@ -1,4 +1,4 @@
Copyright (c) 2009-2011 Sonatype, Inc.
Copyright (c) 2009-2012 Sonatype, Inc.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
and Apache License v2.0 which accompanies this distribution.
Expand Down
55 changes: 17 additions & 38 deletions pom.xml
Expand Up @@ -19,22 +19,31 @@
<parent>
<groupId>org.sonatype.forge</groupId>
<artifactId>forge-parent</artifactId>
<version>12</version>
<version>21</version>
</parent>

<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-maven-bridge-parent</artifactId>
<version>3.0-SNAPSHOT</version>

<packaging>pom</packaging>
<version>3.0-SNAPSHOT</version>
<name>Sonatype Forge Parent Pom</name>

<inceptionYear>2011</inceptionYear>
<url>https://github.com/sonatype/sisu-maven-bridge</url>

<organization>
<name>Sonatype</name>
<url>http://sonatype.org</url>
</organization>

<licenses>
<license>
<name>ASLv2</name>
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
<distribution>repo</distribution>
</license>
<license>
<name>EPLv1</name>
<url>http://www.eclipse.org/legal/epl-v10.html</url>
<distribution>repo</distribution>
</license>
</licenses>

<scm>
<connection>scm:git:git@github.com/sonatype/sisu-maven-bridge.git</connection>
<developerConnection>scm:git:ssh://git@github.com/sonatype/sisu-maven-bridge.git</developerConnection>
Expand All @@ -50,7 +59,6 @@
<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
<build.timestamp>${maven.build.timestamp}</build.timestamp>
<build.number/>

<maven.version>3.0.4</maven.version>
</properties>

Expand Down Expand Up @@ -245,34 +253,6 @@

<pluginManagement>
<plugins>
<!--
mvn license:format -N
If its a new year, update the year range in the header.txt file
-->
<plugin>
<groupId>com.mycila.maven-license-plugin</groupId>
<artifactId>maven-license-plugin</artifactId>
<configuration>
<aggregate>true</aggregate>
<strictCheck>true</strictCheck>
<header>${project.basedir}/header.txt</header>
<useDefaultExcludes>false</useDefaultExcludes>
<includes>
<include>**/pom.xml</include>
<include>**/*.xml</include>
<include>**/*.properties</include>
<include>**/*.java</include>
</includes>
<excludes>
<exclude>**/target/**</exclude>
<exclude>**/.*/**</exclude>
<exclude>atlassian-ide-plugin.xml</exclude>
</excludes>
<mapping>
<java>SLASHSTAR_STYLE</java>
</mapping>
</configuration>
</plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
Expand Down Expand Up @@ -321,7 +301,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.0.1</version>
<executions>
<execution>
<id>checks</id>
Expand Down

0 comments on commit 79cbb2f

Please sign in to comment.