tamaya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anat...@apache.org
Subject [1/2] incubator-tamaya git commit: Added tests and bugfixes for Tamaya OSGI support.
Date Mon, 12 Dec 2016 16:14:53 GMT
Repository: incubator-tamaya
Updated Branches:
  refs/heads/master 36c8ac241 -> 77850ea31


Added tests and bugfixes for Tamaya OSGI support.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/05b6514e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/05b6514e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/05b6514e

Branch: refs/heads/master
Commit: 05b6514e4d9caacccd58a8ce0a73295f1da51962
Parents: 36c8ac2
Author: anatole <anatole@apache.org>
Authored: Mon Dec 12 17:02:41 2016 +0100
Committer: anatole <anatole@apache.org>
Committed: Mon Dec 12 17:13:17 2016 +0100

----------------------------------------------------------------------
 pom.xml | 90 +++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 55 insertions(+), 35 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/05b6514e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 48ba0fb..2cc4d6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,6 +73,7 @@ under the License.
         <!-- Must/should match the JRuby version used by AsciidoctorJ -->
         <jruby.version>1.7.20</jruby.version>
         <findbugs.version>3.0.4</findbugs.version>
+        <mockito.version>1.10.19</mockito.version>
         <rat.version>0.12</rat.version>
         <toolchains.plugin>1.1</toolchains.plugin>
 
@@ -220,7 +221,7 @@ under the License.
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>
-                <version>1.10.19</version>
+                <version>${mockito.version}</version>
                 <scope>test</scope>
                 <exclusions>
                     <exclusion>
@@ -263,11 +264,6 @@ under the License.
             </dependency>
 
             <dependency>
-                <groupId>org.mockito</groupId>
-                <artifactId>mockito-core</artifactId>
-            </dependency>
-
-            <dependency>
                 <groupId>rubygems</groupId>
                 <artifactId>asciidoctor-diagram</artifactId>
                 <version>${asciidoctor-diagramm.version}</version>
@@ -456,6 +452,30 @@ under the License.
                     </configuration>
                 </plugin>
                 <plugin>
+                    <groupId>biz.aQute.bnd</groupId>
+                    <artifactId>bnd-maven-plugin</artifactId>
+                    <version>3.3.0</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>ch.qos.logback</groupId>
+                            <artifactId>logback-core</artifactId>
+                            <version>1.1.3</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.slf4j</groupId>
+                            <artifactId>slf4j-api</artifactId>
+                            <version>1.7.13</version>
+                        </dependency>
+                    </dependencies>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>bnd-process</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-scm-publish-plugin</artifactId>
                     <version>1.1</version>
@@ -467,14 +487,6 @@ under the License.
                     <version>3.4</version>
                     <inherited>true</inherited>
                     <dependencies>
-                        <!-- 3.5.1: Fixes class not found
-                         executing org.apache.maven.plugins:maven-site-plugin:3.5.1:site:
org/apache/maven/doxia/sink/impl/XhtmlBaseSink
-                        <dependency>
-                            <groupId>org.apache.maven.doxia</groupId>
-                            <artifactId>doxia-core</artifactId>
-                            <version>1.7</version>
-                        </dependency>
-                        -->
                         <dependency><!-- add support for ssh/scp -->
                             <groupId>org.apache.maven.wagon</groupId>
                             <artifactId>wagon-ssh</artifactId>
@@ -684,27 +696,25 @@ under the License.
                 </configuration>
             </plugin>
             <plugin>
-				<groupId>biz.aQute.bnd</groupId>
-				<artifactId>bnd-maven-plugin</artifactId>
-				<version>3.3.0</version>
-				<executions>
-					<execution>
-						<goals>
-							<goal>bnd-process</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>3.0.2</version>
-				<configuration>
-					<archive>
-						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-					</archive>
-				</configuration>
-			</plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-maven-plugin</artifactId>
+                <version>3.3.0</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>bnd-process</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
@@ -800,6 +810,16 @@ under the License.
                 <maven.javadoc.skip>false</maven.javadoc.skip>
             </properties>
         </profile>
+
+        <profile>
+            <id>java8</id>
+            <activation>
+                <jdk>[1.8,)</jdk>
+            </activation>
+            <properties>
+                <additionalparam>-Xdoclint:none</additionalparam>
+            </properties>
+        </profile>
     </profiles>
 
     <reporting>


Mime
View raw message