You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by sk...@apache.org on 2014/01/23 17:32:07 UTC
[05/14] git commit: [OLINGO-130] fix
[OLINGO-130] fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/d86ec45b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/d86ec45b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/d86ec45b
Branch: refs/heads/olingo-117
Commit: d86ec45be15bc8ae5d1d569898d502a91ddc302e
Parents: 2216461
Author: Stephan Klevenz <sk...@apache.org>
Authored: Tue Jan 21 13:36:28 2014 +0100
Committer: Stephan Klevenz <sk...@apache.org>
Committed: Tue Jan 21 13:36:28 2014 +0100
----------------------------------------------------------------------
.../lib/src/main/assembly/lib-assembly.xml | 4 +--
.../ref/src/main/assembly/ref-assembly.xml | 2 +-
pom.xml | 32 +++++++++++++-------
3 files changed, 23 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d86ec45b/odata2-dist/lib/src/main/assembly/lib-assembly.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/lib/src/main/assembly/lib-assembly.xml b/odata2-dist/lib/src/main/assembly/lib-assembly.xml
index 1bd91a9..115107c 100644
--- a/odata2-dist/lib/src/main/assembly/lib-assembly.xml
+++ b/odata2-dist/lib/src/main/assembly/lib-assembly.xml
@@ -25,10 +25,8 @@
<includes>
<include>org.apache.olingo:olingo-odata2-core-incubating</include>
<include>org.apache.olingo:olingo-odata2-api-incubating</include>
+ <include>org.apache.olingo:olingo-odata2-api-annotation-incubating</include>
</includes>
- <excludes>
- <exclude>org.apache.olingo:olingo-odata2-api-annotation-incubating</exclude>
- </excludes>
</dependencySet>
</dependencySets>
<fileSets>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d86ec45b/odata2-dist/ref/src/main/assembly/ref-assembly.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/ref/src/main/assembly/ref-assembly.xml b/odata2-dist/ref/src/main/assembly/ref-assembly.xml
index 2409375..ce6f906 100644
--- a/odata2-dist/ref/src/main/assembly/ref-assembly.xml
+++ b/odata2-dist/ref/src/main/assembly/ref-assembly.xml
@@ -27,7 +27,7 @@
</fileSet>
<fileSet>
<outputDirectory>/</outputDirectory>
- <directory>${basedir}/../../odata2-processor-jpa/jpa-web/target/</directory>
+ <directory>${basedir}/../../odata2-jpa-processor/jpa-web/target/</directory>
<includes>
<include>**/*.war</include>
</includes>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d86ec45b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3ac43ed..57de237 100644
--- a/pom.xml
+++ b/pom.xml
@@ -154,7 +154,7 @@
<artifactId>maven-war-plugin</artifactId>
<version>2.4</version>
</plugin>
- </plugins>
+ </plugins>
</pluginManagement>
<plugins>
<plugin>
@@ -359,7 +359,9 @@
<head>Do not implement this interface or derive from class.</head>
</tag>
</tags>
- <excludePackageNames>org.apache.olingo.odata2.core:org.apache.olingo.odata2.core.*:org.apache.olingo.odata2.processor.core:org.apache.olingo.odata2.processor.core.*:org.apache.olingo.odata2.testutil:org.apache.olingo.odata2.testutil.*</excludePackageNames>
+ <excludePackageNames>
+ org.apache.olingo.odata2.core:org.apache.olingo.odata2.core.*:org.apache.olingo.odata2.jpa.processor.core:org.apache.olingo.odata2.jpa.processor.core.*:org.apache.olingo.odata2.annotation.processor.core:org.apache.olingo.odata2.annotation.processor.core.*:org.apache.olingo.odata2.testutil:org.apache.olingo.odata2.testutil.*
+ </excludePackageNames>
<additionalJOptions>
<additionalJOption>-quiet</additionalJOption>
</additionalJOptions>
@@ -374,12 +376,20 @@
</group>
<group>
<title>OData JPA Processor</title>
- <packages>org.apache.olingo.odata2.processor.api:org.apache.olingo.odata2.processor.api.*</packages>
+ <packages>org.apache.olingo.odata2.jpa.processor.api:org.apache.olingo.odata2.jpa.processor.api.*</packages>
+ </group>
+ <group>
+ <title>OData Annotation Processor</title>
+ <packages>org.apache.olingo.odata2.annotation.processor.api:org.apache.olingo.odata2.annotation.processor.api.*</packages>
</group>
<group>
<title>OData JPA Reference Scenario</title>
<packages>org.apache.olingo.odata2.jpa.processor.ref:org.apache.olingo.odata2.jpa.processor.ref.*</packages>
</group>
+ <group>
+ <title>OData Annotation Reference Scenario</title>
+ <packages>org.apache.olingo.odata2.annotation.processor.ref:org.apache.olingo.odata2.annotation.processor.ref.*</packages>
+ </group>
</groups>
</configuration>
</execution>
@@ -389,14 +399,14 @@
</build>
</profile>
</profiles>
-
- <repositories>
- <repository>
- <id>oss.sonatype.org</id>
- <name>OSS Sonatype Staging</name>
- <url>https://oss.sonatype.org/content/groups/staging</url>
- </repository>
- </repositories>
+
+ <repositories>
+ <repository>
+ <id>oss.sonatype.org</id>
+ <name>OSS Sonatype Staging</name>
+ <url>https://oss.sonatype.org/content/groups/staging</url>
+ </repository>
+ </repositories>
<dependencies>
<dependency>