[menya] 3 new revisions pushed by berger.max on 2009-12-09 13:55 GMT

1 view

Skip to first unread message

codesite...@google.com

unread,

Dec 9, 2009, 8:56:26 AM12/9/09

to menya...@googlegroups.com

3 new revisions:

Revision: 1a71597847
Author: Max Berger <m...@berger.name>
Date: Wed Dec 9 05:22:03 2009
Log: Reformatted POM
http://code.google.com/p/menya/source/detail?r=1a71597847

Revision: 62f2f4bba7
Author: Max Berger <m...@berger.name>
Date: Wed Dec 9 05:31:55 2009
Log: Update to Checkstyle 5
http://code.google.com/p/menya/source/detail?r=62f2f4bba7

Revision: 882cf544c8
Author: Max Berger <m...@berger.name>
Date: Wed Dec 9 05:32:48 2009
Log: Use official 0.8 release of pdfbox
http://code.google.com/p/menya/source/detail?r=882cf544c8

==============================================================================
Revision: 1a71597847
Author: Max Berger <m...@berger.name>
Date: Wed Dec 9 05:22:03 2009
Log: Reformatted POM
http://code.google.com/p/menya/source/detail?r=1a71597847

Modified:
/Menya.Linux64.launch
/Menya.Win32.launch
/pom.xml

=======================================
--- /pom.xml Fri Aug 7 07:28:06 2009
+++ /pom.xml Wed Dec 9 05:22:03 2009
@@ -1,155 +1,154 @@
<?xml version="1.0"?>
-<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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.googlecode</groupId>
- <artifactId>menya</artifactId>
- <name>Menya</name>
- <version>0.1.1-SNAPSHOT</version>
- <inceptionYear>2009</inceptionYear>
- <licenses>
- <license>
- <name>GNU General Public License, Version 3.0</name>
- <url>http://www.gnu.org/licenses/gpl-3.0-standalone.html</url>
- <distribution>manual</distribution>
- </license>
- </licenses>
- <scm>
- <connection>scm:svn:http://menya.googlecode.com/svn/trunk</connection>
- <developerConnection>scm:svn:https://menya.googlecode.com/svn/trunk
+<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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.googlecode</groupId>
+ <artifactId>menya</artifactId>
+ <name>Menya</name>
+ <version>0.1.1-SNAPSHOT</version>
+ <inceptionYear>2009</inceptionYear>
+ <licenses>
+ <license>
+ <name>GNU General Public License, Version 3.0</name>
+ <url>http://www.gnu.org/licenses/gpl-3.0-standalone.html</url>
+ <distribution>manual</distribution>
+ </license>
+ </licenses>
+ <scm>
+ <connection>scm:svn:http://menya.googlecode.com/svn/trunk</connection>
+ <developerConnection>scm:svn:https://menya.googlecode.com/svn/trunk
</developerConnection>
- <url>http://code.google.com/p/menya/source/browse</url>
- </scm>
- <build>
- <defaultGoal>package</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- <debug>false</debug>
- <optimize>true</optimize>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.freehep</groupId>
- <artifactId>freehep-nar-plugin</artifactId>
- <version>2.0-alpha-10</version>
- <extensions>true</extensions>
- <configuration>
- <classifiers>
- <classifier>x86-Windows-g++</classifier>
- 
- <classifier>amd64-Linux-g++</classifier>
- <classifier>i386-Linux-g++</classifier>
- </classifiers>
- <linker>
- <name>g++</name>
- </linker>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>nar-download</goal>
- <goal>nar-unpack</goal>
- <goal>nar-assembly</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>appassembler-maven-plugin</artifactId>
- <version>1.0</version>
- <configuration>
- <programs>
- <program>
- <mainClass>menya.gui.GUI</mainClass>
- <name>menya</name>
- </program>
- </programs>
- <repositoryLayout>flat</repositoryLayout>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>create-repository</goal>
- <goal>assemble</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-3</version>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/distribution.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <pluginRepositories>
- <pluginRepository>
- <id>freehep-maven</id>
- <name>Maven FreeHEP</name>
- <url>http://java.freehep.org/maven2</url>
- </pluginRepository>
- </pluginRepositories>
- <repositories>
- <repository>
- <id>max-private</id>
- <url>http://max.berger.name/m2</url>
- </repository>
- <repository>
- <id>freehep-maven</id>
- <name>Maven FreeHEP</name>
- <url>http://java.freehep.org/maven2</url>
- </repository>
- </repositories>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>5.8</version>
- <type>jar</type>
- <classifier>jdk15</classifier>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.pdfbox</groupId>
- <artifactId>pdfbox</artifactId>
- <version>0.8.0-incubator-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.jpen</groupId>
- <artifactId>jpen</artifactId>
- <version>2.1-SNAPSHOT</version>
- </dependency>
- </dependencies>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <configLocation>checkstyle.xml</configLocation>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
+ <url>http://code.google.com/p/menya/source/browse</url>
+ </scm>
+ <build>
+ <defaultGoal>package</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <debug>false</debug>
+ <optimize>true</optimize>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.freehep</groupId>
+ <artifactId>freehep-nar-plugin</artifactId>
+ <version>2.0-alpha-10</version>
+ <extensions>true</extensions>
+ <configuration>
+ <classifiers>
+ <classifier>x86-Windows-g++</classifier>
+ 
+ <classifier>amd64-Linux-g++</classifier>
+ <classifier>i386-Linux-g++</classifier>
+ </classifiers>
+ <linker>
+ <name>g++</name>
+ </linker>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>nar-download</goal>
+ <goal>nar-unpack</goal>
+ <goal>nar-assembly</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>appassembler-maven-plugin</artifactId>
+ <version>1.0</version>
+ <configuration>
+ <programs>
+ <program>
+ <mainClass>menya.gui.GUI</mainClass>
+ <name>menya</name>
+ </program>
+ </programs>
+ <repositoryLayout>flat</repositoryLayout>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>create-repository</goal>
+ <goal>assemble</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-3</version>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assemble/distribution.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>freehep-maven</id>
+ <name>Maven FreeHEP</name>
+ <url>http://java.freehep.org/maven2</url>
+ </pluginRepository>
+ </pluginRepositories>
+ <repositories>
+ <repository>
+ <id>max-private</id>
+ <url>http://max.berger.name/m2</url>
+ </repository>
+ <repository>
+ <id>freehep-maven</id>
+ <name>Maven FreeHEP</name>
+ <url>http://java.freehep.org/maven2</url>
+ </repository>
+ </repositories>
+ <dependencies>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>5.8</version>
+ <type>jar</type>
+ <classifier>jdk15</classifier>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pdfbox</groupId>
+ <artifactId>pdfbox</artifactId>
+ <version>0.8.0-incubator-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.jpen</groupId>
+ <artifactId>jpen</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <configLocation>checkstyle.xml</configLocation>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
</project>

