You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2020/05/29 19:14:09 UTC
[maven-resolver-ant-tasks] branch fixed-stuff updated (e03b077 ->
e8138e1)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch fixed-stuff
in repository https://gitbox.apache.org/repos/asf/maven-resolver-ant-tasks.git.
discard e03b077 Fix build errors
add efd6026 http to central not supported anymore, switch to https In case of Java 7, explicitly set https.protocols
add 8ca6820 [MRESOLVER-102] make bui_ld Reproducible
add e184236 [MRESOLVER-102] make build Reproducible
add 721b5a4 added README
add 11f50aa [MRESOLVER-100] Resolver Ant Task taskdef failing
add 6b67ffa Use maven-shade-plugin 3.2.3
new e8138e1 Fix build errors
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (e03b077)
\
N -- N -- N refs/heads/fixed-stuff (e8138e1)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.asf.yaml | 10 +
README.md | 342 ++++++---------------
pom.xml | 15 +-
src/site/markdown/index.md.vm | 241 ++++++++++++++-
.../maven/resolver/internal/ant/AntBuildsTest.java | 4 +
5 files changed, 367 insertions(+), 245 deletions(-)
create mode 100644 .asf.yaml
[maven-resolver-ant-tasks] 01/01: Fix build errors
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch fixed-stuff
in repository https://gitbox.apache.org/repos/asf/maven-resolver-ant-tasks.git
commit e8138e1cfdf9875402b455361f259fa3d328bebd
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Tue Jan 28 22:44:16 2020 +0100
Fix build errors
---
pom.xml | 6 +++---
.../internal/ant/AntSettingsDecryptorFactory.java | 19 +++----------------
2 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/pom.xml b/pom.xml
index ed2339d..184afc9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,10 +61,10 @@
</distributionManagement>
<properties>
- <mavenVersion>3.5.0</mavenVersion>
- <resolverVersion>1.3.3</resolverVersion>
+ <mavenVersion>3.7.0-SNAPSHOT</mavenVersion>
+ <resolverVersion>1.4.2-SNAPSHOT</resolverVersion>
<antVersion>1.8.4</antVersion>
- <javaVersion>7</javaVersion>
+ <javaVersion>8</javaVersion>
<maven.site.path>resolver-archives/resolver-ant-tasks-LATEST</maven.site.path>
<checkstyle.violation.ignore>LineLength,MagicNumber</checkstyle.violation.ignore>
<project.build.outputTimestamp>2020-04-07T21:04:00Z</project.build.outputTimestamp>
diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/AntSettingsDecryptorFactory.java b/src/main/java/org/apache/maven/resolver/internal/ant/AntSettingsDecryptorFactory.java
index 39ef960..e9bfe6a 100644
--- a/src/main/java/org/apache/maven/resolver/internal/ant/AntSettingsDecryptorFactory.java
+++ b/src/main/java/org/apache/maven/resolver/internal/ant/AntSettingsDecryptorFactory.java
@@ -8,9 +8,9 @@ package org.apache.maven.resolver.internal.ant;
* 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
@@ -19,8 +19,6 @@ package org.apache.maven.resolver.internal.ant;
* under the License.
*/
-import java.lang.reflect.Field;
-
import org.apache.maven.settings.crypto.DefaultSettingsDecrypter;
/**
@@ -32,18 +30,7 @@ class AntSettingsDecryptorFactory
{
AntSecDispatcher secDispatcher = new AntSecDispatcher();
- DefaultSettingsDecrypter decrypter = new DefaultSettingsDecrypter();
-
- try
- {
- Field field = decrypter.getClass().getDeclaredField( "securityDispatcher" );
- field.setAccessible( true );
- field.set( decrypter, secDispatcher );
- }
- catch ( Exception e )
- {
- throw new IllegalStateException( e );
- }
+ DefaultSettingsDecrypter decrypter = new DefaultSettingsDecrypter( secDispatcher );
return decrypter;
}