Skip to content

Commit

Permalink
Merge pull request #561 from jianghaolu/autorest
Browse files Browse the repository at this point in the history 
Version number for library
  • Loading branch information
@jianghaolu
jianghaolu committed Nov 24, 2015
2 parents 6433155 + f209023 commit a65261f
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 98 deletions.
2 changes: 1 addition & 1 deletion azure-mgmt-compute/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../azure/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion azure-mgmt-network/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../azure/pom.xml</relativePath>
</parent>

Expand Down
14 changes: 3 additions & 11 deletions azure-mgmt-resources/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../azure/pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -55,14 +55,6 @@
</developers>

<repositories>
<repository>
<id>nexus-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
<layout>default</layout>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>adx-snapshots</id>
<name>Azure ADX Snapshots</name>
Expand All @@ -83,12 +75,12 @@
<dependency>
<groupId>com.squareup.okhttp</groupId>
<artifactId>okhttp</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.0</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp</groupId>
<artifactId>logging-interceptor</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
2 changes: 1 addition & 1 deletion azure-mgmt-storage/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../azure/pom.xml</relativePath>
</parent>

Expand Down
63 changes: 13 additions & 50 deletions azure/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.microsoft.azure</groupId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
<artifactId>azure-bom</artifactId>
</parent>

Expand Down Expand Up @@ -55,15 +55,6 @@
</developers>

<repositories>
<repository>
<id>nexus-snapshots</id>
<name>Nexus Snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
<layout>default</layout>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>adx-snapshots</id>
<name>Azure ADX Snapshots</name>
Expand All @@ -75,6 +66,16 @@
</repository>
</repositories>

<distributionManagement>
<snapshotRepository>
<id>adx-snapshots</id>
<name>Azure ADX Snapshots</name>
<url>ftp://waws-prod-bay-005.ftp.azurewebsites.windows.net/site/wwwroot/</url>
<uniqueVersion>true</uniqueVersion>
<layout>default</layout>
</snapshotRepository>
</distributionManagement>

<dependencyManagement>
<dependencies>
<dependency>
Expand All @@ -95,7 +96,7 @@
<dependency>
<groupId>com.squareup.okhttp</groupId>
<artifactId>okhttp</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.0</version>
</dependency>
<!-- Test dependencies -->
<dependency>
Expand Down Expand Up @@ -165,49 +166,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.2</version>
<version>2.5.3</version>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-help-plugin</artifactId>
<versionRange>[2.1.1,)</versionRange>
<goals>
<goal>evaluate</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<versionRange>[2.11,)</versionRange>
<goals>
<goal>check</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
Expand Down
55 changes: 21 additions & 34 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-bom</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Microsoft Azure SDK</name>
Expand All @@ -38,7 +38,7 @@
</scm>

<properties>
<projectVersion>0.0.1-SNAPSHOT</projectVersion>
<projectVersion>1.0.0-SNAPSHOT</projectVersion>
</properties>

<developers>
Expand All @@ -47,6 +47,17 @@
<name>Microsoft</name>
</developer>
</developers>

<distributionManagement>
<snapshotRepository>
<id>adx-snapshots</id>
<name>Azure ADX Snapshots</name>
<url>ftp://waws-prod-bay-005.ftp.azurewebsites.windows.net/site/wwwroot/</url>
<uniqueVersion>true</uniqueVersion>
<layout>default</layout>
</snapshotRepository>
</distributionManagement>

<modules>
<module>azure</module>
</modules>
Expand All @@ -56,40 +67,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.2</version>
<version>2.5.3</version>
</plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-checkstyle-plugin
</artifactId>
<versionRange>
[2.11,)
</versionRange>
<goals>
<goal>check</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<extensions>
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ftp</artifactId>
<version>2.10</version>
</extension>
</extensions>
</build>
</project>

0 comments on commit a65261f

Please sign in to comment.