Skip to content

Commit

Permalink
Clean up neo4j-server
Browse files Browse the repository at this point in the history
  • Loading branch information
@klaren
klaren committed Oct 4, 2017
1 parent 255eead commit d0f5480
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 363 deletions.
119 changes: 0 additions & 119 deletions community/neo4j/pom.xml
View file
Expand Up @@ -19,7 +19,6 @@
<properties>
<license-text.header>GPL-3-header.txt</license-text.header>
<licensing.prepend.text>notice-gpl-prefix.txt</licensing.prepend.text>
<maven.javadoc.skip>true</maven.javadoc.skip> <!-- TODO: fix -->
</properties>

<scm>
Expand Down Expand Up @@ -48,124 +47,6 @@ the relevant Commercial Agreement.
</license>
</licenses>

<build>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-filtered-pom</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/extra-resources</outputDirectory>
<resources>
<resource>
<directory>src/main/resources/</directory>
<filtering>true</filtering>
</resource>
</resources>
</configuration>
</execution>
<execution>
<id>copy-dependency-sources</id>
<phase>package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/javadoc-sources</outputDirectory>
<resources>
<resource>
<directory>${project.build.directory}/../../cypher/cypher/src/main/java/</directory>
<filtering>false</filtering>
</resource>
<resource>
<directory>${project.build.directory}/../../graph-algo/src/main/java/</directory>
<filtering>false</filtering>
</resource>
<resource>
<directory>${project.build.directory}/../../jmx/src/main/java/</directory>
<filtering>false</filtering>
</resource>
<resource>
<directory>${project.build.directory}/../../kernel/src/main/java/</directory>
<filtering>false</filtering>
</resource>
<resource>
<directory>${project.build.directory}/../../kernel/target/generated-sources/</directory>
<filtering>false</filtering>
</resource>
<resource>
<directory>${project.build.directory}/../../lucene-index/src/main/java/</directory>
<filtering>false</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>attach-javadoc</id>
<phase>none</phase>
</execution>
<execution>
<id>create-javadocs</id>
<phase>none</phase> <!-- TODO: fix -->
<goals><goal>jar</goal></goals>
<configuration>
<outputDirectory>${project.build.directory}/site/apidocs</outputDirectory>
<sourcepath>${project.build.directory}/javadoc-sources</sourcepath>
<detectLinks>false</detectLinks>
<header>${project.name}</header>
<doctitle>${project.name} ${project.version} API</doctitle>
<show>public</show>
<windowtitle>${project.name} ${project.version} API</windowtitle>
<excludePackageNames>
*.impl.*:*.internal.*:org.neo4j.bolt.ext.udc:org.neo4j.kernel:org.neo4j.kernel.ha:org.neo4j.kernel.ha.*:org.neo4j.com:org.neo4j.com.*:org.apache.lucene.index:org.neo4j.cluster.*:org.neo4j.helpers.progress:org.neo4j.kernel.configuration:org.neo4j.kernel.guard:org.neo4j.kernel.info:org.neo4j.kernel.logging
</excludePackageNames>
<groups>
<group>
<title>Graph database</title>
<packages>org.neo4j.graphdb:org.neo4j.graphdb.*</packages>
</group>
<group>
<title>Index</title>
<packages>org.neo4j.index:org.neo4j.index.*</packages>
</group>
<group>
<title>Graph algorithms</title>
<packages>org.neo4j.graphalgo:org.neo4j.graphalgo.*</packages>
</group>
<group>
<title>Management</title>
<packages>org.neo4j.management:org.neo4j.management.*:org.neo4j.jmx:org.neo4j.jmx.*</packages>
</group>
<group>
<title>Query language</title>
<packages>org.neo4j.cypher.javacompat:org.neo4j.cypher.javacompat.*</packages>
</group>
<group>
<title>Graph matching</title>
<packages>org.neo4j.graphmatching:org.neo4j.graphmatching.*</packages>
</group>
<group>
<title>Helpers</title>
<packages>org.neo4j.helpers:org.neo4j.helpers.*</packages>
</group>
</groups>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>org.neo4j</groupId>
Expand Down
161 changes: 1 addition & 160 deletions community/server/pom.xml
View file
Expand Up @@ -45,14 +45,7 @@
<neo4j-browser.version>3.0.10</neo4j-browser.version>

