Repository: incubator-juneau Updated Branches: refs/heads/master 53dbcf215 -> 8bec2d922
Change versions to 6.1.0 Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/8bec2d92 Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/8bec2d92 Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/8bec2d92 Branch: refs/heads/master Commit: 8bec2d9228133928153bcf10255db132f316dddb Parents: 53dbcf2 Author: JamesBognar <[email protected]> Authored: Thu Feb 9 15:44:15 2017 -0500 Committer: JamesBognar <[email protected]> Committed: Thu Feb 9 15:44:15 2017 -0500 ---------------------------------------------------------------------- juneau-all/pom.xml | 4 +++- juneau-core-rdf/pom.xml | 2 +- juneau-core-test/pom.xml | 2 +- juneau-core/pom.xml | 2 +- juneau-distrib/pom.xml | 2 +- juneau-examples-rest/pom.xml | 2 +- juneau-examples/juneau-examples-core/pom.xml | 2 +- juneau-examples/pom.xml | 2 +- juneau-microservice-template/pom.xml | 6 +++--- .../apache/juneau/microservice/sample/HelloWorldResource.java | 4 ++-- .../org/apache/juneau/microservice/sample/RootResources.java | 4 ++-- juneau-microservice/pom.xml | 2 +- juneau-rest-client/pom.xml | 2 +- juneau-rest-jaxrs/pom.xml | 2 +- juneau-rest-test/pom.xml | 2 +- juneau-rest/pom.xml | 2 +- pom.xml | 3 +-- 17 files changed, 23 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/8bec2d92/juneau-all/pom.xml ---------------------------------------------------------------------- diff --git a/juneau-all/pom.xml b/juneau-all/pom.xml index 0143170..9322e15 100644 --- a/juneau-all/pom.xml +++ b/juneau-all/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.juneau</groupId> <artifactId>juneau</artifactId> - <version>6.0.2-incubating-SNAPSHOT</version> + <version>6.1.0-incubating-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -71,7 +71,9 @@ <artifactSet> <includes> <include>org.apache.juneau:juneau-core</include> + <include>org.apache.juneau:juneau-core-rdf</include> <include>org.apache.juneau:juneau-rest</include> + <include>org.apache.juneau:juneau-rest-jaxrs</include> <include>org.apache.juneau:juneau-rest-client</include> <include>org.apache.juneau:juneau-microservice</include> </includes> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/8bec2d92/juneau-core-rdf/pom.xml ---------------------------------------------------------------------- diff --git a/juneau-core-rdf/pom.xml b/juneau-core-rdf/pom.xml index 4ecfa42..4713051 100644 --- a/juneau-core-rdf/pom.xml +++ b/juneau-core-rdf/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.juneau</groupId> <artifactId>juneau</artifactId> - <version>6.0.2-incubating-SNAPSHOT</version> + <version>6.1.0-incubating-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/8bec2d92/juneau-core-test/pom.xml ---------------------------------------------------------------------- diff --git a/juneau-core-test/pom.xml b/juneau-core-test/pom.xml index b5f66ef..9f85d29 100644 --- a/juneau-core-test/pom.xml +++ b/juneau-core-test/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.juneau</groupId> <artifactId>juneau</artifactId> - <version>6.0.2-incubating-SNAPSHOT</version> + <version>6.1.0-incubating-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/8bec2d92/juneau-core/pom.xml ---------------------------------------------------------------------- diff --git a/juneau-core/pom.xml b/juneau-core/pom.xml index 741250d..9c215bb 100644 --- a/juneau-core/pom.xml +++ b/juneau-core/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.juneau</groupId> <artifactId>juneau</artifactId> - <version>6.0.2-incubating-SNAPSHOT</version> + <version>6.1.0-incubating-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/8bec2d92/juneau-distrib/pom.xml ---------------------------------------------------------------------- diff --git a/juneau-distrib/pom.xml b/juneau-distrib/pom.xml index 3ca16f9..c4c359d 100644 --- a/juneau-distrib/pom.xml +++ b/juneau-distrib/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.juneau</groupId> <artifactId>juneau</artifactId> - <version>6.0.2-incubating-SNAPSHOT</version> + <version>6.1.0-incubating-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/8bec2d92/juneau-examples-rest/pom.xml ---------------------------------------------------------------------- diff --git a/juneau-examples-rest/pom.xml b/juneau-examples-rest/pom.xml index b8114b6..8f1c74d 100644 --- a/juneau-examples-rest/pom.xml +++ b/juneau-examples-rest/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.juneau</groupId> <artifactId>juneau</artifactId> - <version>6.0.2-incubating-SNAPSHOT</version> + <version>6.1.0-incubating-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/8bec2d92/juneau-examples/juneau-examples-core/pom.xml ---------------------------------------------------------------------- diff --git a/juneau-examples/juneau-examples-core/pom.xml b/juneau-examples/juneau-examples-core/pom.xml index d868aba..3cb43db 100644 --- a/juneau-examples/juneau-examples-core/pom.xml +++ b/juneau-examples/juneau-examples-core/pom.xml @@ -24,7 +24,7 @@ <parent> <artifactId>juneau-examples</artifactId> <groupId>org.apache.juneau</groupId> - <version>6.0.2-incubating-SNAPSHOT</version> + <version>6.1.0-incubating-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/8bec2d92/juneau-examples/pom.xml ---------------------------------------------------------------------- diff --git a/juneau-examples/pom.xml b/juneau-examples/pom.xml index a12710d..2e4b97a 100644 --- a/juneau-examples/pom.xml +++ b/juneau-examples/pom.xml @@ -24,7 +24,7 @@ <parent> <artifactId>juneau</artifactId> <groupId>org.apache.juneau</groupId> - <version>6.0.2-incubating-SNAPSHOT</version> + <version>6.1.0-incubating-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/8bec2d92/juneau-microservice-template/pom.xml ---------------------------------------------------------------------- diff --git a/juneau-microservice-template/pom.xml b/juneau-microservice-template/pom.xml index 5952ff0..d49a44c 100644 --- a/juneau-microservice-template/pom.xml +++ b/juneau-microservice-template/pom.xml @@ -20,15 +20,15 @@ The group/artifact/version information is meant to be overwritten by developers to match their own needs. --> <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";> + xsi:schemaLocation="http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <groupId>juneau-microservice-template</groupId> <artifactId>juneau-microservice-template</artifactId> - <version>6.0.0</version> + <version>6.1.0</version> <name>Apache Juneau Microservice Template</name> <description>A template project developers use to start with to create a microservice.</description> <properties> - <juneau.version>6.0.1-incubating-SNAPSHOT</juneau.version> + <juneau.version>6.1.0-incubating-SNAPSHOT</juneau.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <encoding>UTF-8</encoding> </properties> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/8bec2d92/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/HelloWorldResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/HelloWorldResource.java b/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/HelloWorldResource.java index 4f8a819..04edc2e 100755 --- a/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/HelloWorldResource.java +++ b/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/HelloWorldResource.java @@ -13,8 +13,8 @@ package org.apache.juneau.microservice.sample; import org.apache.juneau.microservice.Resource; -import org.apache.juneau.server.annotation.RestMethod; -import org.apache.juneau.server.annotation.RestResource; +import org.apache.juneau.rest.annotation.RestMethod; +import org.apache.juneau.rest.annotation.RestResource; /** * Sample REST resource that prints out a simple "Hello world!" message. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/8bec2d92/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/RootResources.java ---------------------------------------------------------------------- diff --git a/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/RootResources.java b/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/RootResources.java index b7ef7fc..88dbe57 100755 --- a/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/RootResources.java +++ b/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/RootResources.java @@ -17,8 +17,8 @@ import static org.apache.juneau.html.HtmlDocSerializerContext.HTMLDOC_links; import org.apache.juneau.microservice.ResourceGroup; import org.apache.juneau.microservice.resources.ConfigResource; import org.apache.juneau.microservice.resources.LogsResource; -import org.apache.juneau.server.annotation.Property; -import org.apache.juneau.server.annotation.RestResource; +import org.apache.juneau.rest.annotation.Property; +import org.apache.juneau.rest.annotation.RestResource; /** * Root microservice page. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/8bec2d92/juneau-microservice/pom.xml ---------------------------------------------------------------------- diff --git a/juneau-microservice/pom.xml b/juneau-microservice/pom.xml index f34bd13..fc7f645 100644 --- a/juneau-microservice/pom.xml +++ b/juneau-microservice/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.juneau</groupId> <artifactId>juneau</artifactId> - <version>6.0.2-incubating-SNAPSHOT</version> + <version>6.1.0-incubating-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/8bec2d92/juneau-rest-client/pom.xml ---------------------------------------------------------------------- diff --git a/juneau-rest-client/pom.xml b/juneau-rest-client/pom.xml index e035942..77c4b8a 100644 --- a/juneau-rest-client/pom.xml +++ b/juneau-rest-client/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.juneau</groupId> <artifactId>juneau</artifactId> - <version>6.0.2-incubating-SNAPSHOT</version> + <version>6.1.0-incubating-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/8bec2d92/juneau-rest-jaxrs/pom.xml ---------------------------------------------------------------------- diff --git a/juneau-rest-jaxrs/pom.xml b/juneau-rest-jaxrs/pom.xml index 0f4115b..bceb305 100644 --- a/juneau-rest-jaxrs/pom.xml +++ b/juneau-rest-jaxrs/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.juneau</groupId> <artifactId>juneau</artifactId> - <version>6.0.2-incubating-SNAPSHOT</version> + <version>6.1.0-incubating-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/8bec2d92/juneau-rest-test/pom.xml ---------------------------------------------------------------------- diff --git a/juneau-rest-test/pom.xml b/juneau-rest-test/pom.xml index 2d7c070..0591d42 100644 --- a/juneau-rest-test/pom.xml +++ b/juneau-rest-test/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.juneau</groupId> <artifactId>juneau</artifactId> - <version>6.0.2-incubating-SNAPSHOT</version> + <version>6.1.0-incubating-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/8bec2d92/juneau-rest/pom.xml ---------------------------------------------------------------------- diff --git a/juneau-rest/pom.xml b/juneau-rest/pom.xml index f3a4be6..189106a 100644 --- a/juneau-rest/pom.xml +++ b/juneau-rest/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.juneau</groupId> <artifactId>juneau</artifactId> - <version>6.0.2-incubating-SNAPSHOT</version> + <version>6.1.0-incubating-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/8bec2d92/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a9d1356..ebec010 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.juneau</groupId> <artifactId>juneau</artifactId> - <version>6.0.2-incubating-SNAPSHOT</version> + <version>6.1.0-incubating-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache Juneau (incubating)</name> <description>All the Apache Juneau content in one convenient package.</description> @@ -101,7 +101,6 @@ <module>juneau-microservice</module> <module>juneau-examples-rest</module> <module>juneau-all</module> - <module>juneau-examples</module> <module>juneau-distrib</module> </modules>
