You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2018/09/14 16:11:50 UTC
[isis] 09/19: merge - minor tidy-up on pom.xml (from comparing with
master branch)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 3d0d765094e7afa7a8625b4dcf28a146f7d67937
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Sep 14 16:29:45 2018 +0100
merge - minor tidy-up on pom.xml (from comparing with master branch)
---
core/log4j/pom.xml | 10 +--
core/pom.xml | 91 ++++++++++++----------
core/runtime/pom.xml | 41 +++++-----
core/security-shiro/pom.xml | 7 +-
core/unittestsupport/pom.xml | 66 +++++++++-------
core/viewer-restfulobjects-applib/pom.xml | 7 +-
core/viewer-wicket-ui/pom.xml | 8 --
core/webserver/pom.xml | 9 ---
.../application/simpleapp/module-simple/pom.xml | 9 ++-
9 files changed, 111 insertions(+), 137 deletions(-)
diff --git a/core/log4j/pom.xml b/core/log4j/pom.xml
index 511c5b2..06012af 100644
--- a/core/log4j/pom.xml
+++ b/core/log4j/pom.xml
@@ -42,16 +42,8 @@
<artifactId>log4j</artifactId>
</dependency>
-<!-- replaced by javaee-api -->
-<!-- to resolve log4j's optional dependency on javax.mail:mail:1.4 -->
-<!-- <dependency> -->
-<!-- <groupId>org.apache.geronimo.specs</groupId> -->
-<!-- <artifactId>geronimo-javamail_1.4_spec</artifactId> -->
-<!-- <optional>true</optional> -->
-<!-- <scope>provided</scope> -->
-<!-- </dependency> -->
-
<!-- JEE API -->
+ <!-- (replaces org.apache.geronimo.specs:geronimo-javamail_1.4_spec for javax.mail:mail) -->
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 0f7e3b8..0c95b1f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -88,11 +88,9 @@
[6] https://github.com/moment/moment/blob/develop/LICENSE</license.additional-notes>
<!-- JDO API -->
-
<jdo-api.version>3.1</jdo-api.version>
<!-- Isis Datanucleus JDO Plugin dn5 -->
-
<dn5-jdo-api.version>3.2.0-m8</dn5-jdo-api.version>
<dn5-core.version>5.1.11</dn5-core.version>
<dn5-api-jdo.version>5.1.9</dn5-api-jdo.version>
@@ -2106,6 +2104,11 @@ ${license.additional-notes}
<!-- TEST DEPENDENCIES -->
<dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-junit4</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<scope>test</scope>
@@ -2128,11 +2131,6 @@ ${license.additional-notes}
<artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-junit4</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<profiles>
@@ -2373,6 +2371,7 @@ ${license.additional-notes}
</plugins>
</build>
</profile>
+
<profile>
<id>src</id>
<activation>
@@ -2389,6 +2388,7 @@ ${license.additional-notes}
</plugins>
</build>
</profile>
+
<profile>
<id>git</id>
<activation>
@@ -2405,42 +2405,8 @@ ${license.additional-notes}
</plugins>
</build>
</profile>
+
<profile>
-<<<<<<< HEAD
- <!--
- as per https://stackoverflow.com/a/28860520/56880
- allows -Dgpg.passphrase= to be used rather than gpg.useagent
- inherited from parent.
- Note that this requires gpg v2.1+
- -->
- <id>gpg</id>
- <activation>
- <property>
- <name>gpg.passphrase</name>
- </property>
- </activation>
- <properties>
- <gpg.useagent>false</gpg.useagent>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <executions>
- <execution>
- <id>sign-release-artifacts</id>
- <goals>
- <goal>sign</goal>
- </goals>
- <configuration>
- <gpgArguments>
- <arg>--pinentry-mode</arg>
- <arg>loopback</arg>
- </gpgArguments>
- </configuration>
- </execution>
-=======
<id>flatten</id>
<activation>
<property>
@@ -2475,7 +2441,46 @@ ${license.additional-notes}
<goal>clean</goal>
</goals>
</execution>
->>>>>>> master
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <!--
+ as per https://stackoverflow.com/a/28860520/56880
+ allows -Dgpg.passphrase= to be used rather than gpg.useagent
+ inherited from parent.
+ Note that this requires gpg v2.1+
+ -->
+ <id>gpg</id>
+ <activation>
+ <property>
+ <name>gpg.passphrase</name>
+ </property>
+ </activation>
+ <properties>
+ <gpg.useagent>false</gpg.useagent>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>sign-release-artifacts</id>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ <configuration>
+ <gpgArguments>
+ <arg>--pinentry-mode</arg>
+ <arg>loopback</arg>
+ </gpgArguments>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index fc6cf25..ed66721 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -1,16 +1,23 @@
<?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
- information regarding copyright ownership. The ASF licenses this file to
- you under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at 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"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ 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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -98,11 +105,6 @@
<artifactId>isis-core-schema</artifactId>
</dependency>
-<!-- <dependency> -->
-<!-- <groupId>dom4j</groupId> -->
-<!-- <artifactId>dom4j</artifactId> -->
-<!-- </dependency> -->
-
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
@@ -154,10 +156,6 @@
</dependency>
</dependencies>
</profile>
-<<<<<<< HEAD
-
- </profiles>
-=======
<profile>
<id>flatten</id>
<activation>
@@ -202,5 +200,4 @@
</profile>
</profiles>
->>>>>>> master
</project>
diff --git a/core/security-shiro/pom.xml b/core/security-shiro/pom.xml
index 7f0a95e..76c0891 100644
--- a/core/security-shiro/pom.xml
+++ b/core/security-shiro/pom.xml
@@ -107,12 +107,7 @@
<artifactId>shiro-web</artifactId>
</dependency>
-<!-- replaced by javaee-api -->
-<!-- <dependency> -->
-<!-- <groupId>org.apache.geronimo.specs</groupId> -->
-<!-- <artifactId>geronimo-servlet_3.0_spec</artifactId> -->
-<!-- <scope>provided</scope> -->
-<!-- </dependency> -->
+
</dependencies>
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index 1b9dfc2..5b6ccca 100644
--- a/core/unittestsupport/pom.xml
+++ b/core/unittestsupport/pom.xml
@@ -1,34 +1,40 @@
<?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
- information regarding copyright ownership. The ASF licenses this file to
- you under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at 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"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis</artifactId>
- <version>${revision}</version>
- </parent>
-
- <artifactId>isis-core-unittestsupport</artifactId>
- <name>Apache Isis Unit Test Support</name>
-
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.core.unittestsupport</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/core/unittestsupport</git-plugin.propertiesDir>
- </properties>
-
- <description>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ 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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis</artifactId>
+ <version>${revision}</version>
+ </parent>
+
+ <artifactId>isis-core-unittestsupport</artifactId>
+ <name>Apache Isis Unit Test Support</name>
+
+ <properties>
+ <jar-plugin.automaticModuleName>org.apache.isis.core.unittestsupport</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/core/unittestsupport</git-plugin.propertiesDir>
+ </properties>
+
+ <description>
Support for writing unit tests; should be added as a dependency with scope=test only
</description>
diff --git a/core/viewer-restfulobjects-applib/pom.xml b/core/viewer-restfulobjects-applib/pom.xml
index 46777a3..325c6e0 100644
--- a/core/viewer-restfulobjects-applib/pom.xml
+++ b/core/viewer-restfulobjects-applib/pom.xml
@@ -51,16 +51,11 @@
<artifactId>isis-core-applib</artifactId>
</dependency>
-<!-- <dependency> -->
-<!-- <groupId>org.jdom</groupId> -->
-<!-- <artifactId>jdom</artifactId> -->
-<!-- </dependency> -->
-
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
-
+
<!-- TEST DEPENDENCIES -->
<dependency>
<groupId>org.apache.isis.core</groupId>
diff --git a/core/viewer-wicket-ui/pom.xml b/core/viewer-wicket-ui/pom.xml
index e6a0eff..284933d 100644
--- a/core/viewer-wicket-ui/pom.xml
+++ b/core/viewer-wicket-ui/pom.xml
@@ -131,14 +131,6 @@
<artifactId>wicket-bootstrap-themes</artifactId>
</dependency>
-<!-- replaced by javaee-api -->
-<!--
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
--->
<!-- LOGGING DEPENDENCIES - LOG4J -->
diff --git a/core/webserver/pom.xml b/core/webserver/pom.xml
index 02175d1..7ad78e2 100644
--- a/core/webserver/pom.xml
+++ b/core/webserver/pom.xml
@@ -48,15 +48,6 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
</dependency>
-
-<!-- provided by JEE standard API -->
-<!--
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
--->
</dependencies>
<profiles>
diff --git a/example/application/simpleapp/module-simple/pom.xml b/example/application/simpleapp/module-simple/pom.xml
index dd1417d..f8e2647 100644
--- a/example/application/simpleapp/module-simple/pom.xml
+++ b/example/application/simpleapp/module-simple/pom.xml
@@ -150,24 +150,25 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-plugins-codegen-bytebuddy</artifactId>
+ <artifactId>isis-core-plugins-eventbus-axon</artifactId>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-plugins-discovery-reflections</artifactId>
+ <artifactId>isis-core-plugins-codegen-bytebuddy</artifactId>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-plugins-jdo-datanucleus-5</artifactId>
+ <artifactId>isis-core-plugins-discovery-reflections</artifactId>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-plugins-eventbus-guava</artifactId>
+ <artifactId>isis-core-plugins-jdo-datanucleus-5</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-plugins-jaxrs-resteasy-3</artifactId>