<neo4j-server.mainClass>org.neo4j.server.CommunityEntryPoint</neo4j-server.mainClass>
<neo-server.home>target/generated-resources/appassembler/jsw</neo-server.home>
<neo-server.confdir>target/test-classes/etc/neo-server</neo-server.confdir>

<java.io.tmpdir>${project.build.directory}</java.io.tmpdir>

<!-- Run integration tests against a server that is started elsewhere. -->
<neo-server.external>false</neo-server.external>
<neo-server.external.url>http://localhost:7474</neo-server.external.url>
<test.runner.jvm.settings.additional>
-Dorg.neo4j.kernel.impl.api.KernelStatement.trackStatements=false
</test.runner.jvm.settings.additional>
Expand Down Expand Up @@ -91,176 +84,24 @@
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>

<!-- Development execution -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>exec</goal>
</goals>
</execution>
</executions>
<configuration>
<mainClass>${neo4j-server.mainClass}</mainClass>
<classpathScope>test</classpathScope>
<arguments>
<argument>--config-dir=${basedir}/neo4j-home/conf</argument>
<argument>--home-dir=${basedir}/neo4j-home</argument>
</arguments>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>sources</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<appendAssemblyId>true</appendAssemblyId>
<descriptors>
<descriptor>src/main/assemblies/sources-assembly.xml</descriptor>
</descriptors>
</configuration>
</execution>
<execution>
<id>test-sources</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<appendAssemblyId>true</appendAssemblyId>
<descriptors>
<descriptor>src/main/assemblies/test-sources-assembly.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.neo4j.build.plugins</groupId>
<artifactId>license-maven-plugin</artifactId>
<configuration>
<strictCheck>true</strictCheck>
<header>${license-text.header}</header>
<includes>
<include>src/**/*.java</include>
<include>src/**/*.js</include>
<include>src/**/*.scala</include>
<include>src/**/*.xml</include>
</includes>
<mapping>
<scala>JAVADOC_STYLE</scala>
</mapping>
</configuration>
</plugin>

<plugin>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<id>default-jar</id>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<archive>
<manifest>
<!-- TODO: Does the server jar need to be executable? -->
<mainClass>${neo4j-server.mainClass}</mainClass>
</manifest>
</archive>
<excludes>
<exclude>lib/**</exclude>
</excludes>
</configuration>
</execution>
<execution>
<id>attach-docs</id>
<phase>none</phase>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
<java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
</systemPropertyVariables>
</configuration>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>surefire-windows</id>
<activation>
<os>
<family>windows</family>
</os>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>always</forkMode>
</configuration>
</plugin>
</plugins>
</build>
</profile>

<profile>
<id>all-tests</id>
<activation>
<property>
<name>tests</name>
<value>all</value>
</property>
</activation>
</profile>

<profile>
<id>initial-build</id>
<repositories>
<repository>
<id>neo4j-dev</id>
<name>Neo4j Developer Repository</name>
<url>http://m2.neo4j.org/content/groups/everything/</url>
</repository>
</repositories>
</profile>
</profiles>

<repositories>
<repository>
<id>java.net</id>
<url>http://download.java.net/maven/2/</url>
</repository>
<repository>
<id>neo4j-release-repository</id>
<name>Neo4j Maven 2 release repository</name>
<url>http://m2.neo4j.org/content/repositories/releases</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>org.neo4j</groupId>
Expand Down
38 changes: 0 additions & 38 deletions community/server/src/main/assemblies/sources-assembly.xml
View file

This file was deleted.

0 comments on commit d0f5480

Please sign in to comment.