changeset 9137:3bbc687e6cb8

Removed dependency to simply-glamorous font, that was for testing only. Also made pom.xml and pom-oracle.xml more similar.
author gernotbelger
date Fri, 08 Jun 2018 11:06:07 +0200
parents 38e68e72cfb8
children 2ae6c63c576b
files artifacts/contrib/fonts/simply_glamorous.jar artifacts/pom-oracle.xml artifacts/pom.xml backend/pom-oracle.xml
diffstat 4 files changed, 46 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
Binary file artifacts/contrib/fonts/simply_glamorous.jar has changed
--- a/artifacts/pom-oracle.xml	Thu Jun 07 17:49:45 2018 +0200
+++ b/artifacts/pom-oracle.xml	Fri Jun 08 11:06:07 2018 +0200
@@ -5,7 +5,6 @@
   <artifactId>river-artifacts</artifactId>
   <version>1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
-
   <name>river-artifacts</name>
   <url>http://maven.apache.org</url>
 
@@ -41,18 +40,33 @@
           </descriptors>
         </configuration>
       </plugin>
+      <!--plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <version>3.0.0</version>
+        <configuration>
+        <configLocation>../checkstyle.xml</configLocation>
+        <encoding>UTF-8</encoding>
+        </configuration>
+        <executions>
+        <execution>
+        <id>validate</id>
+        <phase>validate</phase>
+        <configuration>
+        <consoleOutput>true</consoleOutput>
+        <failsOnError>true</failsOnError>
+        </configuration>
+        <goals>
+        <goal>check</goal>
+        </goals>
+        </execution>
+        </executions>
+        </plugin -->
     </plugins>
   </build>
 
   <dependencies>
     <dependency>
-      <groupId>simply_glamorous.jar</groupId>
-      <artifactId>simply_glamorous</artifactId>
-      <version>0</version>
-      <scope>system</scope>
-      <systemPath>${project.basedir}/contrib/fonts/simply_glamorous.jar</systemPath>
-    </dependency> 
-    <dependency>
       <groupId>roboto.jar</groupId>
       <artifactId>roboto</artifactId>
       <version>0</version>
--- a/artifacts/pom.xml	Thu Jun 07 17:49:45 2018 +0200
+++ b/artifacts/pom.xml	Fri Jun 08 11:06:07 2018 +0200
@@ -67,13 +67,6 @@
 
   <dependencies>
     <dependency>
-      <groupId>simply_glamorous.jar</groupId>
-      <artifactId>simply_glamorous</artifactId>
-      <version>0</version>
-      <scope>system</scope>
-      <systemPath>${project.basedir}/contrib/fonts/simply_glamorous.jar</systemPath>
-    </dependency>
-    <dependency>
       <groupId>roboto.jar</groupId>
       <artifactId>roboto</artifactId>
       <version>0</version>
--- a/backend/pom-oracle.xml	Thu Jun 07 17:49:45 2018 +0200
+++ b/backend/pom-oracle.xml	Fri Jun 08 11:06:07 2018 +0200
@@ -83,6 +83,30 @@
           </descriptors>
         </configuration>
       </plugin>
+      <!-- 
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <version>3.0.0</version>
+        <configuration>
+          <configLocation>../checkstyle.xml</configLocation>
+          <encoding>UTF-8</encoding>
+        </configuration>
+        <executions>
+          <execution>
+            <id>validate</id>
+            <phase>validate</phase>
+            <configuration>
+              <consoleOutput>true</consoleOutput>
+              <failsOnError>true</failsOnError>
+            </configuration>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+       -->
     </plugins>
   </build>
 

http://dive4elements.wald.intevation.org