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/08/26 17:33:50 UTC

[1/2] git commit: typo fix in pom

Updated Branches:
  refs/heads/master ccbb6bf9a -> 97d72fe01


typo fix in pom


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/24342a58
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/24342a58
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/24342a58

Branch: refs/heads/master
Commit: 24342a58bbdae8b54c8a7000a23487b48f7fd800
Parents: ccbb6bf
Author: Stephan Klevenz <sk...@apache.org>
Authored: Thu Aug 22 14:57:56 2013 +0200
Committer: Stephan Klevenz <sk...@apache.org>
Committed: Mon Aug 26 17:07:32 2013 +0200

----------------------------------------------------------------------
 odata-dist/pom.xml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/24342a58/odata-dist/pom.xml
----------------------------------------------------------------------
diff --git a/odata-dist/pom.xml b/odata-dist/pom.xml
new file mode 100644
index 0000000..e69de29


[2/2] git commit: introduce distribution module

Posted by sk...@apache.org.
introduce distribution module


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/97d72fe0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/97d72fe0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/97d72fe0

Branch: refs/heads/master
Commit: 97d72fe01db7cb372027295666f96316b5bde17a
Parents: 24342a5
Author: Stephan Klevenz <sk...@apache.org>
Authored: Fri Aug 23 13:01:01 2013 +0200
Committer: Stephan Klevenz <sk...@apache.org>
Committed: Mon Aug 26 17:33:08 2013 +0200

----------------------------------------------------------------------
 jpa-core/pom.xml                                |   1 +
 odata-dist/pom.xml                              | 120 +++++++++++++++++++
 .../main/assembly/odata-javadoc-assembly.xml    |  41 +++++++
 .../src/main/assembly/odata-jpa-assembly.xml    |  55 +++++++++
 .../src/main/assembly/odata-lib-assembly.xml    |  53 ++++++++
 .../src/main/assembly/odata-src-assembly.xml    |  41 +++++++
 odata-dist/src/main/resources/DEPENDENCIES      |   4 +
 odata-dist/src/main/resources/NOTICE            |   5 +
 pom.xml                                         |  15 ++-
 9 files changed, 332 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/97d72fe0/jpa-core/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-core/pom.xml b/jpa-core/pom.xml
index f92c755..778e2a2 100644
--- a/jpa-core/pom.xml
+++ b/jpa-core/pom.xml
@@ -134,6 +134,7 @@
 			<groupId>org.easymock</groupId>
 			<artifactId>easymock</artifactId>
 			<version>3.1</version>
