You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2018/11/10 00:24:40 UTC
[tika] 02/04: TIKA-2775 - bulk update plugins
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 7beae2f510d124adcb60178320317c5d161380d0
Author: TALLISON <ta...@apache.org>
AuthorDate: Fri Nov 9 14:43:22 2018 -0500
TIKA-2775 - bulk update plugins
---
pom.xml | 5 ++-
tika-app/pom.xml | 5 ++-
tika-batch/pom.xml | 21 +---------
tika-bundle/pom.xml | 7 +++-
tika-core/pom.xml | 4 +-
.../main/java/org/apache/tika/fork/ForkParser.java | 3 +-
tika-dl/pom.xml | 1 +
tika-eval/pom.xml | 5 ++-
tika-java7/pom.xml | 4 +-
tika-langdetect/pom.xml | 4 +-
tika-nlp/pom.xml | 1 +
tika-parent/pom.xml | 33 ++++++++++++----
tika-parsers/pom.xml | 8 ++--
.../org/apache/tika/parser/crypto/Pkcs7Parser.java | 46 ++++++++++++++--------
tika-server/pom.xml | 7 +++-
tika-translate/pom.xml | 4 +-
tika-xmp/pom.xml | 3 +-
17 files changed, 101 insertions(+), 60 deletions(-)
diff --git a/pom.xml b/pom.xml
index a3cd16d..f1fa8c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,11 +38,11 @@
<module>tika-parent</module>
<module>tika-core</module>
<module>tika-parsers</module>
+ <module>tika-bundle</module>
<module>tika-xmp</module>
<module>tika-serialization</module>
<module>tika-batch</module>
<module>tika-app</module>
- <module>tika-bundle</module>
<module>tika-server</module>
<module>tika-translate</module>
<module>tika-langdetect</module>
@@ -63,6 +63,7 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven.assembly.version}</version>
<executions>
<execution>
<id>src</id>
@@ -86,6 +87,7 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>${maven.antrun.version}</version>
<executions>
<execution>
<goals>
@@ -176,6 +178,7 @@ least three +1 Tika PMC votes are cast.
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
+ <version>${rat.version}</version>
<configuration>
<excludes>
<exclude>CHANGES.txt</exclude>
diff --git a/tika-app/pom.xml b/tika-app/pom.xml
index 482bf28..b5d7afb 100644
--- a/tika-app/pom.xml
+++ b/tika-app/pom.xml
@@ -104,6 +104,7 @@
<plugins>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
+ <version>${maven.shade.version}</version>
<executions>
<execution>
<phase>package</phase>
@@ -182,6 +183,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
+ <version>${rat.version}</version>
<configuration>
<excludes>
<exclude>src/test/resources/test-data/**</exclude>
@@ -203,6 +205,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>${maven.antrun.version}</version>
<executions>
<execution>
<phase>package</phase>
@@ -239,7 +242,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
+ <version>3.0.0</version>
<executions>
<execution>
<phase>package</phase>
diff --git a/tika-batch/pom.xml b/tika-batch/pom.xml
index 6a36e84..45bd066 100644
--- a/tika-batch/pom.xml
+++ b/tika-batch/pom.xml
@@ -124,6 +124,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <version>${maven.bundle.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -138,6 +139,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
+ <version>${rat.version}</version>
<configuration>
<excludes>
<exclude>src/test/resources/org/apache/tika/**</exclude>
@@ -163,25 +165,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>2.10</version>
- <configuration>
- <additionalClasspathElements>
- <additionalClasspathElement>
- ${project.build.directory}/${project.build.finalName}.jar
- </additionalClasspathElement>
- </additionalClasspathElements>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
diff --git a/tika-bundle/pom.xml b/tika-bundle/pom.xml
index 85ba9d4..4fb1019 100644
--- a/tika-bundle/pom.xml
+++ b/tika-bundle/pom.xml
@@ -41,7 +41,7 @@
<url>http://tika.apache.org/</url>
<properties>
- <pax.exam.version>4.11.0</pax.exam.version>
+ <pax.exam.version>4.12.0</pax.exam.version>
</properties>
<dependencies>
@@ -140,6 +140,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <version>${maven.bundle.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -481,6 +482,7 @@
<plugin>
<groupId>de.thetaphi</groupId>
<artifactId>forbiddenapis</artifactId>
+ <version>${forbiddenapis.version}</version>
<configuration>
<skip>true</skip>
</configuration>
@@ -505,7 +507,7 @@
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.10</version>
+ <version>${maven.failsafe.version}</version>
<executions>
<execution>
<goals>
@@ -525,6 +527,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
+ <version>${rat.version}</version>
<configuration>
<excludes>
<exclude>src/main/resources/META-INF/MANIFEST.MF</exclude>
diff --git a/tika-core/pom.xml b/tika-core/pom.xml
index 960e9a1..f55de96 100644
--- a/tika-core/pom.xml
+++ b/tika-core/pom.xml
@@ -69,6 +69,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <version>${maven.bundle.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -83,6 +84,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
+ <version>${rat.version}</version>
<configuration>
<excludes>
<exclude>src/test/resources/org/apache/tika/**</exclude>
@@ -149,7 +151,7 @@
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.10</version>
+ <version>2.22.1</version>
<configuration>
<additionalClasspathElements>
<additionalClasspathElement>
diff --git a/tika-core/src/main/java/org/apache/tika/fork/ForkParser.java b/tika-core/src/main/java/org/apache/tika/fork/ForkParser.java
index 011324a..7298d49 100644
--- a/tika-core/src/main/java/org/apache/tika/fork/ForkParser.java
+++ b/tika-core/src/main/java/org/apache/tika/fork/ForkParser.java
@@ -16,6 +16,7 @@
*/
package org.apache.tika.fork;
+import java.io.Closeable;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Path;
@@ -40,7 +41,7 @@ import org.apache.tika.sax.TeeContentHandler;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
-public class ForkParser extends AbstractParser {
+public class ForkParser extends AbstractParser implements Closeable {
/** Serial version UID */
private static final long serialVersionUID = -4962742892274663950L;
diff --git a/tika-dl/pom.xml b/tika-dl/pom.xml
index b1e8e43..96b27bb 100644
--- a/tika-dl/pom.xml
+++ b/tika-dl/pom.xml
@@ -360,6 +360,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
+ <version>${rat.version}</version>
<configuration>
</configuration>
</plugin>
diff --git a/tika-eval/pom.xml b/tika-eval/pom.xml
index 45c39a2..c2c595c 100644
--- a/tika-eval/pom.xml
+++ b/tika-eval/pom.xml
@@ -156,6 +156,7 @@
<plugins>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
+ <version>${maven.shade.version}</version>
<executions>
<execution>
<phase>package</phase>
@@ -198,6 +199,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <version>${maven.bundle.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -212,6 +214,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
+ <version>${rat.version}</version>
<configuration>
<excludes>
<exclude>src/main/resources/common_tokens/*</exclude>
@@ -241,7 +244,7 @@
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.10</version>
+ <version>${maven.failsafe.version}</version>
<configuration>
<additionalClasspathElements>
<additionalClasspathElement>
diff --git a/tika-java7/pom.xml b/tika-java7/pom.xml
index d5d8716..b3e9fbd 100644
--- a/tika-java7/pom.xml
+++ b/tika-java7/pom.xml
@@ -44,12 +44,13 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <version>1.7.4</version>
+ <version>${maven.scr.version}</version>
</plugin>
<plugin>
<!-- builds the bundle -->
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <version>${maven.bundle.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -63,6 +64,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
+ <version>${rat.version}</version>
<configuration>
<excludes>
<exclude>src/main/resources/META-INF/services/java.nio.file.spi.FileTypeDetector</exclude>
diff --git a/tika-langdetect/pom.xml b/tika-langdetect/pom.xml
index 8605722..d9585bf 100644
--- a/tika-langdetect/pom.xml
+++ b/tika-langdetect/pom.xml
@@ -105,6 +105,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <version>${maven.bundle.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -123,6 +124,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
+ <version>${rat.version}</version>
<configuration>
<excludes>
<exclude>src/test/resources/org/apache/tika/langdetect/*</exclude>
@@ -166,7 +168,7 @@
<pluginExecutionFilter>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <versionRange>[1.7.2,)</versionRange>
+ <version>${maven.scr.version}</version>
<goals>
<goal>scr</goal>
</goals>
diff --git a/tika-nlp/pom.xml b/tika-nlp/pom.xml
index d80e601..70a391b 100644
--- a/tika-nlp/pom.xml
+++ b/tika-nlp/pom.xml
@@ -239,6 +239,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
+ <version>${rat.version}</version>
<configuration>
<excludes />
</configuration>
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 97b5a71..58d0308 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -305,6 +305,18 @@
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
+ <!-- plugin versions -->
+ <forbiddenapis.version>2.6</forbiddenapis.version>
+ <groovy.maven.version>2.1</groovy.maven.version>
+ <maven.antrun.version>1.8</maven.antrun.version>
+ <maven.assembly.version>3.1.0</maven.assembly.version>
+ <maven.bundle.version>4.1.0</maven.bundle.version>
+ <maven.failsafe.version>2.22.1</maven.failsafe.version>
+ <maven.javadoc.version>3.0.1</maven.javadoc.version>
+ <maven.scr.version>1.26.0</maven.scr.version>
+ <maven.surefire.version>2.22.1</maven.surefire.version>
+ <maven.shade.version>3.2.0</maven.shade.version>
+ <rat.version>0.12</rat.version>
<!-- NOTE: sync tukaani version with commons-compress in tika-parsers -->
<commons.compress.version>1.18</commons.compress.version>
<commons.io.version>2.6</commons.io.version>
@@ -321,7 +333,7 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.2</version>
+ <version>3.8.0</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
@@ -334,7 +346,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
- <version>2.5</version>
+ <version>2.7</version>
<configuration>
<generateBackupPoms>false</generateBackupPoms>
</configuration>
@@ -343,7 +355,7 @@
<groupId>de.thetaphi</groupId>
<artifactId>forbiddenapis</artifactId>
<!-- if this version contains commons-io 2.6, remove hard-coded commons-io version below -->
- <version>2.6</version>
+ <version>${forbiddenapis.version}</version>
<configuration>
<targetVersion>${maven.compiler.target}</targetVersion>
<failOnUnresolvableSignatures>false</failOnUnresolvableSignatures>
@@ -368,12 +380,12 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>3.5.1</version>
+ <version>${maven.bundle.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.18.1</version> <!-- versions greater than this don't like System.exit calls in tika-batch -->
+ <version>${maven.surefire.version}</version> <!-- versions greater than this don't like System.exit calls in tika-batch -->
<configuration>
<argLine>-Xmx3072m -Duser.timezone=UTC</argLine>
</configuration>
@@ -381,7 +393,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>2.4.3</version>
+ <version>${maven.shade.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -398,13 +410,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0-M1</version>
+ <version>3.0.0-M2</version>
<executions>
<execution>
<id>enforce</id>
<configuration>
<rules>
<dependencyConvergence/>
+ <requireMavenVersion>
+ <version>3.5</version>
+ </requireMavenVersion>
</rules>
</configuration>
<goals>
@@ -424,6 +439,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
+ <version>${rat.version}</version>
<executions>
<execution>
<phase>verify</phase>
@@ -462,8 +478,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>${maven.javadoc.version}</version>
<configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
+ <doclint>none</doclint>
</configuration>
</plugin>
</plugins>
diff --git a/tika-parsers/pom.xml b/tika-parsers/pom.xml
index 4a284ec..da50721 100644
--- a/tika-parsers/pom.xml
+++ b/tika-parsers/pom.xml
@@ -818,6 +818,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <version>${maven.bundle.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -836,6 +837,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
+ <version>${rat.version}</version>
<configuration>
<excludes>
<exclude>src/main/java/org/apache/tika/parser/txt/Charset*.java</exclude>
@@ -879,7 +881,7 @@
<pluginExecutionFilter>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <versionRange>[1.7.2,)</versionRange>
+ <version>${maven.scr.version}</version>
<goals>
<goal>scr</goal>
</goals>
@@ -892,7 +894,7 @@
<pluginExecutionFilter>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>groovy-maven-plugin</artifactId>
- <versionRange>[2.0,)</versionRange>
+ <version>${groovy.maven.version}</version>
<goals>
<goal>execute</goal>
</goals>
@@ -936,7 +938,7 @@
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>groovy-maven-plugin</artifactId>
- <version>2.0</version>
+ <version>${groovy.maven.version}</version>
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java b/tika-parsers/src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java
index 9897e4b..a0608d1 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java
@@ -16,10 +16,6 @@
*/
package org.apache.tika.parser.crypto;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Set;
-
import org.apache.commons.io.input.CloseShieldInputStream;
import org.apache.tika.exception.TikaException;
import org.apache.tika.metadata.Metadata;
@@ -37,12 +33,18 @@ import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Set;
+
/**
* Basic parser for PKCS7 data.
*/
public class Pkcs7Parser extends AbstractParser {
- /** Serial version UID */
+ /**
+ * Serial version UID
+ */
private static final long serialVersionUID = -7310531559075115044L;
private static final MediaType PKCS7_MIME =
@@ -62,22 +64,32 @@ public class Pkcs7Parser extends AbstractParser {
try {
DigestCalculatorProvider digestCalculatorProvider =
new JcaDigestCalculatorProviderBuilder().setProvider("BC").build();
- try (CMSSignedDataParser parser = new CMSSignedDataParser(digestCalculatorProvider,
- new CloseShieldInputStream(stream))) {
- CMSTypedStream content = parser.getSignedContent();
- if (content == null) {
- throw new TikaException("cannot parse detached pkcs7 signature (no signed data to parse)");
- }
- try (InputStream input = content.getContentStream()) {
- Parser delegate =
- context.get(Parser.class, EmptyParser.INSTANCE);
- delegate.parse(input, handler, metadata, context);
+ CMSSignedDataParser parser = null;
+ CMSTypedStream content = null;
+ try {
+ parser = new CMSSignedDataParser(digestCalculatorProvider,
+ new CloseShieldInputStream(stream));
+ content = parser.getSignedContent();
+ } catch (CMSException e) {
+ throw new TikaException("Unable to parse pkcs7 signed data", e);
+
+ } finally {
+ if (parser != null) {
+ parser.close();
}
}
+
+ if (content == null) {
+ throw new TikaException("cannot parse detached pkcs7 signature (no signed data to parse)");
+ }
+ try (InputStream input = content.getContentStream()) {
+ Parser delegate =
+ context.get(Parser.class, EmptyParser.INSTANCE);
+ delegate.parse(input, handler, metadata, context);
+ }
+
} catch (OperatorCreationException e) {
throw new TikaException("Unable to create DigestCalculatorProvider", e);
- } catch (CMSException e) {
- throw new TikaException("Unable to parse pkcs7 signed data", e);
}
}
diff --git a/tika-server/pom.xml b/tika-server/pom.xml
index 1b606ab..ed4ed24 100644
--- a/tika-server/pom.xml
+++ b/tika-server/pom.xml
@@ -171,6 +171,7 @@
</plugin>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
+ <version>${maven.shade.version}</version>
<executions>
<execution>
<phase>package</phase>
@@ -265,7 +266,7 @@
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
- <version>1.3.7</version>
+ <version>1.4.7</version>
<configuration>
<repository>apache/tika-server</repository>
<tag>${project.version}</tag>
@@ -295,6 +296,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
+ <version>${rat.version}</version>
<configuration>
<excludes>
<exclude>src/main/resources/tikaserver-version.properties</exclude>
@@ -314,6 +316,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
+ <version>1.6.0</version>
<executions>
<execution>
<phase>test</phase>
@@ -329,7 +332,7 @@
<plugin>
<groupId>com.qmino</groupId>
<artifactId>miredot-plugin</artifactId>
- <version>2.0.3</version>
+ <version>2.1.2</version>
<executions>
<execution>
<goals>
diff --git a/tika-translate/pom.xml b/tika-translate/pom.xml
index 6dfe618..4db448c 100644
--- a/tika-translate/pom.xml
+++ b/tika-translate/pom.xml
@@ -107,6 +107,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <version>${maven.bundle.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -125,6 +126,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
+ <version>${rat.version}</version>
<configuration>
<excludes>
<exclude>src/main/java/org/apache/tika/parser/txt/Charset*.java</exclude>
@@ -167,7 +169,7 @@
<pluginExecutionFilter>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <versionRange>[1.7.2,)</versionRange>
+ <version>${maven.scr.version}</version>
<goals>
<goal>scr</goal>
</goals>
diff --git a/tika-xmp/pom.xml b/tika-xmp/pom.xml
index dde2fdc..3067af3 100644
--- a/tika-xmp/pom.xml
+++ b/tika-xmp/pom.xml
@@ -39,12 +39,13 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <version>1.7.4</version>
+ <version>${maven.scr.version}</version>
</plugin>
<plugin>
<!-- builds the bundle -->
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <version>${maven.bundle.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>