You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metamodel.apache.org by ka...@apache.org on 2015/10/21 10:57:57 UTC
metamodel git commit: METAMODEL-144: Fixed - Added binary packaging
of MetaModel. Fixes #60
Repository: metamodel
Updated Branches:
refs/heads/master 5370703a7 -> 60989cc25
METAMODEL-144: Fixed - Added binary packaging of MetaModel.
Fixes #60
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/60989cc2
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/60989cc2
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/60989cc2
Branch: refs/heads/master
Commit: 60989cc255208abd4992455767ac089ee32f75e5
Parents: 5370703
Author: Kasper Sørensen <i....@gmail.com>
Authored: Wed Oct 21 10:57:49 2015 +0200
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Wed Oct 21 10:57:49 2015 +0200
----------------------------------------------------------------------
full/pom.xml | 24 ++++++++++-
.../metamodel-packaged-assembly-descriptor.xml | 45 ++++++++++++++++++++
pom.xml | 9 ++--
3 files changed, 74 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/60989cc2/full/pom.xml
----------------------------------------------------------------------
diff --git a/full/pom.xml b/full/pom.xml
index c2e6278..9a51130 100644
--- a/full/pom.xml
+++ b/full/pom.xml
@@ -17,7 +17,8 @@ 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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
@@ -71,6 +72,27 @@ under the License.
<failOnWarn>true</failOnWarn>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/metamodel-packaged-assembly-descriptor.xml</descriptor>
+ </descriptors>
+ <finalName>MetaModel-${project.version}</finalName>
+ </configuration>
+ <executions>
+ <execution>
+ <id>create-archive</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
<pluginManagement>
http://git-wip-us.apache.org/repos/asf/metamodel/blob/60989cc2/full/src/assembly/metamodel-packaged-assembly-descriptor.xml
----------------------------------------------------------------------
diff --git a/full/src/assembly/metamodel-packaged-assembly-descriptor.xml b/full/src/assembly/metamodel-packaged-assembly-descriptor.xml
new file mode 100644
index 0000000..d9c3743
--- /dev/null
+++ b/full/src/assembly/metamodel-packaged-assembly-descriptor.xml
@@ -0,0 +1,45 @@
+<assembly
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+ <id>packaged</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}/..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>../CHANGES*</include>
+ <include>../LICENSE*</include>
+ <include>../NOTICE*</include>
+ <include>../README*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}/lib</directory>
+ <outputDirectory>/lib</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>MetaModel-*.jar</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}/lib</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>MetaModel-*.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/metamodel/blob/60989cc2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7cac98e..fa5aece 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,8 @@ 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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -354,7 +355,8 @@ under the License.
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<licenses>
- <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+ <license
+ implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
<licenseFamilyCategory>ASL20</licenseFamilyCategory>
<licenseFamilyName>Apache Software License, 2.0</licenseFamilyName>
<notes>Single licensed ASL v2.0</notes>
@@ -371,6 +373,7 @@ under the License.
<exclude>*.md</exclude>
<exclude>example-metamodel-integrationtest-configuration.properties</exclude>
<exclude>travis-metamodel-integrationtest-configuration.properties</exclude>
+ <exclude>**/src/assembly/metamodel-packaged-assembly-descriptor.xml</exclude>
<exclude>**/.gitignore/**</exclude>
<exclude>.git/**</exclude>
<exclude>**/src/test/resources/**</exclude>
@@ -515,7 +518,7 @@ under the License.
<artifactId>hsqldb</artifactId>
<version>1.8.0.10</version>
</dependency>
-
+
<!-- Hadoop -->
<dependency>
<groupId>org.apache.hadoop</groupId>