forked from pool/maven-archetype
This commit is contained in:
@@ -0,0 +1,4 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 11 08:42:34 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Initial packaging of maven-archetype 2.4
|
||||
@@ -0,0 +1,212 @@
|
||||
#
|
||||
# spec file for package maven-archetype
|
||||
#
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
Name: maven-archetype
|
||||
Version: 2.4
|
||||
Release: 0
|
||||
Summary: Maven project templating toolkit
|
||||
License: Apache-2.0 AND Apache-1.1
|
||||
URL: https://maven.apache.org/archetype/
|
||||
Source0: http://repo.maven.apache.org/maven2/org/apache/maven/archetype/%{name}/%{version}/%{name}-%{version}-source-release.zip
|
||||
Patch1: 0001-Add-Maven-3-compatibility.patch
|
||||
Patch2: 0002-Fix-jetty-namespace.patch
|
||||
Patch3: 0003-Port-to-current-plexus-utils.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: unzip
|
||||
BuildRequires: mvn(commons-collections:commons-collections)
|
||||
BuildRequires: mvn(commons-io:commons-io)
|
||||
BuildRequires: mvn(dom4j:dom4j)
|
||||
BuildRequires: mvn(jdom:jdom)
|
||||
BuildRequires: mvn(net.sourceforge.jchardet:jchardet)
|
||||
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
|
||||
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
|
||||
BuildRequires: mvn(org.apache.maven.shared:maven-invoker)
|
||||
BuildRequires: mvn(org.apache.maven.shared:maven-script-interpreter)
|
||||
BuildRequires: mvn(org.apache.maven:maven-compat)
|
||||
BuildRequires: mvn(org.apache.maven:maven-core)
|
||||
BuildRequires: mvn(org.apache.maven:maven-model:2.2.1)
|
||||
BuildRequires: mvn(org.apache.maven:maven-parent:pom:)
|
||||
BuildRequires: mvn(org.apache.maven:maven-plugin-api)
|
||||
BuildRequires: mvn(org.apache.maven:maven-project)
|
||||
BuildRequires: mvn(org.apache.velocity:velocity)
|
||||
BuildRequires: mvn(org.beanshell:bsh)
|
||||
BuildRequires: mvn(org.codehaus.modello:modello-maven-plugin)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-container-default)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-interactivity-api)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-velocity)
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
Archetype is a Maven project templating toolkit. An archetype is
|
||||
defined as an original pattern or model from which all other things of
|
||||
the same kind are made. The names fits as we are trying to provide a
|
||||
system that provides a consistent means of generating Maven
|
||||
projects. Archetype will help authors create Maven project templates
|
||||
for users, and provides users with the means to generate parameterized
|
||||
versions of those project templates.
|
||||
|
||||
Using archetypes provides a great way to enable developers quickly in
|
||||
a way consistent with best practices employed by your project or
|
||||
organization. Within the Maven project we use archetypes to try and
|
||||
get our users up and running as quickly as possible by providing a
|
||||
sample project that demonstrates many of the features of Maven while
|
||||
introducing new users to the best practices employed by Maven. In a
|
||||
matter of seconds a new user can have a working Maven project to use
|
||||
as a jumping board for investigating more of the features in Maven. We
|
||||
have also tried to make the Archetype mechanism additive and by that
|
||||
we mean allowing portions of a project to be captured in an archetype
|
||||
so that pieces or aspects of a project can be added to existing
|
||||
projects. A good example of this is the Maven site archetype. If, for
|
||||
example, you have used the quick start archetype to generate a working
|
||||
project you can then quickly create a site for that project by using
|
||||
the site archetype within that existing project. You can do anything
|
||||
like this with archetypes.
|
||||
|
||||
You may want to standardize J2EE development within your organization
|
||||
so you may want to provide archetypes for EJBs, or WARs, or for your
|
||||
web services. Once these archetypes are created and deployed in your
|
||||
organization's repository they are available for use by all developers
|
||||
within your organization.
|
||||
|
||||
%package javadoc
|
||||
Summary: API documentation for %{name}
|
||||
|
||||
%description javadoc
|
||||
%{summary}.
|
||||
|
||||
%package catalog
|
||||
Summary: Maven Archetype Catalog model
|
||||
|
||||
%description catalog
|
||||
%{summary}.
|
||||
|
||||
%package descriptor
|
||||
Summary: Maven Archetype Descriptor model
|
||||
|
||||
%description descriptor
|
||||
%{summary}.
|
||||
|
||||
%package registry
|
||||
Summary: Maven Archetype Registry model
|
||||
|
||||
%description registry
|
||||
%{summary}.
|
||||
|
||||
%package common
|
||||
Summary: Maven Archetype common classes
|
||||
|
||||
%description common
|
||||
%{summary}.
|
||||
|
||||
%package packaging
|
||||
Summary: Maven Archetype packaging configuration for archetypes
|
||||
|
||||
%description packaging
|
||||
%{summary}.
|
||||
|
||||
%package -n %{name}-plugin
|
||||
Summary: Maven Plugin for using archetypes
|
||||
|
||||
%description -n %{name}-plugin
|
||||
%{summary}.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
|
||||
# useless in packaging
|
||||
%pom_remove_plugin -r :apache-rat-plugin
|
||||
|
||||
# Add OSGI info to catalog and descriptor jars
|
||||
pushd archetype-models/archetype-catalog
|
||||
%pom_xpath_remove "pom:project/pom:packaging"
|
||||
%pom_xpath_inject "pom:project" "<packaging>bundle</packaging>"
|
||||
%pom_xpath_inject "pom:build/pom:plugins" "
|
||||
<plugin>
|
||||
<groupId>org.apache.felix</groupId>
|
||||
<artifactId>maven-bundle-plugin</artifactId>
|
||||
<extensions>true</extensions>
|
||||
<configuration>
|
||||
<instructions>
|
||||
<_nouses>true</_nouses>
|
||||
<Export-Package>org.apache.maven.archetype.catalog.*</Export-Package>
|
||||
</instructions>
|
||||
</configuration>
|
||||
</plugin>"
|
||||
popd
|
||||
pushd archetype-models/archetype-descriptor
|
||||
%pom_xpath_remove "pom:project/pom:packaging"
|
||||
%pom_xpath_inject "pom:project" "<packaging>bundle</packaging>"
|
||||
%pom_xpath_inject "pom:build/pom:plugins" "
|
||||
<plugin>
|
||||
<groupId>org.apache.felix</groupId>
|
||||
<artifactId>maven-bundle-plugin</artifactId>
|
||||
<extensions>true</extensions>
|
||||
<configuration>
|
||||
<instructions>
|
||||
<_nouses>true</_nouses>
|
||||
<Export-Package>org.apache.maven.archetype.metadata.*</Export-Package>
|
||||
</instructions>
|
||||
</configuration>
|
||||
</plugin>"
|
||||
popd
|
||||
|
||||
# groovy is not really needed
|
||||
%pom_remove_dep org.codehaus.groovy:groovy maven-archetype-plugin/pom.xml
|
||||
|
||||
%pom_disable_module archetype-testing
|
||||
%pom_remove_plugin org.apache.maven.plugins:maven-antrun-plugin archetype-common/pom.xml
|
||||
|
||||
%build
|
||||
%{mvn_package} :archetype-models maven-archetype
|
||||
# we don't have cargo so skip tests for now
|
||||
%{mvn_build} -s -f -- -Dmaven.compiler.source=6 -Dmaven.compiler.target=6 -Dsource=6
|
||||
|
||||
%install
|
||||
%mvn_install
|
||||
%fdupes -s %{buildroot}%{_javadocdir}
|
||||
|
||||
%files -f .mfiles-maven-archetype
|
||||
%license LICENSE
|
||||
%doc NOTICE
|
||||
|
||||
%files catalog -f .mfiles-archetype-catalog
|
||||
|
||||
%files descriptor -f .mfiles-archetype-descriptor
|
||||
|
||||
%files registry -f .mfiles-archetype-registry
|
||||
|
||||
%files common -f .mfiles-archetype-common
|
||||
|
||||
%files packaging -f .mfiles-archetype-packaging
|
||||
|
||||
%files -n %{name}-plugin -f .mfiles-maven-archetype-plugin
|
||||
|
||||
%files javadoc -f .mfiles-javadoc
|
||||
%license LICENSE
|
||||
|
||||
%changelog
|
||||
@@ -0,0 +1,23 @@
|
||||
## Default LFS
|
||||
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||
*.png filter=lfs diff=lfs merge=lfs -text
|
||||
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
||||
@@ -0,0 +1 @@
|
||||
.osc
|
||||
@@ -0,0 +1,61 @@
|
||||
From 9d3ab581009e3ab7a08e61f86f270134194bded5 Mon Sep 17 00:00:00 2001
|
||||
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
|
||||
Date: Wed, 14 Sep 2011 15:48:30 +0200
|
||||
Subject: [PATCH 1/3] Add Maven 3 compatibility
|
||||
|
||||
---
|
||||
archetype-common/pom.xml | 8 ++++++++
|
||||
maven-archetype-plugin/pom.xml | 4 ++++
|
||||
.../org/apache/maven/archetype/mojos/IntegrationTestMojo.java | 2 +-
|
||||
3 files changed, 13 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/archetype-common/pom.xml b/archetype-common/pom.xml
|
||||
index 9197880..f1ac876 100644
|
||||
--- a/archetype-common/pom.xml
|
||||
+++ b/archetype-common/pom.xml
|
||||
@@ -73,6 +73,14 @@
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.maven</groupId>
|
||||
+ <artifactId>maven-compat</artifactId>
|
||||
+ </dependency>
|
||||
+ <dependency>
|
||||
+ <groupId>org.apache.maven</groupId>
|
||||
+ <artifactId>maven-core</artifactId>
|
||||
+ </dependency>
|
||||
+ <dependency>
|
||||
+ <groupId>org.apache.maven</groupId>
|
||||
<artifactId>maven-model</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
diff --git a/maven-archetype-plugin/pom.xml b/maven-archetype-plugin/pom.xml
|
||||
index 9bb19c9..2713361 100644
|
||||
--- a/maven-archetype-plugin/pom.xml
|
||||
+++ b/maven-archetype-plugin/pom.xml
|
||||
@@ -83,6 +83,10 @@
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.codehaus.plexus</groupId>
|
||||
+ <artifactId>plexus-interactivity-api</artifactId>
|
||||
+ </dependency>
|
||||
+ <dependency>
|
||||
+ <groupId>org.codehaus.plexus</groupId>
|
||||
<artifactId>plexus-utils</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
diff --git a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
|
||||
index 66966d4..0b48590 100644
|
||||
--- a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
|
||||
+++ b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
|
||||
@@ -673,7 +673,7 @@ public class IntegrationTestMojo
|
||||
// interpolation with token @...@
|
||||
Map<String, Object> composite = getInterpolationValueSource();
|
||||
reader = ReaderFactory.newXmlReader( originalFile );
|
||||
- reader = new InterpolationFilterReader( reader, composite, "@", "@" );
|
||||
+ reader = new InterpolationFilterReader( reader, ( Map ) composite, "@", "@" );
|
||||
xml = IOUtil.toString( reader );
|
||||
}
|
||||
finally
|
||||
--
|
||||
2.5.5
|
||||
|
||||
@@ -0,0 +1,238 @@
|
||||
From 0d3632c231fbc057c338e067d9eb648a97d40583 Mon Sep 17 00:00:00 2001
|
||||
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||
Date: Fri, 13 Mar 2015 14:05:09 +0100
|
||||
Subject: [PATCH 2/3] Fix jetty namespace
|
||||
|
||||
---
|
||||
.../java/org/apache/maven/archetype/ArchetypeCatalogsTest.java | 4 ++--
|
||||
.../org/apache/maven/archetype/test/ArchetyperRoundtripTest.java | 4 ++--
|
||||
.../maven/archetype/test/ArchetyperRoundtripWithProxyTest.java | 4 ++--
|
||||
.../org/apache/maven/archetype/test/RoundtripMultiModuleTest.java | 4 ++--
|
||||
archetype-samples/webapp/pom.xml | 4 ++--
|
||||
archetype-testing/archetype-proxy/pom.xml | 8 ++++----
|
||||
.../main/java/org/apache/maven/archetype/proxy/ProxyServlet.java | 2 +-
|
||||
.../java/org/apache/maven/archetype/proxy/RepositoryServlet.java | 6 +++---
|
||||
archetype-testing/archetype-repository/pom.xml | 8 ++++----
|
||||
.../org/apache/maven/archetype/repository/RepositoryServlet.java | 6 +++---
|
||||
pom.xml | 2 +-
|
||||
11 files changed, 26 insertions(+), 26 deletions(-)
|
||||
|
||||
diff --git a/archetype-common/src/test/java/org/apache/maven/archetype/ArchetypeCatalogsTest.java b/archetype-common/src/test/java/org/apache/maven/archetype/ArchetypeCatalogsTest.java
|
||||
index 952caa4..840417a 100644
|
||||
--- a/archetype-common/src/test/java/org/apache/maven/archetype/ArchetypeCatalogsTest.java
|
||||
+++ b/archetype-common/src/test/java/org/apache/maven/archetype/ArchetypeCatalogsTest.java
|
||||
@@ -22,8 +22,8 @@ import org.apache.maven.archetype.catalog.Archetype;
|
||||
import org.apache.maven.archetype.catalog.ArchetypeCatalog;
|
||||
import org.apache.maven.archetype.catalog.io.xpp3.ArchetypeCatalogXpp3Writer;
|
||||
import org.codehaus.plexus.PlexusTestCase;
|
||||
-import org.mortbay.jetty.Server;
|
||||
-import org.mortbay.jetty.webapp.WebAppContext;
|
||||
+import org.eclipse.jetty.Server;
|
||||
+import org.eclipse.jetty.webapp.WebAppContext;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileWriter;
|
||||
diff --git a/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java b/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java
|
||||
index f6f9c55..ca41101 100644
|
||||
--- a/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java
|
||||
+++ b/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java
|
||||
@@ -38,8 +38,8 @@ import org.apache.maven.project.interpolation.ModelInterpolator;
|
||||
import org.codehaus.plexus.PlexusTestCase;
|
||||
import org.codehaus.plexus.util.FileUtils;
|
||||
import org.codehaus.plexus.util.StringUtils;
|
||||
-import org.mortbay.jetty.Server;
|
||||
-import org.mortbay.jetty.webapp.WebAppContext;
|
||||
+import org.eclipse.jetty.Server;
|
||||
+import org.eclipse.jetty.webapp.WebAppContext;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileWriter;
|
||||
diff --git a/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java b/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java
|
||||
index a58b828..d04d724 100644
|
||||
--- a/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java
|
||||
+++ b/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java
|
||||
@@ -39,8 +39,8 @@ import org.apache.maven.project.interpolation.ModelInterpolator;
|
||||
import org.codehaus.plexus.PlexusTestCase;
|
||||
import org.codehaus.plexus.util.FileUtils;
|
||||
import org.codehaus.plexus.util.StringUtils;
|
||||
-import org.mortbay.jetty.Server;
|
||||
-import org.mortbay.jetty.webapp.WebAppContext;
|
||||
+import org.eclipse.jetty.Server;
|
||||
+import org.eclipse.jetty.webapp.WebAppContext;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileOutputStream;
|
||||
diff --git a/archetype-common/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleTest.java b/archetype-common/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleTest.java
|
||||
index fd66d35..29b7510 100644
|
||||
--- a/archetype-common/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleTest.java
|
||||
+++ b/archetype-common/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleTest.java
|
||||
@@ -39,8 +39,8 @@ import org.apache.maven.project.interpolation.ModelInterpolator;
|
||||
import org.codehaus.plexus.PlexusTestCase;
|
||||
import org.codehaus.plexus.util.FileUtils;
|
||||
import org.codehaus.plexus.util.StringUtils;
|
||||
-import org.mortbay.jetty.Server;
|
||||
-import org.mortbay.jetty.webapp.WebAppContext;
|
||||
+import org.eclipse.jetty.Server;
|
||||
+import org.eclipse.jetty.webapp.WebAppContext;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileOutputStream;
|
||||
diff --git a/archetype-samples/webapp/pom.xml b/archetype-samples/webapp/pom.xml
|
||||
index d65a097..b6153ee 100644
|
||||
--- a/archetype-samples/webapp/pom.xml
|
||||
+++ b/archetype-samples/webapp/pom.xml
|
||||
@@ -22,11 +22,11 @@
|
||||
<defaultGoal>jetty:run</defaultGoal>
|
||||
<plugins>
|
||||
<plugin>
|
||||
- <groupId>org.mortbay.jetty</groupId>
|
||||
+ <groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>maven-jetty-plugin</artifactId>
|
||||
<configuration>
|
||||
<connectors>
|
||||
- <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
|
||||
+ <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
|
||||
<port>15000</port>
|
||||
<maxIdleTime>60000</maxIdleTime>
|
||||
</connector>
|
||||
diff --git a/archetype-testing/archetype-proxy/pom.xml b/archetype-testing/archetype-proxy/pom.xml
|
||||
index 8e2cd3f..a017711 100644
|
||||
--- a/archetype-testing/archetype-proxy/pom.xml
|
||||
+++ b/archetype-testing/archetype-proxy/pom.xml
|
||||
@@ -47,7 +47,7 @@
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
- <groupId>org.mortbay.jetty</groupId>
|
||||
+ <groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-util</artifactId>
|
||||
<version>6.1.11</version>
|
||||
<scope>compile</scope>
|
||||
@@ -68,11 +68,11 @@
|
||||
</proxy>
|
||||
</proxies>
|
||||
-->
|
||||
- <groupId>org.mortbay.jetty</groupId>
|
||||
+ <groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>maven-jetty-plugin</artifactId>
|
||||
<configuration>
|
||||
<connectors>
|
||||
- <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
|
||||
+ <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
|
||||
<port>18881</port>
|
||||
<maxIdleTime>60000</maxIdleTime>
|
||||
</connector>
|
||||
@@ -84,4 +84,4 @@
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
-</project>
|
||||
\ No newline at end of file
|
||||
+</project>
|
||||
diff --git a/archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/ProxyServlet.java b/archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/ProxyServlet.java
|
||||
index 8388221..e749d15 100644
|
||||
--- a/archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/ProxyServlet.java
|
||||
+++ b/archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/ProxyServlet.java
|
||||
@@ -41,7 +41,7 @@ import javax.servlet.http.HttpServlet;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
-import org.mortbay.util.IO;
|
||||
+import org.eclipse.jetty.util.IO;
|
||||
|
||||
/**
|
||||
* Stolen code from Mortbay
|
||||
diff --git a/archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/RepositoryServlet.java b/archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/RepositoryServlet.java
|
||||
index a612d63..7736a7f 100644
|
||||
--- a/archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/RepositoryServlet.java
|
||||
+++ b/archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/RepositoryServlet.java
|
||||
@@ -35,8 +35,8 @@ import javax.servlet.ServletResponse;
|
||||
import javax.servlet.http.HttpServlet;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
-import org.mortbay.util.IO;
|
||||
-import org.mortbay.util.StringUtil;
|
||||
+import org.eclipse.jetty.util.IO;
|
||||
+import org.eclipse.jetty.util.StringUtil;
|
||||
|
||||
/**
|
||||
*
|
||||
@@ -261,4 +261,4 @@ public class RepositoryServlet
|
||||
return "Repository Servlet";
|
||||
}
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff --git a/archetype-testing/archetype-repository/pom.xml b/archetype-testing/archetype-repository/pom.xml
|
||||
index cc597c5..ed38524 100644
|
||||
--- a/archetype-testing/archetype-repository/pom.xml
|
||||
+++ b/archetype-testing/archetype-repository/pom.xml
|
||||
@@ -47,7 +47,7 @@
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
- <groupId>org.mortbay.jetty</groupId>
|
||||
+ <groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-util</artifactId>
|
||||
<version>6.1.11</version>
|
||||
<scope>compile</scope>
|
||||
@@ -68,11 +68,11 @@
|
||||
</proxy>
|
||||
</proxies>
|
||||
-->
|
||||
- <groupId>org.mortbay.jetty</groupId>
|
||||
+ <groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>maven-jetty-plugin</artifactId>
|
||||
<configuration>
|
||||
<connectors>
|
||||
- <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
|
||||
+ <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
|
||||
<port>18882</port>
|
||||
<maxIdleTime>60000</maxIdleTime>
|
||||
</connector>
|
||||
@@ -90,4 +90,4 @@
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
-</project>
|
||||
\ No newline at end of file
|
||||
+</project>
|
||||
diff --git a/archetype-testing/archetype-repository/src/main/java/org/apache/maven/archetype/repository/RepositoryServlet.java b/archetype-testing/archetype-repository/src/main/java/org/apache/maven/archetype/repository/RepositoryServlet.java
|
||||
index 79c9f4f..48c91d1 100644
|
||||
--- a/archetype-testing/archetype-repository/src/main/java/org/apache/maven/archetype/repository/RepositoryServlet.java
|
||||
+++ b/archetype-testing/archetype-repository/src/main/java/org/apache/maven/archetype/repository/RepositoryServlet.java
|
||||
@@ -29,8 +29,8 @@ import javax.servlet.http.HttpServlet;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
-import org.mortbay.util.IO;
|
||||
-import org.mortbay.util.StringUtil;
|
||||
+import org.eclipse.jetty.util.IO;
|
||||
+import org.eclipse.jetty.util.StringUtil;
|
||||
|
||||
/**
|
||||
*
|
||||
@@ -86,4 +86,4 @@ public class RepositoryServlet
|
||||
IO.close( is );
|
||||
}
|
||||
}
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index 54bcd46..e17042f 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -249,7 +249,7 @@
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
- <groupId>org.mortbay.jetty</groupId>
|
||||
+ <groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>maven-jetty-plugin</artifactId>
|
||||
<version>6.1.6</version>
|
||||
</plugin>
|
||||
--
|
||||
2.5.5
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
From dc4233a5bfd55354c003615b33cf9b973149cc08 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Simacek <msimacek@redhat.com>
|
||||
Date: Thu, 2 Jun 2016 13:01:11 +0200
|
||||
Subject: [PATCH 3/3] Port to current plexus-utils
|
||||
|
||||
---
|
||||
.../apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java
|
||||
index ab0162a..38edc86 100644
|
||||
--- a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java
|
||||
+++ b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java
|
||||
@@ -39,6 +39,7 @@ import org.codehaus.plexus.util.PropertyUtils;
|
||||
import org.codehaus.plexus.util.StringUtils;
|
||||
|
||||
import java.io.File;
|
||||
+import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
@@ -287,7 +288,7 @@ public class CreateArchetypeFromProjectMojo
|
||||
}
|
||||
}
|
||||
|
||||
- private List<String> getFilteredExtensions( String archetypeFilteredExtentions, File propertyFile )
|
||||
+ private List<String> getFilteredExtensions( String archetypeFilteredExtentions, File propertyFile ) throws IOException
|
||||
{
|
||||
List<String> filteredExtensions = new ArrayList<String>();
|
||||
|
||||
@@ -321,7 +322,7 @@ public class CreateArchetypeFromProjectMojo
|
||||
return filteredExtensions;
|
||||
}
|
||||
|
||||
- private List<String> getLanguages( String archetypeLanguages, File propertyFile )
|
||||
+ private List<String> getLanguages( String archetypeLanguages, File propertyFile ) throws IOException
|
||||
{
|
||||
List<String> resultingLanguages = new ArrayList<String>();
|
||||
|
||||
--
|
||||
2.5.5
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b9819b0c5ec416f33e38d843a35e32c7d290ba4b7a7a953c930d424314a5bd51
|
||||
size 721148
|
||||
Reference in New Issue
Block a user