You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2012/01/24 21:27:09 UTC
svn commit: r1235471 - in /maven/plugins/trunk/maven-jar-plugin: ./
src/it/mjar-96/ src/it/mjar-96/src/ src/it/mjar-96/src/main/
src/it/mjar-96/src/main/java/ src/it/mjar-96/src/test/
src/it/mjar-96/src/test/java/
Author: krosenvold
Date: Tue Jan 24 20:27:09 2012
New Revision: 1235471
URL: http://svn.apache.org/viewvc?rev=1235471&view=rev
Log:
[MJAR-69] FIxed by upgrading deps
Added:
maven/plugins/trunk/maven-jar-plugin/src/it/mjar-96/
maven/plugins/trunk/maven-jar-plugin/src/it/mjar-96/pom.xml (with props)
maven/plugins/trunk/maven-jar-plugin/src/it/mjar-96/src/
maven/plugins/trunk/maven-jar-plugin/src/it/mjar-96/src/main/
maven/plugins/trunk/maven-jar-plugin/src/it/mjar-96/src/main/java/
maven/plugins/trunk/maven-jar-plugin/src/it/mjar-96/src/main/java/Foo.java (with props)
maven/plugins/trunk/maven-jar-plugin/src/it/mjar-96/src/test/
maven/plugins/trunk/maven-jar-plugin/src/it/mjar-96/src/test/java/
maven/plugins/trunk/maven-jar-plugin/src/it/mjar-96/src/test/java/FooTest.java (with props)
maven/plugins/trunk/maven-jar-plugin/src/it/mjar-96/verify.bsh (with props)
Modified:
maven/plugins/trunk/maven-jar-plugin/pom.xml
Modified: maven/plugins/trunk/maven-jar-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/pom.xml?rev=1235471&r1=1235470&r2=1235471&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-jar-plugin/pom.xml Tue Jan 24 20:27:09 2012
@@ -64,7 +64,7 @@ under the License.
</issueManagement>
<properties>
- <mavenArchiverVersion>2.5-SNAPSHOT</mavenArchiverVersion>
+ <mavenArchiverVersion>2.5</mavenArchiverVersion>
<mavenVersion>2.0.6</mavenVersion>
</properties>
@@ -98,7 +98,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
- <version>2.0.2</version>
+ <version>2.1</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
Added: maven/plugins/trunk/maven-jar-plugin/src/it/mjar-96/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/it/mjar-96/pom.xml?rev=1235471&view=auto
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/it/mjar-96/pom.xml (added)
+++ maven/plugins/trunk/maven-jar-plugin/src/it/mjar-96/pom.xml Tue Jan 24 20:27:09 2012
@@ -0,0 +1,51 @@
+<?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>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin-test-mjar-90</artifactId>
+ <version>99.0</version>
+ <name>Maven</name>
+ <packaging>jar</packaging>
+ <description>Test skip.
+and this os more description
+See how the manifest goes</description>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <!-- version>@pom.version@</version -->
+ <version>2.1</version>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/mjar-96/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-jar-plugin/src/it/mjar-96/src/main/java/Foo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/it/mjar-96/src/main/java/Foo.java?rev=1235471&view=auto
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/it/mjar-96/src/main/java/Foo.java (added)
+++ maven/plugins/trunk/maven-jar-plugin/src/it/mjar-96/src/main/java/Foo.java Tue Jan 24 20:27:09 2012
@@ -0,0 +1,31 @@
+
+/*
+ * 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.
+ */
+
+/**
+ * Hello world!
+ *
+ */
+public class Foo
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/mjar-96/src/main/java/Foo.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-jar-plugin/src/it/mjar-96/src/test/java/FooTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/it/mjar-96/src/test/java/FooTest.java?rev=1235471&view=auto
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/it/mjar-96/src/test/java/FooTest.java (added)
+++ maven/plugins/trunk/maven-jar-plugin/src/it/mjar-96/src/test/java/FooTest.java Tue Jan 24 20:27:09 2012
@@ -0,0 +1,35 @@
+
+/*
+ * 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.
+ */
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test
+ */
+public class FooTest
+ extends TestCase
+{
+ public void testFoo()
+ {
+ assertTrue( true );
+ }
+}
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/mjar-96/src/test/java/FooTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-jar-plugin/src/it/mjar-96/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/it/mjar-96/verify.bsh?rev=1235471&view=auto
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/it/mjar-96/verify.bsh (added)
+++ maven/plugins/trunk/maven-jar-plugin/src/it/mjar-96/verify.bsh Tue Jan 24 20:27:09 2012
@@ -0,0 +1,57 @@
+
+/*
+ * 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.
+ */
+
+import java.io.*;
+import java.util.*;
+import java.util.jar.*;
+import org.codehaus.plexus.util.*;
+
+boolean result = true;
+
+try
+{
+ File target = new File( basedir, "target" );
+ if ( !target.exists() || !target.isDirectory() )
+ {
+ System.err.println( "target file is missing or not a directory." );
+ return false;
+ }
+
+ File artifact = new File( target, "maven-jar-plugin-test-mjar-90-99.0.jar" );
+ if ( !artifact.exists() || artifact.isDirectory() )
+ {
+ System.err.println( "artifact file is missing or a directory." );
+ return false;
+ }
+
+ File testArtifact = new File( target, "maven-jar-plugin-test-mjar-90-99.0-tests.jar" );
+ if ( testArtifact.exists() )
+ {
+ System.err.println( "testArtifact file has been created with maven.Test.skip=true." );
+ return false;
+ }
+}
+catch( Throwable e )
+{
+ e.printStackTrace();
+ result = false;
+}
+
+return result;
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/mjar-96/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native