Skip to content
Permalink
Browse files

Merge pull request #16 from andham/JENKINS-21088

[FIXED JENKINS-21088] Normalize line endings in git repo
  • Loading branch information
jtnord committed Dec 19, 2013
2 parents f3426cc + f005ce3 commit e70a17d791e6b76d5e565f1887c903ecd3872569
Showing with 4,658 additions and 4,645 deletions.
  1. +13 −0 .gitattributes
  2. +159 −159 pom.xml
  3. +337 −337 src/main/java/org/jvnet/hudson/plugins/m2release/M2ReleaseAction.java
  4. +117 −117 src/main/java/org/jvnet/hudson/plugins/m2release/M2ReleaseBadgeAction.java
  5. +48 −48 src/main/java/org/jvnet/hudson/plugins/m2release/ReleaseCause.java
  6. +163 −163 src/main/java/org/jvnet/hudson/plugins/m2release/dashboard/RecentReleasesPortlet.java
  7. +107 −107 src/main/java/org/jvnet/hudson/plugins/m2release/nexus/Stage.java
  8. +64 −64 src/main/java/org/jvnet/hudson/plugins/m2release/nexus/StageAction.java
  9. +693 −693 src/main/java/org/jvnet/hudson/plugins/m2release/nexus/StageClient.java
  10. +71 −71 src/main/java/org/jvnet/hudson/plugins/m2release/nexus/StageException.java
  11. +12 −12 src/main/resources/org/jvnet/hudson/plugins/m2release/M2ReleaseAction/failed.jelly
  12. +78 −78 src/main/resources/org/jvnet/hudson/plugins/m2release/M2ReleaseAction/index.jelly
  13. +8 −8 src/main/resources/org/jvnet/hudson/plugins/m2release/M2ReleaseBadgeAction/badge.jelly
  14. +4 −4 src/main/resources/org/jvnet/hudson/plugins/m2release/Messages.properties
  15. +3 −3 src/main/resources/org/jvnet/hudson/plugins/m2release/ReleaseCause/description.jelly
  16. +24 −24 src/main/resources/org/jvnet/hudson/plugins/m2release/ReleaseCause/description.properties
  17. +28 −28 src/main/resources/org/jvnet/hudson/plugins/m2release/dashboard/RecentReleasesPortlet/config.jelly
  18. +79 −79 src/main/resources/org/jvnet/hudson/plugins/m2release/dashboard/RecentReleasesPortlet/main.jelly
  19. +41 −41 src/main/resources/org/jvnet/hudson/plugins/m2release/dashboard/RecentReleasesPortlet/portlet.jelly
  20. +209 −209 src/test/java/org/jvnet/hudson/plugins/m2release/M2ReleaseArgumentInterceptorActionTest.java
  21. +451 −451 src/test/java/org/jvnet/hudson/plugins/m2release/nexus/StageClientTest.java
  22. +79 −79 src/test/java/org/jvnet/hudson/plugins/m2release/nexus/StageTest.java
  23. +395 −395 ...st/resources/org/jvnet/hudson/plugins/m2release/nexus/stageClientTest/activity__closed_failed.xml
  24. +490 −490 src/test/resources/org/jvnet/hudson/plugins/m2release/nexus/stageClientTest/activity__closed_ok.xml
  25. +96 −96 src/test/resources/org/jvnet/hudson/plugins/m2release/nexus/stageClientTest/profile_repositories.xml
  26. +23 −23 ...t/resources/org/jvnet/hudson/plugins/m2release/nexus/stageClientTest/repository__transitioned.xml
  27. +23 −23 .../resources/org/jvnet/hudson/plugins/m2release/nexus/stageClientTest/repository__transitioning.xml
  28. +373 −373 src/test/resources/org/jvnet/hudson/plugins/m2release/nexus/stageClientTest/status__bad_perms.xml
  29. +376 −376 src/test/resources/org/jvnet/hudson/plugins/m2release/nexus/stageClientTest/status__ok_perms.xml
  30. +36 −36 src/test/resources/org/jvnet/hudson/plugins/m2release/nexus/stageTest/service/local/staging/profiles
  31. +50 −50 test/pom.xml
  32. +8 −8 test/src/main/java/test/Hello.java
@@ -0,0 +1,13 @@
# Set default behaviour, in case users don't have core.autocrlf set.
* text=auto

# Explicitly declare text files we want to always be normalized and converted
# to native line endings on checkout.
*.java text diff=java
*.html text diff=html
*.jelly text

# Denote all files that are truly binary and should not be modified.
*.png binary
*.gif binary
*.jpg binary
318 pom.xml
@@ -1,159 +1,159 @@
<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>

<groupId>org.jenkins-ci.plugins.m2release</groupId>
<artifactId>m2release</artifactId>
<packaging>hpi</packaging>
<version>0.13.0-SNAPSHOT</version>

