[BROOKLYN-185] Remove brooklyn-swagger-annotations
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/55c59048 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/55c59048 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/55c59048 Branch: refs/heads/master Commit: 55c59048fbcc3f3d36c2c4d23f220ad189ee461a Parents: fe0071f Author: Ciprian Ciubotariu <[email protected]> Authored: Tue Oct 20 19:18:14 2015 +0300 Committer: Ciprian Ciubotariu <[email protected]> Committed: Wed Nov 11 17:42:43 2015 +0200 ---------------------------------------------------------------------- camp/camp-server/pom.xml | 7 ---- pom.xml | 1 - usage/rest-api/pom.xml | 5 +-- utils/rest-swagger/pom.xml | 7 ---- utils/swagger-annotations/pom.xml | 44 -------------------- .../brooklyn/swagger/annotations/Apidoc.java | 33 --------------- 6 files changed, 2 insertions(+), 95 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/55c59048/camp/camp-server/pom.xml ---------------------------------------------------------------------- diff --git a/camp/camp-server/pom.xml b/camp/camp-server/pom.xml index d419e89..502c83e 100644 --- a/camp/camp-server/pom.xml +++ b/camp/camp-server/pom.xml @@ -124,7 +124,6 @@ <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> </dependency> - <dependency> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-utils-rest-swagger</artifactId> @@ -132,12 +131,6 @@ </dependency> <dependency> <groupId>org.apache.brooklyn</groupId> - <artifactId>brooklyn-swagger-annotations</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-utils-common</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/55c59048/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index c436b20..f22544c 100644 --- a/pom.xml +++ b/pom.xml @@ -245,7 +245,6 @@ <module>utils/jmx/jmxrmi-agent</module> <module>utils/test-support</module> <module>utils/rest-swagger</module> - <module>utils/swagger-annotations</module> <module>utils/rt-osgi</module> <module>utils/rt-felix</module> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/55c59048/usage/rest-api/pom.xml ---------------------------------------------------------------------- diff --git a/usage/rest-api/pom.xml b/usage/rest-api/pom.xml index 0b3e130..bc54587 100644 --- a/usage/rest-api/pom.xml +++ b/usage/rest-api/pom.xml @@ -82,9 +82,8 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.brooklyn</groupId> - <artifactId>brooklyn-swagger-annotations</artifactId> - <version>${project.version}</version> + <groupId>io.swagger</groupId> + <artifactId>swagger-annotations</artifactId> </dependency> <dependency> <groupId>org.testng</groupId> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/55c59048/utils/rest-swagger/pom.xml ---------------------------------------------------------------------- diff --git a/utils/rest-swagger/pom.xml b/utils/rest-swagger/pom.xml index 8628d48..42edc4b 100644 --- a/utils/rest-swagger/pom.xml +++ b/utils/rest-swagger/pom.xml @@ -63,13 +63,6 @@ <dependency> <groupId>org.apache.brooklyn</groupId> - <artifactId>brooklyn-swagger-annotations</artifactId> - <version>${project.version}</version> - </dependency> - - - <dependency> - <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-test-support</artifactId> <version>${project.version}</version> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/55c59048/utils/swagger-annotations/pom.xml ---------------------------------------------------------------------- diff --git a/utils/swagger-annotations/pom.xml b/utils/swagger-annotations/pom.xml deleted file mode 100644 index 2664e2b..0000000 --- a/utils/swagger-annotations/pom.xml +++ /dev/null @@ -1,44 +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/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - - <artifactId>brooklyn-swagger-annotations</artifactId> - <name>Brooklyn Swagger Annotations</name> - - <description> - Swagger-like annotations developed for Brooklyn but not dependendent on Brooklyn - </description> - - <parent> - <groupId>org.apache.brooklyn</groupId> - <artifactId>brooklyn-parent</artifactId> - <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> - <relativePath>../../parent/pom.xml</relativePath> - </parent> - - <dependencies> - <dependency> - <groupId>io.swagger</groupId> - <artifactId>swagger-annotations</artifactId> - </dependency> - </dependencies> - -</project> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/55c59048/utils/swagger-annotations/src/main/java/org/apache/brooklyn/swagger/annotations/Apidoc.java ---------------------------------------------------------------------- diff --git a/utils/swagger-annotations/src/main/java/org/apache/brooklyn/swagger/annotations/Apidoc.java b/utils/swagger-annotations/src/main/java/org/apache/brooklyn/swagger/annotations/Apidoc.java deleted file mode 100644 index a9263c2..0000000 --- a/utils/swagger-annotations/src/main/java/org/apache/brooklyn/swagger/annotations/Apidoc.java +++ /dev/null @@ -1,33 +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.apache.brooklyn.swagger.annotations; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** like Swagger Api annotation (and treated similarly) but doesn't require path to be repeated, and supports a name */ -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -public @interface Apidoc { - String value(); - String description() default ""; - // ? what is 'open' in @Api -}
