Skip to content

Commit

Permalink
removed Maven3 build dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
kohsuke committed Apr 20, 2011
1 parent b531378 commit 3384732
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
5 changes: 3 additions & 2 deletions licenseCompleter.groovy
Expand Up @@ -16,8 +16,9 @@ complete {

// Apache components
// logkit is a part of Avalon
match(["org.apache.ant:*","commons-jelly:*","log4j:*","avalon-framework:*","logkit:logkit","oro:oro","*:commons-jelly","org.jvnet.hudson:commons-jelly-tags-define","slide:slide-webdavlib"]) {
rewriteLicense([], apacheLicense)
match(["org.apache.ant:*","commons-jelly:*","log4j:*","avalon-framework:*","logkit:logkit","oro:oro","commons-codec:*","*:commons-jelly","org.jvnet.hudson:commons-jelly-tags-define","slide:slide-webdavlib"]) {
if (dependency.licenses.isEmpty())
rewriteLicense([], apacheLicense)
}

// GlassFish components are dual-licensed between CDDL and GPL+Classpath Exception
Expand Down
6 changes: 1 addition & 5 deletions pom.xml
Expand Up @@ -38,10 +38,6 @@ THE SOFTWARE.
<name>Jenkins main module</name>
<description>The module that constitutes the main jenkins.war</description>

<prerequisites>
<maven>3.0</maven>
</prerequisites>

<modules>
<module>remoting</module>
<module>core</module>
Expand Down Expand Up @@ -169,7 +165,7 @@ THE SOFTWARE.
<plugin>
<groupId>com.cloudbees</groupId>
<artifactId>maven-license-plugin</artifactId>
<version>1.1</version>
<version>1.2</version>
<executions>
<execution>
<goals>
Expand Down

0 comments on commit 3384732

Please sign in to comment.