Skip to content

Fix samples and licenses #610

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
jianghaolu merged 5 commits into from
Mar 7, 2016
Merged

Fix samples and licenses #610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
08a35d7
Fix VMCreateGuide sample
jianghaolu Mar 4, 2016
ada1611
Fix inconsistent licenses
jianghaolu Mar 4, 2016
3b09b9a
Fix Android sample to work with 1.0.0-beta1
jianghaolu Mar 5, 2016
b5ab184
Generate .gitrevision
jianghaolu Mar 7, 2016
3b17dae
Deploy .gitrevision
jianghaolu Mar 7, 2016
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
14 changes: 12 additions & 2 deletions azure-mgmt-compute/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<name>The MIT License (MIT)</name>
<url>http://opensource.org/licenses/MIT</url>
<distribution>repo</distribution>
</license>
</licenses>
Expand Down Expand Up @@ -91,6 +91,16 @@
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
Expand Down
14 changes: 12 additions & 2 deletions azure-mgmt-network/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<name>The MIT License (MIT)</name>
<url>http://opensource.org/licenses/MIT</url>
<distribution>repo</distribution>
</license>
</licenses>
Expand Down Expand Up @@ -91,6 +91,16 @@
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
Expand Down
26 changes: 12 additions & 14 deletions azure-mgmt-resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<name>The MIT License (MIT)</name>
<url>http://opensource.org/licenses/MIT</url>
<distribution>repo</distribution>
</license>
</licenses>
Expand All @@ -45,18 +45,6 @@
</developer>
</developers>

<repositories>
<repository>
<id>adx-snapshots</id>
<name>Azure ADX Snapshots</name>
<url>http://adxsnapshots.azurewebsites.net/</url>
<layout>default</layout>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>com.microsoft.azure</groupId>
Expand Down Expand Up @@ -102,6 +90,16 @@
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
Expand Down
14 changes: 12 additions & 2 deletions azure-mgmt-storage/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<name>The MIT License (MIT)</name>
<url>http://opensource.org/licenses/MIT</url>
<distribution>repo</distribution>
</license>
</licenses>
Expand Down Expand Up @@ -86,6 +86,16 @@
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
Expand Down
14 changes: 12 additions & 2 deletions azure-mgmt-website/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<name>The MIT License (MIT)</name>
<url>http://opensource.org/licenses/MIT</url>
<distribution>repo</distribution>
</license>
</licenses>
Expand Down Expand Up @@ -91,6 +91,16 @@
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
Expand Down
61 changes: 57 additions & 4 deletions azure/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<name>The MIT License (MIT)</name>
<url>http://opensource.org/licenses/MIT</url>
<distribution>repo</distribution>
</license>
</licenses>
Expand Down Expand Up @@ -49,10 +49,11 @@
<repository>
<id>adx-snapshots</id>
<name>Azure ADX Snapshots</name>
<url>http://adxsnapshots.azurewebsites.net/</url>
<url>http://adxsnapshots.azurewebsites.net</url>
<layout>default</layout>
<snapshots>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</snapshots>
</repository>
</repositories>
Expand All @@ -61,7 +62,7 @@
<snapshotRepository>
<id>adx-snapshots</id>
<name>Azure ADX Snapshots</name>
<url>ftp://waws-prod-bay-005.ftp.azurewebsites.windows.net/site/wwwroot/</url>
<url>ftp://waws-prod-bay-005.ftp.azurewebsites.windows.net/site/wwwroot</url>
<uniqueVersion>true</uniqueVersion>
<layout>default</layout>
</snapshotRepository>
Expand Down Expand Up @@ -145,6 +146,7 @@
<br />*/</code>]]></bottom>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
Expand All @@ -158,11 +160,13 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.4.3</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand All @@ -179,11 +183,60 @@
</environmentVariables>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.2</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<phase>package</phase>
<configuration>
<target name="generateGitRevision">
<touch file="target/.gitrevision" />
<exec executable="git" outputproperty="git.revision" failifexecutionfails="true" errorproperty="">
<arg value="rev-parse"/>
<arg value="HEAD"/>
</exec>
<echo file="target/.gitrevision" append="false">Azure/azure-sdk-for-java#</echo>
<echo file="target/.gitrevision" append="true">${git.revision}</echo>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.10</version>
<executions>
<execution>
<id>attach-artifacts</id>
<phase>package</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
<configuration>
<artifacts>
<artifact>
<file>target/.gitrevision</file>
<type>gitrevision</type>
</artifact>
</artifacts>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>
Expand Down
10 changes: 5 additions & 5 deletions examples/AzureResourceRunner/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:23.1.1'
compile 'com.android.support:multidex:1.0.1'
compile 'com.microsoft.azure:azure-mgmt-resources:1.0.0-SNAPSHOT'
compile 'com.microsoft.azure:azure-mgmt-storage:1.0.0-SNAPSHOT'
compile 'com.microsoft.azure:azure-mgmt-compute:1.0.0-SNAPSHOT'
compile 'com.microsoft.azure:azure-client-runtime:1.0.0-SNAPSHOT'
compile 'com.microsoft.azure:azure-android-client-authentication:1.0.0-SNAPSHOT'
compile 'com.microsoft.azure:azure-mgmt-resources:1.0.0-beta1'
compile 'com.microsoft.azure:azure-mgmt-storage:1.0.0-beta1'
compile 'com.microsoft.azure:azure-mgmt-compute:1.0.0-beta1'
compile 'com.microsoft.azure:azure-client-runtime:1.0.0-beta1'
compile 'com.microsoft.azure:azure-android-client-authentication:1.0.0-beta1'
compile 'com.android.support:design:23.1.1'
compile 'com.android.support:support-v4:23.1.1'
}
32 changes: 15 additions & 17 deletions ...ceRunner/app/src/main/java/com/example/jianghlu/azureresourcerunner/ResourceOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import android.support.v7.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;