+            <scope>test</scope>
 		</dependency>
 
 		<!-- ########################## -->

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/97d72fe0/odata-dist/pom.xml
----------------------------------------------------------------------
diff --git a/odata-dist/pom.xml b/odata-dist/pom.xml
index e69de29..b1e6f10 100644
--- a/odata-dist/pom.xml
+++ b/odata-dist/pom.xml
@@ -0,0 +1,120 @@
+<?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>dist</artifactId>
+    <packaging>pom</packaging>
+    <name>${project.groupId}-${project.artifactId}</name>
+
+    <parent>
+        <groupId>org.apache.olingo.odata2</groupId>
+        <artifactId>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>
+                        <executions>
+                            <execution>
+                                <id>package-assemblies</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <attach>true</attach>
+                                    <descriptors>
+                                        <descriptor>
+                                            src/main/assembly/odata-lib-assembly.xml
+                                        </descriptor>
+                                        <descriptor>
+                                            src/main/assembly/odata-jpa-assembly.xml
+                                        </descriptor>
+                                        <descriptor>
+                                            src/main/assembly/odata-src-assembly.xml
+                                        </descriptor>
+                                        <descriptor>
+                                            src/main/assembly/odata-javadoc-assembly.xml
+                                        </descriptor>
+                                    </descriptors>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.olingo.odata2</groupId>
+            <artifactId>api.annotation</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.olingo.odata2</groupId>
+            <artifactId>api</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.olingo.odata2</groupId>
+            <artifactId>core</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.olingo.odata2</groupId>
+            <artifactId>jpa.processor.api</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.olingo.odata2</groupId>
+            <artifactId>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/97d72fe0/odata-dist/src/main/assembly/odata-javadoc-assembly.xml
----------------------------------------------------------------------
diff --git a/odata-dist/src/main/assembly/odata-javadoc-assembly.xml b/odata-dist/src/main/assembly/odata-javadoc-assembly.xml
new file mode 100644
index 0000000..0fbf269
--- /dev/null
+++ b/odata-dist/src/main/assembly/odata-javadoc-assembly.xml
@@ -0,0 +1,41 @@
+<?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.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
+    <id>docs</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>${project.parent.build.directory}/apidocs</directory>
+            <includes>
+                <include>**</include>
+            </includes>
+        </fileSet>
+        <!-- license, readme, etc. calculated at build time -->
+        <fileSet>
+            <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
+            <outputDirectory>/</outputDirectory>
+            <excludes>
+                <exclude>DEPENDENCIES</exclude>
+                <exclude>NOTICE</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.basedir}/src/main/resources</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>DEPENDENCIES</include>
+                <include>NOTICE</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</assembly>

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/97d72fe0/odata-dist/src/main/assembly/odata-jpa-assembly.xml
----------------------------------------------------------------------
diff --git a/odata-dist/src/main/assembly/odata-jpa-assembly.xml b/odata-dist/src/main/assembly/odata-jpa-assembly.xml
new file mode 100644
index 0000000..7f699bf
--- /dev/null
+++ b/odata-dist/src/main/assembly/odata-jpa-assembly.xml
@@ -0,0 +1,55 @@
+<?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.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
+    <id>odata-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.odata2:core</include>
+                <include>org.apache.olingo.odata2:api</include>
+                <include>org.apache.olingo.odata2:api.annotation</include>
+                <include>org.apache.olingo.odata2:jpa.processor.api</include>
+                <include>org.apache.olingo.odata2:jpa.processor.core</include>
+ 
+                <include>org.eclipse.persistence:javax.persistence</include>
+            </includes>
+        </dependencySet>
+    </dependencySets>
+    <fileSets>
+        <!-- standard license and disclaimer -->
+        <fileSet>
+            <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
+            <outputDirectory></outputDirectory>
+            <excludes>
+                <exclude>DEPENDENCIES</exclude>
+                <exclude>NOTICE</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.basedir}/src/main/resources</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>DEPENDENCIES</include>
+                <include>NOTICE</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</assembly>

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/97d72fe0/odata-dist/src/main/assembly/odata-lib-assembly.xml
----------------------------------------------------------------------
diff --git a/odata-dist/src/main/assembly/odata-lib-assembly.xml b/odata-dist/src/main/assembly/odata-lib-assembly.xml
new file mode 100644
index 0000000..4f40eb1
--- /dev/null
+++ b/odata-dist/src/main/assembly/odata-lib-assembly.xml
@@ -0,0 +1,53 @@
+<?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.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
+    <id>odata-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.odata2:core</include>
+                <include>org.apache.olingo.odata2:api</include>
+            </includes>
+            <excludes>
+                <exclude>org.apache.olingo.odata2:api.annotation</exclude>
+            </excludes>
+        </dependencySet>
+    </dependencySets>
+    <fileSets>
+        <!-- standard license and disclaimer -->
+        <fileSet>
+            <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
+            <outputDirectory></outputDirectory>
+            <excludes>
+                <exclude>DEPENDENCIES</exclude>
+                <exclude>NOTICE</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.basedir}/src/main/resources</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>DEPENDENCIES</include>
+                <include>NOTICE</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</assembly>

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/97d72fe0/odata-dist/src/main/assembly/odata-src-assembly.xml
----------------------------------------------------------------------
diff --git a/odata-dist/src/main/assembly/odata-src-assembly.xml b/odata-dist/src/main/assembly/odata-src-assembly.xml
new file mode 100644
index 0000000..2da0007
--- /dev/null
+++ b/odata-dist/src/main/assembly/odata-src-assembly.xml
@@ -0,0 +1,41 @@
+<?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.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
+    <id>src</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>${project.directory}/src</directory>
+            <includes>
+                <include>**</include>
+            </includes>
+        </fileSet>
+        <!-- license, readme, etc. calculated at build time -->
+        <fileSet>
+            <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
+            <outputDirectory>/</outputDirectory>
+            <excludes>
+                <exclude>DEPENDENCIES</exclude>
+                <exclude>NOTICE</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.basedir}/src/main/resources</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>DEPENDENCIES</include>
+                <include>NOTICE</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</assembly>

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/97d72fe0/odata-dist/src/main/resources/DEPENDENCIES
----------------------------------------------------------------------
diff --git a/odata-dist/src/main/resources/DEPENDENCIES b/odata-dist/src/main/resources/DEPENDENCIES
new file mode 100644
index 0000000..ece4bc3
--- /dev/null
+++ b/odata-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/97d72fe0/odata-dist/src/main/resources/NOTICE
----------------------------------------------------------------------
diff --git a/odata-dist/src/main/resources/NOTICE b/odata-dist/src/main/resources/NOTICE
new file mode 100644
index 0000000..f0f81ac
--- /dev/null
+++ b/odata-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/97d72fe0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c61a20f..5282488 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,6 +69,7 @@
         <module>jpa-annotation</module>
         <module>jpa-api</module>
         <module>jpa-core</module>
+        <module>odata-dist</module>
     </modules>
 
     <build>
@@ -112,7 +113,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>2.2.1</version>
+                    <version>2.4</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
@@ -217,7 +218,7 @@
             </activation>
             <build>
                 <plugins>
-                 </plugins>
+                </plugins>
             </build>
         </profile>
         <profile>
@@ -232,7 +233,7 @@
                                 <id>javadoc-jar</id>
                                 <phase>package</phase>
                                 <goals>
-                                    <goal>jar</goal>
+                                    <goal>aggregate-jar</goal>
                                 </goals>
                                 <configuration>
                                     <tags>
@@ -245,6 +246,12 @@
                                     <additionalJOptions>
                                         <additionalJOption>-quiet</additionalJOption>
                                     </additionalJOptions>
+                                    <includeDependencySources>false</includeDependencySources>
+                                    <dependencySourceIncludes>
+                                        <dependencySourceInclude>org.apache.olingo.odata2:api</dependencySourceInclude>
+                                        <dependencySourceInclude>org.apache.olingo.odata2:jpa.processor.api</dependencySourceInclude>
+                                        <dependencySourceInclude>org.apache.olingo.odata2:api.annotation</dependencySourceInclude>
+                                    </dependencySourceIncludes>
                                 </configuration>
                             </execution>
                         </executions>
@@ -298,6 +305,8 @@
                                         <exclude>**/*.classpath</exclude>
                                         <exclude>**/*.json</exclude>
                                         <exclude>**/*.batch</exclude>
+                                        <exclude>**/NOTICE</exclude>
+                                        <exclude>**/DEPENDENCIES</exclude>
                                     </excludes>
                                 </configuration>
                             </execution>