You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cs...@apache.org on 2018/07/16 14:24:45 UTC

svn commit: r1836044 - in /felix/trunk/systemready: pom.xml src/test/resources/exam.properties

Author: cschneider
Date: Mon Jul 16 14:24:45 2018
New Revision: 1836044

URL: http://svn.apache.org/viewvc?rev=1836044&view=rev
Log:
Simplify pom.xml

Modified:
    felix/trunk/systemready/pom.xml
    felix/trunk/systemready/src/test/resources/exam.properties

Modified: felix/trunk/systemready/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/systemready/pom.xml?rev=1836044&r1=1836043&r2=1836044&view=diff
==============================================================================
--- felix/trunk/systemready/pom.xml (original)
+++ felix/trunk/systemready/pom.xml Mon Jul 16 14:24:45 2018
@@ -23,6 +23,12 @@
     <version>0.3.0-SNAPSHOT</version>
     <name>Apache Felix - System Ready</name>
     
+    <properties>
+        <felix.java.version>8</felix.java.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <exam.version>4.11.0</exam.version>
+    </properties>
+    
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/systemready</connection>
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/systemready</developerConnection>
@@ -32,14 +38,6 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>8</source>
-                    <target>8</target>
-                </configuration>
-            </plugin>
-            <plugin>
                 <groupId>biz.aQute.bnd</groupId>
                 <artifactId>bnd-maven-plugin</artifactId>
                 <version>4.0.0</version>
@@ -61,48 +59,6 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>org.apache.rat</groupId>
-                <artifactId>apache-rat-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <excludes>
-                        <exclude>**/target/**/*</exclude>
-                        <exclude>**/appended-resources/**/*</exclude>
-                        <exclude>**/dependency-reduced-pom.xml</exclude>
-                        <exclude>**/velocity.log</exclude>
-                        <exclude>**/DEPENDENCIES</exclude>
-                        <!-- exclude IntelliJ IDEA generated files -->
-                        <exclude>**/*.iml</exclude>
-                        <exclude>**/*.ipr</exclude>
-                        <exclude>**/*.iws</exclude>
-                        <exclude>**/.idea/**/*</exclude>
-                        <!-- exclude Eclipse IDE generated files -->
-                        <exclude>**/.project</exclude>
-                        <exclude>**/.classpath</exclude>
-                        <exclude>**/.settings/**</exclude>
-                        <exclude>**/eclipse-classes/**/*</exclude>
-                        <exclude>**/MANIFEST.MF</exclude>
-                        <exclude>**/*.MF</exclude>
-                        <exclude>.gitignore</exclude>
-                        <exclude>bnd.bnd</exclude>
-                        <exclude>**/*.properties</exclude>
-                        <exclude>README.md</exclude>
-                        <exclude>*.cfg</exclude>
-                        <exclude>derby.log</exclude>
-                        <exclude>**/*.sql</exclude>
-                        <exclude>**/README.md</exclude>
-                        <exclude>**/Readme.md</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
@@ -112,17 +68,6 @@
                     <additionalparam>-Xdoclint:none</additionalparam>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>animal-sniffer-maven-plugin</artifactId>
-                <configuration>
-                    <signature>
-                        <groupId>org.codehaus.mojo.signature</groupId>
-                        <artifactId>java18</artifactId>
-                        <version>1.0</version>
-                    </signature>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
@@ -247,8 +192,4 @@
         </dependency>
     </dependencies>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <exam.version>4.11.0</exam.version>
-    </properties>
 </project>

Modified: felix/trunk/systemready/src/test/resources/exam.properties
URL: http://svn.apache.org/viewvc/felix/trunk/systemready/src/test/resources/exam.properties?rev=1836044&r1=1836043&r2=1836044&view=diff
==============================================================================
--- felix/trunk/systemready/src/test/resources/exam.properties (original)
+++ felix/trunk/systemready/src/test/resources/exam.properties Mon Jul 16 14:24:45 2018
@@ -1 +1,17 @@
+#
+# 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.
+#
 pax.exam.logging = none