Skip to content

Commit

Permalink
make releasing simpler
Browse files Browse the repository at this point in the history
  • Loading branch information
johnmcclean committed Jun 9, 2015
1 parent 38c7f13 commit 674b66f
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 7 deletions.
4 changes: 3 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ subprojects {
apply plugin: 'com.bmuschko.nexus'
sourceCompatibility = 1.8
targetCompatibility = 1.8
version = '0.56'

jar {
manifest {
Expand Down Expand Up @@ -103,6 +102,9 @@ subprojects {
compile group: 'org.glassfish.grizzly', name: 'grizzly-http-all', version:"$grizzlyVersion"
compile group: 'org.glassfish.jersey.containers', name: 'jersey-container-grizzly2-http', version:"$jerseyVersion"
compile group: 'org.glassfish.jersey.containers', name: 'jersey-container-grizzly2-servlet', version:"$jerseyVersion"
compile 'org.glassfish.jersey.media:jersey-media-multipart:2.17'

// compile 'org.glassfish.jersey:jax-rs-ri:2.0-rc1'
compile "org.glassfish.jersey.ext:jersey-spring3:$jerseyVersion"
compile "org.glassfish.jersey.ext:jersey-bean-validation:$jerseyVersion"
// testCompile ('org.springframework:spring-jdbc-roma:1.0.0-RELEASE'){
Expand Down
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
version=0.57
2 changes: 1 addition & 1 deletion micro-boot/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ modifyPom {

groupId 'com.aol.microservices'
artifactId 'microserver-boot'
version '0.56'
version "$version"

scm {
url 'scm:[email protected]:aol/micro-server.git'
Expand Down
2 changes: 1 addition & 1 deletion micro-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ modifyPom {

groupId 'com.aol.microservices'
artifactId 'microserver-core'
version '0.57'
version "$version"

dependencyManagement {
dependencies{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
package app.simple.com.aol.micro.server;

import java.util.Arrays;

import org.glassfish.jersey.media.multipart.MultiPartFeature;

import com.aol.micro.server.MicroserverApp;
import com.aol.micro.server.module.ConfigurableModule;

public class SimpleApp {

public static void main(String[] args){

new MicroserverApp(()-> "simple-app").run();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,17 @@
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;

import java.util.Arrays;
import java.util.concurrent.ExecutionException;

import org.glassfish.jersey.media.multipart.MultiPartFeature;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;

import com.aol.micro.server.MicroserverApp;
import com.aol.micro.server.config.Microserver;
import com.aol.micro.server.module.ConfigurableModule;
import com.aol.micro.server.testing.RestAgent;

@Microserver
Expand All @@ -22,8 +25,12 @@ public class SimpleRunnerTest {
MicroserverApp server;
@Before
public void startServer(){

server = new MicroserverApp(()-> "simple-app");
server = new MicroserverApp(ConfigurableModule
.builder()
.context("simple-app")
.defaultResources(Arrays.asList(MultiPartFeature.class))
.build());
// server = new MicroserverApp(()-> "simple-app");
server.start();

}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
package app.simple.com.aol.micro.server;

import java.io.InputStream;

import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;

import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataParam;

import com.aol.micro.server.auto.discovery.Rest;

Expand All @@ -20,5 +28,13 @@ public String ping() {
return "ok";
}


@POST
@Consumes(MediaType.MULTIPART_FORM_DATA)
@Produces(MediaType.TEXT_PLAIN)
@Path("/file")
public String create(@FormDataParam("file") InputStream fileInputStream,
@FormDataParam("file") FormDataContentDisposition contentDispositionHeader) {

return "done";
}
}
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
rootProject.name = 'micro-server'
rootProject.name = 'com.aol.microservices.micro-server'
include ':micro-core'
include ':micro-boot'
include ':micro-tutorial'

0 comments on commit 674b66f

Please sign in to comment.