Skip to content

chore: java web-service example#233

Merged
mergify[bot] merged 12 commits intocdk8s-team:masterfrom
campionfellin:javaexamples
Jun 29, 2020
Merged

chore: java web-service example#233
mergify[bot] merged 12 commits intocdk8s-team:masterfrom
campionfellin:javaexamples

Conversation

@campionfellin
Copy link
Copy Markdown
Contributor

Signed-off-by: campionfellin campionfellin@gmail.com

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

Signed-off-by: campionfellin <campionfellin@gmail.com>
Comment thread examples/java/web-service/pom.xml Outdated
Signed-off-by: campionfellin <campionfellin@gmail.com>
eladb pushed a commit to cdklabs/jsii-srcmak that referenced this pull request Jun 16, 2020
None, but related to comments on this PR: 

cdk8s-team/cdk8s#233 (comment)

*Description of changes:*

Rather than putting imports into a deep folder structure with package name, they all fall under `src/main`. A `cdk8s` java project with multiple imports looks like:

```
imports/
  src/
    main/
      java/
        k8s/
        mattermost/
      resources/
        k8s/
        mattermost/
```

Note: using [ncp](https://github.com/AvianFlu/ncp) because `fs-extra` doesn't have copy/merge functionality.

With `fs.move` option `overwrite` as `true`, you only get the last import in your list of imports. With `overwrite` false, it fails because `imports/src/main/` already exists. We want to effectively merge the two imports into this folder. `ncp` seemed like the best option here for this.

Tested by `yarn link`ing this with `cdk8s` and importing over there.


Signed-off-by: campionfellin <campionfellin@gmail.com>
mergify Bot pushed a commit that referenced this pull request Jun 17, 2020
Includes a bugfix required for #233 and #117 

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
campionfellin and others added 2 commits June 17, 2020 07:12
Comment thread examples/java/hello/pom.xml Outdated
Comment thread examples/java/web-service/src/main/java/com/mycompany/app/WebService.java Outdated
Signed-off-by: campionfellin <campionfellin@gmail.com>
Signed-off-by: campionfellin <campionfellin@gmail.com>
Comment thread examples/java/web-service/pom.xml Outdated
eladb
eladb previously approved these changes Jun 18, 2020
@mergify
Copy link
Copy Markdown
Contributor

mergify Bot commented Jun 18, 2020

Your pull request will be updated and merged automatically (do not update manually).

Signed-off-by: campionfellin <campionfellin@gmail.com>
@mergify mergify Bot dismissed eladb’s stale review June 18, 2020 05:26

Pull request has been modified.

@campionfellin
Copy link
Copy Markdown
Contributor Author

Hey, nice, seems like #224 is working!


Going to do java cdk8s init next

@mergify
Copy link
Copy Markdown
Contributor

mergify Bot commented Jun 29, 2020

Your pull request will be updated and merged automatically (do not update manually).

@mergify mergify Bot merged commit 6d7fd41 into cdk8s-team:master Jun 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants