diff --git a/.gitignore b/.gitignore
index 45059fd..d54c2a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/org.apache.felix.gogo.runtime-0.10.0-project.tar.gz
/org.apache.felix.gogo.runtime-0.12.1-project.tar.gz
/org.apache.felix.gogo.runtime-0.16.2-project.tar.gz
+/org.apache.felix.gogo.runtime-1.0.4-source-release.tar.gz
diff --git a/felix-gogo-runtime-bundle-resources.patch b/felix-gogo-runtime-bundle-resources.patch
deleted file mode 100644
index 4443435..0000000
--- a/felix-gogo-runtime-bundle-resources.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/pom.xml b/pom.xml
-index 345457c..d467d41 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -71,7 +71,7 @@
- ${pom.artifactId}
- The Apache Software Foundation
- org.apache.felix.gogo.runtime.activator.Activator
-- {maven-resources},META-INF/LICENSE=LICENSE,META-INF/NOTICE=NOTICE,META-INF/DEPENDENCIES=DEPENDENCIES
-+ {maven-resources},LICENSE,NOTICE,DEPENDENCIES
- <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))
- <_removeheaders>Private-Package,Ignore-Package,Include-Resource
-
diff --git a/felix-gogo-runtime-deleted-io-test.patch b/felix-gogo-runtime-deleted-io-test.patch
deleted file mode 100644
index d0c500c..0000000
--- a/felix-gogo-runtime-deleted-io-test.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff --git a/src/test/java/org/apache/felix/gogo/runtime/threadio/TestThreadIO.java b/src/test/java/org/apache/felix/gogo/runtime/threadio/TestThreadIO.java
-deleted file mode 100644
-index 32ea917..0000000
---- a/src/test/java/org/apache/felix/gogo/runtime/threadio/TestThreadIO.java
-+++ /dev/null
-@@ -1,89 +0,0 @@
--/*
-- * 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.
-- */
--package org.apache.felix.gogo.runtime.threadio;
--
--import junit.framework.TestCase;
--
--import java.io.ByteArrayOutputStream;
--import java.io.PrintStream;
--import java.util.ArrayList;
--import java.util.List;
--
--public class TestThreadIO extends TestCase
--{
--
-- /**
-- * Test if the threadio works in a nested fashion. We first push
-- * ten markers on the stack and print a message for each, capturing
-- * the output in a ByteArrayOutputStream. Then we pop them, also printing
-- * a message identifying the level. Then we verify the output for each level.
-- */
-- public void testNested()
-- {
-- ThreadIOImpl tio = new ThreadIOImpl();
-- tio.start();
-- List list = new ArrayList();
-- for (int i = 0; i < 10; i++)
-- {
-- ByteArrayOutputStream out = new ByteArrayOutputStream();
-- list.add(out);
-- tio.setStreams(System.in, new PrintStream(out), System.err);
-- System.out.print("b" + i);
-- }
-- for (int i = 9; i >= 0; i--)
-- {
-- System.out.println("e" + i);
-- tio.close();
-- }
-- tio.stop();
-- for (int i = 0; i < 10; i++)
-- {
-- String message = list.get(i).toString().trim();
-- assertEquals("b" + i + "e" + i, message);
-- }
-- }
--
-- /**
-- * Simple test too see if the basics work.
-- */
-- public void testSimple()
-- {
-- ThreadIOImpl tio = new ThreadIOImpl();
-- tio.start();
-- System.out.println("Hello World");
-- ByteArrayOutputStream out = new ByteArrayOutputStream();
-- ByteArrayOutputStream err = new ByteArrayOutputStream();
-- tio.setStreams(System.in, new PrintStream(out), new PrintStream(err));
-- try
-- {
-- System.out.println("Simple Normal Message");
-- System.err.println("Simple Error Message");
-- }
-- finally
-- {
-- tio.close();
-- }
-- tio.stop();
-- String normal = out.toString().trim();
-- //String error = err.toString().trim();
-- assertEquals("Simple Normal Message", normal);
-- //assertEquals("Simple Error Message", error );
-- System.out.println("Goodbye World");
-- }
--}
diff --git a/felix-gogo-runtime-dictionary.patch b/felix-gogo-runtime-dictionary.patch
deleted file mode 100644
index 8ede2a2..0000000
--- a/felix-gogo-runtime-dictionary.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/main/java/org/apache/felix/gogo/runtime/activator/EventAdminListener.java b/src/main/java/org/apache/felix/gogo/runtime/activator/EventAdminListener.java
-index 2368ce1..dab9269 100644
---- a/src/main/java/org/apache/felix/gogo/runtime/activator/EventAdminListener.java
-+++ b/src/main/java/org/apache/felix/gogo/runtime/activator/EventAdminListener.java
-@@ -19,6 +19,7 @@
- package org.apache.felix.gogo.runtime.activator;
-
- import java.util.Properties;
-+import java.util.Dictionary;
-
- import org.apache.felix.gogo.api.CommandSessionListener;
- import org.apache.felix.service.command.CommandSession;
-@@ -45,7 +46,7 @@ public class EventAdminListener implements CommandSessionListener
- if (admin != null) {
- Properties props = new Properties();
- props.setProperty("command", command.toString());
-- Event event = new Event("org/apache/felix/service/command/EXECUTING", props);
-+ Event event = new Event("org/apache/felix/service/command/EXECUTING", (Dictionary)props);
- admin.postEvent(event);
- }
- }
diff --git a/felix-gogo-runtime-parent.patch b/felix-gogo-runtime-parent.patch
deleted file mode 100644
index f8b0bfd..0000000
--- a/felix-gogo-runtime-parent.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/pom.xml b/pom.xml
-index d467d41..5dd4bbb 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -21,7 +21,6 @@
- org.apache.felix
- gogo-parent
- 0.6.0
-- ../gogo-parent/pom.xml
-
- 4.0.0
- bundle
diff --git a/felix-gogo-runtime.spec b/felix-gogo-runtime.spec
index c35d967..c1acdba 100644
--- a/felix-gogo-runtime.spec
+++ b/felix-gogo-runtime.spec
@@ -1,33 +1,19 @@
Name: felix-gogo-runtime
-Version: 0.16.2
-Release: 5%{?dist}
+Version: 1.0.4
+Release: 1%{?dist}
Summary: Community OSGi R4 Service Platform Implementation - Basic Commands
License: ASL 2.0
-URL: http://felix.apache.org/site/apache-felix-gogo.html
+URL: http://felix.apache.org/documentation/subprojects/apache-felix-gogo.html
-Source0: http://www.apache.org/dist/felix/org.apache.felix.gogo.runtime-%{version}-project.tar.gz
-
-# Typecast an Event constructor call with java.util.Properties to
-# java.util.Dictionary because the call to the constructor with Properties
-# was ambiguous.
-Patch1: felix-gogo-runtime-dictionary.patch
-# Changed path to DEPENDENCIES, LICENSE and NOTICE from META-INF to root dir
-Patch2: felix-gogo-runtime-bundle-resources.patch
-# Removed failing thread IO test
-Patch3: felix-gogo-runtime-deleted-io-test.patch
-# Removed relativePath to parent pom
-Patch4: felix-gogo-runtime-parent.patch
+Source0: https://repo1.maven.org/maven2/org/apache/felix/org.apache.felix.gogo.runtime/%{version}/org.apache.felix.gogo.runtime-%{version}-source-release.tar.gz
BuildArch: noarch
BuildRequires: maven-local
-BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.apache.felix:gogo-parent:pom:)
-BuildRequires: mvn(org.easymock:easymock)
-BuildRequires: mvn(org.mockito:mockito-all)
-BuildRequires: mvn(org.osgi:org.osgi.compendium)
-BuildRequires: mvn(org.osgi:org.osgi.core)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires: mvn(org.osgi:osgi.cmpn)
+BuildRequires: mvn(org.osgi:osgi.core)
%description
Apache Felix is a community effort to implement the OSGi R4 Service Platform
@@ -46,10 +32,9 @@ This package contains the API documentation for %{name}.
%prep
%setup -q -n org.apache.felix.gogo.runtime-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+
+%pom_change_dep :org.osgi.core :osgi.core
+%pom_change_dep :org.osgi.compendium :osgi.cmpn
%mvn_file : felix/%{name}
@@ -60,12 +45,15 @@ This package contains the API documentation for %{name}.
%mvn_install
%files -f .mfiles
-%doc DEPENDENCIES LICENSE NOTICE
+%doc DEPENDENCIES LICENSE NOTICE
%files javadoc -f .mfiles-javadoc
%doc LICENSE NOTICE
%changelog
+* Fri May 05 2017 Michael Simacek - 1.0.4-1
+- Update to upstream version 1.0.4
+
* Fri Feb 10 2017 Fedora Release Engineering - 0.16.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
diff --git a/sources b/sources
index c2e974c..2b455e5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-54dd0856165f7a202a88aee1e281e333 org.apache.felix.gogo.runtime-0.16.2-project.tar.gz
+SHA512 (org.apache.felix.gogo.runtime-1.0.4-source-release.tar.gz) = a9b8291b980c6f3a97396d1f9ee9ac6832c77c9f4bf456cdf99536741135f9ecd43f6a2a321ce8cbc9947085eb546da8527a172a724be7072b21c4049240bed3