You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2012/10/15 21:15:41 UTC
svn commit: r1398464 - in /maven/shared/trunk/maven-shared-utils: ./
src/main/java/org/apache/maven/shared/utils/
src/test/java/org/apache/maven/shared/utils/
Author: krosenvold
Date: Mon Oct 15 19:15:40 2012
New Revision: 1398464
URL: http://svn.apache.org/viewvc?rev=1398464&view=rev
Log:
o Added commons-lang as test-scoped dependency, removed ExceptionUtils
Added:
maven/shared/trunk/maven-shared-utils/dependency-reduced-pom.xml
- copied, changed from r1398456, maven/shared/trunk/maven-shared-utils/pom.xml
Removed:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/ExceptionUtils.java
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/ExceptionUtilsTest.java
Modified:
maven/shared/trunk/maven-shared-utils/pom.xml
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Os.java
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/ExpandTest.java
Copied: maven/shared/trunk/maven-shared-utils/dependency-reduced-pom.xml (from r1398456, maven/shared/trunk/maven-shared-utils/pom.xml)
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/dependency-reduced-pom.xml?p2=maven/shared/trunk/maven-shared-utils/dependency-reduced-pom.xml&p1=maven/shared/trunk/maven-shared-utils/pom.xml&r1=1398456&r2=1398464&rev=1398464&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/pom.xml (original)
+++ maven/shared/trunk/maven-shared-utils/dependency-reduced-pom.xml Mon Oct 15 19:15:40 2012
@@ -1,108 +1,87 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!--
- 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.
--->
-<project xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd' xmlns='http://maven.apache.org/POM/4.0.0'>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-shared-components</artifactId>
- <version>18</version>
- <relativePath>../maven-shared-components/pom.xml</relativePath>
- </parent>
-
- <artifactId>maven-shared-utils</artifactId>
- <version>0.1-SNAPSHOT</version>
-
- <properties>
- <mavenVersion>2.1.0</mavenVersion>
- </properties>
-
- <name>Maven Shared Utils</name>
- <description>Shared utils without any further dependencies</description>
-
- <prerequisites>
- <maven>${mavenVersion}</maven>
- </prerequisites>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils</url>
- </scm>
- <issueManagement>
- <system>jira</system>
- <url>http://jira.codehaus.org/browse/MSHARED</url>
- </issueManagement>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.9</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.2</version> <!-- attention: this is the last version supporting java-1.5!-->
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- <version>2.0.1</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>1.7.1</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <createDependencyReducedPom>true</createDependencyReducedPom>
- <minimizeJar>true</minimizeJar>
- <artifactSet>
- <includes>
- <include>commons-io:commons-io</include>
- </includes>
- </artifactSet>
- <relocations>
- <relocation>
- <pattern>org.apache.commons.io</pattern>
- <shadedPattern>org.apache.maven.internal.commons.io</shadedPattern>
- </relocation>
- </relocations>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
-
- </build>
-
-</project>
+<?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">
+ <parent>
+ <artifactId>maven-shared-components</artifactId>
+ <groupId>org.apache.maven.shared</groupId>
+ <version>18</version>
+ <relativePath>../maven-shared-components/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>maven-shared-utils</artifactId>
+ <name>Maven Shared Utils</name>
+ <version>0.1-SNAPSHOT</version>
+ <description>Shared utils without any further dependencies</description>
+ <prerequisites>
+ <maven>${mavenVersion}</maven>
+ </prerequisites>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://jira.codehaus.org/browse/MSHARED</url>
+ </issueManagement>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils</url>
+ </scm>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.7.1</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <createDependencyReducedPom>true</createDependencyReducedPom>
+ <minimizeJar>true</minimizeJar>
+ <artifactSet>
+ <includes>
+ <include>commons-io:commons-io</include>
+ </includes>
+ </artifactSet>
+ <relocations>
+ <relocation>
+ <pattern>org.apache.commons.io</pattern>
+ <shadedPattern>org.apache.maven.internal.commons.io</shadedPattern>
+ </relocation>
+ </relocations>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.9</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>hamcrest-core</artifactId>
+ <groupId>org.hamcrest</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <version>2.0.1</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <properties>
+ <mavenVersion>2.1.0</mavenVersion>
+ </properties>
+</project>
+
Modified: maven/shared/trunk/maven-shared-utils/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/pom.xml?rev=1398464&r1=1398463&r2=1398464&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/pom.xml (original)
+++ maven/shared/trunk/maven-shared-utils/pom.xml Mon Oct 15 19:15:40 2012
@@ -64,7 +64,13 @@
<version>2.2</version> <!-- attention: this is the last version supporting java-1.5!-->
<optional>true</optional>
</dependency>
- <dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.1</version> <!-- attention: this is the last version supporting java-1.5!-->
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>2.0.1</version>
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Os.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Os.java?rev=1398464&r1=1398463&r2=1398464&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Os.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Os.java Mon Oct 15 19:15:40 2012
@@ -221,7 +221,6 @@ public class Os
* that set in setFamily.
*
* @return true if the os matches.
- * @throws Exception if there is an error.
* @see Os#setFamily(String)
*/
boolean eval()
@@ -415,7 +414,7 @@ public class Os
/**
* Test if the given family String represents a valid Family
*
- * @param family
+ * @param family the os family
* @return <code>true</code> if 'family' represents a valid OS-Family, <code>false</code> otherwise.
*/
public static boolean isValidFamily( String family )
Modified: maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/ExpandTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/ExpandTest.java?rev=1398464&r1=1398463&r2=1398464&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/ExpandTest.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/ExpandTest.java Mon Oct 15 19:15:40 2012
@@ -19,6 +19,7 @@ package org.apache.maven.shared.utils;
* under the License.
*/
+import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.maven.shared.utils.io.FileUtils;
import org.junit.Rule;
import org.junit.Test;
@@ -27,7 +28,6 @@ import org.junit.rules.TemporaryFolder;
import java.io.File;
import java.io.FileNotFoundException;
-import java.io.IOException;
import java.net.URL;
import static org.hamcrest.CoreMatchers.*;