Skip to content

Re-normalize line-endings in git of all files to Linux style ("\n") #2977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cdietrich merged 1 commit into from
Apr 7, 2024
Merged

Re-normalize line-endings in git of all files to Linux style ("\n") #2977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions org.eclipse.xtend.core.tests/batch-compiler-data/bug410594/mypackage/TortoiseView.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
*
* SPDX-License-Identifier: EPL-2.0
******************************************************************************/
package mypackage
import com.google.inject.Singleton
import mypackage.ITortoiseInterpreter
package mypackage

import com.google.inject.Singleton
import mypackage.ITortoiseInterpreter

@Singleton
class TortoiseView {

Expand Down
34 changes: 17 additions & 17 deletions org.eclipse.xtend.examples/projects/xtend-annotation-examples-client/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Active Annotations Example Client
Bundle-SymbolicName: xtend-annotation-examples-client
Bundle-Version: 2.35.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.xtend.lib,
com.google.guava;bundle-version="[33.1.0,34.0.0)",
org.eclipse.xtext.xbase.lib;bundle-version="2.35.0",
xtend-annotation-examples;bundle-version="2.4.3"
Bundle-Vendor: Eclipse Xtext
Automatic-Module-Name: xtend-annotation-examples-client
Export-Package: extract;x-internal:=true,
i18n;x-internal:=true,
lazy;x-internal:=true,
observables;x-internal:=true
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Active Annotations Example Client
Bundle-SymbolicName: xtend-annotation-examples-client
Bundle-Version: 2.35.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.xtend.lib,
com.google.guava;bundle-version="[33.1.0,34.0.0)",
org.eclipse.xtext.xbase.lib;bundle-version="2.35.0",
xtend-annotation-examples;bundle-version="2.4.3"
Bundle-Vendor: Eclipse Xtext
Automatic-Module-Name: xtend-annotation-examples-client
Export-Package: extract;x-internal:=true,
i18n;x-internal:=true,
lazy;x-internal:=true,
observables;x-internal:=true

16 changes: 8 additions & 8 deletions org.eclipse.xtend.m2e/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
source.. = src
bin.includes = META-INF/,\
.,\
lifecycle-mapping-metadata.xml,\
plugin.xml,\
plugin.properties,\
about.html,
src.includes = about.html
source.. = src
bin.includes = META-INF/,\
.,\
lifecycle-mapping-metadata.xml,\
plugin.xml,\
plugin.properties,\
about.html,
src.includes = about.html
38 changes: 19 additions & 19 deletions org.eclipse.xtend.m2e/lifecycle-mapping-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.eclipse.xtend</groupId>
<artifactId>xtend-maven-plugin</artifactId>
<versionRange>[2.2.0,)</versionRange>
<goals>
<goal>compile</goal>
<goal>testCompile</goal>
</goals>
</pluginExecutionFilter>
<action>
<configurator>
<id>org.eclipse.xtend.m2e.xtendConfigurator</id>
</configurator>
</action>
</pluginExecution>
</pluginExecutions>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.eclipse.xtend</groupId>
<artifactId>xtend-maven-plugin</artifactId>
<versionRange>[2.2.0,)</versionRange>
<goals>
<goal>compile</goal>
<goal>testCompile</goal>
</goals>
</pluginExecutionFilter>
<action>
<configurator>
<id>org.eclipse.xtend.m2e.xtendConfigurator</id>
</configurator>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
32 changes: 16 additions & 16 deletions org.eclipse.xtend.m2e/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<plugin>
<extension
point="org.eclipse.m2e.core.lifecycleMappingMetadataSource">
</extension>
<extension
point="org.eclipse.m2e.core.projectConfigurators">
<configurator
class="org.eclipse.xtend.m2e.XtendProjectConfigurator"
id="org.eclipse.xtend.m2e.xtendConfigurator"
name="Xtend Project Configurator">
</configurator>
</extension>
</plugin>
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<plugin>
<extension
point="org.eclipse.m2e.core.lifecycleMappingMetadataSource">
</extension>
<extension
point="org.eclipse.m2e.core.projectConfigurators">
<configurator
class="org.eclipse.xtend.m2e.XtendProjectConfigurator"
id="org.eclipse.xtend.m2e.xtendConfigurator"
name="Xtend Project Configurator">
</configurator>
</extension>

</plugin>
134 changes: 67 additions & 67 deletions org.eclipse.xtend.maven.archetype/src/main/resources/archetype-resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,67 +1,67 @@
<?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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>\${groupId}</groupId>
<artifactId>\${artifactId}</artifactId>
<version>\${version}</version>
<name>xtend-quickstart</name>
<properties>
<xtend.version>${project.version}</xtend.version>
<project.build.sourceEncoding>${sourceEncoding}</project.build.sourceEncoding>
<maven.compiler.source>${javaVersion}</maven.compiler.source>
<maven.compiler.target>${javaVersion}</maven.compiler.target>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>xtext-dev-bom</artifactId>
<version>${xtend.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.xtend</groupId>
<artifactId>xtend-maven-plugin</artifactId>
<version>${xtend.version}</version>
<executions>
<execution>
<goals>
<goal>compile</goal>
<goal>testCompile</goal>
<goal>xtend-install-debug-info</goal>
<goal>xtend-test-install-debug-info</goal>
</goals>
</execution>
</executions>
<configuration>
<outputDirectory>\${project.build.directory}/xtend-gen/main</outputDirectory>
<testOutputDirectory>\${project.build.directory}/xtend-gen/test</testOutputDirectory>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.eclipse.xtend</groupId>
<artifactId>org.eclipse.xtend.lib</artifactId>
<version>${xtend.version}</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>\${groupId}</groupId>
<artifactId>\${artifactId}</artifactId>
<version>\${version}</version>
<name>xtend-quickstart</name>
<properties>
<xtend.version>${project.version}</xtend.version>
<project.build.sourceEncoding>${sourceEncoding}</project.build.sourceEncoding>
<maven.compiler.source>${javaVersion}</maven.compiler.source>
<maven.compiler.target>${javaVersion}</maven.compiler.target>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>xtext-dev-bom</artifactId>
<version>${xtend.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.xtend</groupId>
<artifactId>xtend-maven-plugin</artifactId>
<version>${xtend.version}</version>
<executions>
<execution>
<goals>
<goal>compile</goal>
<goal>testCompile</goal>
<goal>xtend-install-debug-info</goal>
<goal>xtend-test-install-debug-info</goal>
</goals>
</execution>
</executions>
<configuration>
<outputDirectory>\${project.build.directory}/xtend-gen/main</outputDirectory>
<testOutputDirectory>\${project.build.directory}/xtend-gen/test</testOutputDirectory>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.eclipse.xtend</groupId>
<artifactId>org.eclipse.xtend.lib</artifactId>
<version>${xtend.version}</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
20 changes: 10 additions & 10 deletions ...end.maven.archetype/src/main/resources/archetype-resources/src/main/java/HelloXtend.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package ${package}
class HelloXtend {
def static void main(String[] args) {
println(message)
}
def static getMessage () '''Hello Xtend!'''
package ${package}

class HelloXtend {

def static void main(String[] args) {
println(message)
}

def static getMessage () '''Hello Xtend!'''

}
46 changes: 23 additions & 23 deletions org.eclipse.xtend.maven.plugin/src/test/resources/it/compile/encoding/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse.xtend</groupId>
<artifactId>it-tests-parent</artifactId>
<version>IT-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>simple</artifactId>
<properties>
<project.build.sourceEncoding>UTF-16</project.build.sourceEncoding>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.xtend</groupId>
<artifactId>xtend-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse.xtend</groupId>
<artifactId>it-tests-parent</artifactId>
<version>IT-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>simple</artifactId>
<properties>
<project.build.sourceEncoding>UTF-16</project.build.sourceEncoding>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.xtend</groupId>
<artifactId>xtend-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
Loading