You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@brooklyn.apache.org by ahgittin <gi...@git.apache.org> on 2014/09/19 11:43:47 UTC
[GitHub] incubator-brooklyn pull request: Apache compliance - NOTICE file
GitHub user ahgittin opened a pull request:
https://github.com/apache/incubator-brooklyn/pull/179
Apache compliance - NOTICE file
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/ahgittin/incubator-brooklyn apache-compliance
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-brooklyn/pull/179.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #179
----
commit d14dd8d1e496e966358b82a4808b9cbd6f8c4d13
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Date: 2014-09-19T09:42:43Z
ensure license is included in WAR file
commit 166f7c08385c1866b81941057035d5061b62aac6
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Date: 2014-09-19T09:42:55Z
expand NOTICE for all included software
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: Apache compliance - NOTICE file
Posted by aledsage <gi...@git.apache.org>.
Github user aledsage commented on the pull request:
https://github.com/apache/incubator-brooklyn/pull/179#issuecomment-56199546
Looks good. Only one minor comment about deleting commented out code (and another generic question). Happy for this to be merged.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: Apache compliance - NOTICE file
Posted by ahgittin <gi...@git.apache.org>.
Github user ahgittin commented on the pull request:
https://github.com/apache/incubator-brooklyn/pull/179#issuecomment-56159993
updated in light of @richardcloudsoft comments to have licenses in LICENSE and simple statements of use in NOTICE
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: Apache compliance - NOTICE file
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/incubator-brooklyn/pull/179
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: Apache compliance - NOTICE file
Posted by aledsage <gi...@git.apache.org>.
Github user aledsage commented on a diff in the pull request:
https://github.com/apache/incubator-brooklyn/pull/179#discussion_r17793801
--- Diff: NOTICE ---
@@ -2,6 +2,79 @@
Apache Brooklyn
Copyright 2014 The Apache Software Foundation
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
+This product includes software developed at The Apache Software Foundation (http://www.apache.org/):
+All code unless otherwise specified.
+Copyright (c) The Apache Software Foundation
+Licensed under the Apache License 2.0.
+
+This product includes software developed at The OSGi Alliance (http://www.osgi.org/):
+Java sources in org.osgi.*.
--- End diff --
Was there an automatic way to generate this, or was it manual to find what should be listed here?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: Apache compliance - NOTICE file
Posted by aledsage <gi...@git.apache.org>.
Github user aledsage commented on a diff in the pull request:
https://github.com/apache/incubator-brooklyn/pull/179#discussion_r17793959
--- Diff: software/webapp/src/test/java/brooklyn/entity/webapp/tomcat/TomcatServerWebAppFixtureIntegrationTest.java ---
@@ -77,16 +78,17 @@
"" // no sub-page path
});
}
-
- TestApplication tomcatApp = newTestApplication();
- TomcatServer tomcat = tomcatApp.createAndManageChild(EntitySpec.create(TomcatServer.class)
- .configure(TomcatServer.HTTP_PORT, PortRanges.fromString(DEFAULT_HTTP_PORT)));
- result.add(new Object[] {
- tomcat,
- "swf-booking-mvc.war",
- "swf-booking-mvc/",
- "spring/intro",
- });
+
+ // removed so we don't have to include swf-booking-mvc war
--- End diff --
Either delete the code or include a TODO that says when we'd uncomment it? I'm fine with deleting it - we've tested with a war, so I don't think we need to test with another.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---