==============================================================================
Revision: 62f2f4bba7
Author: Max Berger <m...@berger.name>
Date: Wed Dec 9 05:31:55 2009
Log: Update to Checkstyle 5
http://code.google.com/p/menya/source/detail?r=62f2f4bba7

Modified:
/checkstyle.xml
/pom.xml

=======================================
--- /checkstyle.xml Tue Aug 4 04:41:14 2009
+++ /checkstyle.xml Wed Dec 9 05:31:55 2009
@@ -47,7 +47,6 @@
<module name="AvoidStarImport"/>
<module name="AnonInnerLength"/>
<module name="ExecutableStatementCount"/>
- <module name="FileLength"/>
<module name="LineLength">
<property name="severity" value="ignore"/>
</module>
@@ -62,7 +61,6 @@
<module name="OperatorWrap"/>
<module name="MethodParamPad"/>
<module name="ParenPad"/>
- <module name="TabCharacter"/>
<module name="TypecastParenPad"/>
<module name="WhitespaceAfter"/>
<module name="WhitespaceAround">
@@ -143,11 +141,12 @@
<module name="TodoComment">
<property name="severity" value="ignore"/>
</module>
- <module name="RequiredRegexp"/>
<module name="FinalParameters"/>
<module name="DescendantToken"/>
<module name="ArrayTypeStyle"/>
</module>
+ <module name="FileLength"/>
+ <module name="FileTabCharacter"/>
<module name="SuppressionCommentFilter"/>
<module name="Translation"/>
<module name="NewlineAtEndOfFile"/>
@@ -156,9 +155,8 @@
<property name="offCommentFormat" value="GEN-BEGIN"/>
<property name="onCommentFormat" value="GEN-END"/>
</module>
-
-
+ </module>
</module>
=======================================
--- /pom.xml Wed Dec 9 05:22:03 2009
+++ /pom.xml Wed Dec 9 05:31:55 2009
@@ -106,6 +106,14 @@
<id>freehep-maven</id>
<name>Maven FreeHEP</name>
<url>http://java.freehep.org/maven2</url>
+ </pluginRepository>
+ <pluginRepository>
+ <id>apache-snapshots</id>
+ <name>Apache Snapshot repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
</pluginRepository>
</pluginRepositories>
<repositories>
@@ -144,7 +152,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.3</version>
+ <version>2.5-SNAPSHOT</version>
<configuration>
<configLocation>checkstyle.xml</configLocation>
</configuration>

==============================================================================
Revision: 882cf544c8
Author: Max Berger <m...@berger.name>
Date: Wed Dec 9 05:32:48 2009
Log: Use official 0.8 release of pdfbox
http://code.google.com/p/menya/source/detail?r=882cf544c8

Modified:
/pom.xml

=======================================
--- /pom.xml Wed Dec 9 05:31:55 2009
+++ /pom.xml Wed Dec 9 05:32:48 2009
@@ -139,7 +139,7 @@
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
- <version>0.8.0-incubator-SNAPSHOT</version>
+ <version>0.8.0-incubating</version>
</dependency>
<dependency>
<groupId>net.sourceforge.jpen</groupId>

Reply all

Reply to author

Forward

0 new messages