<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>1.509.2</version>
</parent>

<name>Jenkins Maven Release Plug-in Plug-in</name>
<description>A plug-in that enables you to perform releases using the maven-release-plugin from Jenkins.</description>
<url>http://wiki.jenkins-ci.org/display/JENKINS/M2+Release+Plugin</url>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.test.version>3.0.4</maven.test.version>
</properties>

<developers>
<developer>
<id>teilo</id>
<name>James Nord</name>
</developer>
<developer>
<id>m68k</id>
<name>Christian Slama</name>
</developer>
<developer>
<id>imod</id>
<name>Dominik Bartholdi</name>
</developer>
</developers>

<scm>
<connection>scm:git:git://github.com/jenkinsci/m2release-plugin.git</connection>
<developerConnection>scm:git:https://github.com/jenkinsci/m2release-plugin.git</developerConnection>
<url>https://github.com/jenkinsci/m2release-plugin/</url>
</scm>

<licenses>
<license>
<name>MIT License</name>
<url>http://www.opensource.org/licenses/mit-license.php</url>
</license>
</licenses>

<dependencies>
<dependency>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>maven-plugin</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.release</groupId>
<artifactId>maven-release-manager</artifactId>
<version>2.1</version>
<exclusions>
<exclusion>
<artifactId>maven-project</artifactId>
<groupId>org.apache.maven</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>dashboard-view</artifactId>
<version>2.0</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.9.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${maven.test.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>${maven.test.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>${maven.test.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
<version>${maven.test.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<!-- until the fix for JENKINS-18918 is available in a backported skip any apache-maven-xxx folders in classes -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<configuration>
<excludes>
<exclude>**/apache-maven-*/*</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.jenkins-ci.tools</groupId>
<artifactId>maven-hpi-plugin</artifactId>
<version>1.96</version>
<extensions>true</extensions>
</plugin>
</plugins>
</build>


<!-- Jenkins is no longer synced to central so we need to bootstrap -->
<repositories>
<repository>
<id>repo.jenkins-ci.org</id>
<releases>
<enabled>true</enabled>
</releases>
<url>http://repo.jenkins-ci.org/public/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>repo.jenkins-ci.org</id>
<url>http://repo.jenkins-ci.org/public/</url>
</pluginRepository>
</pluginRepositories>

</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>

<groupId>org.jenkins-ci.plugins.m2release</groupId>
<artifactId>m2release</artifactId>
<packaging>hpi</packaging>
<version>0.13.0-SNAPSHOT</version>

<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>1.509.2</version>
</parent>

<name>Jenkins Maven Release Plug-in Plug-in</name>
<description>A plug-in that enables you to perform releases using the maven-release-plugin from Jenkins.</description>
<url>http://wiki.jenkins-ci.org/display/JENKINS/M2+Release+Plugin</url>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.test.version>3.0.4</maven.test.version>
</properties>

<developers>
<developer>
<id>teilo</id>
<name>James Nord</name>
</developer>
<developer>
<id>m68k</id>
<name>Christian Slama</name>
</developer>
<developer>
<id>imod</id>
<name>Dominik Bartholdi</name>
</developer>
</developers>

<scm>
<connection>scm:git:git://github.com/jenkinsci/m2release-plugin.git</connection>
<developerConnection>scm:git:https://github.com/jenkinsci/m2release-plugin.git</developerConnection>
<url>https://github.com/jenkinsci/m2release-plugin/</url>
</scm>

<licenses>
<license>
<name>MIT License</name>
<url>http://www.opensource.org/licenses/mit-license.php</url>
</license>
</licenses>

<dependencies>
<dependency>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>maven-plugin</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.release</groupId>
<artifactId>maven-release-manager</artifactId>
<version>2.1</version>
<exclusions>
<exclusion>
<artifactId>maven-project</artifactId>
<groupId>org.apache.maven</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>dashboard-view</artifactId>
<version>2.0</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.9.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${maven.test.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>${maven.test.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>${maven.test.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
<version>${maven.test.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<!-- until the fix for JENKINS-18918 is available in a backported skip any apache-maven-xxx folders in classes -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<configuration>
<excludes>
<exclude>**/apache-maven-*/*</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.jenkins-ci.tools</groupId>
<artifactId>maven-hpi-plugin</artifactId>
<version>1.96</version>
<extensions>true</extensions>
</plugin>
</plugins>
</build>


<!-- Jenkins is no longer synced to central so we need to bootstrap -->
<repositories>
<repository>
<id>repo.jenkins-ci.org</id>
<releases>
<enabled>true</enabled>
</releases>
<url>http://repo.jenkins-ci.org/public/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>repo.jenkins-ci.org</id>
<url>http://repo.jenkins-ci.org/public/</url>
</pluginRepository>
</pluginRepositories>

</project>

0 comments on commit e70a17d

Please sign in to comment.
You can’t perform that action at this time.