Repository: jclouds-chef Updated Branches: refs/heads/1.8.x 61772308e -> cffeede4b
http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/cffeede4/enterprise/src/test/java/org/jclouds/enterprisechef/EnterpriseChefApiLiveTest.java ---------------------------------------------------------------------- diff --git a/enterprise/src/test/java/org/jclouds/enterprisechef/EnterpriseChefApiLiveTest.java b/enterprise/src/test/java/org/jclouds/enterprisechef/EnterpriseChefApiLiveTest.java deleted file mode 100644 index 6ac99c1..0000000 --- a/enterprise/src/test/java/org/jclouds/enterprisechef/EnterpriseChefApiLiveTest.java +++ /dev/null @@ -1,122 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jclouds.enterprisechef; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertNull; -import static org.testng.Assert.assertTrue; - -import java.util.Set; -import java.util.UUID; - -import org.jclouds.chef.internal.BaseChefApiLiveTest; -import org.jclouds.enterprisechef.domain.Group; -import org.jclouds.enterprisechef.domain.User; -import org.jclouds.rest.ResourceNotFoundException; -import org.testng.annotations.Test; - -/** - * Tests behavior of the EnterpriseChefApi. - */ -@Test(groups = "live", singleThreaded = true, testName = "EnterpriseChefApiLiveTest") -public class EnterpriseChefApiLiveTest extends BaseChefApiLiveTest<EnterpriseChefApi> { - - private static final String GROUP_NAME = System.getProperty("user.name") + "-jcloudstest"; - private static final String ORG_NAME = System.getProperty("test.enterprisechef.org"); - - public EnterpriseChefApiLiveTest() { - provider = "enterprisechef"; - } - - @Override - @Test - public void testSearchClientsWithOptions() throws Exception { - // This test will fail because Enterprise Chef does not index client name. - // Once it is fixes, the test should succeed. - // See: http://tickets.opscode.com/browse/CHEF-2477 - super.testSearchClientsWithOptions(); - } - - public void testGetUser() { - User user = api.getUser(identity); - assertEquals(user.getUsername(), identity); - assertNotNull(user.getPublicKey()); - } - - public void testGetUnexistingUser() { - User user = api.getUser(UUID.randomUUID().toString()); - assertNull(user); - } - - public void testListGroups() { - Set<String> groups = api.listGroups(); - assertNotNull(groups); - assertFalse(groups.isEmpty()); - } - - public void testGetUnexistingGroup() { - Group group = api.getGroup(UUID.randomUUID().toString()); - assertNull(group); - } - - public void testCreateGroup() { - api.createGroup(GROUP_NAME); - Group group = api.getGroup(GROUP_NAME); - assertNotNull(group); - assertEquals(group.getGroupname(), GROUP_NAME); - } - - @Test(dependsOnMethods = "testCreateGroup") - public void testUpdateGroup() { - Group group = api.getGroup(GROUP_NAME); - Group updated = Group.builder(group.getGroupname()) // - .actors(group.getActors()) // - .orgname(group.getOrgname()) // - .name(group.getName()) // - .groups(group.getGroups()) // - .client(ORG_NAME + "-validator") // - .user(identity) // - .build(); - - api.updateGroup(updated); - group = api.getGroup(GROUP_NAME); - - assertNotNull(group); - assertTrue(group.getUsers().contains(identity)); - assertTrue(group.getClients().contains(ORG_NAME + "-validator")); - } - - @Test(expectedExceptions = ResourceNotFoundException.class) - public void testUpdateUnexistingGroup() { - api.updateGroup(Group.builder(UUID.randomUUID().toString()).build()); - } - - @Test(dependsOnMethods = "testUpdateGroup") - public void testDeleteGroup() { - api.deleteGroup(GROUP_NAME); - Group group = api.getGroup(GROUP_NAME); - assertNull(group); - } - - @Test(expectedExceptions = ResourceNotFoundException.class) - public void testDeleteUnexistingGroup() { - api.deleteGroup(UUID.randomUUID().toString()); - } - -} http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/cffeede4/enterprise/src/test/java/org/jclouds/enterprisechef/EnterpriseChefProviderMetadataTest.java ---------------------------------------------------------------------- diff --git a/enterprise/src/test/java/org/jclouds/enterprisechef/EnterpriseChefProviderMetadataTest.java b/enterprise/src/test/java/org/jclouds/enterprisechef/EnterpriseChefProviderMetadataTest.java deleted file mode 100644 index 9675af8..0000000 --- a/enterprise/src/test/java/org/jclouds/enterprisechef/EnterpriseChefProviderMetadataTest.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jclouds.enterprisechef; - -import org.jclouds.providers.internal.BaseProviderMetadataTest; -import org.testng.annotations.Test; - -/** - * Unit tests for the {@link EnterpriseChefProviderMetadata} class. - */ -@Test(groups = "unit", testName = "EnterpriseChefProviderTest") -public class EnterpriseChefProviderMetadataTest extends BaseProviderMetadataTest { - - public EnterpriseChefProviderMetadataTest() { - super(new EnterpriseChefProviderMetadata(), new EnterpriseChefApiMetadata()); - } -} http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/cffeede4/enterprise/src/test/java/org/jclouds/enterprisechef/binders/BindGroupToUpdateRequestJsonPayloadTest.java ---------------------------------------------------------------------- diff --git a/enterprise/src/test/java/org/jclouds/enterprisechef/binders/BindGroupToUpdateRequestJsonPayloadTest.java b/enterprise/src/test/java/org/jclouds/enterprisechef/binders/BindGroupToUpdateRequestJsonPayloadTest.java deleted file mode 100644 index 4e9a3c2..0000000 --- a/enterprise/src/test/java/org/jclouds/enterprisechef/binders/BindGroupToUpdateRequestJsonPayloadTest.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jclouds.enterprisechef.binders; - -import static org.testng.Assert.assertEquals; - -import java.io.IOException; -import java.net.URI; - -import org.jclouds.chef.ChefApiMetadata; -import org.jclouds.chef.config.ChefParserModule; -import org.jclouds.enterprisechef.domain.Group; -import org.jclouds.http.HttpRequest; -import org.jclouds.json.config.GsonModule; -import org.jclouds.rest.annotations.ApiVersion; -import org.jclouds.util.Strings2; -import org.testng.annotations.Test; - -import com.google.inject.AbstractModule; -import com.google.inject.Guice; -import com.google.inject.Injector; - -/** - * Unit tests for the {@link BindGroupToUpdateRequestJsonPayload} class. - */ -@Test(groups = "unit", testName = "BindGroupToUpdateRequestJsonPayloadTest") -public class BindGroupToUpdateRequestJsonPayloadTest { - - private Injector injector = Guice.createInjector(new AbstractModule() { - @Override - protected void configure() { - bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApiMetadata.DEFAULT_API_VERSION); - } - }, new ChefParserModule(), new GsonModule()); - - private BindGroupToUpdateRequestJsonPayload binder = injector.getInstance(BindGroupToUpdateRequestJsonPayload.class); - - @Test(expectedExceptions = NullPointerException.class) - public void testInvalidNullInput() { - HttpRequest request = HttpRequest.builder().method("POST").endpoint(URI.create("http://localhost";)).build(); - binder.bindToRequest(request, null); - } - - @Test(expectedExceptions = IllegalArgumentException.class) - public void testInvalidTypeInput() { - HttpRequest request = HttpRequest.builder().method("POST").endpoint(URI.create("http://localhost";)).build(); - binder.bindToRequest(request, new Object()); - } - - public void testBindOnlyName() throws IOException { - HttpRequest request = HttpRequest.builder().method("POST").endpoint(URI.create("http://localhost";)).build(); - HttpRequest newRequest = binder.bindToRequest(request, Group.builder("foo").build()); - - String payload = Strings2.toStringAndClose(newRequest.getPayload().getInput()); - assertEquals(payload, "{\"groupname\":\"foo\",\"actors\":{\"clients\":[],\"groups\":[],\"users\":[]}}"); - } - - public void testBindNameAndLists() throws IOException { - Group group = Group.builder("foo").client("nacx-validator").group("admins").user("nacx").build(); - - HttpRequest request = HttpRequest.builder().method("POST").endpoint(URI.create("http://localhost";)).build(); - HttpRequest newRequest = binder.bindToRequest(request, group); - - String payload = Strings2.toStringAndClose(newRequest.getPayload().getInput()); - assertEquals(payload, - "{\"groupname\":\"foo\",\"actors\":{\"clients\":[\"nacx-validator\"],\"groups\":[\"admins\"],\"users\":[\"nacx\"]}}"); - } -} http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/cffeede4/enterprise/src/test/java/org/jclouds/enterprisechef/binders/GroupNameTest.java ---------------------------------------------------------------------- diff --git a/enterprise/src/test/java/org/jclouds/enterprisechef/binders/GroupNameTest.java b/enterprise/src/test/java/org/jclouds/enterprisechef/binders/GroupNameTest.java deleted file mode 100644 index 98ea715..0000000 --- a/enterprise/src/test/java/org/jclouds/enterprisechef/binders/GroupNameTest.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jclouds.enterprisechef.binders; - -import static org.testng.Assert.assertEquals; - -import java.io.IOException; - -import org.jclouds.enterprisechef.domain.Group; -import org.testng.annotations.Test; - -/** - * Unit tests for the {@link GroupName} class. - */ -@Test(groups = "unit", testName = "GroupNameTest") -public class GroupNameTest { - - @Test(expectedExceptions = NullPointerException.class) - public void testInvalidNullInput() { - new GroupName().apply(null); - } - - public void testApplyGroupName() throws IOException { - assertEquals(new GroupName().apply(Group.builder("foo").build()), "foo"); - } -} http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/cffeede4/enterprise/src/test/resources/group-update.json ---------------------------------------------------------------------- diff --git a/enterprise/src/test/resources/group-update.json b/enterprise/src/test/resources/group-update.json deleted file mode 100644 index cc7bf6a..0000000 --- a/enterprise/src/test/resources/group-update.json +++ /dev/null @@ -1 +0,0 @@ -{"groupname":"admins","actors":{"clients":["abiquo"],"groups":["admins"],"users":["nacx"]}} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/cffeede4/enterprise/src/test/resources/group.json ---------------------------------------------------------------------- diff --git a/enterprise/src/test/resources/group.json b/enterprise/src/test/resources/group.json deleted file mode 100644 index df3eb28..0000000 --- a/enterprise/src/test/resources/group.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "actors" : [ "abiquo", - "nacx", - "pivotal" - ], - "clients" : [ "abiquo" ], - "groupname" : "admins", - "groups" : [ "billing-admins" ], - "name" : "admins", - "orgname" : "nacx", - "users" : [ "nacx", - "pivotal" - ] -} http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/cffeede4/enterprise/src/test/resources/groups.json ---------------------------------------------------------------------- diff --git a/enterprise/src/test/resources/groups.json b/enterprise/src/test/resources/groups.json deleted file mode 100644 index 30c8aa6..0000000 --- a/enterprise/src/test/resources/groups.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "965f2db33d302ed4625d172e0bc36920" : "https://api.opscode.com/organizations/nacx/groups/965f2db33d302ed4625d172e0bc36920";, - "admins" : "https://api.opscode.com/organizations/nacx/groups/admins";, - "billing-admins" : "https://api.opscode.com/organizations/nacx/groups/billing-admins";, - "clients" : "https://api.opscode.com/organizations/nacx/groups/clients";, - "users" : "https://api.opscode.com/organizations/nacx/groups/users"; -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/cffeede4/enterprise/src/test/resources/user.json ---------------------------------------------------------------------- diff --git a/enterprise/src/test/resources/user.json b/enterprise/src/test/resources/user.json deleted file mode 100644 index ee35a95..0000000 --- a/enterprise/src/test/resources/user.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "display_name" : "Ignasi Barrera", - "email" : "[email protected]", - "first_name" : "Ignasi", - "last_name" : "Barrera", - "middle_name" : "", - "public_key" : "-----BEGIN RSA PUBLIC KEY-----\nMIIBCgKCAQEAp0ytgXbPzqJwOOixn7bTa6VAiNvVIOn+yDPoWbyEfc0li93BHIwv\n01KW/mn55IXnSbMw86rdxisvwPHFfb7URuKuTzME6yrphBiancmNjushZZeBWb8j\nqJhnFIKbaaOqew0LZSyG9ycYODB/HDK/pWTV4Bd1OtLHBNFrnIf+r3HOjJsa4rmK\nWXgSQIQO7be/iRHysApV9tfVH8lo1ETnA08JTrQwDgo9St9YNbydb5V0CiLiQsOa\nIbY09buUK9lXthh/rrRVbGbSwQM6OYdXIEZTN2BFvQ0p5pH8AiTwFqb0ICO46a0S\njfGcXNjC/QfHljAPY3T5xyIOODM8afHCnwIDAQAB\n-----END RSA PUBLIC KEY-----\n", - "username" : "nacx" -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/cffeede4/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 460f5e4..0000000 --- a/pom.xml +++ /dev/null @@ -1,108 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - ---> -<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.apache.jclouds.chef</groupId> - <artifactId>chef-project</artifactId> - <version>1.8.2-SNAPSHOT</version> - <relativePath>project/pom.xml</relativePath> - </parent> - <artifactId>jclouds-chef</artifactId> - <name>Apache jclouds Chef</name> - <description>jclouds Chef top level POM</description> - <packaging>pom</packaging> - - <modules> - <module>project</module> - <module>core</module> - <module>compute</module> - <module>enterprise</module> - </modules> - <build> - <plugins> - <plugin> - <groupId>com.mycila.maven-license-plugin</groupId> - <artifactId>maven-license-plugin</artifactId> - <version>1.9.0</version> - <configuration> - <strictCheck>true</strictCheck> - <encoding>${sourceEncoding}</encoding> - <aggregate>true</aggregate> - <header>project/src/etc/header.txt</header> - <mapping> - <xml>XML_STYLE</xml> - Â Â <java>SLASHSTAR_STYLE</java> - Â Â <clj>SEMICOLON_STYLE</clj> - </mapping> - <excludes> - <!-- expectation files for unit tests --> - <exclude>**/src/test/resources/**</exclude> - - <!-- prevent duplicating license --> - <exclude>**/LICENSE.txt</exclude> - <exclude>**/header.txt</exclude> - - <!-- high-level project metadata --> - <exclude>**/NOTICE.txt</exclude> - <exclude>**/DISCLAIMER</exclude> - <exclude>**/BUILD.txt</exclude> - <exclude>**/CHANGES.txt</exclude> - <exclude>**/README.md</exclude> - <exclude>**/README.txt</exclude> - - <!-- one-line service registry files --> - <exclude>**/*ProviderMetadata</exclude> - <exclude>**/*ApiMetadata</exclude> - - <!-- temporary files or those generated by IDE or SCM --> - <exclude>**/target/**</exclude> - <exclude>**/test-output/**</exclude> - <exclude>**/bin/**</exclude> - <exclude>**/.settings/**</exclude> - <exclude>**/.classpath</exclude> - <exclude>**/.dir-locals.el</exclude> - <exclude>**/.project</exclude> - <exclude>**/.idea/**</exclude> - <exclude>**/*.iml</exclude> - <exclude>**/*.eml</exclude> - <exclude>**/*.ipr</exclude> - <exclude>**/*.iws</exclude> - <exclude>**/*.DS_STORE</exclude> - <exclude>**/TAGS</exclude> - <exclude>**/.metadata/**</exclude> - <exclude>**/atlassian-ide-plugin.xml</exclude> - <exclude>**/.DS_Store</exclude> - <exclude>.mailmap</exclude> - <exclude>.git/**</exclude> - <exclude>**/.gitignore</exclude> - <exclude>**/.gitattributes</exclude> - - <!-- Temporary files generated on CloudBees slaves --> - <exclude>.repository/**</exclude> - <exclude>gc.log</exclude> - <!-- binary --> - </excludes> - <useDefaultExcludes>false</useDefaultExcludes> - </configuration> - </plugin> - </plugins> - </build> -</project> http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/cffeede4/project/pom.xml ---------------------------------------------------------------------- diff --git a/project/pom.xml b/project/pom.xml deleted file mode 100644 index a1576a7..0000000 --- a/project/pom.xml +++ /dev/null @@ -1,418 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - ---> -<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.apache</groupId> - <artifactId>apache</artifactId> - <version>14</version> - </parent> - <groupId>org.apache.jclouds.chef</groupId> - <artifactId>chef-project</artifactId> - <version>1.8.2-SNAPSHOT</version> - <packaging>pom</packaging> - <name>Apache jclouds Chef :: Project</name> - <description>jclouds Chef parent POM for Maven configuration</description> - <inceptionYear>2009</inceptionYear> - - <licenses> - <license> - <name>The Apache Software License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> - <distribution>repo</distribution> - </license> - </licenses> - - <properties> - <jclouds.version>1.8.2-SNAPSHOT</jclouds.version> - <maven.compile.source>1.6</maven.compile.source> - <maven.compile.target>1.6</maven.compile.target> - <sourceReleaseAssemblyDescriptor>source-release-zip-tar</sourceReleaseAssemblyDescriptor> - </properties> - <issueManagement> - <system>JIRA</system> - <url>https://issues.apache.org/jira/browse/JCLOUDS</url> - </issueManagement> - <scm> - <connection>scm:git:https://git-wip-us.apache.org/repos/asf/jclouds-chef.git</connection> - <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/jclouds-chef.git</developerConnection> - <url>https://git-wip-us.apache.org/repos/asf?p=jclouds-chef.git</url> - <tag>HEAD</tag> - </scm> - <repositories> - <repository> - <id>apache-snapshots</id> - <url>https://repository.apache.org/content/repositories/snapshots</url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - <repository> - <id>clojars</id> - <url>http://clojars.org/repo/</url> - </repository> - </repositories> - <dependencies> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymockclassextension</artifactId> - <version>3.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>6.5.2</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>xmlunit</groupId> - <artifactId>xmlunit</artifactId> - <version>1.3</version> - </dependency> - </dependencies> - <build> - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-release-plugin</artifactId> - <version>2.4</version> - <configuration> - <useReleaseProfile>false</useReleaseProfile> - <goals>deploy</goals> - <arguments>-Pdoc -Papache-release ${arguments}</arguments> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.5</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.12</version> - </plugin> - </plugins> - </pluginManagement> - - <plugins> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - <configuration> - <excludes> - <!-- expectation files for unit tests --> - <exclude>**/src/test/resources/**/*.sh</exclude> - <exclude>**/src/test/resources/**/*.bat</exclude> - <exclude>**/src/test/resources/**/*.cmd</exclude> - <exclude>**/src/test/resources/**/*.txt</exclude> - <exclude>**/src/test/resources/**/*.gz</exclude> - <exclude>**/src/test/resources/**/*.xml</exclude> - <exclude>**/src/test/resources/**/*.json</exclude> - - <!-- prevent duplicating license --> - <exclude>**/LICENSE.txt</exclude> - <exclude>**/header.txt</exclude> - - <!-- high-level project metadata --> - <exclude>**/NOTICE.txt</exclude> - <exclude>**/DISCLAIMER</exclude> - <exclude>**/BUILD.txt</exclude> - <exclude>**/CHANGES.txt</exclude> - <exclude>**/README.md</exclude> - <exclude>**/README.txt</exclude> - <exclude>**/DEPENDENCIES</exclude> - <exclude>**/CONTRIBUTING.md</exclude> - - <!-- one-line service registry files --> - <exclude>**/*ProviderMetadata</exclude> - <exclude>**/*ApiMetadata</exclude> - - <!-- temporary files or those generated by IDE or SCM --> - <exclude>**/target/**</exclude> - <exclude>**/test-output/**</exclude> - <exclude>**/bin/**</exclude> - <exclude>**/.settings/**</exclude> - <exclude>**/.classpath</exclude> - <exclude>**/.dir-locals.el</exclude> - <exclude>**/.project</exclude> - <exclude>**/.idea/**</exclude> - <exclude>**/*.iml</exclude> - <exclude>**/*.eml</exclude> - <exclude>**/*.ipr</exclude> - <exclude>**/*.iws</exclude> - <exclude>**/*.DS_STORE</exclude> - <exclude>**/TAGS</exclude> - <exclude>**/.metadata/**</exclude> - <exclude>**/atlassian-ide-plugin.xml</exclude> - <exclude>**/.DS_Store</exclude> - <exclude>.mailmap</exclude> - <exclude>.git/**</exclude> - <exclude>**/.gitignore</exclude> - <exclude>**/.gitattributes</exclude> - - <!-- Temporary files generated on CloudBees slaves --> - <exclude>.repository/**</exclude> - <exclude>gc.log</exclude> - <!-- binary --> - </excludes> - </configuration> - </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <encoding>${project.build.sourceEncoding}</encoding> - <source>${maven.compile.source}</source> - <target>${maven.compile.target}</target> - </configuration> - </plugin> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <version>2.4</version> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - <configuration> - <archive> - <manifestEntries> - <Specification-Title>jclouds ${project.name}</Specification-Title> - <Specification-Vendor>jclouds</Specification-Vendor> - <Implementation-Vendor>jclouds</Implementation-Vendor> - <Implementation-Vendor-Id>org.jclouds</Implementation-Vendor-Id> - <Implementation-Version>${project.version}</Implementation-Version> - <X-Compile-Source-JDK>${maven.compile.source}</X-Compile-Source-JDK> - <X-Compile-Target-JDK>${maven.compile.target}</X-Compile-Target-JDK> - </manifestEntries> - </archive> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>2.3.7</version> - <extensions>true</extensions> - <configuration> - <obrRepository>NONE</obrRepository> - <instructions> - <Bundle-Activator>${jclouds.osgi.activator}</Bundle-Activator> - <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> - <Export-Package>${jclouds.osgi.export}</Export-Package> - <Import-Package>${jclouds.osgi.import}</Import-Package> - <DynamicImport-Package>${jclouds.osgi.dynamic}</DynamicImport-Package> - <Fragment-Host>${jclouds.osgi.fragment}</Fragment-Host> - </instructions> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <executions> - <execution> - <id>integration</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <argLine>-Xmx512m -Xms256m -Djava.awt.headless=true -XX:MaxPermSize=256m -Xss256k</argLine> - <groups>integration</groups> - <excludedGroups>unit,performance,live</excludedGroups> - <properties> - <property> - <name>suitename</name> - <value>Integration Tests</value> - </property> - <property> - <name>listener</name> - <value>org.jclouds.test.testng.UnitTestStatusListener</value> - </property> - </properties> - </configuration> - </execution> - </executions> - <configuration> - <parallel>methods</parallel> - <threadCount>5</threadCount> - <groups>unit,performance</groups> - <excludedGroups>integration,live</excludedGroups> - <properties> - <property> - <name>suitename</name> - <value>Unit and Performance Tests</value> - </property> - <property> - <name>listener</name> - <value>org.jclouds.test.testng.UnitTestStatusListener</value> - </property> - </properties> - </configuration> - </plugin> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.9.1</version> - <dependencies> - <dependency> - <groupId>org.apache.jclouds</groupId> - <artifactId>jclouds-resources</artifactId> - <version>${jclouds.version}</version> - </dependency> - </dependencies> - <configuration> - <configLocation>resources/checkstyle.xml</configLocation> - <violationSeverity>warning</violationSeverity> - <includeTestSourceDirectory>true</includeTestSourceDirectory> - </configuration> - </plugin> - </plugins> - </build> - <profiles> - <profile> - <id>live</id> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <executions> - <execution> - <id>integration</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <groups>live,integration</groups> - <excludedGroups>unit,performance</excludedGroups> - <properties> - <property> - <name>suitename</name> - <value>Live Integration Tests</value> - </property> - <property> - <name>listener</name> - <value>org.jclouds.test.testng.UnitTestStatusListener</value> - </property> - </properties> - <systemProperties> - <!-- - If you're behind a proxy, set this here - http://java.sun.com/javase/6/docs/technotes/guides/net/proxies.html - - <property> - <name>https.proxyHost</name> - <value>proxy</value> - </property> - <property> - <name>https.proxyPort</name> - <value>port</value> - </property> - <property> - <name>https.noProxyHosts</name> - <value>localhost|10.150.4.49</value> - </property> - --> - <property> - <name>file.encoding</name> - <value>${project.build.sourceEncoding}</value> - </property> - </systemProperties> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>chef-project</id> - <activation> - <file> - <!-- only in the chef-project module --> - <exists>src/etc/header.txt</exists> - </file> - </activation> - <!-- Maven generates incorrect links without the <site> declaration here --> - <distributionManagement> - <site> - <id>jclouds-github-pages-site</id> - <url>${maven.site.url.base}/${project.version}/${project.artifactId}</url> - </site> - </distributionManagement> - <build> - <plugins> - <plugin> - <artifactId>maven-remote-resources-plugin</artifactId> - <version>1.3</version> - <executions> - <execution> - <goals> - <goal>process</goal> - </goals> - <configuration> - <skip>true</skip> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>doc</id> - <build> - <plugins> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.8.1</version> - <executions> - <execution> - <id>javadoc</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> -</project> http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/cffeede4/project/src/etc/header.txt ---------------------------------------------------------------------- diff --git a/project/src/etc/header.txt b/project/src/etc/header.txt deleted file mode 100644 index 1745cfe..0000000 --- a/project/src/etc/header.txt +++ /dev/null @@ -1,14 +0,0 @@ -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to You under the Apache License, Version 2.0 -(the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License.
