diff --git a/libbuild/GitRevMavenTask/pom.xml b/libbuild/GitRevMavenTask/pom.xml new file mode 100644 index 000000000..fdc4f8f8b --- /dev/null +++ b/libbuild/GitRevMavenTask/pom.xml @@ -0,0 +1,137 @@ +<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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <groupId>net.yacy</groupId> + <artifactId>maven-plugin-gitrevisionnumber</artifactId> + <version>1.0</version> + <packaging>maven-plugin</packaging> + <name>YaCy - Build Number Maven Plugin</name> + <description>This plugin gives you a Git repository release number. in the format 9000 as maven property "releaseNr" and a Git repository timestamp as Maven property "DSTAMP" in the format yyyymmdd </description> + + <url>http://www.yacy.net</url> + + <scm> + <connection>scm:git:https://github.com/yacy/yacy_search_server.git</connection> + <url>https://github.com/yacy/yacy_search_server</url> + </scm> + + <developers> + <developer> + <name>Michael Peter Christen</name> + </developer> + </developers> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + + <build> + <sourceDirectory>src</sourceDirectory> + + <plugins> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.5.1</version> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>buildnumber-maven-plugin</artifactId> + <version>1.2</version> + <executions> + <execution> + <id>1</id> + <phase>validate</phase> + <goals> + <goal>create</goal> + </goals> + </execution> + </executions> + <configuration> + <doCheck>false</doCheck> + <doUpdate>false</doUpdate> + <shortRevisionLength>5</shortRevisionLength> + <revisionOnScmFailure>9000</revisionOnScmFailure> + <!-- creates a string e.g. 20130131-1fd45 --> + <format>{0,date,yyyyMMdd}-{1}</format> + <items> + <item>timestamp</item> + <item>scmVersion</item> + </items> + </configuration> + </plugin> + + <!-- exec:exec goal to provide start YaCy by Maven (just to have it for cases were the ide not provides a run command) --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.2.1</version> + + <configuration> + <classpathScope>runtime</classpathScope> + <executable>java</executable> + <arguments> + <argument>-classpath</argument> + <classpath/> + </arguments> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> + <version>3.2</version> + <configuration> + <!-- see http://jira.codehaus.org/browse/MNG-5346 --> + <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound> + </configuration> + <executions> + <execution> + <id>mojo-descriptor</id> + <goals> + <goal>descriptor</goal> + </goals> + </execution> + <!-- if you want to generate help goal --> + <!-- <execution> <id>help-goal</id> <goals> <goal>helpmojo</goal> </goals> </execution> --> + </executions> + </plugin> + </plugins> + + </build> + + <dependencies> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + <version>3.1.0</version> + </dependency> + <dependency> + <groupId>org.eclipse.jgit</groupId> + <artifactId>org.eclipse.jgit</artifactId> + <version>1.3.0.201202151440-r</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + <version>3.0-alpha-2</version> + </dependency> + <dependency> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-annotations</artifactId> + <version>3.2</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + <version>3.1.1</version> + </dependency> + </dependencies> +</project> diff --git a/libbuild/GitRevMavenTask/GitRevMavenTask.java b/libbuild/GitRevMavenTask/src/GitRevMavenTask.java similarity index 100% rename from libbuild/GitRevMavenTask/GitRevMavenTask.java rename to libbuild/GitRevMavenTask/src/GitRevMavenTask.java diff --git a/libbuild/pom.xml b/libbuild/pom.xml index 4820ed754..9482fa501 100644 --- a/libbuild/pom.xml +++ b/libbuild/pom.xml @@ -3,11 +3,12 @@ <modelVersion>4.0.0</modelVersion> <groupId>net.yacy</groupId> - <artifactId>maven-plugin-gitrevisionnumber</artifactId> + <artifactId>extlib</artifactId> <version>1.0</version> - <packaging>maven-plugin</packaging> - <name>YaCy - Build Properties Utility</name> - <description>This plugin gives you a Git repository release number. in the format 9000 as maven property "releaseNr" and a Git repository timestamp as Maven property "DSTAMP" in the format yyyymmdd </description> + <packaging>pom</packaging> + <name>YaCy - Build External Library Utility</name> + <description>build artifacts/jars needed to compile and run YaCy</description> + <url>http://www.yacy.net</url> <scm> @@ -15,122 +16,15 @@ <url>https://github.com/yacy/yacy_search_server</url> </scm> - <developers> - <developer> - <name>Michael Peter Christen</name> - </developer> - </developers> - + <modules> + <module>GitRevMavenTask</module> + <!-- hack to include YaCy as module + <module>..</module> + --> + </modules> + <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> - - <build> - <sourceDirectory>GitRevMavenTask</sourceDirectory> - - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.5.1</version> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>buildnumber-maven-plugin</artifactId> - <version>1.2</version> - <executions> - <execution> - <id>1</id> - <phase>validate</phase> - <goals> - <goal>create</goal> - </goals> - </execution> - </executions> - <configuration> - <doCheck>false</doCheck> - <doUpdate>false</doUpdate> - <shortRevisionLength>5</shortRevisionLength> - <revisionOnScmFailure>9000</revisionOnScmFailure> - <!-- creates a string e.g. 20130131-1fd45 --> - <format>{0,date,yyyyMMdd}-{1}</format> - <items> - <item>timestamp</item> - <item>scmVersion</item> - </items> - </configuration> - </plugin> - - <!-- exec:exec goal to provide start YaCy by Maven (just to have it for cases were the ide not provides a run command) --> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.2.1</version> - - <configuration> - <classpathScope>runtime</classpathScope> - <executable>java</executable> - <arguments> - <argument>-classpath</argument> - <classpath/> - </arguments> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-plugin-plugin</artifactId> - <version>3.2</version> - <configuration> - <!-- see http://jira.codehaus.org/browse/MNG-5346 --> - <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound> - </configuration> - <executions> - <execution> - <id>mojo-descriptor</id> - <goals> - <goal>descriptor</goal> - </goals> - </execution> - <!-- if you want to generate help goal --> - <!-- <execution> <id>help-goal</id> <goals> <goal>helpmojo</goal> </goals> </execution> --> - </executions> - </plugin> - </plugins> - - </build> - <dependencies> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - <version>3.1.0</version> - </dependency> - <dependency> - <groupId>org.eclipse.jgit</groupId> - <artifactId>org.eclipse.jgit</artifactId> - <version>1.3.0.201202151440-r</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - <version>3.0-alpha-2</version> - </dependency> - <dependency> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-annotations</artifactId> - <version>3.2</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-core</artifactId> - <version>3.1.1</version> - </dependency> - </dependencies> </project>