import com.microsoft.azure.credentials.UserTokenCredentials;
import com.microsoft.azure.management.compute.ComputeManagementClient;
Expand All @@ -24,8 +23,7 @@

public class ResourceOperator extends AppCompatActivity
implements NavigationView.OnNavigationItemSelectedListener,
ResourceFragment.OnFragmentInteractionListener,
StorageFragment.OnFragmentInteractionListener {
ResourceFragment.OnFragmentInteractionListener {
SubscriptionInfo subscription;
ResourceManagementClient rClient;
StorageManagementClient sClient;
Expand Down Expand Up @@ -121,20 +119,20 @@ public boolean onNavigationItemSelected(MenuItem item) {
setTitle(this.getTitle() + " - Resources");
drawer.closeDrawer(navigationView);
} else if (id == R.id.nav_storage) {
StorageFragment fragment = new StorageFragment();
fragment.setRetainInstance(true);
fragment.setStorageManagementClient(sClient);
FragmentManager fragmentManager = getFragmentManager();
fragmentManager.beginTransaction()
.replace(R.id.resource_operator_main_content, fragment)
.commit();

// Highlight the selected item, update the title, and close the drawer
DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
navigationView.setCheckedItem(0);
setTitle(this.getTitle() + " - Storage");
drawer.closeDrawer(navigationView);
// StorageFragment fragment = new StorageFragment();
// fragment.setRetainInstance(true);
// fragment.setStorageManagementClient(sClient);
// FragmentManager fragmentManager = getFragmentManager();
// fragmentManager.beginTransaction()
// .replace(R.id.resource_operator_main_content, fragment)
// .commit();
//
// // Highlight the selected item, update the title, and close the drawer
// DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
// NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
// navigationView.setCheckedItem(0);
// setTitle(this.getTitle() + " - Storage");
// drawer.closeDrawer(navigationView);
} else if (id == R.id.nav_compute) {

} else if (id == R.id.nav_share) {
Expand Down
10 changes: 5 additions & 5 deletions examples/VMCreateGuide/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,27 +29,27 @@
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-mgmt-resources</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.0-beta1</version>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-mgmt-storage</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.0-beta1</version>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-mgmt-network</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.0-beta1</version>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-mgmt-compute</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.0-beta1</version>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-client-authentication</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.0-beta1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down
Loading