You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2023/03/11 15:25:04 UTC

[maven] branch master updated: [MNG-7727] Remove MavenProfilesBuilder and DefaultMavenProfilesBuilder (#1044)

This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/master by this push:
     new 57d5587cf [MNG-7727] Remove MavenProfilesBuilder and DefaultMavenProfilesBuilder (#1044)
57d5587cf is described below

commit 57d5587cf88682026f15db45fbe13acd70028f14
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Sat Mar 11 16:24:56 2023 +0100

    [MNG-7727] Remove MavenProfilesBuilder and DefaultMavenProfilesBuilder (#1044)
---
 .../profiles/DefaultMavenProfilesBuilder.java      | 77 ----------------------
 .../maven/profiles/MavenProfilesBuilder.java       | 34 ----------
 2 files changed, 111 deletions(-)

diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java b/maven-compat/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
deleted file mode 100644
index 87c48f7da..000000000
--- a/maven-compat/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * 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.
- */
-package org.apache.maven.profiles;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.io.StringWriter;
-
-import org.apache.maven.profiles.io.xpp3.ProfilesXpp3Reader;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.interpolation.EnvarBasedValueSource;
-import org.codehaus.plexus.interpolation.RegexBasedInterpolator;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.ReaderFactory;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-
-/**
- * DefaultMavenProfilesBuilder
- */
-@Deprecated
-@Component(role = MavenProfilesBuilder.class)
-public class DefaultMavenProfilesBuilder extends AbstractLogEnabled implements MavenProfilesBuilder {
-    private static final String PROFILES_XML_FILE = "profiles.xml";
-
-    public ProfilesRoot buildProfiles(File basedir) throws IOException, XmlPullParserException {
-        File profilesXml = new File(basedir, PROFILES_XML_FILE);
-
-        ProfilesRoot profilesRoot = null;
-
-        if (profilesXml.exists()) {
-            ProfilesXpp3Reader reader = new ProfilesXpp3Reader();
-            try (Reader profileReader = ReaderFactory.newXmlReader(profilesXml);
-                    StringWriter sWriter = new StringWriter()) {
-                IOUtil.copy(profileReader, sWriter);
-
-                String rawInput = sWriter.toString();
-
-                try {
-                    RegexBasedInterpolator interpolator = new RegexBasedInterpolator();
-                    interpolator.addValueSource(new EnvarBasedValueSource());
-
-                    rawInput = interpolator.interpolate(rawInput, "settings");
-                } catch (Exception e) {
-                    getLogger()
-                            .warn("Failed to initialize environment variable resolver. Skipping environment "
-                                    + "substitution in " + PROFILES_XML_FILE + ".");
-                    getLogger().debug("Failed to initialize envar resolver. Skipping resolution.", e);
-                }
-
-                StringReader sReader = new StringReader(rawInput);
-
-                profilesRoot = reader.read(sReader);
-            }
-        }
-
-        return profilesRoot;
-    }
-}
diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java b/maven-compat/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java
deleted file mode 100644
index a6ad7b97a..000000000
--- a/maven-compat/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.
- */
-package org.apache.maven.profiles;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-
-/**
- * @author jdcasey
- */
-@Deprecated
-public interface MavenProfilesBuilder {
-    String ROLE = MavenProfilesBuilder.class.getName();
-
-    ProfilesRoot buildProfiles(File basedir) throws IOException, XmlPullParserException;
-}