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 2021/08/02 13:36:00 UTC

[maven-integration-testing] branch master updated: Normalize line endings

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

michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git


The following commit(s) were added to refs/heads/master by this push:
     new b1bd585  Normalize line endings
b1bd585 is described below

commit b1bd585c57c93fa748c63f3cf91faac5a3778a97
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Aug 2 15:35:52 2021 +0200

    Normalize line endings
---
 .../its/mng5958/AbstractLifecycleMapping.java      | 142 ++++++++++-----------
 .../maven/its/mng5958/BadLifecycleMapping.java     |  90 ++++++-------
 .../maven/its/mng5958/GoodLifecycleMapping.java    |  80 ++++++------
 3 files changed, 156 insertions(+), 156 deletions(-)

diff --git a/core-it-support/core-it-plugins/mng5958-extension/src/main/java/org/apache/maven/its/mng5958/AbstractLifecycleMapping.java b/core-it-support/core-it-plugins/mng5958-extension/src/main/java/org/apache/maven/its/mng5958/AbstractLifecycleMapping.java
index 9a9db7a..a319b1c 100644
--- a/core-it-support/core-it-plugins/mng5958-extension/src/main/java/org/apache/maven/its/mng5958/AbstractLifecycleMapping.java
+++ b/core-it-support/core-it-plugins/mng5958-extension/src/main/java/org/apache/maven/its/mng5958/AbstractLifecycleMapping.java
@@ -1,71 +1,71 @@
-package org.apache.maven.its.mng5958;
-
-/*
- * 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.
- */
-
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.maven.lifecycle.mapping.Lifecycle;
-import org.apache.maven.lifecycle.mapping.LifecycleMapping;
-
-/**
- * @author Anton Tanasenko
- */
-public abstract class AbstractLifecycleMapping implements LifecycleMapping
-{
-
-    private Map<String, Lifecycle> lifecycleMap;
-    
-    public Map<String, Lifecycle> getLifecycles()
-    {
-        if ( lifecycleMap != null )
-        {
-            return lifecycleMap;
-        }
-
-        lifecycleMap = new LinkedHashMap<>();
-        Lifecycle lifecycle = new Lifecycle();
-
-        lifecycle.setId( "default" );
-        lifecycle.setPhases( initPhases() );
-
-        lifecycleMap.put( "default", lifecycle );
-        return lifecycleMap;
-    }
-
-    public Map<String, String> getPhases( String lifecycle )
-    {
-        Lifecycle lifecycleMapping = getLifecycles().get( lifecycle );
-        if ( lifecycleMapping != null )
-        {
-            return lifecycleMapping.getPhases();
-        }
-        return null;
-    }
-
-    public List<String> getOptionalMojos( String lifecycle )
-    {
-        return null;
-    }
-    
-    // raw map on purpose
-    protected abstract Map initPhases();
-}
+package org.apache.maven.its.mng5958;
+
+/*
+ * 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.
+ */
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.maven.lifecycle.mapping.Lifecycle;
+import org.apache.maven.lifecycle.mapping.LifecycleMapping;
+
+/**
+ * @author Anton Tanasenko
+ */
+public abstract class AbstractLifecycleMapping implements LifecycleMapping
+{
+
+    private Map<String, Lifecycle> lifecycleMap;
+
+    public Map<String, Lifecycle> getLifecycles()
+    {
+        if ( lifecycleMap != null )
+        {
+            return lifecycleMap;
+        }
+
+        lifecycleMap = new LinkedHashMap<>();
+        Lifecycle lifecycle = new Lifecycle();
+
+        lifecycle.setId( "default" );
+        lifecycle.setPhases( initPhases() );
+
+        lifecycleMap.put( "default", lifecycle );
+        return lifecycleMap;
+    }
+
+    public Map<String, String> getPhases( String lifecycle )
+    {
+        Lifecycle lifecycleMapping = getLifecycles().get( lifecycle );
+        if ( lifecycleMapping != null )
+        {
+            return lifecycleMapping.getPhases();
+        }
+        return null;
+    }
+
+    public List<String> getOptionalMojos( String lifecycle )
+    {
+        return null;
+    }
+
+    // raw map on purpose
+    protected abstract Map initPhases();
+}
diff --git a/core-it-support/core-it-plugins/mng5958-extension/src/main/java/org/apache/maven/its/mng5958/BadLifecycleMapping.java b/core-it-support/core-it-plugins/mng5958-extension/src/main/java/org/apache/maven/its/mng5958/BadLifecycleMapping.java
index 7dbf2b5..ac35886 100644
--- a/core-it-support/core-it-plugins/mng5958-extension/src/main/java/org/apache/maven/its/mng5958/BadLifecycleMapping.java
+++ b/core-it-support/core-it-plugins/mng5958-extension/src/main/java/org/apache/maven/its/mng5958/BadLifecycleMapping.java
@@ -1,45 +1,45 @@
-package org.apache.maven.its.mng5958;
-
-/*
- * 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.
- */
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.apache.maven.lifecycle.mapping.LifecyclePhase;
-
-/**
- * @author Anton Tanasenko
- */
-public class BadLifecycleMapping extends AbstractLifecycleMapping
-{
-
-    @Override
-    protected Map<String, String> initPhases()
-    {
-        Map phases = new LinkedHashMap<>();
-        
-        LifecyclePhase lp = new LifecyclePhase();
-        lp.set( "org.apache.maven.its.plugins:mng-5805-pkg-type-mojo-configuration-plugin:2.1-SNAPSHOT:test" );
-        
-        phases.put( "validate", lp );
-        return phases;
-    }
-
-}
+package org.apache.maven.its.mng5958;
+
+/*
+ * 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.
+ */
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.apache.maven.lifecycle.mapping.LifecyclePhase;
+
+/**
+ * @author Anton Tanasenko
+ */
+public class BadLifecycleMapping extends AbstractLifecycleMapping
+{
+
+    @Override
+    protected Map<String, String> initPhases()
+    {
+        Map phases = new LinkedHashMap<>();
+
+        LifecyclePhase lp = new LifecyclePhase();
+        lp.set( "org.apache.maven.its.plugins:mng-5805-pkg-type-mojo-configuration-plugin:2.1-SNAPSHOT:test" );
+
+        phases.put( "validate", lp );
+        return phases;
+    }
+
+}
diff --git a/core-it-support/core-it-plugins/mng5958-extension/src/main/java/org/apache/maven/its/mng5958/GoodLifecycleMapping.java b/core-it-support/core-it-plugins/mng5958-extension/src/main/java/org/apache/maven/its/mng5958/GoodLifecycleMapping.java
index c14099d..d87cc1d 100644
--- a/core-it-support/core-it-plugins/mng5958-extension/src/main/java/org/apache/maven/its/mng5958/GoodLifecycleMapping.java
+++ b/core-it-support/core-it-plugins/mng5958-extension/src/main/java/org/apache/maven/its/mng5958/GoodLifecycleMapping.java
@@ -1,40 +1,40 @@
-package org.apache.maven.its.mng5958;
-
-/*
- * 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.
- */
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * @author Anton Tanasenko
- */
-public class GoodLifecycleMapping extends AbstractLifecycleMapping
-{
-
-    @Override
-    protected Map<String, String> initPhases()
-    {
-        Map<String, String> phases = new LinkedHashMap<>();
-        phases.put( "validate",
-                "org.apache.maven.its.plugins:mng-5805-pkg-type-mojo-configuration-plugin:2.1-SNAPSHOT:test" );
-        return phases;
-    }
-
-}
+package org.apache.maven.its.mng5958;
+
+/*
+ * 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.
+ */
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * @author Anton Tanasenko
+ */
+public class GoodLifecycleMapping extends AbstractLifecycleMapping
+{
+
+    @Override
+    protected Map<String, String> initPhases()
+    {
+        Map<String, String> phases = new LinkedHashMap<>();
+        phases.put( "validate",
+                "org.apache.maven.its.plugins:mng-5805-pkg-type-mojo-configuration-plugin:2.1-SNAPSHOT:test" );
+        return phases;
+    }
+
+}