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 2013/09/24 18:40:01 UTC
git commit: adapt distribution to project refactoring
Updated Branches:
refs/heads/master d7e075de0 -> e0c4d51d4
adapt distribution to project refactoring
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/e0c4d51d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/e0c4d51d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/e0c4d51d
Branch: refs/heads/master
Commit: e0c4d51d43c357fa659e1a8e493bdb4251710120
Parents: d7e075d
Author: Stephan Klevenz <sk...@apache.org>
Authored: Tue Sep 24 18:33:59 2013 +0200
Committer: Stephan Klevenz <sk...@apache.org>
Committed: Tue Sep 24 18:33:59 2013 +0200
----------------------------------------------------------------------
odata2-dist/pom.xml | 128 +++++++++++++++++++
.../src/main/assembly/javadoc-assembly.xml | 44 +++++++
odata2-dist/src/main/assembly/jpa-assembly.xml | 56 ++++++++
odata2-dist/src/main/assembly/lib-assembly.xml | 54 ++++++++
odata2-dist/src/main/assembly/ref-assembly.xml | 55 ++++++++
odata2-dist/src/main/resources/DEPENDENCIES | 4 +
odata2-dist/src/main/resources/NOTICE | 5 +
odata2-dist/src/main/resources/readme.txt | 64 ++++++++++
odata2-lib/odata-dist/pom.xml | 128 -------------------
.../src/main/assembly/javadoc-assembly.xml | 44 -------
.../src/main/assembly/jpa-assembly.xml | 56 --------
.../src/main/assembly/lib-assembly.xml | 54 --------
.../src/main/assembly/ref-assembly.xml | 55 --------
.../odata-dist/src/main/resources/DEPENDENCIES | 4 -
odata2-lib/odata-dist/src/main/resources/NOTICE | 5 -
.../odata-dist/src/main/resources/readme.txt | 64 ----------
odata2-lib/pom.xml | 1 -
odata2-processor-jpa/jpa-ref/pom.xml | 7 -
pom.xml | 3 +-
19 files changed, 412 insertions(+), 419 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/e0c4d51d/odata2-dist/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/pom.xml b/odata2-dist/pom.xml
new file mode 100644
index 0000000..a486547
--- /dev/null
+++ b/odata2-dist/pom.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under
+ the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may
+ obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to
+ in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+ ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under
+ the License. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>olingo.odata2.dist</artifactId>
+ <packaging>pom</packaging>
+ <name>${project.artifactId}</name>
+
+ <parent>
+ <groupId>org.apache.olingo</groupId>
+ <artifactId>olingo.odata2.parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <id>package-assemblies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <attach>true</attach>
+ <appendAssemblyId>true</appendAssemblyId>
+ <descriptors>
+ <descriptor>
+ src/main/assembly/lib-assembly.xml
+ </descriptor>
+ <descriptor>
+ src/main/assembly/jpa-assembly.xml
+ </descriptor>
+ <descriptor>
+ src/main/assembly/javadoc-assembly.xml
+ </descriptor>
+ <descriptor>
+ src/main/assembly/ref-assembly.xml
+ </descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.olingo</groupId>
+ <artifactId>olingo.odata2.api.annotation</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.olingo</groupId>
+ <artifactId>olingo.odata2.api</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.olingo</groupId>
+ <artifactId>olingo.odata2.core</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.olingo</groupId>
+ <artifactId>olingo.odata2.ref</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.olingo</groupId>
+ <artifactId>olingo.odata2.jpa.processor.api</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.olingo</groupId>
+ <artifactId>olingo.odata2.jpa.processor.core</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>javax.persistence</artifactId>
+ <version>${version.javax.persistence}</version>
+ <scope>compile</scope>
+ </dependency>
+
+
+ </dependencies>
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/e0c4d51d/odata2-dist/src/main/assembly/javadoc-assembly.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/src/main/assembly/javadoc-assembly.xml b/odata2-dist/src/main/assembly/javadoc-assembly.xml
new file mode 100644
index 0000000..30a909a
--- /dev/null
+++ b/odata2-dist/src/main/assembly/javadoc-assembly.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Lice nsed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under
+ the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may
+ obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to
+ in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+ ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under
+ the License. -->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ <id>javadoc</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <outputDirectory>/</outputDirectory>
+ <directory>${project.parent.build.directory}/apidocs</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>DEPENDENCIES</exclude>
+ <exclude>NOTICE</exclude>
+ <exclude>readme.txt</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/src/main/resources</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>DEPENDENCIES</include>
+ <include>NOTICE</include>
+ <include>readme.txt</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/e0c4d51d/odata2-dist/src/main/assembly/jpa-assembly.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/src/main/assembly/jpa-assembly.xml b/odata2-dist/src/main/assembly/jpa-assembly.xml
new file mode 100644
index 0000000..b96c04a
--- /dev/null
+++ b/odata2-dist/src/main/assembly/jpa-assembly.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under
+ the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may
+ obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to
+ in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+ ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under
+ the License. -->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ <id>jpa</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory></outputDirectory>
+ <outputFileNameMapping>${artifact.groupId}-${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping>
+ <unpack>false</unpack>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <useTransitiveFiltering>true</useTransitiveFiltering>
+ <scope>compile</scope>
+ <includes>
+ <include>org.apache.olingo:olingo.odata2.core</include>
+ <include>org.apache.olingo:olingo.odata2.api</include>
+ <include>org.apache.olingo:olingo.odata2.api.annotation</include>
+ <include>org.apache.olingo:olingo.odata2.jpa.processor.api</include>
+ <include>org.apache.olingo:olingo.odata2.jpa.processor.core</include>
+
+ <include>org.eclipse.persistence:javax.persistence</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>DEPENDENCIES</exclude>
+ <exclude>NOTICE</exclude>
+ <exclude>readme.txt</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/src/main/resources</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>DEPENDENCIES</include>
+ <include>NOTICE</include>
+ <include>readme.txt</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/e0c4d51d/odata2-dist/src/main/assembly/lib-assembly.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/src/main/assembly/lib-assembly.xml b/odata2-dist/src/main/assembly/lib-assembly.xml
new file mode 100644
index 0000000..6c187b4
--- /dev/null
+++ b/odata2-dist/src/main/assembly/lib-assembly.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under
+ the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may
+ obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to
+ in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+ ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under
+ the License. -->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ <id>lib</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory></outputDirectory>
+ <outputFileNameMapping>${artifact.groupId}-${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping>
+ <unpack>false</unpack>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <useTransitiveFiltering>true</useTransitiveFiltering>
+ <scope>compile</scope>
+ <includes>
+ <include>org.apache.olingo:olingo.odata2.core</include>
+ <include>org.apache.olingo:olingo.odata2.api</include>
+ </includes>
+ <excludes>
+ <exclude>org.apache.olingo:olingo.odata2.api.annotation</exclude>
+ </excludes>
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>DEPENDENCIES</exclude>
+ <exclude>NOTICE</exclude>
+ <exclude>readme.txt</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/src/main/resources</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>DEPENDENCIES</include>
+ <include>NOTICE</include>
+ <include>readme.txt</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/e0c4d51d/odata2-dist/src/main/assembly/ref-assembly.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/src/main/assembly/ref-assembly.xml b/odata2-dist/src/main/assembly/ref-assembly.xml
new file mode 100644
index 0000000..c4c6976
--- /dev/null
+++ b/odata2-dist/src/main/assembly/ref-assembly.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Lice nsed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under
+ the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may
+ obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to
+ in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+ ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under
+ the License. -->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+
+ <id>ref</id>
+
+ <formats>
+ <format>zip</format>
+ </formats>
+
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <fileSets>
+ <fileSet>
+ <outputDirectory>/</outputDirectory>
+ <directory>${basedir}/../odata2-lib/odata-web/target/</directory>
+ <includes>
+ <include>**/*.war</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>/</outputDirectory>
+ <directory>${basedir}/../odata2-processor-jpa/jpa-web/target/</directory>
+ <includes>
+ <include>**/*.war</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>DEPENDENCIES</exclude>
+ <exclude>NOTICE</exclude>
+ <exclude>readme.txt</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/src/main/resources</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>DEPENDENCIES</include>
+ <include>NOTICE</include>
+ <include>readme.txt</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/e0c4d51d/odata2-dist/src/main/resources/DEPENDENCIES
----------------------------------------------------------------------
diff --git a/odata2-dist/src/main/resources/DEPENDENCIES b/odata2-dist/src/main/resources/DEPENDENCIES
new file mode 100644
index 0000000..ece4bc3
--- /dev/null
+++ b/odata2-dist/src/main/resources/DEPENDENCIES
@@ -0,0 +1,4 @@
+Apache Olingo distribution package
+
+For a complete description of dependencies used by JARs/WARs contained in this package,
+please refer to the META-INF/DEPENDENCIES file contained in each Apache Olingo artifact
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/e0c4d51d/odata2-dist/src/main/resources/NOTICE
----------------------------------------------------------------------
diff --git a/odata2-dist/src/main/resources/NOTICE b/odata2-dist/src/main/resources/NOTICE
new file mode 100644
index 0000000..f0f81ac
--- /dev/null
+++ b/odata2-dist/src/main/resources/NOTICE
@@ -0,0 +1,5 @@
+Apache Olingo distribution package
+
+For a complete listing of License Notices for 3rd party libraries shipped by JARs/WARs contained in this package,
+please refer to the META-INF/NOTICE file contained in each Apache Olingo artifact.
+
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/e0c4d51d/odata2-dist/src/main/resources/readme.txt
----------------------------------------------------------------------
diff --git a/odata2-dist/src/main/resources/readme.txt b/odata2-dist/src/main/resources/readme.txt
new file mode 100644
index 0000000..5b53ce6
--- /dev/null
+++ b/odata2-dist/src/main/resources/readme.txt
@@ -0,0 +1,64 @@
+==========================
+Apache Olingo (Incubation)
+==========================
+
+Apache Olingo is a Java library and extensions around
+the OData specification.
+
+Apache Olingo supports the specification versions
+ - OData 2.0 <http://www.odata.org/documentation/odata-v2-documentation/>
+
+Building Apache Olingo
+======================
+
+You can build Apache Olingo like this:
+
+ mvn clean install
+
+You need Maven 3 with Java 6 (or higher) for the build.
+Set the environment variable MAVEN_OPTS to
+'-Xmx1024m -XX:MaxPermSize=256m' to give Maven more memory.
+
+Documentation
+=============
+
+The project documentation is available here:
+
+http://olingo.incubator.apache.org/documentation.html
+
+License (see also package specific LICENSE files)
+=================================================
+
+Collective work: Copyright 2013 The Apache Software Foundation.
+
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Dependencies with "Weak Copyleft" or dual licenses
+==================================================
+
+Apache Olingo uses some libraries with open source licenses that require reciprocal
+licensing when modified. These libraries are included in unmodified binary
+form and can be redistributed under terms that are compatible with the
+Apache License.
+
+Some libraries used by Apache Olingo are dual-licensed under different open source
+licenses. These libraries are redistributed under the license whose terms
+are compatible with the Apache License.
+
+See LICENSE file included in all Apache Olingo packages for
+full licensing details.
+
+
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/e0c4d51d/odata2-lib/odata-dist/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-dist/pom.xml b/odata2-lib/odata-dist/pom.xml
deleted file mode 100644
index 3d56b74..0000000
--- a/odata2-lib/odata-dist/pom.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under
- the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may
- obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to
- in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
- ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under
- the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>olingo.odata2.dist</artifactId>
- <packaging>pom</packaging>
- <name>${project.artifactId}</name>
-
- <parent>
- <groupId>org.apache.olingo</groupId>
- <artifactId>olingo.odata2.lib</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
-
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>apache-release</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <inherited>false</inherited>
- <executions>
- <execution>
- <id>package-assemblies</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <attach>true</attach>
- <appendAssemblyId>true</appendAssemblyId>
- <descriptors>
- <descriptor>
- src/main/assembly/lib-assembly.xml
- </descriptor>
- <descriptor>
- src/main/assembly/jpa-assembly.xml
- </descriptor>
- <descriptor>
- src/main/assembly/javadoc-assembly.xml
- </descriptor>
- <descriptor>
- src/main/assembly/ref-assembly.xml
- </descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.olingo</groupId>
- <artifactId>olingo.odata2.api.annotation</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.olingo</groupId>
- <artifactId>olingo.odata2.api</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.olingo</groupId>
- <artifactId>olingo.odata2.core</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.olingo</groupId>
- <artifactId>olingo.odata2.ref</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.olingo</groupId>
- <artifactId>olingo.odata2.jpa.processor.api</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.olingo</groupId>
- <artifactId>olingo.odata2.jpa.processor.core</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>javax.persistence</artifactId>
- <version>${version.javax.persistence}</version>
- <scope>compile</scope>
- </dependency>
-
-
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/e0c4d51d/odata2-lib/odata-dist/src/main/assembly/javadoc-assembly.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-dist/src/main/assembly/javadoc-assembly.xml b/odata2-lib/odata-dist/src/main/assembly/javadoc-assembly.xml
deleted file mode 100644
index 30a909a..0000000
--- a/odata2-lib/odata-dist/src/main/assembly/javadoc-assembly.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Lice nsed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under
- the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may
- obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to
- in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
- ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under
- the License. -->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
- <id>javadoc</id>
- <formats>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <outputDirectory>/</outputDirectory>
- <directory>${project.parent.build.directory}/apidocs</directory>
- <includes>
- <include>**</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
- <outputDirectory>/</outputDirectory>
- <excludes>
- <exclude>DEPENDENCIES</exclude>
- <exclude>NOTICE</exclude>
- <exclude>readme.txt</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/src/main/resources</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>DEPENDENCIES</include>
- <include>NOTICE</include>
- <include>readme.txt</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/e0c4d51d/odata2-lib/odata-dist/src/main/assembly/jpa-assembly.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-dist/src/main/assembly/jpa-assembly.xml b/odata2-lib/odata-dist/src/main/assembly/jpa-assembly.xml
deleted file mode 100644
index b96c04a..0000000
--- a/odata2-lib/odata-dist/src/main/assembly/jpa-assembly.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under
- the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may
- obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to
- in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
- ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under
- the License. -->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
- <id>jpa</id>
- <formats>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory></outputDirectory>
- <outputFileNameMapping>${artifact.groupId}-${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping>
- <unpack>false</unpack>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- <useTransitiveFiltering>true</useTransitiveFiltering>
- <scope>compile</scope>
- <includes>
- <include>org.apache.olingo:olingo.odata2.core</include>
- <include>org.apache.olingo:olingo.odata2.api</include>
- <include>org.apache.olingo:olingo.odata2.api.annotation</include>
- <include>org.apache.olingo:olingo.odata2.jpa.processor.api</include>
- <include>org.apache.olingo:olingo.odata2.jpa.processor.core</include>
-
- <include>org.eclipse.persistence:javax.persistence</include>
- </includes>
- </dependencySet>
- </dependencySets>
- <fileSets>
- <fileSet>
- <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
- <outputDirectory>/</outputDirectory>
- <excludes>
- <exclude>DEPENDENCIES</exclude>
- <exclude>NOTICE</exclude>
- <exclude>readme.txt</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/src/main/resources</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>DEPENDENCIES</include>
- <include>NOTICE</include>
- <include>readme.txt</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/e0c4d51d/odata2-lib/odata-dist/src/main/assembly/lib-assembly.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-dist/src/main/assembly/lib-assembly.xml b/odata2-lib/odata-dist/src/main/assembly/lib-assembly.xml
deleted file mode 100644
index 6c187b4..0000000
--- a/odata2-lib/odata-dist/src/main/assembly/lib-assembly.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under
- the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may
- obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to
- in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
- ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under
- the License. -->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
- <id>lib</id>
- <formats>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory></outputDirectory>
- <outputFileNameMapping>${artifact.groupId}-${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping>
- <unpack>false</unpack>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- <useTransitiveFiltering>true</useTransitiveFiltering>
- <scope>compile</scope>
- <includes>
- <include>org.apache.olingo:olingo.odata2.core</include>
- <include>org.apache.olingo:olingo.odata2.api</include>
- </includes>
- <excludes>
- <exclude>org.apache.olingo:olingo.odata2.api.annotation</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
- <fileSets>
- <fileSet>
- <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
- <outputDirectory>/</outputDirectory>
- <excludes>
- <exclude>DEPENDENCIES</exclude>
- <exclude>NOTICE</exclude>
- <exclude>readme.txt</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/src/main/resources</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>DEPENDENCIES</include>
- <include>NOTICE</include>
- <include>readme.txt</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/e0c4d51d/odata2-lib/odata-dist/src/main/assembly/ref-assembly.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-dist/src/main/assembly/ref-assembly.xml b/odata2-lib/odata-dist/src/main/assembly/ref-assembly.xml
deleted file mode 100644
index e975f11..0000000
--- a/odata2-lib/odata-dist/src/main/assembly/ref-assembly.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Lice nsed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under
- the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may
- obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to
- in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
- ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under
- the License. -->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-
- <id>ref</id>
-
- <formats>
- <format>zip</format>
- </formats>
-
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <fileSets>
- <fileSet>
- <outputDirectory>/</outputDirectory>
- <directory>${basedir}/../odata-web/target</directory>
- <includes>
- <include>**/*.war</include>
- </includes>
- </fileSet>
- <fileSet>
- <outputDirectory>/</outputDirectory>
- <directory>${basedir}/../jpa-web/target</directory>
- <includes>
- <include>**/*.war</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
- <outputDirectory>/</outputDirectory>
- <excludes>
- <exclude>DEPENDENCIES</exclude>
- <exclude>NOTICE</exclude>
- <exclude>readme.txt</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/src/main/resources</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>DEPENDENCIES</include>
- <include>NOTICE</include>
- <include>readme.txt</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/e0c4d51d/odata2-lib/odata-dist/src/main/resources/DEPENDENCIES
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-dist/src/main/resources/DEPENDENCIES b/odata2-lib/odata-dist/src/main/resources/DEPENDENCIES
deleted file mode 100644
index ece4bc3..0000000
--- a/odata2-lib/odata-dist/src/main/resources/DEPENDENCIES
+++ /dev/null
@@ -1,4 +0,0 @@
-Apache Olingo distribution package
-
-For a complete description of dependencies used by JARs/WARs contained in this package,
-please refer to the META-INF/DEPENDENCIES file contained in each Apache Olingo artifact
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/e0c4d51d/odata2-lib/odata-dist/src/main/resources/NOTICE
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-dist/src/main/resources/NOTICE b/odata2-lib/odata-dist/src/main/resources/NOTICE
deleted file mode 100644
index f0f81ac..0000000
--- a/odata2-lib/odata-dist/src/main/resources/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Olingo distribution package
-
-For a complete listing of License Notices for 3rd party libraries shipped by JARs/WARs contained in this package,
-please refer to the META-INF/NOTICE file contained in each Apache Olingo artifact.
-
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/e0c4d51d/odata2-lib/odata-dist/src/main/resources/readme.txt
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-dist/src/main/resources/readme.txt b/odata2-lib/odata-dist/src/main/resources/readme.txt
deleted file mode 100644
index 5b53ce6..0000000
--- a/odata2-lib/odata-dist/src/main/resources/readme.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-==========================
-Apache Olingo (Incubation)
-==========================
-
-Apache Olingo is a Java library and extensions around
-the OData specification.
-
-Apache Olingo supports the specification versions
- - OData 2.0 <http://www.odata.org/documentation/odata-v2-documentation/>
-
-Building Apache Olingo
-======================
-
-You can build Apache Olingo like this:
-
- mvn clean install
-
-You need Maven 3 with Java 6 (or higher) for the build.
-Set the environment variable MAVEN_OPTS to
-'-Xmx1024m -XX:MaxPermSize=256m' to give Maven more memory.
-
-Documentation
-=============
-
-The project documentation is available here:
-
-http://olingo.incubator.apache.org/documentation.html
-
-License (see also package specific LICENSE files)
-=================================================
-
-Collective work: Copyright 2013 The Apache Software Foundation.
-
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Dependencies with "Weak Copyleft" or dual licenses
-==================================================
-
-Apache Olingo uses some libraries with open source licenses that require reciprocal
-licensing when modified. These libraries are included in unmodified binary
-form and can be redistributed under terms that are compatible with the
-Apache License.
-
-Some libraries used by Apache Olingo are dual-licensed under different open source
-licenses. These libraries are redistributed under the license whose terms
-are compatible with the Apache License.
-
-See LICENSE file included in all Apache Olingo packages for
-full licensing details.
-
-
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/e0c4d51d/odata2-lib/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/pom.xml b/odata2-lib/pom.xml
index aadba0d..f7e1422 100644
--- a/odata2-lib/pom.xml
+++ b/odata2-lib/pom.xml
@@ -30,6 +30,5 @@
<module>odata-fit</module>
<module>odata-ref</module>
<module>odata-web</module>
- <module>odata-dist</module>
</modules>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/e0c4d51d/odata2-processor-jpa/jpa-ref/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-processor-jpa/jpa-ref/pom.xml b/odata2-processor-jpa/jpa-ref/pom.xml
index 05eb859..94857e2 100644
--- a/odata2-processor-jpa/jpa-ref/pom.xml
+++ b/odata2-processor-jpa/jpa-ref/pom.xml
@@ -36,13 +36,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/e0c4d51d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 18ad21c..d11deb8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,8 @@
<modules>
<module>odata2-lib</module>
<module>odata2-processor-jpa</module>
- </modules>
+ <module>odata2-dist</module>
+ </modules>
<build>
<finalName>${project.groupId}-${project.artifactId}-${project.version}</finalName>