felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bimargul...@apache.org
Subject svn commit: r1710372 - in /felix/trunk/tools/maven-bundle-plugin/src/it/embed-multiple-artifacts: ./ pom.xml verify.groovy
Date Sat, 24 Oct 2015 18:30:28 GMT
Author: bimargulies
Date: Sat Oct 24 18:30:28 2015
New Revision: 1710372

URL: http://svn.apache.org/viewvc?rev=1710372&view=rev
Log:
FELIX-5070: integration test that proves that there's no problem here.

Added:
    felix/trunk/tools/maven-bundle-plugin/src/it/embed-multiple-artifacts/
    felix/trunk/tools/maven-bundle-plugin/src/it/embed-multiple-artifacts/pom.xml   (with
props)
    felix/trunk/tools/maven-bundle-plugin/src/it/embed-multiple-artifacts/verify.groovy  
(with props)

Added: felix/trunk/tools/maven-bundle-plugin/src/it/embed-multiple-artifacts/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/tools/maven-bundle-plugin/src/it/embed-multiple-artifacts/pom.xml?rev=1710372&view=auto
==============================================================================
--- felix/trunk/tools/maven-bundle-plugin/src/it/embed-multiple-artifacts/pom.xml (added)
+++ felix/trunk/tools/maven-bundle-plugin/src/it/embed-multiple-artifacts/pom.xml Sat Oct
24 18:30:28 2015
@@ -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.
+-->
+<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>
+  <groupId>org.apache.felix.bundleits</groupId>
+  <artifactId>embed-multiple-artifacts</artifactId>
+  <version>1-SNAPSHOT</version>
+  <packaging>bundle</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.4</version>
+    </dependency>
+    <dependency>
+    <groupId>org.apache.commons</groupId>
+    <artifactId>commons-compress</artifactId>
+    <version>1.10</version>
+</dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>@project.version@</version>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Embed-Dependency>commons-io,commons-compress</Embed-Dependency>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Propchange: felix/trunk/tools/maven-bundle-plugin/src/it/embed-multiple-artifacts/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: felix/trunk/tools/maven-bundle-plugin/src/it/embed-multiple-artifacts/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: felix/trunk/tools/maven-bundle-plugin/src/it/embed-multiple-artifacts/verify.groovy
URL: http://svn.apache.org/viewvc/felix/trunk/tools/maven-bundle-plugin/src/it/embed-multiple-artifacts/verify.groovy?rev=1710372&view=auto
==============================================================================
--- felix/trunk/tools/maven-bundle-plugin/src/it/embed-multiple-artifacts/verify.groovy (added)
+++ felix/trunk/tools/maven-bundle-plugin/src/it/embed-multiple-artifacts/verify.groovy Sat
Oct 24 18:30:28 2015
@@ -0,0 +1,25 @@
+/*
+ * 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.
+ */
+
+new File(basedir, "target/classes/META-INF/MANIFEST.MF").eachLine() { line ->
+    if (line.contains("Embed-Dependency") && !(line.contains("commons-io") &&
line.contains("commons-compress"))) {
+           throw new Exception("Failed to embed both");
+    }
+}
+

Propchange: felix/trunk/tools/maven-bundle-plugin/src/it/embed-multiple-artifacts/verify.groovy
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: felix/trunk/tools/maven-bundle-plugin/src/it/embed-multiple-artifacts/verify.groovy
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message