[OLINGO-163] Optimized pom dependencies

This commit is contained in:
Christian Amend 2014-02-17 17:13:36 +01:00
parent 9593b53cc8
commit 7a67ea2ff8
4 changed files with 360 additions and 359 deletions

View File

@ -1,24 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
license agreements. See the NOTICE file distributed with this work for additional
Licensed to the Apache Software Foundation (ASF) under one information regarding copyright ownership. The ASF licenses this file to
or more contributor license agreements. See the NOTICE file you under the Apache License, Version 2.0 (the "License"); you may not use
distributed with this work for additional information this file except in compliance with the License. You may obtain a copy of
regarding copyright ownership. The ASF licenses this file the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
to you under the Apache License, Version 2.0 (the by applicable law or agreed to in writing, software distributed under the
"License"); you may not use this file except in compliance License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
with the License. You may obtain a copy of the License at OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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"> 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> <modelVersion>4.0.0</modelVersion>
@ -45,21 +35,25 @@
<artifactId>olingo-odata4-commons-core-incubating</artifactId> <artifactId>olingo-odata4-commons-core-incubating</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
</dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId> <artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId> <artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId> <artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

View File

@ -1,24 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
license agreements. See the NOTICE file distributed with this work for additional
Licensed to the Apache Software Foundation (ASF) under one information regarding copyright ownership. The ASF licenses this file to
or more contributor license agreements. See the NOTICE file you under the Apache License, Version 2.0 (the "License"); you may not use
distributed with this work for additional information this file except in compliance with the License. You may obtain a copy of
regarding copyright ownership. The ASF licenses this file the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
to you under the Apache License, Version 2.0 (the by applicable law or agreed to in writing, software distributed under the
"License"); you may not use this file except in compliance License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
with the License. You may obtain a copy of the License at OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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"> 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> <modelVersion>4.0.0</modelVersion>
@ -43,7 +33,14 @@
<dependency> <dependency>
<groupId>commons-codec</groupId> <groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId> <artifactId>commons-codec</artifactId>
<version>${commonscodec.version}</version> </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

View File

@ -1,24 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
license agreements. See the NOTICE file distributed with this work for additional
Licensed to the Apache Software Foundation (ASF) under one information regarding copyright ownership. The ASF licenses this file to
or more contributor license agreements. See the NOTICE file you under the Apache License, Version 2.0 (the "License"); you may not use
distributed with this work for additional information this file except in compliance with the License. You may obtain a copy of
regarding copyright ownership. The ASF licenses this file the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
to you under the Apache License, Version 2.0 (the by applicable law or agreed to in writing, software distributed under the
"License"); you may not use this file except in compliance License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
with the License. You may obtain a copy of the License at OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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"> 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> <modelVersion>4.0.0</modelVersion>
@ -45,11 +35,17 @@
<artifactId>olingo-odata4-commons-core-incubating</artifactId> <artifactId>olingo-odata4-commons-core-incubating</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.antlr</groupId> <groupId>org.antlr</groupId>
<artifactId>antlr4-runtime</artifactId> <artifactId>antlr4-runtime</artifactId>
<version>${antlr.version}</version>
<scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
@ -74,11 +70,11 @@
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
<!--<arguments><argument>-atn</argument></arguments>--> <!--<arguments><argument>-atn</argument></arguments> -->
<listener>true</listener> <listener>true</listener>
<visitor>true</visitor> <visitor>true</visitor>
<!--maven antlr plugin has trouble with grammer import if the grammerfiles are <!--maven antlr plugin has trouble with grammer import if the grammerfiles
not directly inside src/main/antlr4, hence we have to set the libDirectory--> are not directly inside src/main/antlr4, hence we have to set the libDirectory -->
<libDirectory>src/main/antlr4/org/apache/olingo/odata4/server/core/uri/antlr</libDirectory> <libDirectory>src/main/antlr4/org/apache/olingo/odata4/server/core/uri/antlr</libDirectory>
</configuration> </configuration>
</plugin> </plugin>

66
pom.xml
View File

@ -1,24 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
license agreements. See the NOTICE file distributed with this work for additional
Licensed to the Apache Software Foundation (ASF) under one information regarding copyright ownership. The ASF licenses this file to
or more contributor license agreements. See the NOTICE file you under the Apache License, Version 2.0 (the "License"); you may not use
distributed with this work for additional information this file except in compliance with the License. You may obtain a copy of
regarding copyright ownership. The ASF licenses this file the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
to you under the Apache License, Version 2.0 (the by applicable law or agreed to in writing, software distributed under the
"License"); you may not use this file except in compliance License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
with the License. You may obtain a copy of the License at OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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"> 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> <modelVersion>4.0.0</modelVersion>
@ -62,27 +52,51 @@
</modules> </modules>
<properties> <properties>
<mockito.version>1.9.5</mockito.version>
<junit.version>4.11</junit.version>
<commonscodec.version>1.9</commonscodec.version>
<antlr.version>4.1</antlr.version> <antlr.version>4.1</antlr.version>
<jackson.version>2.2.3</jackson.version>
</properties> </properties>
<dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>${junit.version}</version> <version>4.11</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId> <artifactId>mockito-all</artifactId>
<version>${mockito.version}</version> <version>1.9.5</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.9</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4-runtime</artifactId>
<version>${antlr.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.2.3</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.2.3</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.2.3</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement>
<build> <build>
<finalName>${project.artifactId}-${project.version}</finalName> <finalName>${project.artifactId}-${project.version}</finalName>