Merge pull request #4 from Microsoft/setup

Fix maven build failure and using space instead tab
microsoft · Apr 18, 2018 · 3ad0bb2 · 3ad0bb2
2 parents 86c38dd + 6059026
commit 3ad0bb2
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 47 deletions.
diff --git a/src/checkstyle/checkstyle-header.txt → codestyle/checkstyle/checkstyle-header.txt b/src/checkstyle/checkstyle-header.txt → codestyle/checkstyle/checkstyle-header.txt
diff --git a/src/checkstyle/checkstyle.xml → codestyle/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml → codestyle/checkstyle/checkstyle.xml
@@ -39,13 +39,6 @@
         <module name="NeedBraces"/>
         <module name="AvoidNestedBlocks"/>
 
-        <!-- tabs instead of spaces -->
-        <module name="RegexpSinglelineJava">
-            <property name="format" value="^\t* "/>
-            <property name="message" value="Indent must use tab characters"/>
-            <property name="ignoreComments" value="true"/>
-        </module>
-
         <!-- Class Design -->
         <module name="FinalClass"/>
         <module name="InterfaceIsType"/>
@@ -133,19 +126,6 @@
         <!-- Modifiers -->
         <module name="RedundantModifier"/>
 
-        <!-- Regexp -->
-        <module name="RegexpSinglelineJava">
-            <property name="format" value="^\t* +\t*\S"/>
-            <property name="message"
-                      value="Line has leading space characters; indentation should be performed with tabs only."/>
-            <property name="ignoreComments" value="true"/>
-        </module>
-        <module name="Regexp">
-            <property name="format" value="[ \t]+$"/>
-            <property name="illegalPattern" value="true"/>
-            <property name="message" value="Trailing whitespace"/>
-        </module>
-
         <!-- Whitespace -->
         <module name="GenericWhitespace"/>
         <module name="MethodParamPad"/>
@@ -158,7 +138,6 @@
         <module name="TypecastParenPad"/>
         <module name="WhitespaceAfter"/>
         <module name="WhitespaceAround"/>
-        <module name="JavadocParagraph"/>
         <module name="EmptyLineSeparator"/>
     </module>
 </module>
diff --git a/src/eclipse/eclipse-code-formatter.xml → codestyle/eclipse/eclipse-code-formatter.xml b/src/eclipse/eclipse-code-formatter.xml → codestyle/eclipse/eclipse-code-formatter.xml
@@ -385,7 +385,7 @@
 		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
 		<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
 		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="tab"/>
+		<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
 		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations"
 				 value="do not insert"/>
 		<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>

diff --git a/src/eclipse/eclipse.importorder → codestyle/eclipse/eclipse.importorder b/src/eclipse/eclipse.importorder → codestyle/eclipse/eclipse.importorder
diff --git a/pom.xml b/pom.xml
@@ -16,38 +16,42 @@
     <name>Spring Cloud Azure</name>
     <description>Spring Cloud Azure</description>
 
-    <scm>
-        <url>https://github.com/spring-cloud/spring-cloud-azure</url>
-        <connection>scm:git:git://github.com/spring-cloud/spring-cloud-azure.git</connection>
-        <developerConnection>scm:git:ssh://[email protected]/spring-cloud/spring-cloud-azure.git</developerConnection>
-        <tag>HEAD</tag>
-    </scm>
-
     <modules>
+        <module>spring-cloud-azure-context</module>
+        <module>spring-cloud-azure-autoconfigure</module>
+        <module>spring-cloud-azure-eventhub</module>
+        <module>spring-cloud-azure-eventhub-stream-binder</module>
     </modules>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <spring-cloud-release.version>Finchley.M9</spring-cloud-release.version>
+        <spring-cloud-release.version>2.0.0.RELEASE</spring-cloud-release.version>
         <spring-boot-release.version>2.0.1.RELEASE</spring-boot-release.version>
     </properties>
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring-boot-release.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
 
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-dependencies</artifactId>
+                <artifactId>spring-cloud-stream</artifactId>
                 <version>${spring-cloud-release.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
 
             <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring-boot-release.version}</version>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-stream-binder-test</artifactId>
+                <version>${spring-cloud-release.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/spring-cloud-azure-autoconfigure/pom.xml b/spring-cloud-azure-autoconfigure/pom.xml
@@ -3,23 +3,25 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>spring-cloud-azure</artifactId>
         <groupId>com.microsoft.azure</groupId>
+        <artifactId>spring-cloud-azure</artifactId>
         <version>1.0.0.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>spring-cloud-azure-autoconfigure</artifactId>
+    <name>Spring Cloud Azure Autoconfigure</name>
 
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-autoconfigure</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.microsoft.azure</groupId>
             <artifactId>spring-cloud-azure-context</artifactId>
-            <version>1.0.0.BUILD-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 

diff --git a/spring-cloud-azure-context/pom.xml b/spring-cloud-azure-context/pom.xml
@@ -3,13 +3,15 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>spring-cloud-azure</artifactId>
         <groupId>com.microsoft.azure</groupId>
+        <artifactId>spring-cloud-azure</artifactId>
         <version>1.0.0.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>spring-cloud-azure-context</artifactId>
+    <name>Spring Cloud Azure Context</name>
 
     <dependencies>
         <dependency>

diff --git a/spring-cloud-azure-eventhub-stream-binder/pom.xml b/spring-cloud-azure-eventhub-stream-binder/pom.xml
@@ -3,14 +3,15 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>spring-cloud-azure</artifactId>
         <groupId>com.microsoft.azure</groupId>
+        <artifactId>spring-cloud-azure</artifactId>
         <version>1.0.0.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>spring-cloud-azure-eventhub-stream-binder</artifactId>
-    <name>Spring Cloud Azure Stream</name>
+    <name>Spring Cloud Azure Stream Event Hub Binder</name>
     <description>Azure Event hub binder for Spring Cloud Stream</description>
 
     <dependencies>

diff --git a/spring-cloud-azure-eventhub/pom.xml b/spring-cloud-azure-eventhub/pom.xml
@@ -3,21 +3,17 @@
          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>
     <parent>
-        <groupId>org.springframework.cloud</groupId>
+        <groupId>com.microsoft.azure</groupId>
         <artifactId>spring-cloud-azure</artifactId>
         <version>1.0.0.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>spring-cloud-azure-eventhub</artifactId>
-    <name>Spring Cloud Azure Event hub Module</name>
+    <name>Spring Cloud Azure Event hub</name>
     <description>Spring Cloud Azure Event hub Module</description>
 
     <dependencies>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-eventhubs</artifactId>
-            <version>1.0.0</version>
-        </dependency>
         <dependency>
             <groupId>com.microsoft.azure</groupId>
             <artifactId>azure-eventhubs-eph</artifactId>