#91 Changed version numbers and removed artifact names
This commit is contained in:
parent
833b5883d4
commit
e6cae6dcbd
@ -1,32 +1,25 @@
|
|||||||
<?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
|
||||||
Licensed to the Apache Software Foundation (ASF) under one
|
license agreements. See the NOTICE file distributed with this work for additional
|
||||||
or more contributor license agreements. See the NOTICE file
|
information regarding copyright ownership. The ASF licenses this file to
|
||||||
distributed with this work for additional information
|
you under the Apache License, Version 2.0 (the "License"); you may not use
|
||||||
regarding copyright ownership. The ASF licenses this file
|
this file except in compliance with the License. You may obtain a copy of
|
||||||
to you under the Apache License, Version 2.0 (the
|
the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
|
||||||
"License"); you may not use this file except in compliance
|
by applicable law or agreed to in writing, software distributed under the
|
||||||
with the License. You may obtain a copy of the License at
|
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
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
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"
|
||||||
Unless required by applicable law or agreed to in writing,
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||||
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>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>com.iluwatar</groupId>
|
<groupId>com.iluwatar</groupId>
|
||||||
<artifactId>naked-objects</artifactId>
|
<artifactId>naked-objects</artifactId>
|
||||||
<version>1.0-SNAPSHOT</version>
|
<version>1.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>naked-objects-dom</artifactId>
|
<artifactId>naked-objects-dom</artifactId>
|
||||||
<name>Simple App DOM</name>
|
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
<resources>
|
<resources>
|
||||||
@ -85,7 +78,8 @@
|
|||||||
<pluginManagement>
|
<pluginManagement>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
|
<!--This plugin's configuration is used to store Eclipse m2e settings
|
||||||
|
only. It has no influence on the Maven build itself. -->
|
||||||
<groupId>org.eclipse.m2e</groupId>
|
<groupId>org.eclipse.m2e</groupId>
|
||||||
<artifactId>lifecycle-mapping</artifactId>
|
<artifactId>lifecycle-mapping</artifactId>
|
||||||
<version>1.0.0</version>
|
<version>1.0.0</version>
|
||||||
@ -167,10 +161,8 @@
|
|||||||
<artifactId>simpleapp-dom</artifactId>
|
<artifactId>simpleapp-dom</artifactId>
|
||||||
<version>1.9.0-SNAPSHOT</version>
|
<version>1.9.0-SNAPSHOT</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!--
|
<!-- ... workaround to avoid conflict with plexus-default (not sure
|
||||||
... workaround to avoid conflict with plexus-default
|
why exclusions in the isis-maven-plugin aren't sufficient, though ... -->
|
||||||
(not sure why exclusions in the isis-maven-plugin aren't sufficient, though ...
|
|
||||||
-->
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.google.guava</groupId>
|
<groupId>com.google.guava</groupId>
|
||||||
<artifactId>guava</artifactId>
|
<artifactId>guava</artifactId>
|
||||||
|
@ -1,32 +1,25 @@
|
|||||||
<?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
|
||||||
Licensed to the Apache Software Foundation (ASF) under one
|
license agreements. See the NOTICE file distributed with this work for additional
|
||||||
or more contributor license agreements. See the NOTICE file
|
information regarding copyright ownership. The ASF licenses this file to
|
||||||
distributed with this work for additional information
|
you under the Apache License, Version 2.0 (the "License"); you may not use
|
||||||
regarding copyright ownership. The ASF licenses this file
|
this file except in compliance with the License. You may obtain a copy of
|
||||||
to you under the Apache License, Version 2.0 (the
|
the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
|
||||||
"License"); you may not use this file except in compliance
|
by applicable law or agreed to in writing, software distributed under the
|
||||||
with the License. You may obtain a copy of the License at
|
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
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
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"
|
||||||
Unless required by applicable law or agreed to in writing,
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||||
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>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>com.iluwatar</groupId>
|
<groupId>com.iluwatar</groupId>
|
||||||
<artifactId>naked-objects</artifactId>
|
<artifactId>naked-objects</artifactId>
|
||||||
<version>1.0-SNAPSHOT</version>
|
<version>1.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>naked-objects-fixture</artifactId>
|
<artifactId>naked-objects-fixture</artifactId>
|
||||||
<name>Simple App Fixtures</name>
|
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
@ -1,32 +1,25 @@
|
|||||||
<?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
|
||||||
Licensed to the Apache Software Foundation (ASF) under one
|
license agreements. See the NOTICE file distributed with this work for additional
|
||||||
or more contributor license agreements. See the NOTICE file
|
information regarding copyright ownership. The ASF licenses this file to
|
||||||
distributed with this work for additional information
|
you under the Apache License, Version 2.0 (the "License"); you may not use
|
||||||
regarding copyright ownership. The ASF licenses this file
|
this file except in compliance with the License. You may obtain a copy of
|
||||||
to you under the Apache License, Version 2.0 (the
|
the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
|
||||||
"License"); you may not use this file except in compliance
|
by applicable law or agreed to in writing, software distributed under the
|
||||||
with the License. You may obtain a copy of the License at
|
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
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
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"
|
||||||
Unless required by applicable law or agreed to in writing,
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||||
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>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>com.iluwatar</groupId>
|
<groupId>com.iluwatar</groupId>
|
||||||
<artifactId>naked-objects</artifactId>
|
<artifactId>naked-objects</artifactId>
|
||||||
<version>1.0-SNAPSHOT</version>
|
<version>1.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>naked-objects-integtests</artifactId>
|
<artifactId>naked-objects-integtests</artifactId>
|
||||||
<name>Simple App Integration Tests</name>
|
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
<testResources>
|
<testResources>
|
||||||
@ -91,38 +84,17 @@
|
|||||||
<artifactId>hsqldb</artifactId>
|
<artifactId>hsqldb</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!--
|
<!-- uncomment to enable enhanced cucumber-jvm reporting http://www.masterthought.net/section/cucumber-reporting
|
||||||
uncomment to enable enhanced cucumber-jvm reporting
|
<dependency> <groupId>com.googlecode.totallylazy</groupId> <artifactId>totallylazy</artifactId>
|
||||||
http://www.masterthought.net/section/cucumber-reporting
|
<version>991</version> </dependency> <dependency> <groupId>net.masterthought</groupId>
|
||||||
<dependency>
|
<artifactId>cucumber-reporting</artifactId> <version>0.0.21</version> </dependency>
|
||||||
<groupId>com.googlecode.totallylazy</groupId>
|
<dependency> <groupId>net.masterthought</groupId> <artifactId>maven-cucumber-reporting</artifactId>
|
||||||
<artifactId>totallylazy</artifactId>
|
<version>0.0.4</version> </dependency> -->
|
||||||
<version>991</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>net.masterthought</groupId>
|
|
||||||
<artifactId>cucumber-reporting</artifactId>
|
|
||||||
<version>0.0.21</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>net.masterthought</groupId>
|
|
||||||
<artifactId>maven-cucumber-reporting</artifactId>
|
|
||||||
<version>0.0.4</version>
|
|
||||||
</dependency>
|
|
||||||
-->
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<!--
|
<!-- uncomment for enhanced cucumber-jvm reporting http://www.masterthought.net/section/cucumber-reporting
|
||||||
uncomment for enhanced cucumber-jvm reporting
|
<repositories> <repository> <id>repo.bodar.com</id> <url>http://repo.bodar.com</url>
|
||||||
http://www.masterthought.net/section/cucumber-reporting
|
</repository> </repositories> -->
|
||||||
<repositories>
|
|
||||||
<repository>
|
|
||||||
<id>repo.bodar.com</id>
|
|
||||||
<url>http://repo.bodar.com</url>
|
|
||||||
</repository>
|
|
||||||
</repositories>
|
|
||||||
-->
|
|
||||||
|
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
@ -1,22 +1,16 @@
|
|||||||
<?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
|
||||||
Licensed to the Apache Software Foundation (ASF) under one
|
license agreements. See the NOTICE file distributed with this work for additional
|
||||||
or more contributor license agreements. See the NOTICE file
|
information regarding copyright ownership. The ASF licenses this file to
|
||||||
distributed with this work for additional information
|
you under the Apache License, Version 2.0 (the "License"); you may not use
|
||||||
regarding copyright ownership. The ASF licenses this file
|
this file except in compliance with the License. You may obtain a copy of
|
||||||
to you under the Apache License, Version 2.0 (the
|
the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
|
||||||
"License"); you may not use this file except in compliance
|
by applicable law or agreed to in writing, software distributed under the
|
||||||
with the License. You may obtain a copy of the License at
|
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
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
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"
|
||||||
Unless required by applicable law or agreed to in writing,
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||||
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>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<artifactId>java-design-patterns</artifactId>
|
<artifactId>java-design-patterns</artifactId>
|
||||||
@ -24,11 +18,7 @@
|
|||||||
<version>1.1.0</version>
|
<version>1.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<groupId>com.iluwatar</groupId>
|
|
||||||
<artifactId>naked-objects</artifactId>
|
<artifactId>naked-objects</artifactId>
|
||||||
<version>1.0-SNAPSHOT</version>
|
|
||||||
|
|
||||||
<name>Simple App</name>
|
|
||||||
|
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
@ -87,7 +77,7 @@
|
|||||||
<banLatest>true</banLatest>
|
<banLatest>true</banLatest>
|
||||||
<banRelease>true</banRelease>
|
<banRelease>true</banRelease>
|
||||||
</requirePluginVersions>
|
</requirePluginVersions>
|
||||||
<DependencyConvergence/>
|
<DependencyConvergence />
|
||||||
</rules>
|
</rules>
|
||||||
</configuration>
|
</configuration>
|
||||||
<executions>
|
<executions>
|
||||||
@ -250,48 +240,57 @@
|
|||||||
<exclude>**/translations*.po</exclude>
|
<exclude>**/translations*.po</exclude>
|
||||||
</excludes>
|
</excludes>
|
||||||
<licenses>
|
<licenses>
|
||||||
<license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
|
<license
|
||||||
|
implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
|
||||||
<licenseFamilyCategory>AL2</licenseFamilyCategory>
|
<licenseFamilyCategory>AL2</licenseFamilyCategory>
|
||||||
<licenseFamilyName>Apache License 2.0</licenseFamilyName>
|
<licenseFamilyName>Apache License 2.0</licenseFamilyName>
|
||||||
<notes/>
|
<notes />
|
||||||
<patterns>
|
<patterns>
|
||||||
<pattern>Licensed to the Apache Software Foundation (ASF) under one</pattern>
|
<pattern>Licensed to the Apache Software Foundation (ASF) under
|
||||||
|
one</pattern>
|
||||||
</patterns>
|
</patterns>
|
||||||
</license>
|
</license>
|
||||||
<license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
|
<license
|
||||||
|
implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
|
||||||
<licenseFamilyCategory>JQRY</licenseFamilyCategory>
|
<licenseFamilyCategory>JQRY</licenseFamilyCategory>
|
||||||
<licenseFamilyName>MIT</licenseFamilyName>
|
<licenseFamilyName>MIT</licenseFamilyName>
|
||||||
<notes/>
|
<notes />
|
||||||
<patterns>
|
<patterns>
|
||||||
<pattern>Dual licensed under the MIT or GPL Version 2 licenses.</pattern>
|
<pattern>Dual licensed under the MIT or GPL Version 2 licenses.</pattern>
|
||||||
</patterns>
|
</patterns>
|
||||||
</license>
|
</license>
|
||||||
<license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
|
<license
|
||||||
|
implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
|
||||||
<licenseFamilyCategory>JMOCK</licenseFamilyCategory>
|
<licenseFamilyCategory>JMOCK</licenseFamilyCategory>
|
||||||
<licenseFamilyName>JMock</licenseFamilyName>
|
<licenseFamilyName>JMock</licenseFamilyName>
|
||||||
<notes/>
|
<notes />
|
||||||
<patterns>
|
<patterns>
|
||||||
<pattern>Copyright (c) 2000-2007, jMock.org</pattern>
|
<pattern>Copyright (c) 2000-2007, jMock.org</pattern>
|
||||||
</patterns>
|
</patterns>
|
||||||
</license>
|
</license>
|
||||||
<license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
|
<license
|
||||||
|
implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
|
||||||
<licenseFamilyCategory>DOCBK</licenseFamilyCategory>
|
<licenseFamilyCategory>DOCBK</licenseFamilyCategory>
|
||||||
<licenseFamilyName>DocBook 4.5</licenseFamilyName>
|
<licenseFamilyName>DocBook 4.5</licenseFamilyName>
|
||||||
<notes/>
|
<notes />
|
||||||
<patterns>
|
<patterns>
|
||||||
<pattern>Permission to copy in any form is granted for use</pattern>
|
<pattern>Permission to copy in any form is granted for use</pattern>
|
||||||
<pattern>Permission to use, copy, modify and distribute the DocBook DTD</pattern>
|
<pattern>Permission to use, copy, modify and distribute the
|
||||||
<pattern>is hereby granted in perpetuity, provided that the above copyright</pattern>
|
DocBook DTD</pattern>
|
||||||
<pattern>This is the catalog data file for DocBook XML V4.5. It is provided as</pattern>
|
<pattern>is hereby granted in perpetuity, provided that the
|
||||||
|
above copyright</pattern>
|
||||||
|
<pattern>This is the catalog data file for DocBook XML V4.5. It
|
||||||
|
is provided as</pattern>
|
||||||
<pattern>XML Catalog data for DocBook XML V4.5</pattern>
|
<pattern>XML Catalog data for DocBook XML V4.5</pattern>
|
||||||
<pattern>DocBook additional general entities V4.5</pattern>
|
<pattern>DocBook additional general entities V4.5</pattern>
|
||||||
<pattern>XML EXCHANGE TABLE MODEL DECLARATION MODULE</pattern>
|
<pattern>XML EXCHANGE TABLE MODEL DECLARATION MODULE</pattern>
|
||||||
</patterns>
|
</patterns>
|
||||||
</license>
|
</license>
|
||||||
<license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
|
<license
|
||||||
|
implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
|
||||||
<licenseFamilyCategory>W3C</licenseFamilyCategory>
|
<licenseFamilyCategory>W3C</licenseFamilyCategory>
|
||||||
<licenseFamilyName>XHTML</licenseFamilyName>
|
<licenseFamilyName>XHTML</licenseFamilyName>
|
||||||
<notes/>
|
<notes />
|
||||||
<patterns>
|
<patterns>
|
||||||
<pattern>Copyright (c) 1998-2002 W3C (MIT, INRIA, Keio),</pattern>
|
<pattern>Copyright (c) 1998-2002 W3C (MIT, INRIA, Keio),</pattern>
|
||||||
</patterns>
|
</patterns>
|
||||||
@ -360,17 +359,17 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>${project.groupId}</groupId>
|
<groupId>${project.groupId}</groupId>
|
||||||
<artifactId>naked-objects-dom</artifactId>
|
<artifactId>naked-objects-dom</artifactId>
|
||||||
<version>1.0-SNAPSHOT</version>
|
<version>1.1.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>${project.groupId}</groupId>
|
<groupId>${project.groupId}</groupId>
|
||||||
<artifactId>naked-objects-fixture</artifactId>
|
<artifactId>naked-objects-fixture</artifactId>
|
||||||
<version>1.0-SNAPSHOT</version>
|
<version>1.1.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>${project.groupId}</groupId>
|
<groupId>${project.groupId}</groupId>
|
||||||
<artifactId>naked-objects-webapp</artifactId>
|
<artifactId>naked-objects-webapp</artifactId>
|
||||||
<version>1.0-SNAPSHOT</version>
|
<version>1.1.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
@ -1,32 +1,25 @@
|
|||||||
<?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
|
||||||
Licensed to the Apache Software Foundation (ASF) under one
|
license agreements. See the NOTICE file distributed with this work for additional
|
||||||
or more contributor license agreements. See the NOTICE file
|
information regarding copyright ownership. The ASF licenses this file to
|
||||||
distributed with this work for additional information
|
you under the Apache License, Version 2.0 (the "License"); you may not use
|
||||||
regarding copyright ownership. The ASF licenses this file
|
this file except in compliance with the License. You may obtain a copy of
|
||||||
to you under the Apache License, Version 2.0 (the
|
the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
|
||||||
"License"); you may not use this file except in compliance
|
by applicable law or agreed to in writing, software distributed under the
|
||||||
with the License. You may obtain a copy of the License at
|
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
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
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"
|
||||||
Unless required by applicable law or agreed to in writing,
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||||
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>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>com.iluwatar</groupId>
|
<groupId>com.iluwatar</groupId>
|
||||||
<artifactId>naked-objects</artifactId>
|
<artifactId>naked-objects</artifactId>
|
||||||
<version>1.0-SNAPSHOT</version>
|
<version>1.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>naked-objects-webapp</artifactId>
|
<artifactId>naked-objects-webapp</artifactId>
|
||||||
<name>Simple App Webapp</name>
|
|
||||||
|
|
||||||
<description>This module runs both the Wicket viewer and the Restfulobjects viewer in a single webapp configured to run using the datanucleus object store.</description>
|
<description>This module runs both the Wicket viewer and the Restfulobjects viewer in a single webapp configured to run using the datanucleus object store.</description>
|
||||||
|
|
||||||
@ -103,7 +96,8 @@
|
|||||||
</plugins>
|
</plugins>
|
||||||
<pluginManagement>
|
<pluginManagement>
|
||||||
<plugins>
|
<plugins>
|
||||||
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
|
<!--This plugin's configuration is used to store Eclipse m2e settings
|
||||||
|
only. It has no influence on the Maven build itself. -->
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.eclipse.m2e</groupId>
|
<groupId>org.eclipse.m2e</groupId>
|
||||||
<artifactId>lifecycle-mapping</artifactId>
|
<artifactId>lifecycle-mapping</artifactId>
|
||||||
@ -202,37 +196,19 @@
|
|||||||
<artifactId>geronimo-servlet_3.0_spec</artifactId>
|
<artifactId>geronimo-servlet_3.0_spec</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!--
|
<!-- JDBC drivers (for jdo objectstore) -->
|
||||||
JDBC drivers
|
|
||||||
(for jdo objectstore)
|
|
||||||
-->
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.hsqldb</groupId>
|
<groupId>org.hsqldb</groupId>
|
||||||
<artifactId>hsqldb</artifactId>
|
<artifactId>hsqldb</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!--
|
<!-- <dependency> <groupId>postgresql</groupId> <artifactId>postgresql</artifactId>
|
||||||
<dependency>
|
<version>9.1-901.jdbc4</version> </dependency> -->
|
||||||
<groupId>postgresql</groupId>
|
|
||||||
<artifactId>postgresql</artifactId>
|
|
||||||
<version>9.1-901.jdbc4</version>
|
|
||||||
</dependency>
|
|
||||||
-->
|
|
||||||
|
|
||||||
<!--
|
<!-- mvn install:install-file -Dfile=sqljdbc4.jar \ -DgroupId=com.microsoft.sqlserver
|
||||||
mvn install:install-file -Dfile=sqljdbc4.jar \
|
\ -DartifactId=jdbc \ -Dversion=4.0 \ -Dpackaging=jar -->
|
||||||
-DgroupId=com.microsoft.sqlserver \
|
<!-- <dependency> <groupId>com.microsoft.sqlserver</groupId> <artifactId>sqljdbc4</artifactId>
|
||||||
-DartifactId=jdbc \
|
<version>4.0</version> </dependency> -->
|
||||||
-Dversion=4.0 \
|
|
||||||
-Dpackaging=jar
|
|
||||||
-->
|
|
||||||
<!--
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.microsoft.sqlserver</groupId>
|
|
||||||
<artifactId>sqljdbc4</artifactId>
|
|
||||||
<version>4.0</version>
|
|
||||||
</dependency>
|
|
||||||
-->
|
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.lazyluke</groupId>
|
<groupId>org.lazyluke</groupId>
|
||||||
@ -252,9 +228,7 @@
|
|||||||
<id>self-host</id>
|
<id>self-host</id>
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
<!--
|
<!-- mvn -P self-host antrun:run -->
|
||||||
mvn -P self-host antrun:run
|
|
||||||
-->
|
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-antrun-plugin</artifactId>
|
<artifactId>maven-antrun-plugin</artifactId>
|
||||||
@ -262,7 +236,8 @@
|
|||||||
<tasks>
|
<tasks>
|
||||||
<exec executable="java" failonerror="true">
|
<exec executable="java" failonerror="true">
|
||||||
<arg value="-jar" />
|
<arg value="-jar" />
|
||||||
<arg value="${project.build.directory}/${project.build.finalName}-jetty-console.jar" />
|
<arg
|
||||||
|
value="${project.build.directory}/${project.build.finalName}-jetty-console.jar" />
|
||||||
</exec>
|
</exec>
|
||||||
</tasks>
|
</tasks>
|
||||||
</configuration>
|
</configuration>
|
||||||
@ -281,10 +256,8 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.geronimo.specs</groupId>
|
<groupId>org.apache.geronimo.specs</groupId>
|
||||||
<artifactId>geronimo-servlet_3.0_spec</artifactId>
|
<artifactId>geronimo-servlet_3.0_spec</artifactId>
|
||||||
<!--
|
<!-- Use 'compile' so can run o.a.i.WebServer from within IntelliJ;
|
||||||
Use 'compile' so can run o.a.i.WebServer from within IntelliJ;
|
can rely on servlet container to ignore this in war file -->
|
||||||
can rely on servlet container to ignore this in war file
|
|
||||||
-->
|
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
@ -299,11 +272,8 @@
|
|||||||
</properties>
|
</properties>
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
<!--
|
<!-- mvn -P jrebel antrun:run \ -Djrebel.jar="C:/Users/Dan/.IdeaIC13/config/plugins/jr-ide-idea/lib/jrebel/jrebel.jar"
|
||||||
mvn -P jrebel antrun:run \
|
\ -Disis_jrebel_plugin.jar="C:/github/danhaywood/isis-jrebel-plugin/target/danhaywood-isis-jrebel-plugin-1.0.0-SNAPSHOT.jar" -->
|
||||||
-Djrebel.jar="C:/Users/Dan/.IdeaIC13/config/plugins/jr-ide-idea/lib/jrebel/jrebel.jar" \
|
|
||||||
-Disis_jrebel_plugin.jar="C:/github/danhaywood/isis-jrebel-plugin/target/danhaywood-isis-jrebel-plugin-1.0.0-SNAPSHOT.jar"
|
|
||||||
-->
|
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-antrun-plugin</artifactId>
|
<artifactId>maven-antrun-plugin</artifactId>
|
||||||
@ -333,8 +303,10 @@
|
|||||||
<arg value="-Dtarget.dir=${target.dir}" />
|
<arg value="-Dtarget.dir=${target.dir}" />
|
||||||
|
|
||||||
<arg value="-Drebel.plugins=${isis_jrebel_plugin.jar}" />
|
<arg value="-Drebel.plugins=${isis_jrebel_plugin.jar}" />
|
||||||
<arg value="-Disis-jrebel-plugin.packagePrefix=${isis-jrebel-plugin.packagePrefix}" />
|
<arg
|
||||||
<arg value="-Disis-jrebel-plugin.loggingLevel=${isis-jrebel-plugin.loggingLevel}" />
|
value="-Disis-jrebel-plugin.packagePrefix=${isis-jrebel-plugin.packagePrefix}" />
|
||||||
|
<arg
|
||||||
|
value="-Disis-jrebel-plugin.loggingLevel=${isis-jrebel-plugin.loggingLevel}" />
|
||||||
<arg value="-XX:MaxPermSize=128m" />
|
<arg value="-XX:MaxPermSize=128m" />
|
||||||
<arg value="-classpath" />
|
<arg value="-classpath" />
|
||||||
<arg value="${runtime_classpath}" />
|
<arg value="${runtime_classpath}" />
|
||||||
|
Loading…
x
Reference in New Issue
Block a user