CAY-2372 OSGI module fixed. Add correct manifest.
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/32a17ff0 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/32a17ff0 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/32a17ff0 Branch: refs/heads/master Commit: 32a17ff004abb4d9cc171088f8ecd3665d2e2021 Parents: 8041641 Author: Arseni Bulatski <ancars...@gmail.com> Authored: Wed Nov 22 10:03:06 2017 +0300 Committer: Arseni Bulatski <ancars...@gmail.com> Committed: Wed Nov 22 10:41:24 2017 +0300 ---------------------------------------------------------------------- cayenne-client/pom.xml | 10 ++--- cayenne-osgi/pom.xml | 41 +++++++++++++++++++- .../configuration/web/CayenneFilter.java | 2 +- docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 + docs/doc/src/main/resources/UPGRADE.txt | 6 +++ pom.xml | 6 --- 6 files changed, 53 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/32a17ff0/cayenne-client/pom.xml ---------------------------------------------------------------------- diff --git a/cayenne-client/pom.xml b/cayenne-client/pom.xml index c8d6aac..46aa5a6 100644 --- a/cayenne-client/pom.xml +++ b/cayenne-client/pom.xml @@ -44,6 +44,11 @@ <artifactId>hessian</artifactId> <scope>compile</scope> </dependency> + <dependency> + <groupId>org.apache.cayenne</groupId> + <artifactId>cayenne-rop-server</artifactId> + <version>${project.version}</version> + </dependency> <!-- Test dependencies --> <dependency> @@ -74,11 +79,6 @@ <artifactId>slf4j-simple</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.cayenne</groupId> - <artifactId>cayenne-rop-server</artifactId> - <version>4.1.M2-SNAPSHOT</version> - </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/cayenne/blob/32a17ff0/cayenne-osgi/pom.xml ---------------------------------------------------------------------- diff --git a/cayenne-osgi/pom.xml b/cayenne-osgi/pom.xml index 724df7e..c948165 100644 --- a/cayenne-osgi/pom.xml +++ b/cayenne-osgi/pom.xml @@ -31,5 +31,44 @@ </dependency> </dependencies> - + <build> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <!-- include OSGi stuff --> + <configuration> + <archive> + <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> + </archive> + </configuration> + <!-- share tests with downstream modules --> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <executions> + <execution> + <id>bundle-manifest</id> + <phase>process-classes</phase> + <goals> + <goal>manifest</goal> + </goals> + <!-- TODO: export package filters. --> + <configuration> + <instructions> + <Require-Bundle>org.apache.cayenne.server</Require-Bundle> + </instructions> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cayenne/blob/32a17ff0/cayenne-web/src/main/java/org/apache/cayenne/configuration/web/CayenneFilter.java ---------------------------------------------------------------------- diff --git a/cayenne-web/src/main/java/org/apache/cayenne/configuration/web/CayenneFilter.java b/cayenne-web/src/main/java/org/apache/cayenne/configuration/web/CayenneFilter.java index 358e640..3aab772 100644 --- a/cayenne-web/src/main/java/org/apache/cayenne/configuration/web/CayenneFilter.java +++ b/cayenne-web/src/main/java/org/apache/cayenne/configuration/web/CayenneFilter.java @@ -30,7 +30,7 @@ import java.util.Collection; /** * A filter that creates a Cayenne server runtime, possibly including custom modules. By - * default runtime includes {@link ServerModule} and {@link WebModule}. Any custom modules + * default runtime includes {@link ServerModule}. Any custom modules * are loaded after the two standard ones to allow custom service overrides. Filter * initialization parameters: * <ul> http://git-wip-us.apache.org/repos/asf/cayenne/blob/32a17ff0/docs/doc/src/main/resources/RELEASE-NOTES.txt ---------------------------------------------------------------------- diff --git a/docs/doc/src/main/resources/RELEASE-NOTES.txt b/docs/doc/src/main/resources/RELEASE-NOTES.txt index 01cab73..fe47c13 100644 --- a/docs/doc/src/main/resources/RELEASE-NOTES.txt +++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt @@ -13,6 +13,7 @@ Date: ---------------------------------- Changes/New Features: +CAY-2372 Extract new modules from cayenne-server Bug Fixes: http://git-wip-us.apache.org/repos/asf/cayenne/blob/32a17ff0/docs/doc/src/main/resources/UPGRADE.txt ---------------------------------------------------------------------- diff --git a/docs/doc/src/main/resources/UPGRADE.txt b/docs/doc/src/main/resources/UPGRADE.txt index e2ecdc4..7ed098c 100644 --- a/docs/doc/src/main/resources/UPGRADE.txt +++ b/docs/doc/src/main/resources/UPGRADE.txt @@ -4,6 +4,12 @@ Apache Cayenne Upgrade Information IMPORTANT: be sure to read all notes for the intermediate releases between your current release and the release you are upgrading to. ------------------------------------------------------------------------------- +UPGRADING TO 4.1.M1 + +* Per CAY-2372 + - Extract cayenne-web module from cayenne server. Now cayenne-web is autoloaded. + - Extract cayenne-osgi module from cayenne-server. + - Extract cayenne-rop-server from cayenne-server. UPGRADING TO 4.1.M1 http://git-wip-us.apache.org/repos/asf/cayenne/blob/32a17ff0/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6faaba8..b13feb8 100644 --- a/pom.xml +++ b/pom.xml @@ -79,15 +79,9 @@ <module>tutorials</module> <module>docs</module> <module>assembly</module> -<<<<<<< HEAD <module>cayenne-web</module> -======= <module>cayenne-osgi</module> -<<<<<<< HEAD ->>>>>>> e8768c6e3... CAY-2372 Extracted OSGI module from server module -======= <module>cayenne-rop-server</module> ->>>>>>> 48b87d59f... CAY-2372 with osgi, web and rop-server modules. Tests failling </modules> <issueManagement> <system>jira</system>
