← Back to branch summary

~ubuntu-branches/debian/sid/wagon2/sid

« back to all changes in this revision

Viewing changes to wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/ConfigurationUtils.java

  • Committer: Package Import Robot
  • Author(s): Emmanuel Bourg
  • Date: 2015-09-02 23:46:43 UTC
  • mfrom: (1.1.5)
  • Revision ID: package-import@ubuntu.com-20150902234643-byu832r11djlzjbs
Tags: 2.9-1
* Team upload.
* New upstream release
  - Refreshed the patches
* Removed the build dependency on libmaven-enforcer-plugin-java
* No longer build and install the unused wagon-scm and wagon-ssh modules
  to reduce the dependencies of libwagon2-java.

Show diffs side-by-side

added added

removed removed

Lines of Context:
wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/ConfigurationUtils.java
73
73
            {
74
74
                String key = (String) entry.getKey();
75
75
                String value = (String) entry.getValue();
76
 
                Matcher matcher = coercePattern.matcher(value);
 
76
                Matcher matcher = coercePattern.matcher( value );
77
77
                if ( matcher.matches() )
78
78
                {
79
79
                    value = matcher.group( 2 );
97
97
                }
98
98
                else if ( key.equals( DEFAULT_PROXY ) )
99
99
                {
100
 
                    builder.setProxy( new HttpHost( value ));
 
100
                    builder.setProxy( new HttpHost( value ) );
101
101
                }
102
102
                else if ( key.equals( LOCAL_ADDRESS ) )
103
103
                {
104
 
                    try {
 
104
                    try
 
105
                    {
105
106
                        builder.setLocalAddress( InetAddress.getByName( value ) );
106
107
                    }
107
 
                    catch (UnknownHostException ignore) {
 
108
                    catch ( UnknownHostException ignore )
 
109
                    {
 
110
                        // ignore
108
111
                    }
109
112
                }
110
113
                else if ( key.equals( PROXY_AUTH_PREF ) )